aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeon Henrik Plickat <leonhenrik.plickat@stud.uni-goettingen.de>2020-10-18 02:47:48 +0200
committerIsaac Freund <ifreund@ifreund.xyz>2020-10-18 16:36:11 +0200
commit4b4f7c464c82d90af6ae378d948bd1923ab50d58 (patch)
tree7342272d05e9155dd55c542b47ee80b2fef71d40
parentec5d5e8826d0370587b6209dcdb2ad9ba9ab4d54 (diff)
downloadriver-4b4f7c464c82d90af6ae378d948bd1923ab50d58.tar.gz
river-4b4f7c464c82d90af6ae378d948bd1923ab50d58.tar.xz
Allow "None" as modifier string for bindings without modifiers
This is more userfriendly than the empty string approach.
-rw-r--r--doc/riverctl.1.scd3
-rw-r--r--river/command/map.zig2
2 files changed, 2 insertions, 3 deletions
diff --git a/doc/riverctl.1.scd b/doc/riverctl.1.scd
index 14c73d7..8ede532 100644
--- a/doc/riverctl.1.scd
+++ b/doc/riverctl.1.scd
@@ -153,8 +153,7 @@ that tag 1 through 9 are visible.
_key_ is an XKB key name. See _/usr/include/xkbcommon/xkbcommon-keysyms.h_
for a list of special key names. _command_ can be any of the above commands.
- A mapping without modifiers can be created by passing an empty string as
- the modifiers argument.
+ A mapping without modifiers can be created by using "None" as sole modifier.
*map-pointer* _mode_ _modifiers_ _button_ _action_
_mode_ and _modifiers_ are the same as for *map*.
diff --git a/river/command/map.zig b/river/command/map.zig
index 42f834b..e47161e 100644
--- a/river/command/map.zig
+++ b/river/command/map.zig
@@ -29,7 +29,7 @@ const modifier_names = [_]struct {
name: []const u8,
modifier: u32,
}{
- .{ .name = "", .modifier = 0 },
+ .{ .name = "None", .modifier = 0 },
.{ .name = "Shift", .modifier = c.WLR_MODIFIER_SHIFT },
.{ .name = "Lock", .modifier = c.WLR_MODIFIER_CAPS },
.{ .name = "Control", .modifier = c.WLR_MODIFIER_CTRL },