refactor: move palette keybindings to keybind module

src/keybind/static/overlay/palette.zig

@@ -0,0 +1,105 @@
+const tp = @import("thespian");
+const key = @import("renderer").input.key;
+const mod = @import("renderer").input.modifier;
+const event_type = @import("renderer").input.event_type;
+const command = @import("command");
+const EventHandler = @import("EventHandler");
+
+pub fn create() EventHandler {
+    return EventHandler.static(@This());
+}
+
+pub fn receive(_: tp.pid_ref, m: tp.message) error{Exit}!bool {
+    var evtype: u32 = undefined;
+    var keypress: u32 = undefined;
+    var egc: u32 = undefined;
+    var modifiers: u32 = undefined;
+
+    if (try m.match(.{ "I", tp.extract(&evtype), tp.extract(&keypress), tp.extract(&egc), tp.string, tp.extract(&modifiers) })) {
+        mapEvent(evtype, keypress, egc, modifiers) catch |e| return tp.exit_error(e, @errorReturnTrace());
+    }
+    return false;
+}
+
+fn mapEvent(evtype: u32, keypress: u32, egc: u32, modifiers: u32) !void {
+    return switch (evtype) {
+        event_type.PRESS => mapPress(keypress, egc, modifiers),
+        event_type.REPEAT => mapPress(keypress, egc, modifiers),
+        event_type.RELEASE => mapRelease(keypress, modifiers),
+        else => {},
+    };
+}
+
+fn mapPress(keypress: u32, egc: u32, modifiers: u32) !void {
+    const keynormal = if ('a' <= keypress and keypress <= 'z') keypress - ('a' - 'A') else keypress;
+    return switch (modifiers) {
+        mod.CTRL => switch (keynormal) {
+            'J' => command.executeName("toggle_panel", .{}),
+            'Q' => command.executeName("quit", .{}),
+            'W' => command.executeName("close_file", .{}),
+            'P' => command.executeName("palette_menu_up", .{}),
+            'N' => command.executeName("palette_menu_down", .{}),
+            'T' => command.executeName("palette_menu_down", .{}), // select theme repeat key
+            'R' => command.executeName("palette_menu_down", .{}), // open recent project repeat key
+            'V' => command.executeName("system_paste", .{}),
+            'C' => command.executeName("palette_menu_cancel", .{}),
+            'G' => command.executeName("palette_menu_cancel", .{}),
+            key.ESC => command.executeName("palette_menu_cancel", .{}),
+            key.UP => command.executeName("palette_menu_up", .{}),
+            key.DOWN => command.executeName("palette_menu_down", .{}),
+            key.PGUP => command.executeName("palette_menu_pageup", .{}),
+            key.PGDOWN => command.executeName("palette_menu_pagedown", .{}),
+            key.ENTER => command.executeName("palette_menu_activate", .{}),
+            key.BACKSPACE => command.executeName("overlay_delete_word_left", .{}),
+            else => {},
+        },
+        mod.CTRL | mod.SHIFT => switch (keynormal) {
+            'P' => command.executeName("palette_menu_down", .{}), // command palette repeat key
+            'Q' => command.executeName("quit_without_saving", .{}),
+            'W' => command.executeName("close_file_without_saving", .{}),
+            'R' => command.executeName("restart", .{}),
+            'L' => command.executeName("overlay_toggle_panel", .{}),
+            'I' => command.executeName("overlay_toggle_inputview", .{}),
+            else => {},
+        },
+        mod.ALT | mod.SHIFT => switch (keynormal) {
+            'P' => command.executeName("palette_menu_down", .{}),
+            else => {},
+        },
+        mod.ALT => switch (keynormal) {
+            'P' => command.executeName("palette_menu_up", .{}),
+            'L' => command.executeName("toggle_panel", .{}),
+            'I' => command.executeName("toggle_inputview", .{}),
+            else => {},
+        },
+        mod.SHIFT => switch (keypress) {
+            else => if (!key.synthesized_p(keypress))
+                command.executeName("overlay_insert_code_point", command.fmt(.{egc}))
+            else {},
+        },
+        0 => switch (keypress) {
+            key.F09 => command.executeName("theme_prev", .{}),
+            key.F10 => command.executeName("theme_next", .{}),
+            key.F11 => command.executeName("toggle_panel", .{}),
+            key.F12 => command.executeName("toggle_inputview", .{}),
+            key.ESC => command.executeName("palette_menu_cancel", .{}),
+            key.UP => command.executeName("palette_menu_up", .{}),
+            key.DOWN => command.executeName("palette_menu_down", .{}),
+            key.PGUP => command.executeName("palette_menu_pageup", .{}),
+            key.PGDOWN => command.executeName("palette_menu_pagedown", .{}),
+            key.ENTER => command.executeName("palette_menu_activate", .{}),
+            key.BACKSPACE => command.executeName("overlay_delete_backwards", .{}),
+            else => if (!key.synthesized_p(keypress))
+                command.executeName("overlay_insert_code_point", command.fmt(.{egc}))
+            else {},
+        },
+        else => {},
+    };
+}
+
+fn mapRelease(keypress: u32, _: u32) !void {
+    return switch (keypress) {
+        key.LCTRL, key.RCTRL => command.executeName("overlay_release_control", .{}),
+        else => {},
+    };
+}

