code polishing, removed unnecessary newlines

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 83301bc..e959917 100644 (file)
--- a/event.c
+++ b/event.c
@@ -1,5 +1,4 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
@@ -21,23 +20,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 +34,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 +49,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;
                }
        }
 }
@@ -91,19 +63,17 @@ resizemouse(Client *c) {
        ocx = c->x;
        ocy = c->y;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
-                               None, cursor[CurResize], CurrentTime) != GrabSuccess)
+                       None, cursor[CurResize], CurrentTime) != GrabSuccess)
                return;
        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 +91,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;
                }
        }
 }
@@ -160,10 +122,8 @@ buttonpress(XEvent *e) {
                                return;
                        }
                }
-               if(ev->x < x + bmw) {
-                       if(ev->button == Button1)
-                               togglemode(NULL);
-               }
+               if((ev->x < x + bmw) && (ev->button == Button1))
+                       togglemode(NULL);
        }
        else if((c = getclient(ev->window))) {
                focus(c);
@@ -190,11 +150,7 @@ configurerequest(XEvent *e) {
        XWindowChanges wc;
 
        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,10 +171,13 @@ 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)
+               if(c->isfloat) {
                        resize(c, False, TopLeft);
+                       if(!isvisible(c))
+                               ban(c);
+               }
                else
                        arrange(NULL);
        }
@@ -251,7 +210,6 @@ enternotify(XEvent *e) {
 
        if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
                return;
-
        if(((c = getclient(ev->window)) || (c = getctitle(ev->window))) && isvisible(c))
                focus(c);
        else if(ev->window == root) {
@@ -319,13 +277,11 @@ maprequest(XEvent *e) {
 
        if(!XGetWindowAttributes(dpy, ev->window, &wa))
                return;
-
        if(wa.override_redirect) {
                XSelectInput(dpy, ev->window,
                                (StructureNotifyMask | PropertyChangeMask));
                return;
        }
-
        if(!getclient(ev->window))
                manage(ev->window, &wa);
 }
@@ -338,7 +294,6 @@ propertynotify(XEvent *e) {
 
        if(ev->state == PropertyDelete)
                return; /* ignore */
-
        if((c = getclient(ev->window))) {
                if(ev->atom == wmatom[WMProtocols]) {
                        c->proto = getproto(c->win);
@@ -357,6 +312,7 @@ propertynotify(XEvent *e) {
                }
                if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
                        updatetitle(c);
+                       resizetitle(c);
                        drawtitle(c);
                }
        }