X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/63c9e30a7638a1e8e845fb32c9284f118b3102ed..7195e941c1cb91e347a9c906203ad39245deabd6:/dmenu.c

diff --git a/dmenu.c b/dmenu.c
index bc69bcf..3d3a928 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -1,5 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 #include <ctype.h>
+#include <limits.h>
 #include <locale.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -353,13 +354,11 @@ kpress(XKeyEvent * e) {
 	len = strlen(text);
 	buf[0] = 0;
 	num = XLookupString(e, buf, sizeof buf, &ksym, 0);
-	if(IsKeypadKey(ksym)) { 
-		if(ksym == XK_KP_Enter) {
+	if(IsKeypadKey(ksym))
+		if(ksym == XK_KP_Enter)
 			ksym = XK_Return;
-		} else if(ksym >= XK_KP_0 && ksym <= XK_KP_9) {
+		else if(ksym >= XK_KP_0 && ksym <= XK_KP_9)
 			ksym = (ksym - XK_KP_0) + XK_0;
-		}
-	}
 	if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
 	|| IsMiscFunctionKey(ksym) || IsPFKey(ksym)
 	|| IsPrivateKeypadKey(ksym))
@@ -536,7 +535,7 @@ match(char *pattern) {
 	}
 	if(lprefix) {
 		if(itemend) {
-			itemend->right - lprefix;
+			itemend->right = lprefix;
 			lprefix->left = itemend;
 		}
 		else
@@ -631,7 +630,7 @@ setup(int x, int y, int w) {
 	mw = w ? w : DisplayWidth(dpy, screen);
 	mh = dc.font.height + 2;
 	if(y < 0) {
-		if(y == (int)(unsigned int)-1)
+		if(y == INT_MIN)
 			y = DisplayHeight(dpy, screen) - mh;
 		else
 			y = (-1 * y) - mh;
@@ -709,12 +708,11 @@ main(int argc, char *argv[]) {
 			if(++i < argc) x = atoi(argv[i]);
 		}
 		else if(!strcmp(argv[i], "-y")) {
-			if(++i < argc) {
+			if(++i < argc)
 				if(!strcmp(argv[i], "-0"))
-					y = (int)(unsigned int)-1;
+					y = INT_MIN;
 				else
 					y = atoi(argv[i]);
-			}
 		}
 		else if(!strcmp(argv[i], "-w")) {
 			if(++i < argc) w = atoi(argv[i]);