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

origin mode set cursor pos

Browse Source
This commit is contained in:
Mitchell Hashimoto
2022-06-22 16:06:48 -07:00
parent 46db4623bc
commit 7dbe6b941e
2 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Window.zig
View File

@ -632,14 +632,17 @@ pub fn setCursorUp(self: *Window, amount: u16) !void {
}
pub fn setCursorCol(self: *Window, col: u16) !void {
if (self.terminal.mode_origin) unreachable; // TODO
self.terminal.setCursorPos(self.terminal.cursor.y + 1, col);
}
pub fn setCursorRow(self: *Window, row: u16) !void {
if (self.terminal.mode_origin) unreachable; // TODO
self.terminal.setCursorPos(row, self.terminal.cursor.x + 1);
}
pub fn setCursorPos(self: *Window, row: u16, col: u16) !void {
if (self.terminal.mode_origin) unreachable; // TODO
self.terminal.setCursorPos(row, col);
}
@ -680,7 +683,6 @@ pub fn setMode(self: *Window, mode: terminal.Mode, enabled: bool) !void {
.origin => {
self.terminal.mode_origin = enabled;
self.terminal.setCursorPos(1, 1);
unreachable; // TODO: implement
},
.bracketed_paste => self.bracketed_paste = true,
@ -721,6 +723,8 @@ pub fn deviceStatusReport(
log.warn("error queueing device attr response: {}", .{err}),
.cursor_position => {
if (self.terminal.mode_origin) unreachable; // TODO
// Response always is at least 4 chars, so this leaves the
// remainder for the row/column as base-10 numbers. This
// will support a very large terminal.

49
src/terminal/Terminal.zig
View File

@ -203,8 +203,30 @@ pub fn reverseIndex(self: *Terminal) !void {
// greater than the bottom-most row it is adjusted to the bottom-most
// row.
pub fn setCursorPos(self: *Terminal, row: usize, col: usize) void {
self.cursor.x = @minimum(self.cols, col) -| 1;
self.cursor.y = @minimum(self.rows, row) -| 1;
// If cursor origin mode is set the cursor row will be moved relative to
// the top margin row and adjusted to be above or at bottom-most row in
// the current scroll region.
//
// If origin mode is set and left and right margin mode is set the cursor
// will be moved relative to the left margin column and adjusted to be on
// or left of the right margin column.
const params: struct {
x_offset: usize = 0,
y_offset: usize = 0,
x_max: usize,
y_max: usize,
} = if (self.mode_origin) .{
.x_offset = 0, // TODO: left/right margins
.x_max = self.cols, // TODO: left/right margins
.y_offset = self.scrolling_region.top + 1,
.y_max = self.scrolling_region.bottom + 1, // We need this 1-indexed
} else .{
.x_max = self.cols,
.y_max = self.rows,
};
self.cursor.x = @minimum(params.x_max, col) -| 1;
self.cursor.y = @minimum(params.y_max, row + params.y_offset) -| 1;
}
/// Erase the display.
@ -643,6 +665,29 @@ test "Terminal: setCursorPosition" {
t.setCursorPos(81, 81);
try testing.expectEqual(@as(usize, 79), t.cursor.x);
try testing.expectEqual(@as(usize, 79), t.cursor.y);
// Origin mode
t.mode_origin = true;
// No change without a scroll region
t.setCursorPos(81, 81);
try testing.expectEqual(@as(usize, 79), t.cursor.x);
try testing.expectEqual(@as(usize, 79), t.cursor.y);
// Set the scroll region
t.setScrollingRegion(10, t.rows);
t.setCursorPos(0, 0);
try testing.expectEqual(@as(usize, 0), t.cursor.x);
try testing.expectEqual(@as(usize, 9), t.cursor.y);
t.setCursorPos(100, 0);
try testing.expectEqual(@as(usize, 0), t.cursor.x);
try testing.expectEqual(@as(usize, 79), t.cursor.y);
t.setScrollingRegion(10, 11);
t.setCursorPos(2, 0);
try testing.expectEqual(@as(usize, 0), t.cursor.x);
try testing.expectEqual(@as(usize, 10), t.cursor.y);
}
test "Terminal: setScrollingRegion" {