Simplify logic in match().

[st.git] / st.c

diff --git a/st.c b/st.c
index 9df6707..da2ce3f 100644 (file)
--- a/st.c
+++ b/st.c
@@ -256,9 +256,9 @@ typedef struct {
 } XWindow;
 
 typedef struct {
 } XWindow;
 
 typedef struct {

-       int b;
+       uint b;

        uint mask;
        uint mask;

-       char s[ESC_BUF_SIZ];
+       char *s;

 } Mousekey;
 
 typedef struct {
 } Mousekey;
 
 typedef struct {


@@ -3501,15 +3501,7 @@ focus(XEvent *ev) {
 
 static inline bool
 match(uint mask, uint state) {
 
 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
 }
 
 void


@@ -3579,7 +3571,6 @@ kpress(XEvent *ev) {
                return;
 
        len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status);
                return;
 
        len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status);

-       e->state &= ~Mod2Mask;

        /* 1. shortcuts */
        for(bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
                if(ksym == bp->keysym && match(bp->mod, e->state)) {
        /* 1. shortcuts */
        for(bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
                if(ksym == bp->keysym && match(bp->mod, e->state)) {


@@ -3687,6 +3678,8 @@ run(void) {
        gettimeofday(&last, NULL);
 
        for(xev = actionfps;;) {
        gettimeofday(&last, NULL);
 
        for(xev = actionfps;;) {

+               long deltatime;
+

                FD_ZERO(&rfd);
                FD_SET(cmdfd, &rfd);
                FD_SET(xfd, &rfd);
                FD_ZERO(&rfd);
                FD_SET(cmdfd, &rfd);
                FD_SET(xfd, &rfd);


@@ -3720,8 +3713,9 @@ run(void) {
                        gettimeofday(&lastblink, NULL);
                        dodraw = 1;
                }
                        gettimeofday(&lastblink, NULL);
                        dodraw = 1;
                }

-               if(TIMEDIFF(now, last) \
-                               > (xev? (1000/xfps) : (1000/actionfps))) {
+               deltatime = TIMEDIFF(now, last);
+               if(deltatime > (xev? (1000/xfps) : (1000/actionfps))
+                               || deltatime < 0) {

                        dodraw = 1;
                        last = now;
                }
                        dodraw = 1;
                        last = now;
                }