circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-08 14:34:01 +00:00
Code Issues Projects Releases Wiki Activity

Get rid of the PANE_HIDDEN flag in favour of a function, and moving the

Browse Source 
decision for whether or not a pane should be drawn out of the layout code and
into the redraw code.

This is needed for the new layout design, getting it in now to make that easier
to work on.
This commit is contained in:
Nicholas Marriott
2009-07-15 17:42:44 +00:00
parent 537c32b6b6
commit 1e574bb70c
13 changed files with 108 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
layout-manual.c
View File

@ -1,4 +1,4 @@
/* $Id: layout-manual.c,v 1.3 2009-05-18 21:29:11 nicm Exp $ */
/* $Id: layout-manual.c,v 1.4 2009-07-15 17:42:44 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@ -26,7 +26,7 @@ void
layout_manual_v_refresh(struct window *w, unused int active_only)
{
struct window_pane *wp;
u_int npanes, canfit, total;
u_int npanes, total, height;
int left;
if (active_only)
@ -35,34 +35,25 @@ layout_manual_v_refresh(struct window *w, unused int active_only)
if (TAILQ_EMPTY(&w->panes))
return;
/* Clear hidden flags. */
TAILQ_FOREACH(wp, &w->panes, entry)
wp->flags &= ~PANE_HIDDEN;
/* Check the new size. */
npanes = window_count_panes(w);
if (w->sy <= PANE_MINIMUM * npanes) {
/* How many can we fit? */
canfit = w->sy / PANE_MINIMUM;
if (canfit == 0) {
/* None. Just use this size for the first. */
TAILQ_FOREACH(wp, &w->panes, entry) {
if (wp == TAILQ_FIRST(&w->panes))
wp->sy = w->sy;
else
wp->flags |= PANE_HIDDEN;
}
} else {
/* >=1, set minimum for them all. */
TAILQ_FOREACH(wp, &w->panes, entry) {
if (canfit-- > 0)
wp->sy = PANE_MINIMUM - 1;
else
wp->flags |= PANE_HIDDEN;
}
/* And increase the first by the rest. */
TAILQ_FIRST(&w->panes)->sy += 1 + w->sy % PANE_MINIMUM;
/*
* Make the first pane the smaller of the minimum and total (it
* must fit to be visible) and the rest the minimum size.
*/
height = PANE_MINIMUM;
if (height > w->sy)
height = w->sy + 1;
TAILQ_FOREACH(wp, &w->panes, entry) {
if (wp == TAILQ_FIRST(&w->panes))
wp->sy = height - 1;
else
wp->sy = PANE_MINIMUM - 1;
}
/* And increase the first by the rest if possible. */
if (w->sy >= PANE_MINIMUM)
TAILQ_FIRST(&w->panes)->sy += 1 + w->sy % PANE_MINIMUM;
} else {
/* In theory they will all fit. Find the current total. */
total = 0;
@ -174,8 +165,6 @@ layout_manual_v_update_offsets(struct window *w)
yoff = 0;
TAILQ_FOREACH(wp, &w->panes, entry) {
if (wp->flags & PANE_HIDDEN)
continue;
wp->xoff = 0;
wp->yoff = yoff;
yoff += wp->sy + 1;