Simplify logic in match().

11 years ago · 1fa27b93f9
parent 3d3c37bc70
commit 1fa27b93f9
1 changed files with 1 additions and 9 deletions
--- a/st.c
+++ b/st.c
@ -3501,15 +3501,7 @@ focus(XEvent *ev) {

 static inline bool
 match(uint mask, uint state) {
-	state &= ~ignoremod;
-
-	if(mask == XK_NO_MOD && state)
-		return false;
-	if(mask != XK_ANY_MOD && mask != XK_NO_MOD && !state)
-		return false;
-	if(mask == XK_ANY_MOD)
-		return true;
-	return state == mask;
+	return mask == XK_ANY_MOD || mask == (state & ~ignoremod);
 }

 void