From ef9b2eb566fc090b773c79e406dd43d0006a3217 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Mon, 22 Nov 2010 21:13:13 +0000 Subject: [PATCH] There is somewhere that WINDOW_HIDDEN is getting set when it shouldn't be and I can't find it, but the flag itself is a useless optimisation that only applies to automatic-resize windows, so just dispose of it entirely. Fixes problems reported by Nicholas Riley. --- resize.c | 5 +---- tmux.h | 5 ++--- tty.c | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/resize.c b/resize.c index 15f99e7c..af84eaba 100644 --- a/resize.c +++ b/resize.c @@ -113,11 +113,8 @@ recalculate_sizes(void) ssy = s->sy; } } - if (ssx == UINT_MAX || ssy == UINT_MAX) { - w->flags |= WINDOW_HIDDEN; + if (ssx == UINT_MAX || ssy == UINT_MAX) continue; - } - w->flags &= ~WINDOW_HIDDEN; limit = options_get_number(&w->options, "force-width"); if (limit != 0 && ssx > limit) diff --git a/tmux.h b/tmux.h index 0d37e554..e4323a5d 100644 --- a/tmux.h +++ b/tmux.h @@ -843,9 +843,8 @@ struct window { int flags; #define WINDOW_BELL 0x1 -#define WINDOW_HIDDEN 0x2 -#define WINDOW_ACTIVITY 0x4 -#define WINDOW_REDRAW 0x8 +#define WINDOW_ACTIVITY 0x2 +#define WINDOW_REDRAW 0x4 struct options options; diff --git a/tty.c b/tty.c index 379fa42d..63f6127f 100644 --- a/tty.c +++ b/tty.c @@ -547,7 +547,7 @@ tty_write(void (*cmdfn)( if (wp->window->flags & WINDOW_REDRAW || wp->flags & PANE_REDRAW) return; - if (wp->window->flags & WINDOW_HIDDEN || !window_pane_visible(wp)) + if (!window_pane_visible(wp)) return; for (i = 0; i < ARRAY_LENGTH(&clients); i++) {