=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-rotate-window.c,v retrieving revision 1.1 retrieving revision 1.2 diff -c -r1.1 -r1.2 *** src/usr.bin/tmux/cmd-rotate-window.c 2009/06/01 22:58:49 1.1 --- src/usr.bin/tmux/cmd-rotate-window.c 2009/06/03 07:51:24 1.2 *************** *** 1,4 **** ! /* $OpenBSD: cmd-rotate-window.c,v 1.1 2009/06/01 22:58:49 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott --- 1,4 ---- ! /* $OpenBSD: cmd-rotate-window.c,v 1.2 2009/06/03 07:51:24 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott *************** *** 60,65 **** --- 60,66 ---- struct window *w; struct window_pane *wp, *wp2; u_int sx, sy, xoff, yoff; + int flags; if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL) return (-1); *************** *** 71,84 **** TAILQ_INSERT_HEAD(&w->panes, wp, entry); xoff = wp->xoff; yoff = wp->yoff; ! sx = wp->sx; sy = wp->sy; TAILQ_FOREACH(wp, &w->panes, entry) { if ((wp2 = TAILQ_NEXT(wp, entry)) == NULL) break; wp->xoff = wp2->xoff; wp->yoff = wp2->yoff; window_pane_resize(wp, wp2->sx, wp2->sy); } wp->xoff = xoff; wp->yoff = yoff; window_pane_resize(wp, sx, sy); if ((wp = TAILQ_PREV(w->active, window_panes, entry)) == NULL) --- 72,90 ---- TAILQ_INSERT_HEAD(&w->panes, wp, entry); xoff = wp->xoff; yoff = wp->yoff; ! sx = wp->sx; sy = wp->sy; ! flags = w->flags; TAILQ_FOREACH(wp, &w->panes, entry) { if ((wp2 = TAILQ_NEXT(wp, entry)) == NULL) break; wp->xoff = wp2->xoff; wp->yoff = wp2->yoff; + wp->flags &= ~PANE_HIDDEN; + wp->flags |= wp2->flags & PANE_HIDDEN; window_pane_resize(wp, wp2->sx, wp2->sy); } wp->xoff = xoff; wp->yoff = yoff; + wp->flags &= ~PANE_HIDDEN; + wp->flags |= flags & PANE_HIDDEN; window_pane_resize(wp, sx, sy); if ((wp = TAILQ_PREV(w->active, window_panes, entry)) == NULL) *************** *** 91,103 **** --- 97,114 ---- xoff = wp->xoff; yoff = wp->yoff; sx = wp->sx; sy = wp->sy; + flags = w->flags; TAILQ_FOREACH_REVERSE(wp, &w->panes, window_panes, entry) { if ((wp2 = TAILQ_PREV(wp, window_panes, entry)) == NULL) break; wp->xoff = wp2->xoff; wp->yoff = wp2->yoff; + wp->flags &= ~PANE_HIDDEN; + wp->flags |= wp2->flags & PANE_HIDDEN; window_pane_resize(wp, wp2->sx, wp2->sy); } wp->xoff = xoff; wp->yoff = yoff; + wp->flags &= ~PANE_HIDDEN; + wp->flags |= flags & PANE_HIDDEN; window_pane_resize(wp, sx, sy); if ((wp = TAILQ_NEXT(w->active, entry)) == NULL)