mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-23 01:40:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

config: ‘pipe’ is now optional ‘aux’ data in the key-binding struct

Browse source 
This allows us to add helper functions that e.g. compare bindings’ aux
data in a generic way.
This commit is contained in:
Daniel Eklöf 2022-02-08 19:35:41 +01:00
parent 9814d96206
commit e5c5cd5478
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
5 changed files with 116 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

14
input.c
View file

@ -526,7 +526,7 @@ convert_key_binding(const struct seat *seat,
struct key_binding binding = {
.type = KEY_BINDING,
.action = conf_binding->action,
.pipe_argv = conf_binding->pipe.argv.args,
.aux = &conf_binding->aux,
.mods = mods,
.k = {
.sym = sym,
@ -570,7 +570,7 @@ convert_mouse_binding(struct seat *seat,
struct key_binding binding = {
.type = MOUSE_BINDING,
.action = conf_binding->action,
.pipe_argv = conf_binding->pipe.argv.args,
.aux = &conf_binding->aux,
.mods = conf_modifiers_to_mask(seat, &conf_binding->modifiers),
.m = {
.button = conf_binding->m.button,
@ -1526,7 +1526,7 @@ key_press_release(struct seat *seat, struct terminal *term, uint32_t serial,
if (bind->k.sym == sym &&
bind->mods == (bind_mods & ~bind_consumed) &&
execute_binding(
seat, term, bind->action, bind->pipe_argv, serial))
seat, term, bind->action, bind->aux->pipe.args, serial))
{
goto maybe_repeat;
}
@ -1537,7 +1537,7 @@ key_press_release(struct seat *seat, struct terminal *term, uint32_t serial,
/* Match untranslated symbols */
for (size_t i = 0; i < raw_count; i++) {
if (bind->k.sym == raw_syms[i] && execute_binding(
seat, term, bind->action, bind->pipe_argv, serial))
seat, term, bind->action, bind->aux->pipe.args, serial))
{
goto maybe_repeat;
}
@ -1546,7 +1546,7 @@ key_press_release(struct seat *seat, struct terminal *term, uint32_t serial,
/* Match raw key code */
tll_foreach(bind->k.key_codes, code) {
if (code->item == key && execute_binding(
seat, term, bind->action, bind->pipe_argv, serial))
seat, term, bind->action, bind->aux->pipe.args, serial))
{
goto maybe_repeat;
}
@ -2435,7 +2435,7 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
if (match != NULL) {
consumed = execute_binding(
seat, term, match->action, match->pipe_argv, serial);
seat, term, match->action, match->aux->pipe.args, serial);
}
}
@ -2470,7 +2470,7 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
if (match != NULL) {
consumed = execute_binding(
seat, term, match->action, match->pipe.argv.args,
seat, term, match->action, match->aux.pipe.args,
serial);
}
}