aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiltjo Posthuma <hiltjo@codemadness.org>2016-07-26 23:13:06 +0200
committerHiltjo Posthuma <hiltjo@codemadness.org>2016-07-26 23:13:06 +0200
commitd14670b9959f8b3760b63dd40a70687a90312b8a (patch)
tree6e627d4fa9930366d4504f3e62c116367c6788ec
parentaa92cd68bdff95c181cc854043598e6c6007d45e (diff)
downloaddmenu-d14670b9959f8b3760b63dd40a70687a90312b8a.tar.gz
dmenu-d14670b9959f8b3760b63dd40a70687a90312b8a.tar.bz2
dmenu-d14670b9959f8b3760b63dd40a70687a90312b8a.zip
fix crash if negative monitor (< -1) was passed
for example: dmenu -m '-9001'
-rw-r--r--dmenu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/dmenu.c b/dmenu.c
index 8e84fbd..df51e76 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -541,7 +541,7 @@ setup(void)
#ifdef XINERAMA
if ((info = XineramaQueryScreens(dpy, &n))) {
XGetInputFocus(dpy, &w, &di);
- if (mon != -1 && mon < n)
+ if (mon >= 0 && mon < n)
i = mon;
else if (w != root && w != PointerRoot && w != None) {
/* find top-level window containing current input focus */
@@ -558,7 +558,7 @@ setup(void)
}
}
/* no focused window is on screen, so use pointer location instead */
- if (mon == -1 && !area && XQueryPointer(dpy, root, &dw, &dw, &x, &y, &di, &di, &du))
+ if (mon < 0 && !area && XQueryPointer(dpy, root, &dw, &dw, &x, &y, &di, &di, &du))
for (i = 0; i < n; i++)
if (INTERSECT(x, y, 1, 1, info[i]))
break;