aboutsummaryrefslogtreecommitdiff
path: root/search.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2022-02-08 18:43:00 +0000
committerDaniel Eklöf <daniel@ekloef.se>2022-02-09 16:51:05 +0000
commitfed90646d3b8fdd99d2811ecc1c9745b86fa051a (patch)
treeaf818ce48fcd92fcf1f83c68ddd846295a1cd6b1 /search.c
parentconfig: ‘pipe’ is now optional ‘aux’ data in the key-binding struct (diff)
input/search/url: pass pointer-to key-binding struct to execute()
Diffstat (limited to 'search.c')
-rw-r--r--search.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/search.c b/search.c
index 3d3d6265..6251c697 100644
--- a/search.c
+++ b/search.c
@@ -604,10 +604,11 @@ from_clipboard_done(void *user)
static bool
execute_binding(struct seat *seat, struct terminal *term,
- enum bind_action_search action, uint32_t serial,
+ const struct key_binding *binding, uint32_t serial,
bool *update_search_result, bool *redraw)
{
*update_search_result = *redraw = false;
+ const enum bind_action_search action = binding->action;
switch (action) {
case BIND_ACTION_SEARCH_NONE:
@@ -841,7 +842,7 @@ search_input(struct seat *seat, struct terminal *term, uint32_t key,
if (bind->k.sym == sym &&
bind->mods == (mods & ~consumed)) {
- if (execute_binding(seat, term, bind->action, serial,
+ if (execute_binding(seat, term, bind, serial,
&update_search_result, &redraw))
{
goto update_search;
@@ -855,7 +856,7 @@ search_input(struct seat *seat, struct terminal *term, uint32_t key,
/* Match untranslated symbols */
for (size_t i = 0; i < raw_count; i++) {
if (bind->k.sym == raw_syms[i]) {
- if (execute_binding(seat, term, bind->action, serial,
+ if (execute_binding(seat, term, bind, serial,
&update_search_result, &redraw))
{
goto update_search;
@@ -867,7 +868,7 @@ search_input(struct seat *seat, struct terminal *term, uint32_t key,
/* Match raw key code */
tll_foreach(bind->k.key_codes, code) {
if (code->item == key) {
- if (execute_binding(seat, term, bind->action, serial,
+ if (execute_binding(seat, term, bind, serial,
&update_search_result, &redraw))
{
goto update_search;