Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

command/map: layout-pinned mappings

Browse Source 
e.g. `riverctl map -layout 0 normal Super Y spawn foot`

When this mapping is checked against a pressed key, layout 0 will be used to translate the pressed key instead of the currently active layout.

The number denotes to an index of the layouts set with
`XKB_DEFAULT_LAYOUT`.
This commit is contained in:
Peter Kaplan
2022-04-20 15:38:18 +02:00
committed by Isaac Freund
parent 8f59075bc5
commit 44aaee3a51
9 changed files with 131 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
river/Seat.zig
View File

@ -342,17 +342,20 @@ pub fn handleViewUnmap(self: *Self, view: *View) void {
if (self.focused == .view and self.focused.view == view) self.focus(null);
}
/// Handle any user-defined mapping for the passed keysym and modifiers
/// Handle any user-defined mapping for passed keycode, modifiers and keyboard state
/// Returns true if the key was handled
pub fn handleMapping(
self: *Self,
keysym: xkb.Keysym,
keycode: xkb.Keycode,
modifiers: wlr.Keyboard.ModifierMask,
released: bool,
xkb_state: *xkb.State,
) bool {
const modes = &server.config.modes;
// In case more than on mapping matches, all of them are activated
var handled = false;
for (modes.items[self.mode_id].mappings.items) |*mapping| {
if (std.meta.eql(modifiers, mapping.modifiers) and keysym == mapping.keysym and released == mapping.release) {
if (mapping.match(keycode, modifiers, released, xkb_state)) {
if (mapping.repeat) {
self.repeating_mapping = mapping;
self.mapping_repeat_timer.timerUpdate(server.config.repeat_delay) catch {
@ -360,10 +363,10 @@ pub fn handleMapping(
};
}
self.runCommand(mapping.command_args);
return true;
handled = true;
}
}
return false;
return handled;
}
/// Handle any user-defined mapping for switches