diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-04-27 21:21:55 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-04-27 21:21:55 +0100 |
| commit | 94a8ef1caef855d1a43b6373dd08ce0bbf4aadd5 (patch) | |
| tree | 052d89cf9193a324fb646fe25152df6aa4070534 /cmd-select-pane.c | |
| parent | 72e9ebf2ece28c986050162bf4f401a6a7679f53 (diff) | |
| parent | 95195f52584565483bf9850840f6d81cd88bf9b2 (diff) | |
| download | rtmux-94a8ef1caef855d1a43b6373dd08ce0bbf4aadd5.tar.gz rtmux-94a8ef1caef855d1a43b6373dd08ce0bbf4aadd5.tar.bz2 rtmux-94a8ef1caef855d1a43b6373dd08ce0bbf4aadd5.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile
tmux.1
Diffstat (limited to 'cmd-select-pane.c')
| -rw-r--r-- | cmd-select-pane.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/cmd-select-pane.c b/cmd-select-pane.c index c84b4149..e7f2249e 100644 --- a/cmd-select-pane.c +++ b/cmd-select-pane.c @@ -77,12 +77,6 @@ cmd_select_pane_exec(struct cmd *self, struct cmd_q *cmdq) if ((wl = cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp)) == NULL) return (CMD_RETURN_ERROR); - server_unzoom_window(wp->window); - if (!window_pane_visible(wp)) { - cmdq_error(cmdq, "pane not visible"); - return (CMD_RETURN_ERROR); - } - if (args_has(self->args, 'P') || args_has(self->args, 'g')) { if (args_has(args, 'P')) { style = args_get(args, 'P'); @@ -111,11 +105,23 @@ cmd_select_pane_exec(struct cmd *self, struct cmd_q *cmdq) return (CMD_RETURN_ERROR); } - if (args_has(self->args, 'e')) + if (args_has(self->args, 'e')) { wp->flags &= ~PANE_INPUTOFF; - else if (args_has(self->args, 'd')) + return (CMD_RETURN_NORMAL); + } + if (args_has(self->args, 'd')) { wp->flags |= PANE_INPUTOFF; - else if (window_set_active_pane(wl->window, wp)) { + return (CMD_RETURN_NORMAL); + } + + if (wp == wl->window->active) + return (CMD_RETURN_NORMAL); + server_unzoom_window(wp->window); + if (!window_pane_visible(wp)) { + cmdq_error(cmdq, "pane not visible"); + return (CMD_RETURN_ERROR); + } + if (window_set_active_pane(wl->window, wp)) { server_status_window(wl->window); server_redraw_window_borders(wl->window); } |