diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-08-15 11:02:48 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-08-15 11:02:48 +0100 |
| commit | ed0f2831b470e7f9025793a3228805991e9cff61 (patch) | |
| tree | f42594a8177df0a4ad652108f9f42a71887e2baa /cmd-rotate-window.c | |
| parent | 9b3fefc43529666b1f6adc5efc89f6a5f127f274 (diff) | |
| parent | 21fae500897fcc3fa1bf561a2da3c439f5b5897b (diff) | |
| download | rtmux-ed0f2831b470e7f9025793a3228805991e9cff61.tar.gz rtmux-ed0f2831b470e7f9025793a3228805991e9cff61.tar.bz2 rtmux-ed0f2831b470e7f9025793a3228805991e9cff61.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-rotate-window.c')
| -rw-r--r-- | cmd-rotate-window.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/cmd-rotate-window.c b/cmd-rotate-window.c index 6dc0f2a8..cc661163 100644 --- a/cmd-rotate-window.c +++ b/cmd-rotate-window.c @@ -31,8 +31,8 @@ const struct cmd_entry cmd_rotate_window_entry = { .name = "rotate-window", .alias = "rotatew", - .args = { "Dt:U", 0, 0 }, - .usage = "[-DU] " CMD_TARGET_WINDOW_USAGE, + .args = { "Dt:UZ", 0, 0 }, + .usage = "[-DUZ] " CMD_TARGET_WINDOW_USAGE, .target = { 't', CMD_FIND_WINDOW, 0 }, @@ -50,7 +50,7 @@ cmd_rotate_window_exec(struct cmd *self, struct cmdq_item *item) struct layout_cell *lc; u_int sx, sy, xoff, yoff; - server_unzoom_window(w); + window_push_zoom(w, args_has(self->args, 'Z')); if (args_has(self->args, 'D')) { wp = TAILQ_LAST(&w->panes, window_panes); @@ -77,9 +77,6 @@ cmd_rotate_window_exec(struct cmd *self, struct cmdq_item *item) if ((wp = TAILQ_PREV(w->active, window_panes, entry)) == NULL) wp = TAILQ_LAST(&w->panes, window_panes); - window_set_active_pane(w, wp, 1); - cmd_find_from_winlink_pane(current, wl, wp, 0); - server_redraw_window(w); } else { wp = TAILQ_FIRST(&w->panes); TAILQ_REMOVE(&w->panes, wp, entry); @@ -105,10 +102,12 @@ cmd_rotate_window_exec(struct cmd *self, struct cmdq_item *item) if ((wp = TAILQ_NEXT(w->active, entry)) == NULL) wp = TAILQ_FIRST(&w->panes); - window_set_active_pane(w, wp, 1); - cmd_find_from_winlink_pane(current, wl, wp, 0); - server_redraw_window(w); } + window_set_active_pane(w, wp, 1); + cmd_find_from_winlink_pane(current, wl, wp, 0); + window_pop_zoom(w); + server_redraw_window(w); + return (CMD_RETURN_NORMAL); } |