mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-30 11:10:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

input: ask XKB for consumed modifiers, but don’t actually use them just yet

Browse source
This commit is contained in:
Daniel Eklöf 2021-03-04 09:42:36 +01:00
parent b87b8f1170
commit decc655d48
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
input.c
View file

@ -822,20 +822,22 @@ key_press_release(struct seat *seat, struct terminal *term, uint32_t serial,
xkb_mod_mask_t mods = xkb_state_serialize_mods( xkb_mod_mask_t mods = xkb_state_serialize_mods(
seat->kbd.xkb_state, XKB_STATE_MODS_DEPRESSED); seat->kbd.xkb_state, XKB_STATE_MODS_DEPRESSED);
//xkb_mod_mask_t consumed = xkb_state_key_get_consumed_mods(seat->kbd.xkb_state, key); xkb_mod_mask_t consumed = xkb_state_key_get_consumed_mods(
xkb_mod_mask_t consumed = 0x0; seat->kbd.xkb_state, key);
xkb_mod_mask_t significant = ctrl | alt | shift | meta; xkb_mod_mask_t significant = ctrl | alt | shift | meta;
xkb_mod_mask_t effective_mods = mods & ~consumed & significant; mods &= significant;
consumed &= significant;
if (term->is_searching) { if (term->is_searching) {
if (should_repeat) if (should_repeat)
start_repeater(seat, key); start_repeater(seat, key);
search_input(seat, term, key, sym, effective_mods, serial); search_input(seat, term, key, sym, mods, serial);
return; return;
} else if (urls_mode_is_active(term)) { } else if (urls_mode_is_active(term)) {
if (should_repeat) if (should_repeat)
start_repeater(seat, key); start_repeater(seat, key);
urls_input(seat, term, key, sym, effective_mods, serial); urls_input(seat, term, key, sym, mods, serial);
return; return;
} }
@ -853,16 +855,15 @@ key_press_release(struct seat *seat, struct terminal *term, uint32_t serial,
#endif #endif
LOG_DBG("%s (%u/0x%x): seat=%s, term=%p, serial=%u, " LOG_DBG("%s (%u/0x%x): seat=%s, term=%p, serial=%u, "
"mod=0x%08x, consumed=0x%08x, significant=0x%08x, " "mods=0x%08x, consumed=0x%08x, repeats=%d",
"effective=0x%08x, repeats=%d",
sym_name, sym, sym, seat->name, (void *)term, serial, sym_name, sym, sym, seat->name, (void *)term, serial,
mods, consumed, significant, effective_mods, should_repeat); mods, consumed, should_repeat);
/* /*
* User configurable bindings * User configurable bindings
*/ */
tll_foreach(seat->kbd.bindings.key, it) { tll_foreach(seat->kbd.bindings.key, it) {
if (it->item.mods != effective_mods) if (it->item.mods != mods)
continue; continue;
/* Match symbol */ /* Match symbol */
@ -972,7 +973,7 @@ key_press_release(struct seat *seat, struct terminal *term, uint32_t serial,
} }
else { else {
if (effective_mods & alt) { if (mods & alt) {
/* /*
* When the alt modifier is pressed, we do one out of three things: * When the alt modifier is pressed, we do one out of three things:
* *