1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
use crate::buffer::{Buffer, Cell, CellDiffOption, CellWidth};
use crate::layout::Rect;
use crate::style::{Color, Modifier};
/// A zero-allocation iterator over the differences between two buffers of the same width.
///
/// Yields `(x, y, &Cell)` tuples for each cell in `next` that differs from the corresponding cell
/// in `prev`. Handles multi-width characters (including VS16 emoji trailing cells) and
/// [`CellDiffOption`] directives.
#[derive(Debug)]
pub struct BufferDiff<'prev, 'next> {
/// The next (current) buffer's cells.
next: &'next [Cell],
/// The previous buffer's cells.
prev: &'prev [Cell],
/// Buffer width (for `pos_of` calculation).
area: Rect,
/// Current position in the flat cell array.
pos: usize,
/// Tracks trailing cells that must be yielded after a wide character is processed.
///
/// Set when a wide char was replaced by narrower content (force=true) or when a VS16 emoji
/// needs its trailing column checked (force=false).
trailing: Option<TrailingState>,
}
/// Tracks pending trailing-cell yields when a wide character is followed by narrower content.
#[derive(Debug)]
struct TrailingState {
next_index: usize,
end: usize,
/// When `true`, all cells in the trailing range are emitted unconditionally: the previous
/// wide character's style was visible on blank cells, so the terminal may show stale style
/// there and every trailing cell must be refreshed.
///
/// When `false` (VS16 path), only cells whose symbol changed are emitted, because the emoji
/// visually covers its trailing column and style differences there are invisible.
force: bool,
}
/// Modifiers that are visually apparent on a blank (space) cell.
const VISIBLE_ON_BLANK: Modifier = Modifier::REVERSED
.union(Modifier::UNDERLINED)
.union(Modifier::SLOW_BLINK)
.union(Modifier::RAPID_BLINK)
.union(Modifier::CROSSED_OUT);
impl<'prev, 'next> BufferDiff<'prev, 'next> {
/// Creates a new iterator over the differences between `prev` and `next` terminal cells.
///
/// Heights may differ; the iterator uses the minimum of the two.
///
/// # Panics
///
/// Panics if the buffers have different `x`, `y`, or `width` values.
pub(crate) fn new(prev: &'prev Buffer, next: &'next Buffer) -> Self {
assert!(
prev.area.x == next.area.x
&& prev.area.y == next.area.y
&& prev.area.width == next.area.width,
"buffer areas must have the same x, y, and width: prev={:?}, next={:?}",
prev.area,
next.area,
);
let mut area = prev.area;
area.height = area.height.min(next.area.height);
Self {
next: &next.content,
prev: &prev.content,
area,
pos: 0,
trailing: None,
}
}
/// Converts a flat index to (x, y) coordinates.
const fn pos_of(&self, index: usize) -> (u16, u16) {
let w = self.area.width as usize;
let x = index % w + self.area.x as usize;
let y = index / w + self.area.y as usize;
(x as u16, y as u16)
}
}
impl<'next> Iterator for BufferDiff<'_, 'next> {
type Item = (u16, u16, &'next Cell);
fn next(&mut self) -> Option<Self::Item> {
let len = self.next.len().min(self.prev.len());
// First, yield any pending trailing cells.
if let Some(TrailingState {
next_index,
end,
force,
}) = &mut self.trailing
{
while *next_index < *end {
let j = *next_index;
// Advance past this cell; if it is wide, also skip its own trailing column
// so the main loop does not emit a spurious EMPTY write over it.
let cell_width = self.next[j].cell_width().max(1) as usize;
*next_index += cell_width;
*end = (*end).max(*next_index).min(len);
if !is_skip(&self.next[j])
&& (*force || self.prev[j].symbol() != self.next[j].symbol())
{
let (tx, ty) = self.pos_of(j);
return Some((tx, ty, &self.next[j]));
}
}
// Done with trailing cells; resume main loop past the wide character.
self.pos = *end;
self.trailing = None;
}
while self.pos < len {
let i = self.pos;
self.pos += 1;
let current = &self.next[i];
let previous = &self.prev[i];
match current.diff_option {
CellDiffOption::Skip => {}
_ if is_skip(current) => {}
CellDiffOption::ForcedWidth(width) => {
self.pos = self
.pos
.saturating_add(width.get().saturating_sub(1) as usize);
if current != previous {
let (x, y) = self.pos_of(i);
return Some((x, y, &self.next[i]));
}
}
CellDiffOption::None | CellDiffOption::AlwaysUpdate => {
// If the current cell is multi-width, ensure the trailing cells are
// explicitly cleared when they previously contained non-blank content.
// Some terminals do not reliably clear the trailing cell(s) when printing
// a wide grapheme, which can result in visual artifacts (e.g., leftover
// characters). Emitting an explicit update for the trailing cells avoids
// this.
let cell_width = current.cell_width() as usize;
if matches!(current.diff_option, CellDiffOption::None) && current == previous {
// Equal cells still need to account for multi-width skip.
self.pos += cell_width.saturating_sub(1);
continue;
}
let previous_width = previous.cell_width() as usize;
// Work around terminals that fail to clear the trailing cell of certain
// emoji presentation sequences (those containing VS16 / U+FE0F).
// Only emit explicit clears for such sequences to avoid bloating diffs
// for standard wide characters (e.g., CJK), which terminals handle well.
let contains_vs16 =
cell_width > 1 && current.symbol().chars().any(|c| c == '\u{FE0F}');
if contains_vs16 {
let trailing_end = (i + cell_width).min(len);
self.trailing = Some(TrailingState {
next_index: i + 1,
end: trailing_end,
force: false,
});
} else if cell_width > 1 {
self.pos += cell_width.saturating_sub(1);
} else if previous_width > cell_width
&& (previous.bg != Color::Reset
|| previous.modifier.intersects(VISIBLE_ON_BLANK))
{
// The previous wide character's style is visible on blank cells, so the
// terminal may still show it on the trailing columns even after the
// character is replaced. Force-emit every cell in the trailing range to
// refresh the terminal regardless of whether the buffer content changed.
self.trailing = Some(TrailingState {
next_index: i + 1,
end: i + previous_width,
force: true,
});
} else {
// single-width character, no position adjustment needed
}
let (x, y) = self.pos_of(i);
return Some((x, y, &self.next[i]));
}
}
}
None
}
}
/// Returns `true` if this cell should be skipped during diffing.
#[allow(deprecated)]
const fn is_skip(cell: &Cell) -> bool {
matches!(cell.diff_option, CellDiffOption::Skip)
|| (cell.skip && matches!(cell.diff_option, CellDiffOption::None))
}
#[cfg(test)]
mod tests {
use alloc::vec::Vec;
use core::num::NonZeroU16;
use compact_str::CompactString;
use super::*;
use crate::buffer::Buffer;
use crate::layout::Rect;
use crate::style::Color;
#[test]
fn empty_buffers_yield_no_diffs() {
let rect = Rect::new(0, 0, 5, 1);
let buf = Buffer::empty(rect);
let diff: Vec<_> = BufferDiff::new(&buf, &buf).collect();
assert!(diff.is_empty());
}
#[test]
fn identical_buffers_yield_no_diffs() {
let buf = Buffer::with_lines(["hello"]);
let diff: Vec<_> = BufferDiff::new(&buf, &buf).collect();
assert!(diff.is_empty());
}
#[test]
fn single_cell_change() {
let prev = Buffer::with_lines(["hello"]);
let next = Buffer::with_lines(["hallo"]);
let diff: Vec<_> = BufferDiff::new(&prev, &next).collect();
assert_eq!(diff.len(), 1);
assert_eq!(diff[0].0, 1); // x
assert_eq!(diff[0].1, 0); // y
assert_eq!(diff[0].2.symbol(), "a");
}
#[test]
fn all_cells_changed() {
let prev = Buffer::with_lines(["aaa"]);
let next = Buffer::with_lines(["bbb"]);
let diff: Vec<_> = BufferDiff::new(&prev, &next).collect();
assert_eq!(diff.len(), 3);
}
#[test]
fn skip_cells_are_skipped() {
let prev = Buffer::with_lines(["abc"]);
let mut next = Buffer::with_lines(["xyz"]);
next.content[1].diff_option = CellDiffOption::Skip;
let diff: Vec<_> = BufferDiff::new(&prev, &next).collect();
assert_eq!(diff.len(), 2);
assert_eq!(diff[0].2.symbol(), "x");
assert_eq!(diff[1].2.symbol(), "z");
}
#[test]
fn always_update_cells_are_emitted_even_when_identical() {
let mut prev = Buffer::with_lines(["abc"]);
prev.content[1].diff_option = CellDiffOption::AlwaysUpdate;
let mut next = Buffer::with_lines(["abc"]);
next.content[1].diff_option = CellDiffOption::AlwaysUpdate;
let diff: Vec<_> = BufferDiff::new(&prev, &next).collect();
assert_eq!(diff.len(), 1);
assert_eq!(diff[0].0, 1);
assert_eq!(diff[0].1, 0);
assert_eq!(diff[0].2.symbol(), "b");
}
#[test]
fn forced_width_skips_trailing() {
let prev = Buffer::with_lines(["abcd"]);
let mut next = Buffer::with_lines(["xbcd"]);
next.content[0].diff_option = CellDiffOption::ForcedWidth(NonZeroU16::new(2).unwrap());
let diff: Vec<_> = BufferDiff::new(&prev, &next).collect();
assert_eq!(diff.len(), 1);
assert_eq!(diff[0].2.symbol(), "x");
}
#[test]
fn vs16_trailing_cell_unchanged() {
use crate::style::{Color, Style};
let rect = Rect::new(0, 0, 4, 1);
let mut prev = Buffer::empty(rect);
prev.set_string(0, 0, "⌨️", Style::new());
prev.set_string(2, 0, "ab", Style::new());
let mut next = Buffer::empty(rect);
next.set_string(0, 0, "⌨️", Style::new().fg(Color::Red));
next.set_string(2, 0, "ab", Style::new());
// Only the main emoji cell (0,0) differs (different style);
// the trailing cell (1,0) is identical in both buffers.
let diff: Vec<_> = BufferDiff::new(&prev, &next).collect();
assert_eq!(diff.len(), 1);
assert_eq!(diff[0].0, 0);
assert_eq!(diff[0].1, 0);
}
#[test]
#[allow(deprecated)]
fn deprecated_skip_field_is_respected() {
let prev = Buffer::with_lines(["abc"]);
let mut next = Buffer::with_lines(["xyz"]);
next.content[1].skip = true;
let diff: CompactString = BufferDiff::new(&prev, &next)
.map(|(_, _, cell)| cell.symbol())
.collect();
assert_eq!(diff, "xz");
}
#[test]
#[allow(deprecated)]
fn forced_width_takes_precedence_over_deprecated_skip() {
let prev = Buffer::with_lines(["abcd"]);
let mut next = Buffer::with_lines(["xbcd"]);
next.content[0].skip = true;
next.content[0].diff_option = CellDiffOption::ForcedWidth(NonZeroU16::new(2).unwrap());
// ForcedWidth wins over skip=true, so the cell is diffed with forced width
let diff: CompactString = BufferDiff::new(&prev, &next)
.map(|(_, _, cell)| cell.symbol())
.collect();
assert_eq!(diff, "x");
}
/// Regression test for the "uncovered trailing cell" bug.
///
/// When a wide char with a non-default style (e.g. bg=Blue) is replaced by a narrow char,
/// its trailing cell was `reset()` in the buffer and therefore has default style in both
/// `prev` and `next`. The diff would skip it because symbol and style are identical.
///
/// But the *terminal* rendered the trailing cell with the wide char's style (that's how
/// terminals work: printing "," with bg=Blue paints both columns blue). So an explicit
/// update must be emitted even though the buffer cell looks unchanged.
///
/// With "你好,世界!" (Blue) replaced by "Hello" (default), "Hello" covers columns 0–4.
/// Columns 5, 7, 9, 11 are trailing cells of ",", "世", "界", "!" respectively — all
/// EMPTY in both buffers, but rendered blue on the terminal.
#[test]
fn uncovered_trailing_cells_emitted_when_wide_char_style_changes() {
use crate::style::{Color, Style};
// Width 12 fits exactly "你好,世界!" (6 wide chars × 2 cols each).
let rect = Rect::new(0, 0, 12, 1);
let mut prev = Buffer::empty(rect);
prev.set_string(0, 0, "你好,世界!", Style::new().bg(Color::Blue));
let mut next = Buffer::empty(rect);
next.set_string(0, 0, "Hello", Style::default());
let diff: Vec<_> = BufferDiff::new(&prev, &next).collect();
// Columns 5, 7, 9, 11 are the trailing cells of ",", "世", "界", "!".
// Both prev and next hold EMPTY there (same symbol, same default style), but the
// previous cell did have a different style, so the terminal painted them blue.
// Without an explicit update the blue background is never cleared, producing
// "Hello ░ ░ ░ ░".
for x in [5u16, 7, 9, 11] {
assert!(
diff.iter().any(|(dx, dy, _)| *dx == x && *dy == 0),
"expected update for trailing cell at x={x} (blue bg not cleared otherwise)"
);
}
}
/// Regression for a multi-step scenario that produces "Hello ░" artifacts.
///
/// "你好,世界!"(Blue) → "喵呜www"(Blue): "世"(cols 6-7) is replaced by "w"(Blue). Both
/// have the same background, so a guard like `previous.bg != current.bg` would not fire —
/// but the terminal painted col 7 (the trailing cell of "世") blue when it rendered the
/// wide char. Col 7 is EMPTY in both buffers, so without an explicit update the blue
/// lingers. A subsequent "Hello" draw then shows "Hello ░" because "Hello" covers cols
/// 0-4, cols 5-6 are cleared (they held "ww"), but col 7 is never cleared.
#[test]
fn uncovered_trailing_cells_emitted_when_wide_chars_partially_replaced() {
use crate::style::{Color, Style};
let rect = Rect::new(0, 0, 12, 1);
let mut prev = Buffer::empty(rect);
prev.set_string(0, 0, "你好,世界!", Style::new().bg(Color::Blue));
let mut next = Buffer::empty(rect);
next.set_string(0, 0, "喵呜www", Style::new().bg(Color::Blue));
let diff: Vec<_> = BufferDiff::new(&prev, &next).collect();
// Col 7 is the trailing cell of "世"(6-7). "世" and its replacement "w" both have
// Blue bg, so a `previous.bg != current.bg` guard would not trigger — but the
// terminal painted it blue and it must be cleared.
assert!(
diff.iter().any(|(dx, dy, _)| *dx == 7 && *dy == 0),
"expected update for trailing cell at x=7 (blue bg not cleared otherwise)"
);
}
#[test]
fn no_force_update_when_wide_char_has_default_style() {
use crate::style::Style;
let rect = Rect::new(0, 0, 12, 1);
let mut prev = Buffer::empty(rect);
prev.set_string(0, 0, "你好,世界!", Style::default());
let mut next = Buffer::empty(rect);
next.set_string(0, 0, "Hello", Style::default());
let diff: Vec<_> = BufferDiff::new(&prev, &next).collect();
// Columns 5..=11 include the trailing cells of ",", "世", "界", "!".
// Both prev and next hold EMPTY there, and the previous wide chars had default style
// (bg=Reset, no visible modifier), so `force=true` is never set and trailing cells
// are not emitted.
for x in [5u16, 7, 9, 11] {
assert!(
!diff.iter().any(|(dx, dy, _)| *dx == x && *dy == 0),
"expected no update for trailing cell at x={x}"
);
}
}
#[test]
fn shrinking_wide_glyph_clears_trailing_cell() {
// Regression for https://github.com/ratatui/ratatui/issues/2585 (introduced by #1605):
// the cell-diff-options refactor dropped the classic `invalidated` counter, so when a
// multi-width glyph (here the full-width plus +, U+FF0B) is replaced by narrower content,
// the trailing cell it physically painted over was left un-cleared. Because that trailing
// cell is blank in both buffers (`current == previous`), only the previous glyph's width
// can force the redraw — exactly what `invalidated` tracks.
let rect = Rect::new(0, 0, 2, 1);
let mut prev = Buffer::empty(rect);
prev.set_string(0, 0, "+", crate::style::Style::new());
// Force some style that would leave artifacts (anything except foreground color).
prev.cell_mut((0, 0)).unwrap().set_bg(Color::Red);
assert_eq!(prev.content[0].symbol(), "+");
// The trailing cell is reset to a blank space when the wide glyph is written.
assert_eq!(prev.content[1].symbol(), " ");
// Next frame clears the glyph: both cells are blank.
let next = Buffer::empty(rect);
assert_eq!(next.content[1], prev.content[1]); // trailing cell is unchanged
let diff: Vec<_> = BufferDiff::new(&prev, &next).collect();
assert_eq!(diff.len(), 2, "both columns must be redrawn, got {diff:?}");
assert_eq!((diff[0].0, diff[0].1), (0, 0));
assert_eq!(diff[0].2.symbol(), " ");
// The trailing cell (1,0) must be emitted even though it is identical in both buffers,
// otherwise the right half of the old glyph (and its background) lingers on screen.
assert_eq!((diff[1].0, diff[1].1), (1, 0));
assert_eq!(diff[1].2.symbol(), " ");
}
#[test]
fn shrinking_wide_glyph_clears_trailing_background() {
use crate::style::{Color, Style};
// Same regression, framed as the reported symptom: a styled background painted across a
// wide glyph must be cleared from the trailing cell when the glyph shrinks away.
let rect = Rect::new(0, 0, 2, 1);
let mut prev = Buffer::empty(rect);
prev.set_string(0, 0, "+", Style::new().bg(Color::Blue));
let next = Buffer::empty(rect); // blank, default background
let diff: Vec<_> = BufferDiff::new(&prev, &next).collect();
assert!(
diff.iter().any(|(x, y, _)| *x == 1 && *y == 0),
"trailing cell (1,0) must be redrawn to clear the leftover background, got {diff:?}"
);
}
/// Regression: a non-blank cell inside the trailing range whose style changes between frames
/// must still be emitted.
///
/// The trailing loop replaces the main loop for indices in `[i+1, i+prev_width)`. When
/// `force=true` every non-skip cell in the range is emitted unconditionally — not because the
/// style change is specifically detected, but because `force=true` short-circuits the check
/// entirely. This ensures style-only changes on trailing cells are never silently dropped.
///
/// Scenario: widget A draws "你"(Blue) at col 0; widget B then writes "X"(Red) at col 1
/// (overriding the trailing reset). Next frame: widget A writes "a"(default), widget B writes
/// "X"(Green). Symbol at col 1 is unchanged, but fg changed Red→Green.
/// `force=true` fires because prev "你" had bg=Blue (visible on blank), so col 1 is emitted
/// regardless.
#[test]
fn trailing_range_cell_style_change_is_emitted() {
use crate::style::{Color, Style};
let rect = Rect::new(0, 0, 3, 1);
let mut prev = Buffer::empty(rect);
prev.set_string(0, 0, "你", Style::new().bg(Color::Blue));
// Widget B overrides the trailing reset at col 1.
prev.content[1]
.set_symbol("X")
.set_fg(Color::Red)
.set_bg(Color::Reset);
let mut next = Buffer::empty(rect);
next.set_string(0, 0, "a", Style::default());
// Same symbol, different fg — style-only change.
next.content[1]
.set_symbol("X")
.set_fg(Color::Green)
.set_bg(Color::Reset);
let diff: Vec<_> = BufferDiff::new(&prev, &next).collect();
assert!(
diff.iter().any(|(x, y, _)| *x == 1 && *y == 0),
"col 1 style change (Red→Green) must be emitted even though symbol is unchanged; got {diff:?}"
);
}
/// Regression: when the trailing loop emits a wide char, its own trailing column must be
/// skipped so the main loop does not write EMPTY there and corrupt the display.
///
/// Scenario: prev="你好"(Blue) → next="a好"(Blue) where 'a' replaces '你'.
/// `force=true` is set (Blue bg), trailing range = [1, 2).
/// At j=1 the trailing loop finds '好' (width 2) in next and emits it.
/// Without the fix `next_index` advances to 2 = end; `self.pos` is set to 2.
/// The main loop then sees next[2]=EMPTY vs prev[2]='好'(Blue) and emits
/// EMPTY at col 2 — writing a space over the right half of the just-drawn '好'.
#[test]
fn trailing_range_wide_char_trailing_not_corrupted() {
use crate::style::{Color, Style};
let rect = Rect::new(0, 0, 4, 1);
let mut prev = Buffer::empty(rect);
prev.set_string(0, 0, "你好", Style::new().bg(Color::Blue));
// prev: [你(Blue)][EMPTY][好(Blue)][EMPTY]
let mut next = Buffer::empty(rect);
next.set_string(0, 0, "a", Style::new().bg(Color::Blue));
next.set_string(1, 0, "好", Style::new().bg(Color::Blue));
// next: [a(Blue)][好(Blue)][EMPTY][EMPTY]
let diff: Vec<_> = BufferDiff::new(&prev, &next).collect();
// col 2 is the trailing cell of '好' in next; writing EMPTY there would
// overwrite the right half of '好' and corrupt the display.
assert!(
!diff.iter().any(|(x, y, _)| *x == 2 && *y == 0),
"trailing cell of '好' must not receive a spurious EMPTY write; got {diff:?}"
);
// '好' itself must be emitted at col 1.
assert!(
diff.iter()
.any(|(x, y, cell)| *x == 1 && *y == 0 && cell.symbol() == "好"),
"'好' at col 1 must be emitted; got {diff:?}"
);
}
#[test]
#[should_panic(expected = "buffer areas must have the same x, y, and width")]
fn mismatched_widths_panics() {
let prev = Buffer::empty(Rect::new(0, 0, 5, 1));
let next = Buffer::empty(Rect::new(0, 0, 10, 1));
BufferDiff::new(&prev, &next);
}
}