fixed configurerequest according to Jukkas complains

[dwm.git] / event.c

diff --git a/event.c b/event.c
index a5e75ca..153b49a 100644 (file)
--- a/event.c
+++ b/event.c
@@ -22,41 +22,42 @@ KEYS
 
 static void
 movemouse(Client *c) {
 
 static void
 movemouse(Client *c) {

-       int x1, y1, ocx, ocy, di;
+       int x1, y1, ocx, ocy, di, nx, ny;

        unsigned int dui;
        Window dummy;
        XEvent ev;
 
        unsigned int dui;
        Window dummy;
        XEvent ev;
 

-       ocx = c->x;
-       ocy = c->y;
+       ocx = nx = c->x;
+       ocy = ny = c->y;

        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
                        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;
        c->ismax = False;
        XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
        for(;;) {
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
                        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;
        c->ismax = False;
        XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
        for(;;) {

-               XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
+               XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);

                switch (ev.type) {
                case ButtonRelease:
                switch (ev.type) {
                case ButtonRelease:

-                       resize(c, True, TopLeft);

                        XUngrabPointer(dpy, CurrentTime);
                        return;
                        XUngrabPointer(dpy, CurrentTime);
                        return;

+               case ConfigureRequest:

                case Expose:
                case Expose:

-                       handler[Expose](&ev);
+               case MapRequest:
+                       handler[ev.type](&ev);

                        break;
                case MotionNotify:
                        XSync(dpy, False);
                        break;
                case MotionNotify:
                        XSync(dpy, False);

-                       c->x = ocx + (ev.xmotion.x - x1);
-                       c->y = ocy + (ev.xmotion.y - y1);
-                       if(abs(wax + c->x) < SNAP)
-                               c->x = wax;
-                       else if(abs((wax + waw) - (c->x + c->w)) < SNAP)
-                               c->x = wax + waw - c->w - 2 * BORDERPX;
-                       if(abs(way - c->y) < SNAP)
-                               c->y = way;
-                       else if(abs((way + wah) - (c->y + c->h)) < SNAP)
-                               c->y = way + wah - c->h - 2 * BORDERPX;
-                       resize(c, False, TopLeft);
+                       nx = ocx + (ev.xmotion.x - x1);
+                       ny = ocy + (ev.xmotion.y - y1);
+                       if(abs(wax + nx) < SNAP)
+                               nx = wax;
+                       else if(abs((wax + waw) - (nx + c->w + 2 * c->border)) < SNAP)
+                               nx = wax + waw - c->w - 2 * c->border;
+                       if(abs(way - ny) < SNAP)
+                               ny = way;
+                       else if(abs((way + wah) - (ny + c->h + 2 * c->border)) < SNAP)
+                               ny = way + wah - c->h - 2 * c->border;
+                       resize(c, nx, ny, c->w, c->h, False);

                        break;
                }
        }
                        break;
                }
        }


@@ -66,7 +67,6 @@ static void
 resizemouse(Client *c) {
        int ocx, ocy;
        int nw, nh;
 resizemouse(Client *c) {
        int ocx, ocy;
        int nw, nh;

-       Corner sticky;

        XEvent ev;
 
        ocx = c->x;
        XEvent ev;
 
        ocx = c->x;


@@ -75,30 +75,28 @@ resizemouse(Client *c) {
                        None, cursor[CurResize], CurrentTime) != GrabSuccess)
                return;
        c->ismax = False;
                        None, cursor[CurResize], CurrentTime) != GrabSuccess)
                return;
        c->ismax = False;

-       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
+       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1);

        for(;;) {
        for(;;) {

-               XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
+               XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask , &ev);

                switch(ev.type) {
                case ButtonRelease:
                switch(ev.type) {
                case ButtonRelease:

-                       resize(c, True, TopLeft);
+                       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
+                                       c->w + c->border - 1, c->h + c->border - 1);

                        XUngrabPointer(dpy, CurrentTime);
                        XUngrabPointer(dpy, CurrentTime);

+                       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));

                        return;
                        return;

+               case ConfigureRequest:

                case Expose:
                case Expose:

-                       handler[Expose](&ev);
+               case MapRequest:
+                       handler[ev.type](&ev);

                        break;
                case MotionNotify:
                        XSync(dpy, False);
                        break;
                case MotionNotify:
                        XSync(dpy, False);

-                       if((nw = abs(ocx - ev.xmotion.x)))
-                               c->w = nw;
-                       if((nh = abs(ocy - ev.xmotion.y)))
-                               c->h = nh;
-                       c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w;
-                       c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h;
-                       if(ocx <= ev.xmotion.x)
-                               sticky = (ocy <= ev.xmotion.y) ? TopLeft : BotLeft;
-                       else
-                               sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight;
-                       resize(c, True, sticky);
+                       if((nw = ev.xmotion.x - ocx - 2 * c->border + 1) <= 0)
+                               nw = 1;
+                       if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
+                               nh = 1;
+                       resize(c, c->x, c->y, nw, nh, True);

                        break;
                }
        }
                        break;
                }
        }


