Commit Diff

Commit:
d14670b9959f8b3760b63dd40a70687a90312b8a
From:
Hiltjo Posthuma <hiltjo@codemadness.org>
Date:
Message:
fix crash if negative monitor (< -1) was passed for example: dmenu -m '-9001'
Actions:
Patch | Tree
commit - aa92cd68bdff95c181cc854043598e6c6007d45e
commit + d14670b9959f8b3760b63dd40a70687a90312b8a
blob - 8e84fbdf9afb6e572d2cae240d0d2801851c1765
blob + df51e7695afe2acc97335c637d4efc889fdeb910
--- dmenu.c
+++ 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;