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

Merge pull request #1344 from rockorager/reflow

Browse Source 
reflow: respect wraparound mode when reflowing text
This commit is contained in:
Mitchell Hashimoto
2024-01-21 09:12:18 -08:00
committed by GitHub
parent 046a36766f 6dcec75e32
commit 628b54fbb5
1 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/terminal/Terminal.zig
View File

@ -330,11 +330,19 @@ pub fn resize(self: *Terminal, alloc: Allocator, cols: usize, rows: usize) !void
// If we're making the screen smaller, dealloc the unused items. // If we're making the screen smaller, dealloc the unused items.
if (self.active_screen == .primary) { if (self.active_screen == .primary) {
self.clearPromptForResize(); self.clearPromptForResize();
if (self.modes.get(.wraparound)) {
try self.screen.resize(rows, cols); try self.screen.resize(rows, cols);
} else {
try self.screen.resizeWithoutReflow(rows, cols);
}
try self.secondary_screen.resizeWithoutReflow(rows, cols); try self.secondary_screen.resizeWithoutReflow(rows, cols);
} else { } else {
try self.screen.resizeWithoutReflow(rows, cols); try self.screen.resizeWithoutReflow(rows, cols);
if (self.modes.get(.wraparound)) {
try self.secondary_screen.resize(rows, cols); try self.secondary_screen.resize(rows, cols);
} else {
try self.secondary_screen.resizeWithoutReflow(rows, cols);
}
} }
// Set our size // Set our size
@ -5194,6 +5202,47 @@ test "Terminal: resize with left and right margin set" {
try t.resize(alloc, cols, rows); try t.resize(alloc, cols, rows);
} }
// https://github.com/mitchellh/ghostty/issues/1343
test "Terminal: resize with wraparound off" {
const alloc = testing.allocator;
const cols = 4;
const rows = 2;
var t = try init(alloc, cols, rows);
defer t.deinit(alloc);
t.modes.set(.wraparound, false);
try t.print('0');
try t.print('1');
try t.print('2');
try t.print('3');
const new_cols = 2;
try t.resize(alloc, new_cols, rows);
const str = try t.plainString(testing.allocator);
defer testing.allocator.free(str);
try testing.expectEqualStrings("01", str);
}
test "Terminal: resize with wraparound on" {
const alloc = testing.allocator;
const cols = 4;
const rows = 2;
var t = try init(alloc, cols, rows);
defer t.deinit(alloc);
t.modes.set(.wraparound, true);
try t.print('0');
try t.print('1');
try t.print('2');
try t.print('3');
const new_cols = 2;
try t.resize(alloc, new_cols, rows);
const str = try t.plainString(testing.allocator);
defer testing.allocator.free(str);
try testing.expectEqualStrings("01\n23", str);
}
test "Terminal: saveCursor" { test "Terminal: saveCursor" {
const alloc = testing.allocator; const alloc = testing.allocator;
var t = try init(alloc, 3, 3); var t = try init(alloc, 3, 3);