From f6db0c7a86a9550401b42f90c5baf37187dd2bd0 Mon Sep 17 00:00:00 2001 From: Mark Edgar Date: Sat, 19 Oct 2013 14:56:40 +0200 Subject: [PATCH 1/2] Simplify logic in match(). --- st.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/st.c b/st.c index 50b58a7..e044352 100644 --- 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 -- 1.8.4