separated layout-specific stuff into separate .h and .c files which are included...

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 4d9a1e6..d0716fa 100644 (file)
--- a/event.c
+++ b/event.c
@@ -1,5 +1,4 @@
-/* © 2004-2007 Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details. */
+/* See LICENSE file for copyright and license details. */
 #include "dwm.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -17,7 +16,7 @@ typedef struct {
 
 KEYS
 
-#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define CLEANMASK(mask)                (mask & ~(numlockmask | LockMask))
 #define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 
 static Client *
@@ -139,12 +138,8 @@ buttonpress(XEvent *e) {
                                return;
                        }
                }
-               if(ev->x < x + blw)
-                       switch(ev->button) {
-                       case Button1:
-                               setlayout(NULL);
-                               break;
-                       }
+               if((ev->x < x + blw) && ev->button == Button1)
+                       setlayout(NULL);
        }
        else if((c = getclient(ev->window))) {
                focus(c);
@@ -173,6 +168,8 @@ configurerequest(XEvent *e) {
 
        if((c = getclient(ev->window))) {
                c->ismax = False;
+               if(ev->value_mask & CWBorderWidth)
+                       c->border = ev->border_width;
                if(c->isfixed || c->isfloating || (lt->arrange == floating)) {
                        if(ev->value_mask & CWX)
                                c->x = ev->x;
@@ -182,18 +179,18 @@ configurerequest(XEvent *e) {
                                c->w = ev->width;
                        if(ev->value_mask & CWHeight)
                                c->h = ev->height;
+                       if((c->x + c->w) > sw && c->isfloating)
+                               c->x = sw / 2 - c->w / 2; /* center in x direction */
+                       if((c->y + c->h) > sh && c->isfloating)
+                               c->y = sh / 2 - c->h / 2; /* center in y direction */
                        if((ev->value_mask & (CWX | CWY))
                        && !(ev->value_mask & (CWWidth | CWHeight)))
                                configure(c);
                        if(isvisible(c))
                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
                }
-               else {
-                       if(ev->value_mask & CWBorderWidth)
-                               c->border = ev->border_width;
+               else
                        configure(c);
-                       c->border = BORDERPX;
-               }
        }
        else {
                wc.x = ev->x;
@@ -209,6 +206,21 @@ configurerequest(XEvent *e) {
 }
 
 static void
+configurenotify(XEvent *e) {
+       XConfigureEvent *ev = &e->xconfigure;
+
+       if (ev->window == root && (ev->width != sw || ev->height != sh)) {
+               sw = ev->width;
+               sh = ev->height;
+               XFreePixmap(dpy, dc.drawable);
+               dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
+               XResizeWindow(dpy, barwin, sw, bh);
+               updatebarpos();
+               lt->arrange();
+       }
+}
+
+static void
 destroynotify(XEvent *e) {
        Client *c;
        XDestroyWindowEvent *ev = &e->xdestroywindow;
@@ -224,12 +236,11 @@ enternotify(XEvent *e) {
 
        if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
                return;
-       if((c = getclient(ev->window)) && isvisible(c))
+       if((c = getclient(ev->window)))
                focus(c);
        else if(ev->window == root) {
                selscreen = True;
-               for(c = stack; c && !isvisible(c); c = c->snext);
-               focus(c);
+               focus(NULL);
        }
 }
 
@@ -325,8 +336,10 @@ unmapnotify(XEvent *e) {
        Client *c;
        XUnmapEvent *ev = &e->xunmap;
 
-       if((c = getclient(ev->window)))
-               unmanage(c);
+       if((c = getclient(ev->window)) && (ev->event == root)) {
+               if(ev->send_event || c->unmapped-- == 0)
+                       unmanage(c);
+       }
 }
 
 /* extern */
@@ -334,6 +347,7 @@ unmapnotify(XEvent *e) {
 void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,
        [ConfigureRequest] = configurerequest,
+       [ConfigureNotify] = configurenotify,
        [DestroyNotify] = destroynotify,
        [EnterNotify] = enternotify,
        [LeaveNotify] = leavenotify,