Fix incorrect codepoint index usage as byte offset in input handling

Fixes unicode inputs
linusg · Jun 1, 2024 · 58e37e6 · 58e37e6
1 parent f88d45b
commit 58e37e6
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 16 deletions.
diff --git a/src/example.zig b/src/example.zig
@@ -18,18 +18,29 @@ pub fn main() Editor.Error!void {
             self.editor.stripStyles();
             const buf = self.editor.getBuffer();
             for (buf, 0..) |c, i| {
-                self.editor.stylize(.{
-                    .begin = i,
-                    .end = i + 1,
-                }, .{
-                    .foreground = .{
-                        .rgb = [3]u8{
-                            @intCast(c % 26 * 10),
-                            @intCast(c / 26 * 10),
-                            @intCast(c % 10 * 10 + 150),
+                if (c > 0x7F) {
+                    self.editor.stylize(.{
+                        .begin = i,
+                        .end = i + 1,
+                    }, .{
+                        .foreground = .{
+                            .rgb = [3]u8{ 255, 0, 0 },
                         },
-                    },
-                }) catch unreachable;
+                    }) catch unreachable;
+                } else {
+                    self.editor.stylize(.{
+                        .begin = i,
+                        .end = i + 1,
+                    }, .{
+                        .foreground = .{
+                            .rgb = [3]u8{
+                                @intCast(c % 26 * 10),
+                                @intCast(c / 26 * 10),
+                                @intCast(c % 10 * 10 + 150),
+                            },
+                        },
+                    }) catch unreachable;
+                }
             }
         }
 

diff --git a/src/main.zig b/src/main.zig
@@ -1689,7 +1689,7 @@ pub const Editor = struct {
         self.prohibit_input_processing = true;
         defer self.prohibit_input_processing = false;
 
-        var keybuf = [16]u8{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+        var keybuf = [_]u8{0} ** 32;
 
         var stdin = std.io.getStdIn();
 
@@ -1997,11 +1997,11 @@ pub const Editor = struct {
             self.insertCodePoint(code_point);
         }
 
-        if (consumed_code_points == self.incomplete_data.container.items.len) {
+        if (input_it.i == self.incomplete_data.container.items.len) {
             self.incomplete_data.container.clearAndFree();
         } else {
-            for (consumed_code_points..self.incomplete_data.container.items.len) |_| {
-                _ = self.incomplete_data.container.orderedRemove(consumed_code_points);
+            for (input_it.i..self.incomplete_data.container.items.len) |_| {
+                _ = self.incomplete_data.container.orderedRemove(input_it.i);
             }
         }
 
@@ -2042,7 +2042,7 @@ pub const Editor = struct {
     }
 
     fn vtDSR(self: *Self) ![2]usize {
-        var buf = [16]u8{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+        var buf = [_]u8{0} ** 32;
         var more_junk_to_read = false;
         var stdin = std.io.getStdIn();
         var pollfds = [1]std.posix.pollfd{undefined};