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: cursorResetWrap should not reset wrap_continuation

Browse Source
This commit is contained in:
Qwerasd
2024-09-06 17:47:29 -04:00
parent 8f47581e22
commit 9669332134
2 changed files with 18 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/terminal/Screen.zig
View File

@ -1042,58 +1042,32 @@ pub fn cursorMarkDirty(self: *Screen) void {
} }
/// Reset the cursor row's soft-wrap state and the cursor's pending wrap. /// Reset the cursor row's soft-wrap state and the cursor's pending wrap.
/// Also clears spacer heads from the cursor row and prior row as necessary. /// Also handles clearing the spacer head on the cursor row and resetting
/// the wrap_continuation flag on the next row if necessary.
pub fn cursorResetWrap(self: *Screen) void { pub fn cursorResetWrap(self: *Screen) void {
// Reset the cursor's pending wrap state // Reset the cursor's pending wrap state
self.cursor.pending_wrap = false; self.cursor.pending_wrap = false;
const page_row = self.cursor.page_row; const page_row = self.cursor.page_row;
if (!(page_row.wrap or page_row.wrap_continuation)) return; if (!page_row.wrap) return;
const cells = self.cursor.page_pin.cells(.all);
// The previous row does not wrap and this row is not wrapped to
if (page_row.wrap_continuation) {
page_row.wrap_continuation = false;
if (self.cursor.page_pin.up(1)) |prev_row| {
const p_rac = prev_row.rowAndCell();
p_rac.row.wrap = false;
// If the first cell in a row is wide the previous row
// may have a spacer head which needs to be cleared.
if (cells[0].wide == .wide) {
const p_cells = prev_row.cells(.all);
const p_cell = p_cells[prev_row.page.data.size.cols - 1];
if (p_cell.wide == .spacer_head) {
self.clearCells(
&prev_row.page.data,
p_rac.row,
p_cells[prev_row.page.data.size.cols - 1 ..][0..1],
);
}
}
}
}
// This row does not wrap and the next row is not wrapped to // This row does not wrap and the next row is not wrapped to
if (page_row.wrap) { page_row.wrap = false;
page_row.wrap = false;
if (self.cursor.page_pin.down(1)) |next_row| { if (self.cursor.page_pin.down(1)) |next_row| {
next_row.rowAndCell().row.wrap_continuation = false; next_row.rowAndCell().row.wrap_continuation = false;
} }
// If the last cell in the row is a spacer head we need to clear it. // If the last cell in the row is a spacer head we need to clear it.
const cell = cells[self.cursor.page_pin.page.data.size.cols - 1]; const cells = self.cursor.page_pin.cells(.all);
if (cell.wide == .spacer_head) { const cell = cells[self.cursor.page_pin.page.data.size.cols - 1];
self.clearCells( if (cell.wide == .spacer_head) {
&self.cursor.page_pin.page.data, self.clearCells(
page_row, &self.cursor.page_pin.page.data,
cells[self.cursor.page_pin.page.data.size.cols - 1 ..][0..1], page_row,
); cells[self.cursor.page_pin.page.data.size.cols - 1 ..][0..1],
} );
} }
} }

4
src/terminal/Terminal.zig
View File

@ -6083,7 +6083,7 @@ test "Terminal: eraseChars wide char wrap boundary conditions" {
const unwrapped = try t.plainStringUnwrapped(alloc); const unwrapped = try t.plainStringUnwrapped(alloc);
defer testing.allocator.free(unwrapped); defer testing.allocator.free(unwrapped);
try testing.expectEqualStrings(".......\n cde\n😀......", unwrapped); try testing.expectEqualStrings("....... cde\n😀......", unwrapped);
} }
} }
@ -9049,7 +9049,7 @@ test "Terminal: deleteChars wide char wrap boundary conditions" {
const unwrapped = try t.plainStringUnwrapped(alloc); const unwrapped = try t.plainStringUnwrapped(alloc);
defer testing.allocator.free(unwrapped); defer testing.allocator.free(unwrapped);
try testing.expectEqualStrings(".......\n cde\n😀......", unwrapped); try testing.expectEqualStrings("....... cde\n😀......", unwrapped);
} }
} }