Rework commands to be string based

This allows for significantly more flexibility and should make
implementing the bind command possible.

1 files changed, 169 insertions, 141 deletions

diff --git a/src/Config.zig b/src/Config.zig
index 54eb58a..679f248 100644
--- a/src/Config.zig
+++ b/src/Config.zig
@@ -21,10 +21,10 @@ const std = @import("std");
 
 const c = @import("c.zig");
 
-const Command = @import("Command.zig");
 const Log = @import("log.zig").Log;
 const Mode = @import("Mode.zig");
 const Server = @import("Server.zig");
+const Keybind = @import("Keybind.zig");
 
 /// Width of borders in pixels
 border_width: u32,
@@ -55,190 +55,218 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
     const mod = c.WLR_MODIFIER_LOGO;
 
     // Mod+Shift+Return to start an instance of alacritty
-    try normal.keybinds.append(.{
-        .keysym = c.XKB_KEY_Return,
-        .modifiers = mod | c.WLR_MODIFIER_SHIFT,
-        .command = try Command.init(&[_][]const u8{ "spawn", "alacritty" }, allocator),
-    });
+    try normal.keybinds.append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_Return,
+        mod | c.WLR_MODIFIER_SHIFT,
+        &[_][]const u8{ "spawn", "alacritty" },
+    ));
 
     // Mod+Q to close the focused view
-    try normal.keybinds.append(.{
-        .keysym = c.XKB_KEY_q,
-        .modifiers = mod,
-        .command = try Command.init(&[_][]const u8{"close"}, allocator),
-    });
+    try normal.keybinds.append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_q,
+        mod,
+        &[_][]const u8{"close"},
+    ));
 
     // Mod+E to exit river
-    try normal.keybinds.append(.{
-        .keysym = c.XKB_KEY_e,
-        .modifiers = mod,
-        .command = try Command.init(&[_][]const u8{"exit"}, allocator),
-    });
+    try normal.keybinds.append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_e,
+        mod,
+        &[_][]const u8{"exit"},
+    ));
 
     // Mod+J and Mod+K to focus the next/previous view in the layout stack
-    try normal.keybinds.append(.{
-        .keysym = c.XKB_KEY_j,
-        .modifiers = mod,
-        .command = try Command.init(&[_][]const u8{ "focus", "next" }, allocator),
-    });
-    try normal.keybinds.append(.{
-        .keysym = c.XKB_KEY_k,
-        .modifiers = mod,
-        .command = try Command.init(&[_][]const u8{ "focus", "previous" }, allocator),
-    });
+    try normal.keybinds.append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_j,
+        mod,
+        &[_][]const u8{ "focus", "next" },
+    ));
+    try normal.keybinds.append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_k,
+        mod,
+        &[_][]const u8{ "focus", "previous" },
+    ));
 
     // Mod+Return to bump the focused view to the top of the layout stack,
     // making it the new master
-    try normal.keybinds.append(.{
-        .keysym = c.XKB_KEY_Return,
-        .modifiers = mod,
-        .command = try Command.init(&[_][]const u8{"zoom"}, allocator),
-    });
+    try normal.keybinds.append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_Return,
+        mod,
+        &[_][]const u8{"zoom"},
+    ));
 
     // Mod+H and Mod+L to increase/decrease the width of the master column
-    try normal.keybinds.append(.{
-        .keysym = c.XKB_KEY_h,
-        .modifiers = mod,
-        .command = try Command.init(&[_][]const u8{ "mod_master_factor", "+0.05" }, allocator),
-    });
-    try normal.keybinds.append(.{
-        .keysym = c.XKB_KEY_l,
-        .modifiers = mod,
-        .command = try Command.init(&[_][]const u8{ "mod_master_factor", "-0.05" }, allocator),
-    });
+    try normal.keybinds.append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_h,
+        mod,
+        &[_][]const u8{ "mod_master_factor", "+0.05" },
+    ));
+    try normal.keybinds.append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_l,
+        mod,
+        &[_][]const u8{ "mod_master_factor", "-0.05" },
+    ));
 
     // Mod+Shift+H and Mod+Shift+L to increment/decrement the number of
     // master views in the layout