@@ -156,8 +154,9 @@ buttonpress(XEvent *e) {
                }
                else if(ev->button == Button2)
                        zoom(NULL);
                }
                else if(ev->button == Button2)
                        zoom(NULL);

-               else if(ev->button == Button3 && (arrange == dofloat || c->isfloat) &&
-                               !c->isfixed) {
+               else if(ev->button == Button3
+               && (arrange == dofloat || c->isfloat) && !c->isfixed)
+               {

                        restack();
                        resizemouse(c);
                }
                        restack();
                        resizemouse(c);
                }


@@ -166,40 +165,38 @@ buttonpress(XEvent *e) {
 
 static void
 configurerequest(XEvent *e) {
 
 static void
 configurerequest(XEvent *e) {

-       unsigned long newmask;

        Client *c;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XWindowChanges wc;
 
        if((c = getclient(ev->window))) {
                c->ismax = False;
        Client *c;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XWindowChanges wc;
 
        if((c = getclient(ev->window))) {
                c->ismax = False;

-               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;
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;

-               wc.x = c->x;
-               wc.y = c->y;
-               wc.width = c->w;
-               wc.height = c->h;
-               newmask = ev->value_mask & (~(CWSibling | CWStackMode | CWBorderWidth));
-               if(newmask)
-                       XConfigureWindow(dpy, c->win, newmask, &wc);
-               else
-                       configure(c);
-               XSync(dpy, False);
-               if(c->isfloat) {
-                       resize(c, False, TopLeft);
-                       if(!isvisible(c))
-                               XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+               if(c->isfixed || c->isfloat || (arrange == dofloat)) {
+                       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 | CWY))
+                       && !(ev->value_mask & (CWWidth | CWHeight)))
+                       {
+                               configure(c);
+                               if(isvisible(c))
+                                       XMoveWindow(dpy, c->win, c->x, c->y);
+                       }
+                       else {
+                               XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
+                               if(!isvisible(c))
+                                       ban(c);
+                       }

                }
                else
                }
                else

-                       arrange();
+                       configure(c);

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


@@ -210,8 +207,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


@@ -233,10 +230,9 @@ enternotify(XEvent *e) {
        if((c = getclient(ev->window)) && isvisible(c))
                focus(c);
        else if(ev->window == root) {
        if((c = getclient(ev->window)) && isvisible(c))
                focus(c);
        else if(ev->window == root) {

-               issel = True;
-               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-               if(sel)
-                       focus(sel);
+               selscreen = True;
+               for(c = stack; c && !isvisible(c); c = c->snext);
+               focus(c);

        }
 }
 
        }
 }
 


@@ -258,14 +254,13 @@ keypress(XEvent *e) {
        XKeyEvent *ev = &e->xkey;
 
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        XKeyEvent *ev = &e->xkey;
 
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);

-       for(i = 0; i < len; i++) {
+       for(i = 0; i < len; i++)

                if(keysym == key[i].keysym
                if(keysym == key[i].keysym

-                       && CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
+               && CLEANMASK(key[i].mod) == CLEANMASK(ev->state))

                {
                        if(key[i].func)
                                key[i].func(&key[i].arg);
                }
                {
                        if(key[i].func)
                                key[i].func(&key[i].arg);
                }

-       }

 }
 
 static void
 }
 
 static void


@@ -273,9 +268,8 @@ leavenotify(XEvent *e) {
        XCrossingEvent *ev = &e->xcrossing;
 
        if((ev->window == root) && !ev->same_screen) {
        XCrossingEvent *ev = &e->xcrossing;
 
        if((ev->window == root) && !ev->same_screen) {

-               issel = False;
-               if(sel)
-                       XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
+               selscreen = False;
+               focus(NULL);

        }
 }
 
        }
 }
 


@@ -295,11 +289,8 @@ maprequest(XEvent *e) {
 
        if(!XGetWindowAttributes(dpy, ev->window, &wa))
                return;
 
        if(!XGetWindowAttributes(dpy, ev->window, &wa))
                return;

-       if(wa.override_redirect) {
-               XSelectInput(dpy, ev->window,
-                               (StructureNotifyMask | PropertyChangeMask));
+       if(wa.override_redirect)

                return;
                return;

-       }

        if(!getclient(ev->window))
                manage(ev->window, &wa);
 }
        if(!getclient(ev->window))
                manage(ev->window, &wa);
 }


@@ -313,10 +304,6 @@ propertynotify(XEvent *e) {
        if(ev->state == PropertyDelete)
                return; /* ignore */
        if((c = getclient(ev->window))) {
        if(ev->state == PropertyDelete)
                return; /* ignore */
        if((c = getclient(ev->window))) {

-               if(ev->atom == wmatom[WMProtocols]) {
-                       c->proto = getproto(c->win);
-                       return;
-               }

                switch (ev->atom) {
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
                switch (ev->atom) {
                        default: break;
                        case XA_WM_TRANSIENT_FOR: