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

Incremental search in copy mode (on for emacs keys by default) - much

Browse Source 
the same as normal searching but updates the cursor position and marked
search terms as you type. C-r and C-s in the prompt repeat the search,
once finished searching (with Enter), N and n work as before.
This commit is contained in:
nicm
2017-01-06 11:57:03 +00:00
parent 9a56671a75
commit 461217d0f0
8 changed files with 256 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
cmd-command-prompt.c
View File

@ -32,15 +32,15 @@
static enum cmd_retval cmd_command_prompt_exec(struct cmd *,
struct cmdq_item *);
static int cmd_command_prompt_callback(void *, const char *);
static int cmd_command_prompt_callback(void *, const char *, int);
static void cmd_command_prompt_free(void *);
const struct cmd_entry cmd_command_prompt_entry = {
.name = "command-prompt",
.alias = NULL,
.args = { "1I:Np:t:", 0, 1 },
.usage = "[-1N] [-I inputs] [-p prompts] " CMD_TARGET_CLIENT_USAGE " "
.args = { "1iI:Np:t:", 0, 1 },
.usage = "[-1Ni] [-I inputs] [-p prompts] " CMD_TARGET_CLIENT_USAGE " "
"[template]",
.tflag = CMD_CLIENT,
@ -51,10 +51,14 @@ const struct cmd_entry cmd_command_prompt_entry = {
struct cmd_command_prompt_cdata {
struct client *c;
int flags;
char *inputs;
char *next_input;
char *next_prompt;
char *prompts;
char *next_prompt;
char *template;
int idx;
};
@ -73,14 +77,17 @@ cmd_command_prompt_exec(struct cmd *self, struct cmdq_item *item)
if (c->prompt_string != NULL)
return (CMD_RETURN_NORMAL);
cdata = xmalloc(sizeof *cdata);
cdata = xcalloc(1, sizeof *cdata);
cdata->c = c;
cdata->idx = 1;
cdata->inputs = NULL;
cdata->next_input = NULL;
cdata->next_prompt = NULL;
cdata->prompts = NULL;
cdata->next_prompt = NULL;
cdata->template = NULL;
cdata->idx = 1;
if (args->argc != 0)
cdata->template = xstrdup(args->argv[0]);
@ -112,11 +119,13 @@ cmd_command_prompt_exec(struct cmd *self, struct cmdq_item *item)
flags = 0;
if (args_has(args, '1'))
flags |= PROMPT_SINGLE;
cdata->flags |= PROMPT_SINGLE;
else if (args_has(args, 'N'))
flags |= PROMPT_NUMERIC;
cdata->flags |= PROMPT_NUMERIC;
else if (args_has(args, 'i'))
cdata->flags |= PROMPT_INCREMENTAL;
status_prompt_set(c, prompt, input, cmd_command_prompt_callback,
cmd_command_prompt_free, cdata, flags);
cmd_command_prompt_free, cdata, cdata->flags);
free(prompt);
return (CMD_RETURN_NORMAL);
@ -134,7 +143,7 @@ cmd_command_prompt_error(struct cmdq_item *item, void *data)
}
static int
cmd_command_prompt_callback(void *data, const char *s)
cmd_command_prompt_callback(void *data, const char *s, int done)
{
struct cmd_command_prompt_cdata *cdata = data;
struct client *c = cdata->c;
@ -145,16 +154,20 @@ cmd_command_prompt_callback(void *data, const char *s)
if (s == NULL)
return (0);
if (done && (cdata->flags & PROMPT_INCREMENTAL))
return (0);
new_template = cmd_template_replace(cdata->template, s, cdata->idx);
free(cdata->template);
cdata->template = new_template;
if (done) {
free(cdata->template);
cdata->template = new_template;
}
/*
* Check if there are more prompts; if so, get its respective input
* and update the prompt data.
*/
if ((ptr = strsep(&cdata->next_prompt, ",")) != NULL) {
if (done && (ptr = strsep(&cdata->next_prompt, ",")) != NULL) {
xasprintf(&prompt, "%s ", ptr);
input = strsep(&cdata->next_input, ",");
status_prompt_update(c, prompt, input);
@ -178,6 +191,8 @@ cmd_command_prompt_callback(void *data, const char *s)
if (new_item != NULL)
cmdq_append(c, new_item);
if (!done)
free(new_template);
if (c->prompt_callbackfn != (void *)&cmd_command_prompt_callback)
return (1);
return (0);