-    try normal.keybinds.append(.{
-        .keysym = c.XKB_KEY_h,
-        .modifiers = mod | c.WLR_MODIFIER_SHIFT,
-        .command = try Command.init(&[_][]const u8{ "mod_master_count", "+1" }, allocator),
-    });
-    try normal.keybinds.append(.{
-        .keysym = c.XKB_KEY_l,
-        .modifiers = mod | c.WLR_MODIFIER_SHIFT,
-        .command = try Command.init(&[_][]const u8{ "mod_master_count", "+1" }, allocator),
-    });
+    try normal.keybinds.append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_h,
+        mod | c.WLR_MODIFIER_SHIFT,
+        &[_][]const u8{ "mod_master_count", "+1" },
+    ));
+    try normal.keybinds.append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_l,
+        mod | c.WLR_MODIFIER_SHIFT,
+        &[_][]const u8{ "mod_master_count", "+1" },
+    ));
 
     comptime var i = 0;
     inline while (i < 9) : (i += 1) {
         const str = &[_]u8{i + '0' + 1};
         // Mod+[1-9] to focus tag [1-9]
-        try normal.keybinds.append(.{
-            .keysym = c.XKB_KEY_1 + i,
-            .modifiers = mod,
-            .command = try Command.init(&[_][]const u8{ "focus_tag", str }, allocator),
-        });
+        try normal.keybinds.append(try Keybind.init(
+            allocator,
+            c.XKB_KEY_1 + i,
+            mod,
+            &[_][]const u8{ "focus_tag", str },
+        ));
         // Mod+Shift+[1-9] to tag focused view with tag [1-9]
-        try normal.keybinds.append(.{
-            .keysym = c.XKB_KEY_1 + i,
-            .modifiers = mod | c.WLR_MODIFIER_SHIFT,
-            .command = try Command.init(&[_][]const u8{ "tag_view", str }, allocator),
-        });
+        try normal.keybinds.append(try Keybind.init(
+            allocator,
+            c.XKB_KEY_1 + i,
+            mod | c.WLR_MODIFIER_SHIFT,
+            &[_][]const u8{ "tag_view", str },
+        ));
         // Mod+Ctrl+[1-9] to toggle focus of tag [1-9]
-        try normal.keybinds.append(.{
-            .keysym = c.XKB_KEY_1 + i,
-            .modifiers = mod | c.WLR_MODIFIER_CTRL,
-            .command = try Command.init(&[_][]const u8{ "toggle_tag_focus", str }, allocator),
-        });
+        try normal.keybinds.append(try Keybind.init(
+            allocator,
+            c.XKB_KEY_1 + i,
+            mod | c.WLR_MODIFIER_CTRL,
+            &[_][]const u8{ "toggle_tag_focus", str },
+        ));
         // Mod+Shift+Ctrl+[1-9] to toggle tag [1-9] of focused view
-        try normal.keybinds.append(.{
-            .keysym = c.XKB_KEY_1 + i,
-            .modifiers = mod | c.WLR_MODIFIER_CTRL | c.WLR_MODIFIER_SHIFT,
-            .command = try Command.init(&[_][]const u8{ "toggle_view_tag", str }, allocator),
-        });
+        try normal.keybinds.append(try Keybind.init(
+            allocator,
+            c.XKB_KEY_1 + i,
+            mod | c.WLR_MODIFIER_CTRL | c.WLR_MODIFIER_SHIFT,
+            &[_][]const u8{ "toggle_view_tag", str },
+        ));
     }
 
     // Mod+0 to focus all tags
-    try normal.keybinds.append(.{
-        .keysym = c.XKB_KEY_0,
-        .modifiers = mod,
-        .command = try Command.init(&[_][]const u8{"focus_all_tags"}, allocator),
-    });
+    try normal.keybinds.append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_0,
+        mod,
+        &[_][]const u8{"focus_all_tags"},
+    ));
 
     // Mod+Shift+0 to tag focused view with all tags
-    try normal.keybinds.append(.{
-        .keysym = c.XKB_KEY_0,
-        .modifiers = mod | c.WLR_MODIFIER_SHIFT,
-        .command = try Command.init(&[_][]const u8{"tag_view_all_tags"}, allocator),
-    });
+    try normal.keybinds.append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_0,
+        mod | c.WLR_MODIFIER_SHIFT,
+        &[_][]const u8{"tag_view_all_tags"},
+    ));
 
     // Mod+Period and Mod+Comma to focus the next/previous output
-    try normal.keybinds.append(.{
-        .keysym = c.XKB_KEY_period,
-        .modifiers = mod,
-        .command = try Command.init(&[_][]const u8{ "focus_output", "next" }, allocator),
-    });
-    try normal.keybinds.append(.{
-        .keysym = c.XKB_KEY_comma,
-        .modifiers = mod,
-        .command = try Command.init(&[_][]const u8{ "focus_output", "previous" }, allocator),
-    });
+    try normal.keybinds.append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_period,
+        mod,
+        &[_][]const u8{ "focus_output", "next" },
+    ));
+    try normal.keybinds.append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_comma,
+        mod,
+        &[_][]const u8{ "focus_output", "previous" },
+    ));
 
     // Mod+Shift+Period/Comma to send the focused view to the the
     // next/previous output
