[hackers] [st] Simplify logic in kmap(). || Mark Edgar

From: <git_AT_suckless.org>
Date: Mon, 25 Nov 2013 12:53:59 +0100

commit 7263820759aa914b27ab3097613bdf22432ed736
Author: Mark Edgar <medgar123_AT_gmail.com>
Date: Sat Oct 19 15:13:13 2013 +0200

    Simplify logic in kmap().

diff --git a/st.c b/st.c
index da2ce3f..fda7044 100644
--- a/st.c
+++ b/st.c
_AT_@ -3531,25 +3531,16 @@ kmap(KeySym k, uint state) {
                 if(!match(kp->mask, state))
                         continue;
 
- if(kp->appkey > 0) {
- if(!IS_SET(MODE_APPKEYPAD))
- continue;
- if(term.numlock && kp->appkey == 2)
- continue;
- } else if(kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) {
+ if(IS_SET(MODE_APPKEYPAD) ? kp->appkey < 0 : kp->appkey > 0)
+ continue;
+ if(term.numlock && kp->appkey == 2)
                         continue;
- }
 
- if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) ||
- (kp->appcursor > 0
- && !IS_SET(MODE_APPCURSOR))) {
+ if(IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0)
                         continue;
- }
 
- if((kp->crlf < 0 && IS_SET(MODE_CRLF)) ||
- (kp->crlf > 0 && !IS_SET(MODE_CRLF))) {
+ if(IS_SET(MODE_CRLF) ? kp->crlf < 0 : kp->crlf > 0)
                         continue;
- }
 
                 return kp->s;
         }
Received on Mon Nov 25 2013 - 12:53:59 CET