Store modes by id

src/Config.zig

@@ -22,7 +22,6 @@ const std = @import("std");
 const c = @import("c.zig");
 
 const Log = @import("log.zig").Log;
-const Mode = @import("Mode.zig");
 const Server = @import("Server.zig");
 const Keybind = @import("Keybind.zig");
 
@@ -35,8 +34,11 @@ view_padding: u32,
 /// Amount of padding arount the outer edge of the layout in pixels
 outer_padding: u32,
 
-/// All user-defined keybinding modes
+/// Map of mode name to mode id
-modes: std.ArrayList(Mode),
+mode_to_id: std.StringHashMap(u32),
+
+/// All user-defined keybinding modes, indexed by mode id
+modes: std.ArrayList(std.ArrayList(Keybind)),
 
 /// List of app_ids which will be started floating
 float_filter: std.ArrayList([*:0]const u8),
@@ -46,16 +48,21 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
     self.view_padding = 8;
     self.outer_padding = 8;
 
-    self.modes = std.ArrayList(Mode).init(allocator);
+    self.mode_to_id = std.StringHashMap(u32).init(allocator);
-    try self.modes.append(try Mode.init("normal", allocator));
+    try self.mode_to_id.putNoClobber("normal", 0);
+    try self.mode_to_id.putNoClobber("passthrough", 1);
+
+    self.modes = std.ArrayList(std.ArrayList(Keybind)).init(allocator);
+    try self.modes.append(std.ArrayList(Keybind).init(allocator));
+    try self.modes.append(std.ArrayList(Keybind).init(allocator));
 
     self.float_filter = std.ArrayList([*:0]const u8).init(allocator);
 
-    const normal = &self.modes.items[0];
+    const normal_keybinds = &self.modes.items[0];
     const mod = c.WLR_MODIFIER_LOGO;
 
     // Mod+Shift+Return to start an instance of alacritty
-    try normal.keybinds.append(try Keybind.init(
+    try normal_keybinds.append(try Keybind.init(
         allocator,
         c.XKB_KEY_Return,
         mod | c.WLR_MODIFIER_SHIFT,
@@ -63,7 +70,7 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
     ));
 
     // Mod+Q to close the focused view
-    try normal.keybinds.append(try Keybind.init(
+    try normal_keybinds.append(try Keybind.init(
         allocator,
         c.XKB_KEY_q,
         mod,
@@ -71,7 +78,7 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
     ));
 
     // Mod+E to exit river
-    try normal.keybinds.append(try Keybind.init(
+    try normal_keybinds.append(try Keybind.init(
         allocator,
         c.XKB_KEY_e,
         mod,
@@ -79,13 +86,13 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
     ));
 
     // Mod+J and Mod+K to focus the next/previous view in the layout stack
-    try normal.keybinds.append(try Keybind.init(
+    try normal_keybinds.append(try Keybind.init(
         allocator,
         c.XKB_KEY_j,
         mod,
         &[_][]const u8{ "focus", "next" },
     ));
-    try normal.keybinds.append(try Keybind.init(
+    try normal_keybinds.append(try Keybind.init(
         allocator,
         c.XKB_KEY_k,
         mod,
@@ -94,7 +101,7 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
 
     // Mod+Return to bump the focused view to the top of the layout stack,
     // making it the new master
-    try normal.keybinds.append(try Keybind.init(
+    try normal_keybinds.append(try Keybind.init(
         allocator,
         c.XKB_KEY_Return,
         mod,
@@ -102,13 +109,13 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
     ));
 
     // Mod+H and Mod+L to increase/decrease the width of the master column
-    try normal.keybinds.append(try Keybind.init(
+    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(
+    try normal_keybinds.append(try Keybind.init(
         allocator,
         c.XKB_KEY_l,
         mod,
@@ -117,13 +124,13 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
 
     // Mod+Shift+H and Mod+Shift+L to increment/decrement the number of
     // master views in the layout
-    try normal.keybinds.append(try Keybind.init(
+    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(
+    try normal_keybinds.append(try Keybind.init(
         allocator,
         c.XKB_KEY_l,
         mod | c.WLR_MODIFIER_SHIFT,
@@ -134,28 +141,28 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
     inline while (i < 9) : (i += 1) {
         const str = &[_]u8{i + '0' + 1};
         // Mod+[1-9] to focus tag [1-9]
-        try normal.keybinds.append(try Keybind.init(
+        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(try Keybind.init(
+        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(try Keybind.init(
+        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(try Keybind.init(
+        try normal_keybinds.append(try Keybind.init(
             allocator,
             c.XKB_KEY_1 + i,
             mod | c.WLR_MODIFIER_CTRL | c.WLR_MODIFIER_SHIFT,
@@ -164,7 +171,7 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
     }
 
     // Mod+0 to focus all tags
-    try normal.keybinds.append(try Keybind.init(
+    try normal_keybinds.append(try Keybind.init(
         allocator,
         c.XKB_KEY_0,
         mod,
@@ -172,7 +179,7 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
     ));
 
     // Mod+Shift+0 to tag focused view with all tags
-    try normal.keybinds.append(try Keybind.init(
+    try normal_keybinds.append(try Keybind.init(
         allocator,
         c.XKB_KEY_0,
         mod | c.WLR_MODIFIER_SHIFT,
@@ -180,13 +187,13 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
     ));
 
     // Mod+Period and Mod+Comma to focus the next/previous output
-    try normal.keybinds.append(try Keybind.init(
+    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(
+    try normal_keybinds.append(try Keybind.init(
         allocator,
         c.XKB_KEY_comma,
         mod,
@@ -195,13 +202,13 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
 
     // Mod+Shift+Period/Comma to send the focused view to the the
     // next/previous output
-    try normal.keybinds.append(try Keybind.init(
+    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(
+    try normal_keybinds.append(try Keybind.init(
         allocator,
         c.XKB_KEY_comma,
         mod | c.WLR_MODIFIER_SHIFT,
@@ -209,7 +216,7 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
     ));
 
     // Mod+Space to toggle float
-    try normal.keybinds.append(try Keybind.init(
+    try normal_keybinds.append(try Keybind.init(
         allocator,
         c.XKB_KEY_space,
         mod,
@@ -217,43 +224,33 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
     ));
 
     // Mod+F11 to enter passthrough mode
-    try normal.keybinds.append(try Keybind.init(
+    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(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(try Keybind.init(
+    try normal_keybinds.append(try Keybind.init(
         allocator,
         c.XKB_KEY_Up,
         mod,
         &[_][]const u8{ "layout", "TopMaster" },
     ));
-    try normal.keybinds.append(try Keybind.init(
+    try normal_keybinds.append(try Keybind.init(
         allocator,
         c.XKB_KEY_Right,
         mod,
         &[_][]const u8{ "layout", "RightMaster" },
     ));
-    try normal.keybinds.append(try Keybind.init(
+    try normal_keybinds.append(try Keybind.init(
         allocator,
         c.XKB_KEY_Down,
         mod,
         &[_][]const u8{ "layout", "BottomMaster" },
     ));
-    try normal.keybinds.append(try Keybind.init(
+    try normal_keybinds.append(try Keybind.init(
         allocator,
         c.XKB_KEY_Left,
         mod,
@@ -261,27 +258,27 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void {
     ));
 
     // Mod+f to change to Full layout
-    try normal.keybinds.append(try Keybind.init(
+    try normal_keybinds.append(try Keybind.init(
         allocator,
         c.XKB_KEY_f,
         mod,
         &[_][]const u8{ "layout", "Full" },
     ));
 
+    // Mod+F11 to return to normal mode
+    try self.modes.items[1].append(try Keybind.init(
+        allocator,
+        c.XKB_KEY_F11,
+        mod,
+        &[_][]const u8{ "mode", "normal" },
+    ));
+
     // Float views with app_id "float"
     try self.float_filter.append("float");
 }
 
 pub fn deinit(self: Self, allocator: *std.mem.Allocator) void {
+    self.mode_to_id.deinit();
     for (self.modes.items) |*mode| mode.deinit();
     self.modes.deinit();
 }
-
-pub fn getMode(self: Self, name: []const u8) *Mode {
-    for (self.modes.items) |*mode|
-        if (std.mem.eql(u8, mode.name, name)) return mode;
-    Log.Error.log("Mode '{}' does not exist, entering normal mode", .{name});
-    for (self.modes.items) |*mode|
-        if (std.mem.eql(u8, mode.name, "normal")) return mode;
-    unreachable;
-}

src/Mode.zig

@@ -1,43 +0,0 @@
-// This file is part of river, a dynamic tiling wayland compositor.
-//
-// Copyright 2020 Isaac Freund
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-const Self = @This();
-
-const std = @import("std");
-
-const Keybind = @import("Keybind.zig");
-
-/// The name of the mode
-name: []const u8,
-
-/// The list of active keybindings for this mode
-keybinds: std.ArrayList(Keybind),
-
-pub fn init(name: []const u8, allocator: *std.mem.Allocator) !Self {
-    const owned_name = try std.mem.dupe(allocator, u8, name);
-    return Self{
-        .name = owned_name,
-        .keybinds = std.ArrayList(Keybind).init(allocator),
-    };
-}
-
-pub fn deinit(self: Self) void {
-    const allocator = self.keybinds.allocator;
-    allocator.free(self.name);
-    for (self.keybinds.items) |keybind| keybind.deinit(allocator);
-    self.keybinds.deinit();
-}

src/Seat.zig

@@ -26,7 +26,6 @@ const Cursor = @import("Cursor.zig");
 const InputManager = @import("InputManager.zig");
 const Keyboard = @import("Keyboard.zig");
 const LayerSurface = @import("LayerSurface.zig");
-const Mode = @import("Mode.zig");
 const Output = @import("Output.zig");
 const View = @import("View.zig");
 const ViewStack = @import("view_stack.zig").ViewStack;
@@ -46,8 +45,8 @@ cursor: Cursor,
 /// Mulitple keyboards are handled separately
 keyboards: std.TailQueue(Keyboard),
 
-/// Current keybind mode
+/// Id of the current keybind mode
-mode: *Mode,
+mode_id: u32,
 
 /// Currently focused output, may be the noop output if no
 focused_output: *Output,
@@ -77,7 +76,7 @@ pub fn init(self: *Self, input_manager: *InputManager, name: []const u8) !void {
 
     self.keyboards = std.TailQueue(Keyboard).init();
 
-    self.mode = input_manager.server.config.getMode("normal");
+    self.mode_id = 0;
 
     self.focused_output = &self.input_manager.server.root.noop_output;
 
@@ -250,7 +249,8 @@ pub fn handleViewUnmap(self: *Self, view: *View) void {
 /// Handle any user-defined keybinding for the passed keysym and modifiers
 /// Returns true if the key was handled
 pub fn handleKeybinding(self: *Self, keysym: c.xkb_keysym_t, modifiers: u32) bool {
-    for (self.mode.keybinds.items) |keybind| {
+    const modes = &self.input_manager.server.config.modes;
+    for (modes.items[self.mode_id].items) |keybind| {
         if (modifiers == keybind.modifiers and keysym == keybind.keysym) {
             // Execute the bound command
             const allocator = self.input_manager.server.allocator;

src/command/mode.zig

@@ -31,5 +31,13 @@ pub fn mode(
     if (args.len > 2) return Error.TooManyArguments;
 
     const config = seat.input_manager.server.config;
-    seat.mode = config.getMode(args[1]);
+    const target_mode = args[1];
+    seat.mode_id = config.mode_to_id.getValue(target_mode) orelse {
+        failure_message.* = try std.fmt.allocPrint(
+            allocator,
+            "cannot enter non-existant mode '{}'",
+            .{target_mode},
+        );
+        return Error.CommandFailed;
+    };
 }