commit e4fdaba88d94d049c4140593cb2fd3208c8cf0f1
parent 849f1dd7a3ac1fc6d6a88a9e2b7d7dedbcd0befc
Author: Connor Lane Smith <cls@lubutu.com>
Date: Wed, 18 Aug 2010 17:33:34 +0100
signed ints, ignore negative -l value
Diffstat:
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/dmenu.c b/dmenu.c
@@ -39,6 +39,10 @@ static void setup(void);
static void usage(void);
static char text[BUFSIZ];
+static int bh, mw, mh;
+static int inputw = 0;
+static int promptw;
+static int lines = 0;
static size_t cursor = 0;
static const char *font = NULL;
static const char *prompt = NULL;
@@ -46,10 +50,6 @@ static const char *normbgcolor = "#cccccc";
static const char *normfgcolor = "#000000";
static const char *selbgcolor = "#0066ff";
static const char *selfgcolor = "#ffffff";
-static unsigned int bh, mw, mh;
-static unsigned int inputw = 0;
-static unsigned int lines = 0;
-static unsigned int promptw;
static unsigned long normcol[ColLast];
static unsigned long selcol[ColLast];
static Atom utf8;
@@ -444,6 +444,7 @@ setup(void) {
/* menu geometry */
bh = dc->font.height + 2;
+ lines = MAX(lines, 0);
mh = (lines + 1) * bh;
#ifdef XINERAMA
if((info = XineramaQueryScreens(dc->dpy, &n))) {
