From 4b4f7c464c82d90af6ae378d948bd1923ab50d58 Mon Sep 17 00:00:00 2001 From: Leon Henrik Plickat Date: Sun, 18 Oct 2020 02:47:48 +0200 Subject: [PATCH] Allow "None" as modifier string for bindings without modifiers This is more userfriendly than the empty string approach. --- doc/riverctl.1.scd | 3 +-- river/command/map.zig | 2 +- 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 },