diff options
| author | nicm <nicm> | 2015-04-10 16:00:08 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2015-04-10 16:00:08 +0000 |
| commit | 0cd55eb1e7823a75810b7f43f53b6266cb8b0bc0 (patch) | |
| tree | e73e29a48ca3db93d292f709198ff5ef20d4fead /window-copy.c | |
| parent | 009a5e4213a04555be0fb654f80fe8685082ba20 (diff) | |
| download | rtmux-0cd55eb1e7823a75810b7f43f53b6266cb8b0bc0.tar.gz rtmux-0cd55eb1e7823a75810b7f43f53b6266cb8b0bc0.tar.bz2 rtmux-0cd55eb1e7823a75810b7f43f53b6266cb8b0bc0.zip | |
Add a -x flag to copy-selection, append-selection and start-named-buffer
to prevent it exiting copy mode after copying. From J Raynor with a few
tweaks by me.
Diffstat (limited to 'window-copy.c')
| -rw-r--r-- | window-copy.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/window-copy.c b/window-copy.c index 074e7310..feb8c481 100644 --- a/window-copy.c +++ b/window-copy.c @@ -147,6 +147,7 @@ struct window_copy_mode_data { enum window_copy_input_type inputtype; const char *inputprompt; char *inputstr; + int inputexit; int numprefix; @@ -424,8 +425,12 @@ window_copy_key(struct window_pane *wp, struct session *sess, int key) case MODEKEYCOPY_APPENDSELECTION: if (sess != NULL) { window_copy_append_selection(wp, NULL); - window_pane_reset_mode(wp); - return; + if (arg == NULL) { + window_pane_reset_mode(wp); + return; + } + window_copy_clear_selection(wp); + window_copy_redraw_screen(wp); } break; case MODEKEYCOPY_CANCEL: @@ -572,8 +577,12 @@ window_copy_key(struct window_pane *wp, struct session *sess, int key) case MODEKEYCOPY_COPYSELECTION: if (sess != NULL) { window_copy_copy_selection(wp, NULL); - window_pane_reset_mode(wp); - return; + if (arg == NULL) { + window_pane_reset_mode(wp); + return; + } + window_copy_clear_selection(wp); + window_copy_redraw_screen(wp); } break; case MODEKEYCOPY_STARTOFLINE: @@ -718,6 +727,7 @@ window_copy_key(struct window_pane *wp, struct session *sess, int key) goto input_on; case MODEKEYCOPY_STARTNAMEDBUFFER: data->inputtype = WINDOW_COPY_NAMEDBUFFER; + data->inputexit = (arg == NULL); data->inputprompt = "Buffer"; *data->inputstr = '\0'; goto input_on; @@ -828,8 +838,13 @@ window_copy_key_input(struct window_pane *wp, int key) case WINDOW_COPY_NAMEDBUFFER: window_copy_copy_selection(wp, data->inputstr); *data->inputstr = '\0'; - window_pane_reset_mode(wp); - return (0); + if (data->inputexit) { + window_pane_reset_mode(wp); + return (0); + } + window_copy_clear_selection(wp); + window_copy_redraw_screen(wp); + break; case WINDOW_COPY_GOTOLINE: window_copy_goto_line(wp, data->inputstr); *data->inputstr = '\0'; |