PatchSet 789

Date: 2010/11/22 21:13:13
Author: nicm
Branch: HEAD
Tag: (none)
Log:
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.

Members:
        resize.c:1.5->1.6
        tmux.h:1.246->1.247
        tty.c:1.92->1.93
This commit is contained in:
Nicholas Marriott 2010-12-06 21:57:56 +00:00
parent 7a0468c95c
commit e75187310d
3 changed files with 7 additions and 11 deletions

View File

@ -1,4 +1,4 @@
/* $Id: resize.c,v 1.25 2010-06-22 23:26:18 tcunha Exp $ */
/* $Id: resize.c,v 1.26 2010-12-06 21:57:56 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)

7
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.583 2010-12-06 21:50:24 nicm Exp $ */
/* $Id: tmux.h,v 1.584 2010-12-06 21:57:56 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -841,9 +841,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;

4
tty.c
View File

@ -1,4 +1,4 @@
/* $Id: tty.c,v 1.196 2010-10-24 00:45:57 tcunha Exp $ */
/* $Id: tty.c,v 1.197 2010-12-06 21:57:56 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++) {