input/search/url: pass pointer-to key-binding struct to execute()

This commit is contained in:
Daniel Eklöf 2022-02-08 19:43:00 +01:00
parent e5c5cd5478
commit fed90646d3
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 28 additions and 25 deletions

View file

@ -25,8 +25,10 @@ static void url_destroy(struct url *url);
static bool
execute_binding(struct seat *seat, struct terminal *term,
enum bind_action_url action, uint32_t serial)
const struct key_binding *binding, uint32_t serial)
{
const enum bind_action_url action = binding->action;
switch (action) {
case BIND_ACTION_URL_NONE:
return false;
@ -128,7 +130,7 @@ urls_input(struct seat *seat, struct terminal *term, uint32_t key,
if (bind->k.sym == sym &&
bind->mods == (mods & ~consumed))
{
execute_binding(seat, term, bind->action, serial);
execute_binding(seat, term, bind, serial);
return;
}
@ -137,7 +139,7 @@ urls_input(struct seat *seat, struct terminal *term, uint32_t key,
for (size_t i = 0; i < raw_count; i++) {
if (bind->k.sym == raw_syms[i]) {
execute_binding(seat, term, bind->action, serial);
execute_binding(seat, term, bind, serial);
return;
}
}
@ -145,7 +147,7 @@ urls_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) {
execute_binding(seat, term, bind->action, serial);
execute_binding(seat, term, bind, serial);
return;
}
}