neurocyte/flow
neurocyte/flow
1
1
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

fix: don't disable primary terminal cursor when offscreen

Browse source 
Disabling the primary cursor when offscreen will also disable secondary
cursors when kitty's multi-cursor support is enabled. So instead we move
the primary cursor offscreen.
This commit is contained in:
CJ van den Berg 2026-01-15 11:59:22 +01:00
parent 7b1f6c898d
commit 1b9e01671a
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
2 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/renderer/vaxis/renderer.zig
View file

@ -561,10 +561,12 @@ pub fn request_mouse_cursor_default(self: *Self, push_or_pop: bool) void {
if (push_or_pop) self.vx.setMouseShape(.default) else self.vx.setMouseShape(.default); if (push_or_pop) self.vx.setMouseShape(.default) else self.vx.setMouseShape(.default);
} }
pub fn cursor_enable(self: *Self, y: c_int, x: c_int, shape: CursorShape) !void { pub fn cursor_enable(self: *Self, y_: c_int, x_: c_int, shape: CursorShape) !void {
const y: u16 = if (y_ < 0) self.vx.screen.height + 1 else @intCast(y_);
const x: u16 = if (x_ < 0) self.vx.screen.width + 1 else @intCast(x_);
self.vx.screen.cursor_vis = true; self.vx.screen.cursor_vis = true;
self.vx.screen.cursor_row = @intCast(y); self.vx.screen.cursor_row = y;
self.vx.screen.cursor_col = @intCast(x); self.vx.screen.cursor_col = x;
self.vx.screen.cursor_shape = shape; self.vx.screen.cursor_shape = shape;
} }

22
src/tui/editor.zig
View file

@ -1283,22 +1283,22 @@ pub const Editor = struct {
self.render_cursor_cell(style); self.render_cursor_cell(style);
} }
} else { } else {
const configured_shape = tui.get_cursor_shape();
const cursor_shape = if (tui.rdr().vx.caps.multi_cursor)
configured_shape
else if (self.cursels.items.len > 1) switch (configured_shape) {
.beam => .block,
.beam_blink => .block_blink,
.underline => .block,
.underline_blink => .block_blink,
else => configured_shape,
} else configured_shape;
if (self.screen_cursor(cursor)) |pos| { if (self.screen_cursor(cursor)) |pos| {
set_cell_map_cursor(cell_map, pos.row, pos.col); set_cell_map_cursor(cell_map, pos.row, pos.col);
const y, const x = self.plane.rel_yx_to_abs(@intCast(pos.row), @intCast(pos.col)); const y, const x = self.plane.rel_yx_to_abs(@intCast(pos.row), @intCast(pos.col));
const configured_shape = tui.get_cursor_shape();
const cursor_shape = if (tui.rdr().vx.caps.multi_cursor)
configured_shape
else if (self.cursels.items.len > 1) switch (configured_shape) {
.beam => .block,
.beam_blink => .block_blink,
.underline => .block,
.underline_blink => .block_blink,
else => configured_shape,
} else configured_shape;
tui.rdr().cursor_enable(y, x, cursor_shape) catch {}; tui.rdr().cursor_enable(y, x, cursor_shape) catch {};
} else { } else {
tui.rdr().cursor_disable(); tui.rdr().cursor_enable(-1, -1, cursor_shape) catch {};
} }
} }
} }