diff --git a/build.zig.zon b/build.zig.zon index fd3394d..0e4191c 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -30,8 +30,8 @@ .hash = "fuzzig-0.1.1-Ji0xivxIAQBD0g8O_NV_0foqoPf3elsg9Sc3pNfdVH4D", }, .vaxis = .{ - .url = "git+https://github.com/neurocyte/libvaxis?ref=zig-0.15#db66bacf4799945c9d99704bf150112df2d688cf", - .hash = "vaxis-0.5.1-BWNV_J0eCQD_x1nEGocK1PgaTZU9L81qc9Vf3IIGx7W2", + .url = "git+https://github.com/neurocyte/libvaxis?ref=zig-0.15#52d9193a3bbaf529bdde0a4fe1bf7fa793392856", + .hash = "vaxis-0.5.1-BWNV_FcYCQCTHIK-wrMmgBpU3TppdGXHmbrbdM-RyWrw", }, .zeit = .{ .url = "git+https://github.com/rockorager/zeit?ref=zig-0.15#ed2ca60db118414bda2b12df2039e33bad3b0b88", diff --git a/src/buffer/View.zig b/src/buffer/View.zig index 09e8def..b3909ca 100644 --- a/src/buffer/View.zig +++ b/src/buffer/View.zig @@ -67,9 +67,8 @@ inline fn is_at_bottom(self: *const Self, root: Buffer.Root) bool { } pub inline fn is_visible(self: *const Self, cursor: *const Cursor) bool { - if (self.rows == 0) return false; const row_min = self.row; - const row_max = row_min + self.rows - 1; + const row_max = row_min + self.rows; const col_min = self.col; const col_max = col_min + self.cols; return row_min <= cursor.row and cursor.row <= row_max and diff --git a/src/renderer/vaxis/renderer.zig b/src/renderer/vaxis/renderer.zig index ec5651f..870c56d 100644 --- a/src/renderer/vaxis/renderer.zig +++ b/src/renderer/vaxis/renderer.zig @@ -385,11 +385,6 @@ pub fn process_renderer_event(self: *Self, msg: []const u8) Error!void { self.vx.caps.rgb = true; }, .cap_color_scheme_updates => {}, - - .cap_multi_cursor => { - self.logger.print("multi cursor capability detected", .{}); - self.vx.caps.multi_cursor = true; - }, } } @@ -543,14 +538,6 @@ pub fn cursor_disable(self: *Self) void { self.vx.screen.cursor_vis = false; } -pub fn clear_all_multi_cursors(self: *Self) !void { - try self.tty.anyWriter().print("\x1b[>0;4 q", .{}); -} - -pub fn show_multi_cursor_yx(self: *Self, y: c_int, x: c_int) !void { - try self.tty.anyWriter().print("\x1b[>-1;2:{d}:{d} q", .{ y + 1, x + 1 }); -} - fn sync_mod_state(self: *Self, keypress: u32, modifiers: vaxis.Key.Modifiers) !void { if (modifiers.ctrl and !self.mods.ctrl and !(keypress == input.key.left_control or keypress == input.key.right_control)) try self.send_sync_key(input.event.press, input.key.left_control, "", modifiers); diff --git a/src/renderer/win32/renderer.zig b/src/renderer/win32/renderer.zig index 701a631..a4d8ed8 100644 --- a/src/renderer/win32/renderer.zig +++ b/src/renderer/win32/renderer.zig @@ -476,13 +476,3 @@ pub fn cursor_disable(self: *Self) void { _ = self; //@panic("todo"); } -pub fn clear_all_multi_cursors(self: *Self) !void { - _ = self; - //@panic("todo"); -} -pub fn show_multi_cursor_yx(self: *Self, y: c_int, x: c_int) !void { - _ = self; - _ = y; - _ = x; - //@panic("todo"); -} diff --git a/src/tui/editor.zig b/src/tui/editor.zig index e64168b..06c0480 100644 --- a/src/tui/editor.zig +++ b/src/tui/editor.zig @@ -1179,8 +1179,6 @@ pub const Editor = struct { const style = tui.get_selection_style(); const frame = tracy.initZone(@src(), .{ .name = "editor render cursors" }); defer frame.deinit(); - if (tui.config().enable_terminal_cursor and tui.rdr().vx.caps.multi_cursor) - tui.rdr().clear_all_multi_cursors() catch {}; for (self.cursels.items[0 .. self.cursels.items.len - 1]) |*cursel_| if (cursel_.*) |*cursel| { const cursor = try self.get_rendered_cursor(style, cursel); try self.render_cursor_secondary(&cursor, theme, cell_map); @@ -1209,9 +1207,7 @@ pub const Editor = struct { 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 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) { + const cursor_shape = if (self.cursels.items.len > 1) switch (configured_shape) { .beam => .block, .beam_blink => .block_blink, .underline => .block, @@ -1228,13 +1224,8 @@ pub const Editor = struct { fn render_cursor_secondary(self: *Self, cursor: *const Cursor, theme: *const Widget.Theme, cell_map: CellMap) !void { if (self.screen_cursor(cursor)) |pos| { set_cell_map_cursor(cell_map, pos.row, pos.col); - if (tui.config().enable_terminal_cursor and tui.rdr().vx.caps.multi_cursor) { - const y, const x = self.plane.rel_yx_to_abs(@intCast(pos.row), @intCast(pos.col)); - tui.rdr().show_multi_cursor_yx(y, x) catch return; - } else { - self.plane.cursor_move_yx(@intCast(pos.row), @intCast(pos.col)) catch return; - self.render_cursor_cell(theme.editor_cursor_secondary); - } + self.plane.cursor_move_yx(@intCast(pos.row), @intCast(pos.col)) catch return; + self.render_cursor_cell(theme.editor_cursor_secondary); } }