Merge branch 'master' into zig-0.15
This commit is contained in:
commit
f958aa3039
3 changed files with 4 additions and 2 deletions
|
@ -538,7 +538,7 @@ const Node = union(enum) {
|
|||
const ctx = @as(*@This(), @ptrCast(@alignCast(ctx_)));
|
||||
ctx.at = egc;
|
||||
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;
|
||||
ctx.col -= wcwidth;
|
||||
return Walker.keep_walking;
|
||||
|
|
|
@ -225,6 +225,7 @@
|
|||
"select": {
|
||||
"name": "SELECT",
|
||||
"inherit": "normal",
|
||||
"cursor": "block",
|
||||
"press": [
|
||||
["left", "select_left"],
|
||||
["right", "select_right"],
|
||||
|
|
|
@ -1455,7 +1455,8 @@ fn set_terminal_style(self: *Self) void {
|
|||
|
||||
pub fn get_cursor_shape() renderer.CursorShape {
|
||||
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) {
|
||||
.default => .default,
|
||||
.block_blink => .block_blink,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue