aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2010-01-27 20:26:42 +0000
committerNicholas Marriott <nicm@openbsd.org>2010-01-27 20:26:42 +0000
commit05213e4c8cb083669382e0287481df994827352f (patch)
treee837f57ae47d2a56ba02597832c3ff4df06dea21
parent3e2cc2d2c4c443cc99086927c83547d50cb07369 (diff)
downloadrtmux-05213e4c8cb083669382e0287481df994827352f.tar.gz
rtmux-05213e4c8cb083669382e0287481df994827352f.tar.bz2
rtmux-05213e4c8cb083669382e0287481df994827352f.zip
Calculate offset correctly, fixes incorrect offset and prevents crash when
status-left is empty. From Micah Cowan.
-rw-r--r--status.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/status.c b/status.c
index ee8f2390..5576cff9 100644
--- a/status.c
+++ b/status.c
@@ -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++;