calculating the remainder for master and stack area correctly

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 153b49a..2773c6f 100644 (file)
--- a/event.c
+++ b/event.c
@@ -1,7 +1,8 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+ * See LICENSE file for license details. */
 #include "dwm.h"
+#include <stdio.h>
 #include <stdlib.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
@@ -11,8 +12,8 @@
 typedef struct {
        unsigned long mod;
        KeySym keysym;
-       void (*func)(Arg *arg);
-       Arg arg;
+       void (*func)(const char *arg);
+       const char *arg;
 } Key;
 
 KEYS
@@ -20,6 +21,14 @@ KEYS
 #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
 #define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 
+static Client *
+getclient(Window w) {
+       Client *c;
+
+       for(c = clients; c && c->win != w; c = c->next);
+       return c;
+}
+
 static void
 movemouse(Client *c) {
        int x1, y1, ocx, ocy, di, nx, ny;
@@ -104,43 +113,37 @@ resizemouse(Client *c) {
 
 static void
 buttonpress(XEvent *e) {
-       int x;
-       Arg a;
+       static char buf[32];
+       unsigned int i, x;
        Client *c;
        XButtonPressedEvent *ev = &e->xbutton;
 
+       buf[0] = 0;
        if(barwin == ev->window) {
                x = 0;
-               for(a.i = 0; a.i < ntags; a.i++) {
-                       x += textw(tags[a.i]);
+               for(i = 0; i < ntags; i++) {
+                       x += textw(tags[i]);
                        if(ev->x < x) {
+                               snprintf(buf, sizeof buf, "%d", i);
                                if(ev->button == Button1) {
                                        if(ev->state & MODKEY)
-                                               tag(&a);
+                                               tag(buf);
                                        else
-                                               view(&a);
+                                               view(buf);
                                }
                                else if(ev->button == Button3) {
                                        if(ev->state & MODKEY)
-                                               toggletag(&a);
+                                               toggletag(buf);
                                        else
-                                               toggleview(&a);
+                                               toggleview(buf);
                                }
                                return;
                        }
                }
-               if(ev->x < x + bmw)
+               if(ev->x < x + blw)
                        switch(ev->button) {
                        case Button1:
-                               togglemode(NULL);
-                               break;
-                       case Button4:
-                               a.i = 1;
-                               incnmaster(&a);
-                               break;
-                       case Button5:
-                               a.i = -1;
-                               incnmaster(&a);
+                               setlayout(NULL);
                                break;
                        }
        }
@@ -148,14 +151,14 @@ buttonpress(XEvent *e) {
                focus(c);
                if(CLEANMASK(ev->state) != MODKEY)
                        return;
-               if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) {
+               if(ev->button == Button1 && (lt->arrange == floating || c->isfloating)) {
                        restack();
                        movemouse(c);
                }
                else if(ev->button == Button2)
                        zoom(NULL);
                else if(ev->button == Button3
-               && (arrange == dofloat || c->isfloat) && !c->isfixed)
+               && (lt->arrange == floating || c->isfloating) && !c->isfixed)
                {
                        restack();
                        resizemouse(c);
@@ -173,7 +176,7 @@ configurerequest(XEvent *e) {
                c->ismax = False;
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;
-               if(c->isfixed || c->isfloat || (arrange == dofloat)) {
+               if(c->isfixed || c->isfloating || (lt->arrange == floating)) {
                        if(ev->value_mask & CWX)
                                c->x = ev->x;
                        if(ev->value_mask & CWY)
@@ -182,18 +185,15 @@ 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))
-                                       XMoveWindow(dpy, c->win, c->x, c->y);
-                       }
-                       else {
+                       if(isvisible(c))
                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
-                               if(!isvisible(c))
-                                       ban(c);
-                       }
                }
                else
                        configure(c);
@@ -211,6 +211,21 @@ configurerequest(XEvent *e) {
        XSync(dpy, False);
 }
 
+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;
@@ -231,8 +246,7 @@ enternotify(XEvent *e) {
                focus(c);
        else if(ev->window == root) {
                selscreen = True;
-               for(c = stack; c && !isvisible(c); c = c->snext);
-               focus(c);
+               focustopvisible();
        }
 }
 
@@ -259,7 +273,7 @@ keypress(XEvent *e) {
                && CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
                {
                        if(key[i].func)
-                               key[i].func(&key[i].arg);
+                               key[i].func(key[i].arg);
                }
 }
 
@@ -308,8 +322,8 @@ propertynotify(XEvent *e) {
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);
-                               if(!c->isfloat && (c->isfloat = (trans != 0)))
-                                       arrange();
+                               if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
+                                       lt->arrange();
                                break;
                        case XA_WM_NORMAL_HINTS:
                                updatesizehints(c);
@@ -337,6 +351,7 @@ unmapnotify(XEvent *e) {
 void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,
        [ConfigureRequest] = configurerequest,
+       [ConfigureNotify] = configurenotify,
        [DestroyNotify] = destroynotify,
        [EnterNotify] = enternotify,
        [LeaveNotify] = leavenotify,
@@ -367,14 +382,3 @@ grabkeys(void) {
                                GrabModeAsync, GrabModeAsync);
        }
 }
-
-void
-procevent(void) {
-       XEvent ev;
-
-       while(XPending(dpy)) {
-               XNextEvent(dpy, &ev);
-               if(handler[ev.type])
-                       (handler[ev.type])(&ev); /* call handler */
-       }
-}