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

terminal: reset cursor state before eraseDisplay in fullReset

Browse Source 
fullReset resets the state of the terminal. This method calls
eraseDisplay, which depends on the state of the cursor pen for setting
the cell styles when it erases. Reset the state of the cursor prior to
calling eraseDisplay to ensure a clean reset.

Fixes: alacritty/alt_reset test
This commit is contained in:
Tim Culverhouse
2023-09-22 17:43:32 -05:00
parent 300ba32ad0
commit 2784f25b5b
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/terminal/Terminal.zig
View File

@ -1622,8 +1622,6 @@ pub fn kittyGraphics(
pub fn fullReset(self: *Terminal, alloc: Allocator) void {
self.primaryScreen(alloc, .{ .clear_on_exit = true, .cursor_save = true });
self.charset = .{};
self.eraseDisplay(alloc, .scrollback);
self.eraseDisplay(alloc, .complete);
self.modes = .{};
self.flags = .{};
self.tabstops.reset(0);
@ -1633,9 +1631,24 @@ pub fn fullReset(self: *Terminal, alloc: Allocator) void {
self.screen.kitty_keyboard = .{};
self.scrolling_region = .{ .top = 0, .bottom = self.rows - 1 };
self.previous_char = null;
self.eraseDisplay(alloc, .scrollback);
self.eraseDisplay(alloc, .complete);
self.pwd.clearRetainingCapacity();
}
test "Terminal: fullReset with a non-empty pen" {
var t = try init(testing.allocator, 80, 80);
defer t.deinit(testing.allocator);
t.screen.cursor.pen.bg = .{ .r = 0xFF, .g = 0x00, .b = 0x7F };
t.screen.cursor.pen.fg = .{ .r = 0xFF, .g = 0x00, .b = 0x7F };
t.fullReset(testing.allocator);
const cell = t.screen.getCell(.active, t.screen.cursor.y, t.screen.cursor.x);
try testing.expect(cell.bg.eql(.{}));
try testing.expect(cell.fg.eql(.{}));
}
test "Terminal: input with no control characters" {
var t = try init(testing.allocator, 80, 80);
defer t.deinit(testing.allocator);