mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-06 19:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move cmdq_state into cmd-queue.c.

Browse Source
This commit is contained in:
nicm
2020-04-13 14:46:04 +00:00
parent 9a65102bfc
commit adb76fd1ce
24 changed files with 99 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd-if-shell.c
View File

@@ -56,16 +56,15 @@ struct cmd_if_shell_data {
struct client *client;
struct cmdq_item *item;
struct mouse_event mouse;
struct key_event event;
};
static enum cmd_retval
cmd_if_shell_exec(struct cmd *self, struct cmdq_item *item)
{
struct args *args = cmd_get_args(self);
struct cmdq_state *state = cmdq_get_state(item);
struct cmd_find_state *target = cmdq_get_target(item);
struct mouse_event *m = &state->event.m;
struct key_event *event = cmdq_get_event(item);
struct cmd_if_shell_data *cdata;
char *shellcmd, *cmd;
const char *file;
@@ -102,7 +101,8 @@ cmd_if_shell_exec(struct cmd *self, struct cmdq_item *item)
free(pr->error);
return (CMD_RETURN_ERROR);
case CMD_PARSE_SUCCESS:
new_item = cmdq_get_command(pr->cmdlist, target, m, 0);
new_item = cmdq_get_command(pr->cmdlist, target, event,
0);
cmdq_insert_after(item, new_item);
cmd_list_free(pr->cmdlist);
break;
@@ -117,7 +117,7 @@ cmd_if_shell_exec(struct cmd *self, struct cmdq_item *item)
cdata->cmd_else = xstrdup(args->argv[2]);
else
cdata->cmd_else = NULL;
memcpy(&cdata->mouse, m, sizeof cdata->mouse);
memcpy(&cdata->event, event, sizeof cdata->event);
if (!args_has(args, 'b'))
cdata->client = cmdq_get_client(item);
@@ -161,7 +161,7 @@ cmd_if_shell_callback(struct job *job)
{
struct cmd_if_shell_data *cdata = job_get_data(job);
struct client *c = cdata->client;
struct mouse_event *m = &cdata->mouse;
struct key_event *event = &cdata->event;
struct cmdq_item *new_item = NULL;
char *cmd;
int status;
@@ -185,7 +185,7 @@ cmd_if_shell_callback(struct job *job)
free(pr->error);
break;
case CMD_PARSE_SUCCESS:
new_item = cmdq_get_command(pr->cmdlist, NULL, m, 0);
new_item = cmdq_get_command(pr->cmdlist, NULL, event, 0);
cmd_list_free(pr->cmdlist);
break;
}