Adding a way to ignore bits in the state.

[st.git] / st.c

diff --git a/st.c b/st.c
index 8206001..64366af 100644 (file)
--- a/st.c
+++ b/st.c
@@ -61,6 +61,7 @@
 #define DRAW_BUF_SIZ  20*1024
 #define XK_ANY_MOD    UINT_MAX
 #define XK_NO_MOD     0
+#define XK_SWITCH_MOD (1<<13)
 
 #define REDRAW_TIMEOUT (80*1000) /* 80 ms */
 
@@ -3008,6 +3009,8 @@ focus(XEvent *ev) {
 
 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)
@@ -3166,10 +3169,12 @@ void
 run(void) {
        XEvent ev;
        fd_set rfd;
-       int xfd = XConnectionNumber(xw.dpy), i;
-       struct timeval drawtimeout, *tv = NULL;
+       int xfd = XConnectionNumber(xw.dpy), xev;
+       struct timeval drawtimeout, *tv = NULL, now, last;
+
+       gettimeofday(&last, NULL);
 
-       for(i = 0;; i++) {
+       for(xev = actionfps;;) {
                FD_ZERO(&rfd);
                FD_SET(cmdfd, &rfd);
                FD_SET(xfd, &rfd);
@@ -3179,35 +3184,36 @@ run(void) {
                        die("select failed: %s\n", SERRNO);
                }
 
-               /*
-                * Stop after a certain number of reads so the user does not
-                * feel like the system is stuttering.
-                */
-               if(i < 1000 && FD_ISSET(cmdfd, &rfd)) {
+               gettimeofday(&now, NULL);
+               drawtimeout.tv_sec = 0;
+               drawtimeout.tv_usec = (1000/xfps) * 1000;
+               tv = &drawtimeout;
+
+               if(FD_ISSET(cmdfd, &rfd))
                        ttyread();
 
-                       /*
-                        * Just wait a bit so it isn't disturbing the
-                        * user and the system is able to write something.
-                        */
-                       drawtimeout.tv_sec = 0;
-                       drawtimeout.tv_usec = 5;
-                       tv = &drawtimeout;
-                       continue;
-               }
-               i = 0;
-               tv = NULL;
+               if(FD_ISSET(xfd, &rfd))
+                       xev = actionfps;
 
-               while(XPending(xw.dpy)) {
-                       XNextEvent(xw.dpy, &ev);
-                       if(XFilterEvent(&ev, None))
-                               continue;
-                       if(handler[ev.type])
-                               (handler[ev.type])(&ev);
-               }
+               if(TIMEDIFF(now, last) > \
+                               (xev ? (1000/xfps) : (1000/actionfps))) {
+                       while(XPending(xw.dpy)) {
+                               XNextEvent(xw.dpy, &ev);
+                               if(XFilterEvent(&ev, None))
+                                       continue;
+                               if(handler[ev.type])
+                                       (handler[ev.type])(&ev);
+                       }
+
+                       draw();
+                       XFlush(xw.dpy);
+                       last = now;
 
-               draw();
-               XFlush(xw.dpy);
+                       if(xev && !FD_ISSET(xfd, &rfd))
+                               xev--;
+                       if(!FD_ISSET(cmdfd, &rfd) && !FD_ISSET(xfd, &rfd))
+                               tv = NULL;
+               }
        }
 }