diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-06-23 10:54:55 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-06-23 10:54:55 +0000 |
| commit | 4e5f5026b8abc4aa2e23a82f3e91196cb09ecabe (patch) | |
| tree | 75e456ffe40c4c33d2ec8275c646c9204aeae7b5 /input.c | |
| parent | config: remove duplicated error logs for invalid colors (diff) | |
| parent | config: add new function config_clone() (diff) | |
Merge branch 'config-clone'
Diffstat (limited to 'input.c')
| -rw-r--r-- | input.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -519,7 +519,7 @@ convert_key_binding(const struct seat *seat, .sym = sym, .key_codes = key_codes_for_xkb_sym(seat->kbd.xkb_keymap, sym), .action = conf_binding->action, - .pipe_argv = conf_binding->pipe.argv, + .pipe_argv = conf_binding->pipe.argv.args, }; tll_push_back(*bindings, binding); } @@ -568,7 +568,7 @@ convert_mouse_binding(struct seat *seat, .mods = conf_modifiers_to_mask(seat, &conf_binding->modifiers), .button = conf_binding->button, .count = conf_binding->count, - .pipe_argv = conf_binding->pipe.argv, + .pipe_argv = conf_binding->pipe.argv.args, }; tll_push_back(seat->mouse.bindings, binding); } @@ -1970,7 +1970,8 @@ 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->pipe.argv.args, + serial); } } } |
