X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=st.c;h=ca4248a301eba50ba78ed2bf9b848417b43d9a21;hb=461aac159cf3dbb8514e645df6387e03e7c26084;hp=14408c566a54369e7fde2d7a167930fb75b21803;hpb=ea782bfc5d34d712bc9391e498935d2d27f3116c;p=st.git

diff --git a/st.c b/st.c
index 14408c5..ca4248a 100644
--- a/st.c
+++ b/st.c
@@ -2699,21 +2699,30 @@ kmap(KeySym k, uint state) {
 
 		if(kp->k != k)
 			continue;
-		if((state & mask) != mask &&
-		   (mask == XK_NO_MOD && state))
+
+		if((state & mask) != mask ||
+				(mask == XK_NO_MOD && state)) {
 			continue;
+		}
+
 		if((kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) ||
-		   (kp->appkey > 0 && !IS_SET(MODE_APPKEYPAD)))
+				(kp->appkey > 0 && !IS_SET(MODE_APPKEYPAD))) {
 			continue;
+		}
+
 		if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) ||
-		   (kp->appcursor > 0 && !IS_SET(MODE_APPCURSOR)))
+				(kp->appcursor > 0 && !IS_SET(MODE_APPCURSOR))) {
 			continue;
+		}
+
 		if((kp->crlf < 0 && IS_SET(MODE_CRLF)) ||
-		   (kp->crlf > 0 && !IS_SET(MODE_CRLF)))
+				(kp->crlf > 0 && !IS_SET(MODE_CRLF))) {
 			continue;
+		}
 
 		return kp->s;
 	}
+
 	return NULL;
 }
 
@@ -2755,6 +2764,7 @@ kpress(XEvent *ev) {
 		memcpy(cp, xstr, len);
 		len = cp - buf + len;
 	}
+
 	ttywrite(buf, len);
 	if(IS_SET(MODE_ECHO))
 		techo(buf, len);
@@ -2869,7 +2879,7 @@ main(int argc, char *argv[]) {
 				opt_class = argv[i];
 			break;
 		case 'e':
-			/* eat every remaining arguments */
+			/* eat all remaining arguments */
 			if(++i < argc)
 				opt_cmd = &argv[i];
 			goto run;
@@ -2924,6 +2934,7 @@ run:
 	ttynew();
 	selinit();
 	run();
+
 	return 0;
 }