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

refactor: don't special case cursor rendering in inclusive mode

Browse source 
This is too confusing. Rendering cursors differently, only in inclusive
mode and only if there is an active selection is too confusing and pushes
a lot of edge cases into otherwise simple commands.

This will likely break a lot of the existing helix commands, but is better
in the long run to fix them anyway.
This commit is contained in:
CJ van den Berg 2025-11-26 23:09:17 +01:00
parent 423b8c1613
commit 8ba6e1843a
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 2 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/tui/editor.zig
View file

@ -146,13 +146,6 @@ pub const CurSel = struct {
}; };
} }
fn to_cursor_inclusive(self: *const Self, root: Buffer.Root, metrics: Buffer.Metrics) Cursor {
var cursor = self.cursor;
if (self.selection) |sel| if (!sel.is_reversed())
cursor.move_left(root, metrics) catch {};
return cursor;
}
pub fn disable_selection(self: *Self, root: Buffer.Root, metrics: Buffer.Metrics) void { pub fn disable_selection(self: *Self, root: Buffer.Root, metrics: Buffer.Metrics) void {
switch (tui.get_selection_style()) { switch (tui.get_selection_style()) {
.normal => self.disable_selection_normal(), .normal => self.disable_selection_normal(),
@ -1181,26 +1174,18 @@ pub const Editor = struct {
} }
fn render_cursors(self: *Self, theme: *const Widget.Theme, cell_map: CellMap) !void { fn render_cursors(self: *Self, theme: *const Widget.Theme, cell_map: CellMap) !void {
const style = tui.get_selection_style();
const frame = tracy.initZone(@src(), .{ .name = "editor render cursors" }); const frame = tracy.initZone(@src(), .{ .name = "editor render cursors" });
defer frame.deinit(); defer frame.deinit();
if (tui.config().enable_terminal_cursor and tui.rdr().vx.caps.multi_cursor) if (tui.config().enable_terminal_cursor and tui.rdr().vx.caps.multi_cursor)
tui.rdr().clear_all_multi_cursors() catch {}; tui.rdr().clear_all_multi_cursors() catch {};
for (self.cursels.items[0 .. self.cursels.items.len - 1]) |*cursel_| if (cursel_.*) |*cursel| { for (self.cursels.items[0 .. self.cursels.items.len - 1]) |*cursel_| if (cursel_.*) |*cursel| {
const cursor = self.get_rendered_cursor(style, cursel); const cursor = cursel.cursor;
try self.render_cursor_secondary(&cursor, theme, cell_map); try self.render_cursor_secondary(&cursor, theme, cell_map);
}; };
const cursor = self.get_rendered_cursor(style, self.get_primary()); const cursor = self.get_primary().cursor;
try self.render_cursor_primary(&cursor, theme, cell_map); try self.render_cursor_primary(&cursor, theme, cell_map);
} }
fn get_rendered_cursor(self: *Self, style: anytype, cursel: anytype) Cursor {
return switch (style) {
.normal => cursel.cursor,
.inclusive => cursel.to_cursor_inclusive(self.buf_root() catch return cursel.cursor, self.metrics),
};
}
fn render_cursor_primary(self: *Self, cursor: *const Cursor, theme: *const Widget.Theme, cell_map: CellMap) !void { fn render_cursor_primary(self: *Self, cursor: *const Cursor, theme: *const Widget.Theme, cell_map: CellMap) !void {
if (!tui.is_mainview_focused() or !self.enable_terminal_cursor) { if (!tui.is_mainview_focused() or !self.enable_terminal_cursor) {
if (self.screen_cursor(cursor)) |pos| { if (self.screen_cursor(cursor)) |pos| {