Amolith
/
st
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify logic in kmap().

This commit is contained in:
Mark Edgar 2013-10-19 15:13:13 +02:00 committed by Roberto E. Vargas Caballero
parent 1fa27b93f9
commit 7263820759
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
st.c
View File

@ -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;
}