circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 05:21:10 +00:00
Code Issues Projects Releases Wiki Activity

Tidy command prompt callbacks and pass in the client.

Browse Source
This commit is contained in:
nicm
2017-05-17 15:20:23 +00:00
parent 31625c2d17
commit 91d202da7e
4 changed files with 35 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cmd-command-prompt.c
View File

@ -32,7 +32,8 @@
static enum cmd_retval cmd_command_prompt_exec(struct cmd *,
struct cmdq_item *);
static int cmd_command_prompt_callback(void *, const char *, int);
static int cmd_command_prompt_callback(struct client *, void *,
const char *, int);
static void cmd_command_prompt_free(void *);
const struct cmd_entry cmd_command_prompt_entry = {
@ -48,17 +49,16 @@ const struct cmd_entry cmd_command_prompt_entry = {
};
struct cmd_command_prompt_cdata {
struct client *c;
int flags;
int flags;
char *inputs;
char *next_input;
char *inputs;
char *next_input;
char *prompts;
char *next_prompt;
char *prompts;
char *next_prompt;
char *template;
int idx;
char *template;
int idx;
};
static enum cmd_retval
@ -78,7 +78,6 @@ cmd_command_prompt_exec(struct cmd *self, struct cmdq_item *item)
return (CMD_RETURN_NORMAL);
cdata = xcalloc(1, sizeof *cdata);
cdata->c = c;
cdata->inputs = NULL;
cdata->next_input = NULL;
@ -142,10 +141,10 @@ cmd_command_prompt_error(struct cmdq_item *item, void *data)
}
static int
cmd_command_prompt_callback(void *data, const char *s, int done)
cmd_command_prompt_callback(struct client *c, void *data, const char *s,
int done)
{
struct cmd_command_prompt_cdata *cdata = data;
struct client *c = cdata->c;
struct cmd_list *cmdlist;
struct cmdq_item *new_item;
char *cause, *new_template, *prompt, *ptr;
@ -193,7 +192,7 @@ cmd_command_prompt_callback(void *data, const char *s, int done)
if (!done)
free(new_template);
if (c->prompt_callbackfn != cmd_command_prompt_callback)
if (c->prompt_inputcb != cmd_command_prompt_callback)
return (1);
return (0);
}