still something wrong with reorder()

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 85205d9..c7a0b15 100644 (file)
--- a/event.c
+++ b/event.c
@@ -18,7 +18,7 @@ typedef struct {
 
 KEYS
 
 
 KEYS
 

-#define CLEANMASK(mask) (mask & ~(NUMLOCKMASK | LockMask))
+#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))

 
 static void
 movemouse(Client *c)
 
 static void
 movemouse(Client *c)


@@ -109,16 +109,22 @@ buttonpress(XEvent *e)
                for(a.i = 0; a.i < ntags; a.i++) {
                        x += textw(tags[a.i]);
                        if(ev->x < x) {
                for(a.i = 0; a.i < ntags; a.i++) {
                        x += textw(tags[a.i]);
                        if(ev->x < x) {

-                               if(ev->button == Button3)
-                                       toggleview(&a);
-                               else
+                               if(ev->button == Button1)

                                        view(&a);
                                        view(&a);

+                               else if(ev->button == Button3)
+                                       toggleview(&a);

                                return;
                        }
                }
                                return;
                        }
                }

+               if(ev->x < x + bmw) {
+                       if(ev->button == Button1)
+                               togglemode(NULL);
+               }

        }
        else if((c = getclient(ev->window))) {
                focus(c);
        }
        else if((c = getclient(ev->window))) {
                focus(c);

+               if(CLEANMASK(ev->state) != MODKEY)
+                       return;

                switch(ev->button) {
                default:
                        break;
                switch(ev->button) {
                default:
                        break;


@@ -144,11 +150,11 @@ buttonpress(XEvent *e)
 static void
 configurerequest(XEvent *e)
 {
 static void
 configurerequest(XEvent *e)
 {

+       unsigned long newmask;

        Client *c;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XEvent synev;
        XWindowChanges wc;
        Client *c;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XEvent synev;
        XWindowChanges wc;

-       unsigned long newmask;

 
        if((c = getclient(ev->window))) {
                gravitate(c, True);
 
        if((c = getclient(ev->window))) {
                gravitate(c, True);


@@ -378,10 +384,22 @@ grabkeys()
                                GrabModeAsync, GrabModeAsync);
                XGrabKey(dpy, code, key[i].mod | LockMask, root, True,
                                GrabModeAsync, GrabModeAsync);
                                GrabModeAsync, GrabModeAsync);
                XGrabKey(dpy, code, key[i].mod | LockMask, root, True,
                                GrabModeAsync, GrabModeAsync);

-               XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root, True,
+               XGrabKey(dpy, code, key[i].mod | numlockmask, root, True,

                                GrabModeAsync, GrabModeAsync);
                                GrabModeAsync, GrabModeAsync);

-               XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root, True,
+               XGrabKey(dpy, code, key[i].mod | numlockmask | LockMask, root, True,

                                GrabModeAsync, GrabModeAsync);
                                GrabModeAsync, GrabModeAsync);

-               XSync(dpy, False);

        }
 }
        }
 }

+
+void
+procevent()
+{
+       XEvent ev;
+
+       while(XPending(dpy)) {
+               XNextEvent(dpy, &ev);
+               if(handler[ev.type])
+                       (handler[ev.type])(&ev); /* call handler */
+       }
+}
+