circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 622: 

Calculate offset correctly, fixes incorrect offset and prevents crash when
status-left is empty. From Micah Cowan.
This commit is contained in:
Tiago Cunha 2010-01-28 22:46:44 +00:00
parent 735cfaf09a
commit 95dfa950b8
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
status.c
View File

@ -1,4 +1,4 @@
/* $Id: status.c,v 1.142 2010-01-28 22:44:16 tcunha Exp $ */
/* $Id: status.c,v 1.143 2010-01-28 22:46:44 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -302,18 +302,20 @@ draw:
}
/* Figure out the offset for the window list. */
wloffset = 1;
if (llen != 0)
wloffset = llen + 1;
else
wloffset = 0;
if (wlwidth < wlavailable) {
switch (options_get_number(&s->options, "status-justify")) {
case 1: /* centered */
wloffset = 1 + (wlavailable - wlwidth) / 2;
wloffset += (wlavailable - wlwidth) / 2;
break;
case 2: /* right */
wloffset = 1 + (wlavailable - wlwidth);
wloffset += (wlavailable - wlwidth);
break;
}
}
wloffset += llen;
if (larrow != 0)
wloffset++;