-    try normal.keybinds.append(.{
-        .keysym = c.XKB_KEY_period,
-        .modifiers = mod | c.WLR_MODIFIER_SHIFT,
-        .command = try Command.init(&[_][]const u8{ "send_to_output", "next" }, allocator),
-    });
-    try normal.keybinds.append(.{
-        .keysym = c.XKB_KEY_comma,
-        .modifiers = mod | c.WLR_MODIFIER_SHIFT,
-        .command = try Command.init(&[_][]const u8{ "send_to_output", "previous" }, allocator),
-    });
+    try normal.keybinds.append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_period,
+        mod | c.WLR_MODIFIER_SHIFT,
+        &[_][]const u8{ "send_to_output", "next" },
+    ));
+    try normal.keybinds.append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_comma,
+        mod | c.WLR_MODIFIER_SHIFT,
+        &[_][]const u8{ "send_to_output", "previous" },
+    ));
 
     // Mod+Space to toggle float
-    try normal.keybinds.append(.{
-        .keysym = c.XKB_KEY_space,
-        .modifiers = mod,
-        .command = try Command.init(&[_][]const u8{"toggle_float"}, allocator),
-    });
+    try normal.keybinds.append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_space,
+        mod,
+        &[_][]const u8{"toggle_float"},
+    ));
 
     // Mod+F11 to enter passthrough mode
-    try normal.keybinds.append(.{
-        .keysym = c.XKB_KEY_F11,
-        .modifiers = mod,
-        .command = try Command.init(&[_][]const u8{ "mode", "passthrough" }, allocator),
-    });
+    try normal.keybinds.append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_F11,
+        mod,
+        &[_][]const u8{ "mode", "passthrough" },
+    ));
 
     try self.modes.append(try Mode.init("passthrough", allocator));
 
     // Mod+F11 to return to normal mode
-    try self.modes.items[1].keybinds.append(.{
-        .keysym = c.XKB_KEY_F11,
-        .modifiers = mod,
-        .command = try Command.init(&[_][]const u8{ "mode", "normal" }, allocator),
-    });
+    try self.modes.items[1].keybinds.append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_F11,
+        mod,
+        &[_][]const u8{ "mode", "normal" },
+    ));
 
     // Change master orientation with Mod+{Up,Right,Down,Left}
-    try normal.keybinds.append(.{
-        .keysym = c.XKB_KEY_Up,
-        .modifiers = mod,
-        .command = try Command.init(&[_][]const u8{ "layout", "TopMaster" }, allocator),
-    });
-    try normal.keybinds.append(.{
-        .keysym = c.XKB_KEY_Right,
-        .modifiers = mod,
-        .command = try Command.init(&[_][]const u8{ "layout", "RightMaster" }, allocator),
-    });
-    try normal.keybinds.append(.{
-        .keysym = c.XKB_KEY_Down,
-        .modifiers = mod,
-        .command = try Command.init(&[_][]const u8{ "layout", "BottomMaster" }, allocator),
-    });
-    try normal.keybinds.append(.{
-        .keysym = c.XKB_KEY_Left,
-        .modifiers = mod,
-        .command = try Command.init(&[_][]const u8{ "layout", "LeftMaster" }, allocator),
-    });
+    try normal.keybinds.append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_Up,
+        mod,
+        &[_][]const u8{ "layout", "TopMaster" },
+    ));
+    try normal.keybinds.append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_Right,
+        mod,
+        &[_][]const u8{ "layout", "RightMaster" },
+    ));
+    try normal.keybinds.append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_Down,
+        mod,
+        &[_][]const u8{ "layout", "BottomMaster" },
+    ));
+    try normal.keybinds.append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_Left,
+        mod,
+        &[_][]const u8{ "layout", "LeftMaster" },
+    ));
 
     // Mod+f to change to Full layout
-    try normal.keybinds.append(.{
-        .keysym = c.XKB_KEY_f,
-        .modifiers = mod,
-        .command = try Command.init(&[_][]const u8{ "layout", "Full" }, allocator),
-    });
+    try normal.keybinds.append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_f,
+        mod,
+        &[_][]const u8{ "layout", "Full" },
+    ));
 
     // Float views with app_id "float"
     try self.float_filter.append("float");