diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2010-11-22 21:13:14 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2010-11-22 21:13:14 +0000 |
| commit | b9df347bd784429922493fbed0889aa40e78fe78 (patch) | |
| tree | 25e34f9bd9448d330be67fb20683f7db1b4090ee /usr.bin | |
| parent | 3f5d1e243f1a3f9cff8a000dae3db7d1aa279211 (diff) | |
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.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/tmux/resize.c | 7 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.h | 7 | ||||
| -rw-r--r-- | usr.bin/tmux/tty.c | 4 |
3 files changed, 7 insertions, 11 deletions
diff --git a/usr.bin/tmux/resize.c b/usr.bin/tmux/resize.c index 0db5587830d..c0d243106cb 100644 --- a/usr.bin/tmux/resize.c +++ b/usr.bin/tmux/resize.c @@ -1,4 +1,4 @@ -/* $OpenBSD: resize.c,v 1.5 2010/06/21 01:27:46 nicm Exp $ */ +/* $OpenBSD: resize.c,v 1.6 2010/11/22 21:13:13 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -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/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index 782b21d827e..1f35566fd4f 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.246 2010/11/11 20:51:30 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.247 2010/11/22 21:13:13 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -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/usr.bin/tmux/tty.c b/usr.bin/tmux/tty.c index 1ba18b1504f..31dbd4796b2 100644 --- a/usr.bin/tmux/tty.c +++ b/usr.bin/tmux/tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.c,v 1.92 2010/10/16 08:31:55 nicm Exp $ */ +/* $OpenBSD: tty.c,v 1.93 2010/11/22 21:13:13 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -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++) { |