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

Merge pull request #1184 from mitchellh/cub

Browse Source 
terminal: cursor back should not reduce by one with pending wrap
This commit is contained in:
Mitchell Hashimoto
2023-12-29 12:37:26 -08:00
committed by GitHub
parent 7815aeaa86 fdd519f73b
commit 884814eb03
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/terminal/Terminal.zig
View File

@ -1564,12 +1564,10 @@ pub fn cursorLeft(self: *Terminal, count_req: usize) void {
break :wrap_mode .none; break :wrap_mode .none;
}; };
// If we have a pending wrap state on, we reset it and reduce our count. // Unset the pending wrap state no matter what
var count: usize = @max(count_req, 1);
if (self.screen.cursor.pending_wrap) {
self.screen.cursor.pending_wrap = false; self.screen.cursor.pending_wrap = false;
count -= 1;
} var count: usize = @max(count_req, 1);
// If we are in no wrap mode, then we move the cursor left and exit // If we are in no wrap mode, then we move the cursor left and exit
// since this is the fastest and most typical path. // since this is the fastest and most typical path.
@ -6245,7 +6243,7 @@ test "Terminal: cursorLeft unsets pending wrap state" {
{ {
const str = try t.plainString(testing.allocator); const str = try t.plainString(testing.allocator);
defer testing.allocator.free(str); defer testing.allocator.free(str);
try testing.expectEqualStrings("ABCDX", str); try testing.expectEqualStrings("ABCXE", str);
} }
} }
@ -6263,7 +6261,7 @@ test "Terminal: cursorLeft unsets pending wrap state with longer jump" {
{ {
const str = try t.plainString(testing.allocator); const str = try t.plainString(testing.allocator);
defer testing.allocator.free(str); defer testing.allocator.free(str);
try testing.expectEqualStrings("ABXDE", str); try testing.expectEqualStrings("AXCDE", str);
} }
} }