From eebaa1a75e7c9b0a8b7313ea7039c8bc2d552da8 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 27 Jan 2010 20:26:43 +0000 Subject: Calculate offset correctly, fixes incorrect offset and prevents crash when status-left is empty. From Micah Cowan. --- usr.bin/tmux/status.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'usr.bin') diff --git a/usr.bin/tmux/status.c b/usr.bin/tmux/status.c index c6344476c09..d4a28fa9568 100644 --- a/usr.bin/tmux/status.c +++ b/usr.bin/tmux/status.c @@ -1,4 +1,4 @@ -/* $OpenBSD: status.c,v 1.57 2010/01/26 21:36:53 nicm Exp $ */ +/* $OpenBSD: status.c,v 1.58 2010/01/27 20:26:42 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -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++; -- cgit v1.2.3