circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-02 15:56:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master' into master

Browse Source
This commit is contained in:
Thomas Adam
2021-01-08 10:01:20 +00:00
parent fc28e2065a b96c5e3687
commit 9df33bc536
2 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
status.c
View File

@@ -543,7 +543,7 @@ status_prompt_set(struct client *c, struct cmd_find_state *fs,
prompt_free_cb freecb, void *data, int flags) prompt_free_cb freecb, void *data, int flags)
{ {
struct format_tree *ft; struct format_tree *ft;
char *tmp, *cp; char *tmp;
if (fs != NULL) if (fs != NULL)
ft = format_create_from_state(NULL, c, fs); ft = format_create_from_state(NULL, c, fs);
@@ -563,7 +563,13 @@ status_prompt_set(struct client *c, struct cmd_find_state *fs,
c->prompt_string = format_expand_time(ft, msg); c->prompt_string = format_expand_time(ft, msg);
c->prompt_buffer = utf8_fromcstr(tmp); if (flags & PROMPT_INCREMENTAL) {
c->prompt_last = xstrdup(tmp);
c->prompt_buffer = utf8_fromcstr("");
} else {
c->prompt_last = NULL;
c->prompt_buffer = utf8_fromcstr(tmp);
}
c->prompt_index = utf8_strlen(c->prompt_buffer); c->prompt_index = utf8_strlen(c->prompt_buffer);
c->prompt_inputcb = inputcb; c->prompt_inputcb = inputcb;
@@ -579,11 +585,8 @@ status_prompt_set(struct client *c, struct cmd_find_state *fs,
c->tty.flags |= (TTY_NOCURSOR|TTY_FREEZE); c->tty.flags |= (TTY_NOCURSOR|TTY_FREEZE);
c->flags |= CLIENT_REDRAWSTATUS; c->flags |= CLIENT_REDRAWSTATUS;
if ((flags & PROMPT_INCREMENTAL) && *tmp != '\0') { if (flags & PROMPT_INCREMENTAL)
xasprintf(&cp, "=%s", tmp); c->prompt_inputcb(c, c->prompt_data, "=", 0);
c->prompt_inputcb(c, c->prompt_data, cp, 0);
free(cp);
}
free(tmp); free(tmp);
format_free(ft); format_free(ft);
@@ -599,6 +602,9 @@ status_prompt_clear(struct client *c)
if (c->prompt_freecb != NULL && c->prompt_data != NULL) if (c->prompt_freecb != NULL && c->prompt_data != NULL)
c->prompt_freecb(c->prompt_data); c->prompt_freecb(c->prompt_data);
free(c->prompt_last);
c->prompt_last = NULL;
free(c->prompt_string); free(c->prompt_string);
c->prompt_string = NULL; c->prompt_string = NULL;
@@ -1260,17 +1266,27 @@ process_key:
status_prompt_clear(c); status_prompt_clear(c);
break; break;
case '\022': /* C-r */ case '\022': /* C-r */
if (c->prompt_flags & PROMPT_INCREMENTAL) { if (~c->prompt_flags & PROMPT_INCREMENTAL)
break;
if (c->prompt_buffer[0].size == 0) {
prefix = '=';
free (c->prompt_buffer);
c->prompt_buffer = utf8_fromcstr(c->prompt_last);
c->prompt_index = utf8_strlen(c->prompt_buffer);
} else
prefix = '-'; prefix = '-';
goto changed; goto changed;
}
break;
case '\023': /* C-s */ case '\023': /* C-s */
if (c->prompt_flags & PROMPT_INCREMENTAL) { if (~c->prompt_flags & PROMPT_INCREMENTAL)
break;
if (c->prompt_buffer[0].size == 0) {
prefix = '=';
free (c->prompt_buffer);
c->prompt_buffer = utf8_fromcstr(c->prompt_last);
c->prompt_index = utf8_strlen(c->prompt_buffer);
} else
prefix = '+'; prefix = '+';
goto changed; goto changed;
}
break;
default: default:
goto append_key; goto append_key;
} }

4
window-copy.c
View File

@@ -2030,6 +2030,8 @@ window_copy_cmd_search_backward_incremental(struct window_copy_cmd_state *cs)
data->timeout = 0; data->timeout = 0;
log_debug ("%s: %s", __func__, argument);
prefix = *argument++; prefix = *argument++;
if (data->searchx == -1 || data->searchy == -1) { if (data->searchx == -1 || data->searchy == -1) {
data->searchx = data->cx; data->searchx = data->cx;
@@ -2083,6 +2085,8 @@ window_copy_cmd_search_forward_incremental(struct window_copy_cmd_state *cs)
data->timeout = 0; data->timeout = 0;
log_debug ("%s: %s", __func__, argument);
prefix = *argument++; prefix = *argument++;
if (data->searchx == -1 || data->searchy == -1) { if (data->searchx == -1 || data->searchy == -1) {
data->searchx = data->cx; data->searchx = data->cx;