src/tui/mode/overlay/palette.zig

@@ -8,6 +8,7 @@ const Plane = @import("renderer").Plane;
 const key = @import("renderer").input.key;
 const mod = @import("renderer").input.modifier;
 const event_type = @import("renderer").input.event_type;
+const keybind = @import("keybind");
 const ucs32_to_utf8 = @import("renderer").ucs32_to_utf8;
 const command = @import("command");
 const EventHandler = @import("EventHandler");
@@ -84,7 +85,8 @@ pub fn Create(options: type) type {
             try mv.floating_views.add(self.modal.widget());
             try mv.floating_views.add(self.menu.container_widget);
             return .{
-                .input_handler = EventHandler.to_owned(self),
+                .input_handler = keybind.mode.overlay.palette.create(),
+                .event_handler = EventHandler.to_owned(self),
                 .name = options.name,
             };
         }
@@ -201,103 +203,14 @@ pub fn Create(options: type) type {
         }
 
         pub fn receive(self: *Self, _: tp.pid_ref, m: tp.message) error{Exit}!bool {
-            var evtype: u32 = undefined;
-            var keypress: u32 = undefined;
-            var egc: u32 = undefined;
-            var modifiers: u32 = undefined;
             var text: []const u8 = undefined;
 
-            if (try m.match(.{ "I", tp.extract(&evtype), tp.extract(&keypress), tp.extract(&egc), tp.string, tp.extract(&modifiers) })) {
+            if (try m.match(.{ "system_clipboard", tp.extract(&text) })) {
-                self.mapEvent(evtype, keypress, egc, modifiers) catch |e| return tp.exit_error(e, @errorReturnTrace());
-            } else if (try m.match(.{ "system_clipboard", tp.extract(&text) })) {
                 self.insert_bytes(text) catch |e| return tp.exit_error(e, @errorReturnTrace());
             }
             return false;
         }
 
-        fn mapEvent(self: *Self, evtype: u32, keypress: u32, egc: u32, modifiers: u32) !void {
-            return switch (evtype) {
-                event_type.PRESS => self.mapPress(keypress, egc, modifiers),
-                event_type.REPEAT => self.mapPress(keypress, egc, modifiers),
-                event_type.RELEASE => self.mapRelease(keypress, modifiers),
-                else => {},
-            };
-        }
-
-        fn mapPress(self: *Self, keypress: u32, egc: u32, modifiers: u32) !void {
-            const keynormal = if ('a' <= keypress and keypress <= 'z') keypress - ('a' - 'A') else keypress;
-            return switch (modifiers) {
-                mod.CTRL => switch (keynormal) {
-                    'J' => self.cmd("toggle_panel", .{}),
-                    'Q' => self.cmd("quit", .{}),
-                    'W' => self.cmd("close_file", .{}),
-                    'P' => self.cmd("palette_menu_up", .{}),
-                    'N' => self.cmd("palette_menu_down", .{}),
-                    'T' => self.cmd("palette_menu_down", .{}), // select theme repeat key
-                    'R' => self.cmd("palette_menu_down", .{}), // open recent project repeat key
-                    'V' => self.cmd("system_paste", .{}),
-                    'C' => self.cmd("palette_menu_cancel", .{}),
-                    'G' => self.cmd("palette_menu_cancel", .{}),
-                    key.ESC => self.cmd("palette_menu_cancel", .{}),
-                    key.UP => self.cmd("palette_menu_up", .{}),
-                    key.DOWN => self.cmd("palette_menu_down", .{}),
-                    key.PGUP => self.cmd("palette_menu_pageup", .{}),
-                    key.PGDOWN => self.cmd("palette_menu_pagedown", .{}),
-                    key.ENTER => self.cmd("palette_menu_activate", .{}),
-                    key.BACKSPACE => self.delete_word(),
-                    else => {},
-                },
-                mod.CTRL | mod.SHIFT => switch (keynormal) {
-                    'P' => self.cmd("palette_menu_down", .{}), // command palette repeat key
-                    'Q' => self.cmd("quit_without_saving", .{}),
-                    'W' => self.cmd("close_file_without_saving", .{}),
-                    'R' => self.cmd("restart", .{}),
-                    'L' => self.cmd_async("toggle_panel"),
-                    'I' => self.cmd_async("toggle_inputview"),
-                    else => {},
-                },
-                mod.ALT | mod.SHIFT => switch (keynormal) {
-                    'P' => self.cmd("palette_menu_down", .{}),
-                    else => {},
-                },
-                mod.ALT => switch (keynormal) {
-                    'P' => self.cmd("palette_menu_up", .{}),
-                    'L' => self.cmd("toggle_panel", .{}),
-                    'I' => self.cmd("toggle_inputview", .{}),
-                    else => {},
-                },
-                mod.SHIFT => switch (keypress) {
-                    else => if (!key.synthesized_p(keypress))
-                        self.insert_code_point(egc)
-                    else {},
-                },
-                0 => switch (keypress) {
-                    key.F09 => self.cmd("theme_prev", .{}),
-                    key.F10 => self.cmd("theme_next", .{}),
-                    key.F11 => self.cmd("toggle_panel", .{}),
-                    key.F12 => self.cmd("toggle_inputview", .{}),
-                    key.ESC => self.cmd("palette_menu_cancel", .{}),
-                    key.UP => self.cmd("palette_menu_up", .{}),
-                    key.DOWN => self.cmd("palette_menu_down", .{}),
-                    key.PGUP => self.cmd("palette_menu_pageup", .{}),
-                    key.PGDOWN => self.cmd("palette_menu_pagedown", .{}),
-                    key.ENTER => self.cmd("palette_menu_activate", .{}),
-                    key.BACKSPACE => self.delete_code_point(),
-                    else => if (!key.synthesized_p(keypress))
-                        self.insert_code_point(egc)
-                    else {},
-                },
-                else => {},
-            };
-        }
-
-        fn mapRelease(self: *Self, keypress: u32, _: u32) !void {
-            return switch (keypress) {
-                key.LCTRL, key.RCTRL => if (self.menu.selected orelse 0 > 0) return self.cmd("palette_menu_activate", .{}),
-                else => {},
-            };
-        }
-
         fn start_query(self: *Self) !void {
             self.items = 0;
             self.menu.reset_items();
@@ -497,6 +410,39 @@ pub fn Create(options: type) type {
                 try self.cmd("exit_overlay_mode", .{});
             }
             pub const palette_menu_cancel_meta = .{ .interactive = false };
+
+            pub fn overlay_delete_word_left(self: *Self, _: Ctx) Result {
+                self.delete_word() catch |e| return tp.exit_error(e, @errorReturnTrace());
+            }
+            pub const overlay_delete_word_left_meta = .{ .description = "Delete word to the left" };
+
+            pub fn overlay_delete_backwards(self: *Self, _: Ctx) Result {
+                self.delete_code_point() catch |e| return tp.exit_error(e, @errorReturnTrace());
+            }
+            pub const overlay_delete_backwards_meta = .{ .description = "Delete backwards" };
+
+            pub fn overlay_insert_code_point(self: *Self, ctx: Ctx) Result {
+                var egc: u32 = 0;
+                if (!try ctx.args.match(.{tp.extract(&egc)}))
+                    return error.InvalidArgument;
+                self.insert_code_point(egc) catch |e| return tp.exit_error(e, @errorReturnTrace());
+            }
+            pub const overlay_insert_code_point_meta = .{ .interactive = false };
+
+            pub fn overlay_release_control(self: *Self, _: Ctx) Result {
+                if (self.menu.selected orelse 0 > 0) return self.cmd("palette_menu_activate", .{});
+            }
+            pub const overlay_release_control_meta = .{ .interactive = false };
+
+            pub fn overlay_toggle_panel(self: *Self, _: Ctx) Result {
+                return self.cmd_async("toggle_panel");
+            }
+            pub const overlay_toggle_panel_meta = .{ .interactive = false };
+
+            pub fn overlay_toggle_inputview(self: *Self, _: Ctx) Result {
+                return self.cmd_async("toggle_inputview");
+            }
+            pub const overlay_toggle_inputview_meta = .{ .interactive = false };
         };
     };
 }