diff options
author | nicm <nicm> | 2017-05-30 21:44:59 +0000 |
---|---|---|
committer | nicm <nicm> | 2017-05-30 21:44:59 +0000 |
commit | aad4e4ddb194cba9c01b0ddd696fb7b214e1a7eb (patch) | |
tree | 8a8a273bb54a7b4010b48b64a59aa5d3c3c96b55 /cmd-copy-mode.c | |
parent | bd39fcbeea1930a2b36e98a622d864e2e27e5d14 (diff) | |
download | rtmux-aad4e4ddb194cba9c01b0ddd696fb7b214e1a7eb.tar.gz rtmux-aad4e4ddb194cba9c01b0ddd696fb7b214e1a7eb.tar.bz2 rtmux-aad4e4ddb194cba9c01b0ddd696fb7b214e1a7eb.zip |
Rewrite of choose mode, both to simplify and tidy the code and to add
some modern features.
Now the common code is in mode-tree.c, which provides an API used by the
three modes now separated into window-{buffer,client,tree}.c. Buffer
mode shows buffers, client mode clients and tree mode a tree of
sessions, windows and panes.
Each mode has a common set of key bindings plus a few that are specific
to the mode. Other changes are:
- each mode has a preview pane: for buffers this is the buffer content
(very useful), for others it is a preview of the pane;
- items may be sorted in different ways ('O' key);
- multiple items may be tagged and an operation applied to all of them
(for example, to delete multiple buffers at once);
- in tree mode a command may be run on the selected item (session,
window, pane) or on tagged items (key ':');
- displayed items may be filtered in tree mode by using a format (this
is used to implement find-window) (key 'f');
- the custom format (-F) for the display is no longer available;
- shortcut keys change from 0-9, a-z, A-Z which was always a bit weird
with keys used for other uses to 0-9, M-a to M-z.
Now that the code is simpler, other improvements will come later.
Primary key bindings for each mode are documented under the commands in
the man page (choose-buffer, choose-client, choose-tree).
Parts written by Thomas Adam.
Diffstat (limited to 'cmd-copy-mode.c')
-rw-r--r-- | cmd-copy-mode.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c index 5599bb96..699a868d 100644 --- a/cmd-copy-mode.c +++ b/cmd-copy-mode.c @@ -60,6 +60,7 @@ cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item) struct client *c = item->client; struct session *s; struct window_pane *wp = item->target.wp; + int flag; if (args_has(args, 'M')) { if ((wp = cmd_mouse_pane(&shared->mouse, &s, NULL)) == NULL) @@ -69,12 +70,13 @@ cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item) } if (self->entry == &cmd_clock_mode_entry) { - window_pane_set_mode(wp, &window_clock_mode); + window_pane_set_mode(wp, &window_clock_mode, NULL, NULL); return (CMD_RETURN_NORMAL); } if (wp->mode != &window_copy_mode) { - if (window_pane_set_mode(wp, &window_copy_mode) != 0) + flag = window_pane_set_mode(wp, &window_copy_mode, NULL, NULL); + if (flag != 0) return (CMD_RETURN_NORMAL); window_copy_init_from_pane(wp, args_has(self->args, 'e')); } |