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

Merge branch 'master' into zig-0.15

Browse source
This commit is contained in:
CJ van den Berg 2025-09-13 16:16:51 +02:00
commit f958aa3039
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/buffer/Buffer.zig
View file

@ -538,7 +538,7 @@ const Node = union(enum) {
const ctx = @as(*@This(), @ptrCast(@alignCast(ctx_))); const ctx = @as(*@This(), @ptrCast(@alignCast(ctx_)));
ctx.at = egc; ctx.at = egc;
ctx.wcwidth = wcwidth; ctx.wcwidth = wcwidth;
if (ctx.col == 0 or egc[0] == '\n' or ctx.col < wcwidth) if (wcwidth > 0 and (ctx.col == 0 or egc[0] == '\n' or ctx.col < wcwidth))
return Walker.stop; return Walker.stop;
ctx.col -= wcwidth; ctx.col -= wcwidth;
return Walker.keep_walking; return Walker.keep_walking;

1
src/keybind/builtin/flow.json
View file

@ -225,6 +225,7 @@
"select": { "select": {
"name": "SELECT", "name": "SELECT",
"inherit": "normal", "inherit": "normal",
"cursor": "block",
"press": [ "press": [
["left", "select_left"], ["left", "select_left"],
["right", "select_right"], ["right", "select_right"],

3
src/tui/tui.zig
View file

@ -1455,7 +1455,8 @@ fn set_terminal_style(self: *Self) void {
pub fn get_cursor_shape() renderer.CursorShape { pub fn get_cursor_shape() renderer.CursorShape {
const self = current(); const self = current();
const shape = if (self.input_mode_) |mode| mode.cursor_shape orelse self.default_cursor else self.default_cursor; const shape_ = if (self.input_mode_) |mode| mode.cursor_shape orelse self.default_cursor else self.default_cursor;
const shape = if (self.rdr_.vx.caps.multi_cursor and shape_ == .default) .beam_blink else shape_;
return switch (shape) { return switch (shape) {
.default => .default, .default => .default,
.block_blink => .block_blink, .block_blink => .block_blink,