Skip to content

fix: keybinding release propagation (attempt 2) #1209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Lubsch wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: keybinding release propagation (attempt 2) #1209

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 31 additions & 21 deletions src/mango.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,8 @@ typedef struct {
const xkb_keysym_t *keysyms; /* invalid if nsyms == 0 */
uint32_t mods; /* invalid if nsyms == 0 */
uint32_t keycode;
bool intercepted[256]; // press was consumed by a binding, indexed by
// event->keycode
struct wl_event_source *key_repeat_source;

struct wl_listener modifiers;
Expand Down Expand Up @@ -4306,30 +4308,21 @@ keybinding(uint32_t state, bool locked, uint32_t mods, xkb_keysym_t sym,
int32_t ji;
int32_t isbreak = 0;

if (state != WL_KEYBOARD_KEY_STATE_PRESSED &&
state != WL_KEYBOARD_KEY_STATE_RELEASED) {
return 0;
}

if (is_keyboard_shortcut_inhibitor(seat->keyboard_state.focused_surface)) {
return false;
return 0;
}

for (ji = 0; ji < config.key_bindings_count; ji++) {
if (config.key_bindings_count < 1)
break;

if (locked && config.key_bindings[ji].islockapply == false)
continue;

if (state == WL_KEYBOARD_KEY_STATE_RELEASED &&
config.key_bindings[ji].isreleaseapply == false)
continue;

if (state == WL_KEYBOARD_KEY_STATE_PRESSED &&
config.key_bindings[ji].isreleaseapply == true)
continue;
k = &config.key_bindings[ji];

if (state != WL_KEYBOARD_KEY_STATE_PRESSED &&
state != WL_KEYBOARD_KEY_STATE_RELEASED)
if (locked && k->islockapply == false)
continue;

k = &config.key_bindings[ji];
if ((k->iscommonmode || (k->isdefaultmode && keymode.isdefault) ||
(strcmp(keymode.mode, k->mode) == 0)) &&
CLEANMASK(mods) == CLEANMASK(k->mod) &&
Expand All @@ -4344,8 +4337,14 @@ keybinding(uint32_t state, bool locked, uint32_t mods, xkb_keysym_t sym,

if (!k->ispassapply)
handled = 1;
else
handled = 0;

if (state == WL_KEYBOARD_KEY_STATE_RELEASED &&
k->isreleaseapply == false)
continue;

if (state == WL_KEYBOARD_KEY_STATE_PRESSED &&
k->isreleaseapply == true)
continue;

isbreak = k->func(&k->arg);

Expand Down Expand Up @@ -4485,8 +4484,19 @@ void keypress(struct wl_listener *listener, void *data) {
wl_event_source_timer_update(group->key_repeat_source, 0);
}

if (handled)
return;
if (event->state == WL_KEYBOARD_KEY_STATE_RELEASED) {
if (group->intercepted[event->keycode & 0xff]) {
group->intercepted[event->keycode & 0xff] = false;
// press was intercepted -> intercept release
return;
}
// press was forwarded -> forward release no matter what keybinding
// returns
} else {
group->intercepted[event->keycode & 0xff] = handled;
if (handled)
return;
}

if (selmon && selmon->is_jump_mode &&
event->state == WL_KEYBOARD_KEY_STATE_PRESSED) {
Expand Down