removed NET_ACTIVE_WINDOW handling

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 0c159c7..2e4f62e 100644 (file)
--- a/event.c
+++ b/event.c
@@ -105,7 +105,7 @@ buttonpress(XEvent *e)
                switch(ev->button) {
                default:
                        x = 0;
                switch(ev->button) {
                default:
                        x = 0;

-                       for(a.i = 0; a.i < TLast; a.i++) {
+                       for(a.i = 0; a.i < ntags; a.i++) {

                                x += textw(tags[a.i]);
                                if(ev->x < x) {
                                        view(&a);
                                x += textw(tags[a.i]);
                                if(ev->x < x) {
                                        view(&a);


@@ -156,22 +156,17 @@ configurerequest(XEvent *e)
 
        if((c = getclient(ev->window))) {
                gravitate(c, True);
 
        if((c = getclient(ev->window))) {
                gravitate(c, True);

-               if(c->isfloat) {
-                       if(ev->value_mask & CWX)
-                               c->x = ev->x;
-                       if(ev->value_mask & CWY)
-                               c->y = ev->y;
-                       if(ev->value_mask & CWWidth)
-                               c->w = ev->width;
-                       if(ev->value_mask & CWHeight)
-                               c->h = ev->height;
-               }
+               if(ev->value_mask & CWX)
+                       c->x = ev->x;
+               if(ev->value_mask & CWY)
+                       c->y = ev->y;
+               if(ev->value_mask & CWWidth)
+                       c->w = ev->width;
+               if(ev->value_mask & CWHeight)
+                       c->h = ev->height;

                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;
                gravitate(c, False);
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;
                gravitate(c, False);

-
-               resize(c, True, TopLeft);
-

                wc.x = c->x;
                wc.y = c->y;
                wc.width = c->w;
                wc.x = c->x;
                wc.y = c->y;
                wc.width = c->w;


@@ -193,6 +188,11 @@ configurerequest(XEvent *e)
                        /* Send synthetic ConfigureNotify */
                        XSendEvent(dpy, c->win, True, NoEventMask, &synev);
                }
                        /* Send synthetic ConfigureNotify */
                        XSendEvent(dpy, c->win, True, NoEventMask, &synev);
                }

+               XSync(dpy, False);
+               if(c->isfloat)
+                       resize(c, False, TopLeft);
+               else
+                       arrange(NULL);

        }
        else {
                wc.x = ev->x;
        }
        else {
                wc.x = ev->x;


@@ -203,8 +203,8 @@ configurerequest(XEvent *e)
                wc.sibling = ev->above;
                wc.stack_mode = ev->detail;
                XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
                wc.sibling = ev->above;
                wc.stack_mode = ev->detail;
                XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);

+               XSync(dpy, False);

        }
        }

-       XSync(dpy, False);

 }
 
 static void
 }
 
 static void


@@ -359,20 +359,12 @@ grabkeys()
 
        for(i = 0; i < len; i++) {
                code = XKeysymToKeycode(dpy, key[i].keysym);
 
        for(i = 0; i < len; i++) {
                code = XKeysymToKeycode(dpy, key[i].keysym);

-               /* normal */
-               XUngrabKey(dpy, code, key[i].mod, root);

                XGrabKey(dpy, code, key[i].mod, root, True,
                                GrabModeAsync, GrabModeAsync);
                XGrabKey(dpy, code, key[i].mod, root, True,
                                GrabModeAsync, GrabModeAsync);

-               /* capslock */
-               XUngrabKey(dpy, code, key[i].mod | LockMask, root);

                XGrabKey(dpy, code, key[i].mod | LockMask, root, True,
                                GrabModeAsync, GrabModeAsync);
                XGrabKey(dpy, code, key[i].mod | LockMask, root, True,
                                GrabModeAsync, GrabModeAsync);

-               /* numlock */
-               XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root);

                XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root, True,
                                GrabModeAsync, GrabModeAsync);
                XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root, True,
                                GrabModeAsync, GrabModeAsync);

-               /* capslock & numlock */
-               XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root);

                XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root, True,
                                GrabModeAsync, GrabModeAsync);
        }
                XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root, True,
                                GrabModeAsync, GrabModeAsync);
        }