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

Keyboard: check translated keysyms for mappings

Browse Source 
If our current approch without xkbcommon translation does not match any
mapping on a key event attempt to match the translated keysym as well.

This makes e.g. the keypad number keys (e.g. KP_1) work intuitively as
they may require translation with numlock active.

The reason we stopped doing this in I7c02ebcbc was due to layout where
e.g. Super+Shift+Space is translated as Space with the Shift modifier
consumed, thereby conflicting with a separate mapping for Super+Space.
This should not be a issue anymore though as we now only run a maximum
of one mapping per key event and we attemt to match mappings without
xkbcommon translation before attempting with translation.
This commit is contained in:
Isaac Freund
2024-01-11 15:06:33 -06:00
parent f6c434c7a7
commit ec8f57e704
2 changed files with 68 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
river/Seat.zig
View File

@ -359,7 +359,7 @@ pub fn enterMode(self: *Self, mode_id: u32) void {
}
/// Handle any user-defined mapping for passed keycode, modifiers and keyboard state
/// Returns true if at least one mapping was run
/// Returns true if a mapping was run
pub fn handleMapping(
self: *Self,
keycode: xkb.Keycode,
@ -368,16 +368,40 @@ pub fn handleMapping(
xkb_state: *xkb.State,
) bool {
const modes = &server.config.modes;
// It is possible for more than one mapping to be matched due to the existence of
// layout-independent mappings. In this case run the first match and log a warning
// if there are other matches.
// It is possible for more than one mapping to be matched due to the
// existence of layout-independent mappings. It is also possible due to
// translation by xkbcommon consuming modifiers. On the swedish layout
// for example, translating Super+Shift+Space may consume the Shift
// modifier and confict with a mapping for Super+Space. For this reason,
// matching wihout xkbcommon translation is done first and after a match
// has been found all further matches are ignored.
var found: ?*Mapping = null;
// First check for matches without translating keysyms with xkbcommon.
// That is, if the physical keys Mod+Shift+1 are pressed on a US layout don't
// translate the keysym 1 to an exclamation mark. This behavior is generally
// what is desired.
for (modes.items[self.mode_id].mappings.items) |*mapping| {
if (mapping.match(keycode, modifiers, released, xkb_state)) {
if (mapping.match(keycode, modifiers, released, xkb_state, .no_translate)) {
if (found == null) {
found = mapping;
} else {
log.warn("already found a matching mapping, ignoring additional match", .{});
log.debug("already found a matching mapping, ignoring additional match", .{});
}
}
}
// There are however some cases where it is necessary to translate keysyms
// with xkbcommon for intuitive behavior. For example, layouts may require
// translation with the numlock modifier to obtain keypad number keysyms
// (e.g. KP_1).
for (modes.items[self.mode_id].mappings.items) |*mapping| {
if (mapping.match(keycode, modifiers, released, xkb_state, .translate)) {
if (found == null) {
found = mapping;
} else {
log.debug("already found a matching mapping, ignoring additional match", .{});
}
}
}