Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-16 16:56:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

terminal/Screen: fix trailing blank cell handling for wrapped rows in dumpString

Browse Source
This commit is contained in:
Qwerasd
2024-07-08 22:26:36 -04:00
parent 730185b212
commit 6f1a2d1e8e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/terminal/Screen.zig
View File

@ -2337,6 +2337,7 @@ pub fn dumpString(
opts: DumpString, opts: DumpString,
) !void { ) !void {
var blank_rows: usize = 0; var blank_rows: usize = 0;
var blank_cells: usize = 0;
var iter = opts.tl.rowIterator(.right_down, opts.br); var iter = opts.tl.rowIterator(.right_down, opts.br);
while (iter.next()) |row_offset| { while (iter.next()) |row_offset| {
@ -2363,7 +2364,12 @@ pub fn dumpString(
blank_rows += 1; blank_rows += 1;
} }
var blank_cells: usize = 0; if (!row.wrap_continuation or !opts.unwrap) {
// We should also reset blank cell counts at the start of each row
// unless we're unwrapping and this row is a wrap continuation.
blank_cells = 0;
}
for (cells) |*cell| { for (cells) |*cell| {
// Skip spacers // Skip spacers
switch (cell.wide) { switch (cell.wide) {
@ -2379,7 +2385,7 @@ pub fn dumpString(
continue; continue;
} }
if (blank_cells > 0) { if (blank_cells > 0) {
for (0..blank_cells) |_| try writer.writeByte(' '); try writer.writeByteNTimes(' ', blank_cells);
blank_cells = 0; blank_cells = 0;
} }