aboutsummaryrefslogtreecommitdiff
path: root/cmd-send-keys.c
diff options
context:
space:
mode:
Diffstat (limited to 'cmd-send-keys.c')
-rw-r--r--cmd-send-keys.c73
1 files changed, 39 insertions, 34 deletions
diff --git a/cmd-send-keys.c b/cmd-send-keys.c
index cc04a73f..afaf0a81 100644
--- a/cmd-send-keys.c
+++ b/cmd-send-keys.c
@@ -57,21 +57,23 @@ const struct cmd_entry cmd_send_prefix_entry = {
};
static struct cmdq_item *
-cmd_send_keys_inject_key(struct client *c, struct cmd_find_state *fs,
- struct cmdq_item *item, key_code key)
+cmd_send_keys_inject_key(struct cmdq_item *item, struct cmdq_item *after,
+ key_code key)
{
- struct session *s = fs->s;
- struct winlink *wl = fs->wl;
- struct window_pane *wp = fs->wp;
+ struct cmd_find_state *target = cmdq_get_target(item);
+ struct client *tc = cmdq_get_target_client(item);
+ struct session *s = target->s;
+ struct winlink *wl = target->wl;
+ struct window_pane *wp = target->wp;
struct window_mode_entry *wme;
struct key_table *table;
struct key_binding *bd;
- wme = TAILQ_FIRST(&fs->wp->modes);
+ wme = TAILQ_FIRST(&wp->modes);
if (wme == NULL || wme->mode->key_table == NULL) {
- if (options_get_number(fs->wp->window->options, "xterm-keys"))
+ if (options_get_number(wp->window->options, "xterm-keys"))
key |= KEYC_XTERM;
- if (window_pane_key(wp, item->client, s, wl, key, NULL) != 0)
+ if (window_pane_key(wp, tc, s, wl, key, NULL) != 0)
return (NULL);
return (item);
}
@@ -80,18 +82,17 @@ cmd_send_keys_inject_key(struct client *c, struct cmd_find_state *fs,
bd = key_bindings_get(table, key & ~KEYC_XTERM);
if (bd != NULL) {
table->references++;
- item = key_bindings_dispatch(bd, item, c, NULL, &item->target);
+ after = key_bindings_dispatch(bd, after, tc, NULL, target);
key_bindings_unref_table(table);
}
- return (item);
+ return (after);
}
static struct cmdq_item *
-cmd_send_keys_inject_string(struct client *c, struct cmd_find_state *fs,
- struct cmdq_item *item, struct args *args, int i)
+cmd_send_keys_inject_string(struct cmdq_item *item, struct cmdq_item *after,
+ struct args *args, int i)
{
const char *s = args->argv[i];
- struct cmdq_item *new_item;
struct utf8_data *ud, *uc;
wchar_t wc;
key_code key;
@@ -103,16 +104,16 @@ cmd_send_keys_inject_string(struct client *c, struct cmd_find_state *fs,
n = strtol(s, &endptr, 16);
if (*s =='\0' || n < 0 || n > 0xff || *endptr != '\0')
return (item);
- return (cmd_send_keys_inject_key(c, fs, item, KEYC_LITERAL|n));
+ return (cmd_send_keys_inject_key(item, after, KEYC_LITERAL|n));
}
literal = args_has(args, 'l');
if (!literal) {
key = key_string_lookup_string(s);
if (key != KEYC_NONE && key != KEYC_UNKNOWN) {
- new_item = cmd_send_keys_inject_key(c, fs, item, key);
- if (new_item != NULL)
- return (new_item);
+ after = cmd_send_keys_inject_key(item, after, key);
+ if (after != NULL)
+ return (after);
}
literal = 1;
}
@@ -121,24 +122,26 @@ cmd_send_keys_inject_string(struct client *c, struct cmd_find_state *fs,
for (uc = ud; uc->size != 0; uc++) {
if (utf8_combine(uc, &wc) != UTF8_DONE)
continue;
- item = cmd_send_keys_inject_key(c, fs, item, wc);
+ after = cmd_send_keys_inject_key(item, after, wc);
}
free(ud);
}
- return (item);
+ return (after);
}
static enum cmd_retval
cmd_send_keys_exec(struct cmd *self, struct cmdq_item *item)
{
- struct args *args = self->args;
- struct client *c = cmd_find_client(item, NULL, 1);
- struct cmd_find_state *fs = &item->target;
- struct window_pane *wp = item->target.wp;
- struct session *s = item->target.s;
- struct winlink *wl = item->target.wl;
- struct mouse_event *m = &item->shared->mouse;
+ struct args *args = cmd_get_args(self);
+ struct cmd_find_state *target = cmdq_get_target(item);
+ struct client *tc = cmdq_get_target_client(item);
+ struct session *s = target->s;
+ struct winlink *wl = target->wl;
+ struct window_pane *wp = target->wp;
+ struct key_event *event = cmdq_get_event(item);
+ struct mouse_event *m = &event->m;
struct window_mode_entry *wme = TAILQ_FIRST(&wp->modes);
+ struct cmdq_item *after = item;
int i;
key_code key;
u_int np = 1;
@@ -152,7 +155,7 @@ cmd_send_keys_exec(struct cmd *self, struct cmdq_item *item)
return (CMD_RETURN_ERROR);
}
if (wme != NULL && (args_has(args, 'X') || args->argc == 0)) {
- if (wme == NULL || wme->mode->command == NULL) {
+ if (wme->mode->command == NULL) {
cmdq_error(item, "not in a mode");
return (CMD_RETURN_ERROR);
}
@@ -167,7 +170,7 @@ cmd_send_keys_exec(struct cmd *self, struct cmdq_item *item)
}
if (!m->valid)
m = NULL;
- wme->mode->command(wme, c, s, wl, args, m);
+ wme->mode->command(wme, tc, s, wl, args, m);
return (CMD_RETURN_NORMAL);
}
@@ -177,27 +180,29 @@ cmd_send_keys_exec(struct cmd *self, struct cmdq_item *item)
cmdq_error(item, "no mouse target");
return (CMD_RETURN_ERROR);
}
- window_pane_key(wp, item->client, s, wl, m->key, m);
+ window_pane_key(wp, tc, s, wl, m->key, m);
return (CMD_RETURN_NORMAL);
}
- if (self->entry == &cmd_send_prefix_entry) {
+ if (cmd_get_entry(self) == &cmd_send_prefix_entry) {
if (args_has(args, '2'))
key = options_get_number(s->options, "prefix2");
else
key = options_get_number(s->options, "prefix");
- cmd_send_keys_inject_key(c, fs, item, key);
+ cmd_send_keys_inject_key(item, item, key);
return (CMD_RETURN_NORMAL);
}
if (args_has(args, 'R')) {
window_pane_reset_palette(wp);
- input_reset(wp, 1);
+ input_reset(wp->ictx, 1);
}
for (; np != 0; np--) {
- for (i = 0; i < args->argc; i++)
- item = cmd_send_keys_inject_string(c, fs, item, args, i);
+ for (i = 0; i < args->argc; i++) {
+ after = cmd_send_keys_inject_string(item, after, args,
+ i);
+ }
}
return (CMD_RETURN_NORMAL);
generated by cgit (git 2.34.1) at 2025-07-01 22:39:34 +0000