added configure(), but this doesn't really fix those frking broken SDL apps

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 83301bc..50c59a0 100644 (file)
--- a/event.c
+++ b/event.c
@@ -1,3 +1,4 @@
+#include <stdio.h>
 /*
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
@@ -21,23 +22,6 @@ KEYS
 #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
 
 static void
-synconfig(Client *c, int x, int y, int w, int h, unsigned int border) {
-       XEvent synev;
-
-       synev.type = ConfigureNotify;
-       synev.xconfigure.display = dpy;
-       synev.xconfigure.event = c->win;
-       synev.xconfigure.window = c->win;
-       synev.xconfigure.x = x;
-       synev.xconfigure.y = y;
-       synev.xconfigure.width = w;
-       synev.xconfigure.height = h;
-       synev.xconfigure.border_width = border;
-       synev.xconfigure.above = None;
-       XSendEvent(dpy, c->win, True, NoEventMask, &synev);
-}
-
-static void
 movemouse(Client *c) {
        int x1, y1, ocx, ocy, di;
        unsigned int dui;
@@ -52,14 +36,12 @@ movemouse(Client *c) {
        c->ismax = False;
        XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
        for(;;) {
-               XMaskEvent(dpy, MOUSEMASK | ExposureMask | StructureNotifyMask, &ev);
+               XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
                switch (ev.type) {
-               default:
-                       break;
-               case ConfigureRequest:
-                       synconfig(c, c->x, c->y, c->w, c->h, ev.xconfigure.border_width);
-                       XSync(dpy, False);
-                       break;
+               case ButtonRelease:
+                       resize(c, True, TopLeft);
+                       XUngrabPointer(dpy, CurrentTime);
+                       return;
                case Expose:
                        handler[Expose](&ev);
                        break;
@@ -69,14 +51,6 @@ movemouse(Client *c) {
                        c->y = ocy + (ev.xmotion.y - y1);
                        resize(c, False, TopLeft);
                        break;
-               case ButtonRelease:
-                       XUngrabPointer(dpy, CurrentTime);
-                       return;
-               case DestroyNotify:
-               case UnmapNotify:
-                       XUngrabPointer(dpy, CurrentTime);
-                       handler[ev.type](&ev);
-                       return;
                }
        }
 }
@@ -96,14 +70,12 @@ resizemouse(Client *c) {
        c->ismax = False;
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
        for(;;) {
-               XMaskEvent(dpy, MOUSEMASK | ExposureMask | StructureNotifyMask, &ev);
+               XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
                switch(ev.type) {
-               default:
-                       break;
-               case ConfigureRequest:
-                       synconfig(c, c->x, c->y, c->w, c->h, ev.xconfigure.border_width);
-                       XSync(dpy, False);
-                       break;
+               case ButtonRelease:
+                       resize(c, True, TopLeft);
+                       XUngrabPointer(dpy, CurrentTime);
+                       return;
                case Expose:
                        handler[Expose](&ev);
                        break;
@@ -121,14 +93,6 @@ resizemouse(Client *c) {
                                sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight;
                        resize(c, True, sticky);
                        break;
-               case ButtonRelease:
-                       XUngrabPointer(dpy, CurrentTime);
-                       return;
-               case DestroyNotify:
-               case UnmapNotify:
-                       XUngrabPointer(dpy, CurrentTime);
-                       handler[ev.type](&ev);
-                       return;
                }
        }
 }
@@ -187,14 +151,12 @@ configurerequest(XEvent *e) {
        unsigned long newmask;
        Client *c;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
+       XEvent synev;
        XWindowChanges wc;
 
+       fputs("configurerequest\n", stderr);
        if((c = getclient(ev->window))) {
-               if((c == sel) && !c->isfloat && (arrange != dofloat)) {
-                       synconfig(c, sx, sy + bh, sw - 2, sh - 2 - bh, ev->border_width);
-                       XSync(dpy, False);
-                       return;
-               }
+               c->ismax = False;
                gravitate(c, True);
                if(ev->value_mask & CWX)
                        c->x = ev->x;
@@ -215,7 +177,7 @@ configurerequest(XEvent *e) {
                if(newmask)
                        XConfigureWindow(dpy, c->win, newmask, &wc);
                else
-                       synconfig(c, c->x, c->y, c->w, c->h, c->border);
+                       configure(c);
                XSync(dpy, False);
                if(c->isfloat)
                        resize(c, False, TopLeft);
@@ -249,6 +211,7 @@ enternotify(XEvent *e) {
        Client *c;
        XCrossingEvent *ev = &e->xcrossing;
 
+       fputs("enternotify\n", stderr);
        if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
                return;
 
@@ -336,6 +299,7 @@ propertynotify(XEvent *e) {
        Window trans;
        XPropertyEvent *ev = &e->xproperty;
 
+       fputs("propertynotify\n", stderr);
        if(ev->state == PropertyDelete)
                return; /* ignore */