git.lucas.co / cce-compositor
Wayland compositor (wlroots)
git clone https://git.lucas.co/cce-compositor.git

commit2c9a36bad128abc58cc42de44b1771c50cea9899
parentd3a763d747
authorIsaac Freund <[email protected]>
date2024-02-19 18:21
command/map: remove references to locked mods

These have never created functional mappings as far as I'm aware.

 doc/riverctl.1.scd    | 4 +---
 river/command/map.zig | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/doc/riverctl.1.scd b/doc/riverctl.1.scd
index 68e1159..9023c33 100644
--- a/doc/riverctl.1.scd
+++ b/doc/riverctl.1.scd
@@ -162,17 +162,15 @@ a screenlocker). It cannot be entered or exited manually.
 The following modifiers are available for use in mappings:
 
 	- Shift
-	- Lock
 	- Control
 	- Mod1 (Alt)
-	- Mod2
 	- Mod3
 	- Mod4 (Super)
 	- Mod5
 	- None
 
 Alt and Super are aliases for Mod1 and Mod4 respectively. None allows creating
-a mapping without modifiers
+a mapping without modifiers.
 
 Keys are specified by their XKB keysym name. See
 _/usr/include/xkbcommon/xkbcommon-keysyms.h_ for the complete list.
diff --git a/river/command/map.zig b/river/command/map.zig
index 3ba5af6..b46475a 100644
--- a/river/command/map.zig
+++ b/river/command/map.zig
@@ -287,11 +287,9 @@ fn parseModifiers(modifiers_str: []const u8, out: *?[]const u8) !wlr.Keyboard.Mo
         if (mem.eql(u8, mod_name, "None")) continue;
         inline for ([_]struct { name: []const u8, field_name: []const u8 }{
             .{ .name = "Shift", .field_name = "shift" },
-            .{ .name = "Lock", .field_name = "caps" },
             .{ .name = "Control", .field_name = "ctrl" },
             .{ .name = "Mod1", .field_name = "alt" },
             .{ .name = "Alt", .field_name = "alt" },
-            .{ .name = "Mod2", .field_name = "mod2" },
             .{ .name = "Mod3", .field_name = "mod3" },
             .{ .name = "Mod4", .field_name = "logo" },
             .{ .name = "Super", .field_name = "logo" },