removed the _DWM_PROPERTIES handling, reverted ban/unban to XMoveWindow(), and change...

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 8a3d99a..9e83178 100644 (file)
--- a/event.c
+++ b/event.c
@@ -1,34 +1,39 @@
-/* (C)opyright MMVI-MMVII 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 <stdlib.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 #include "dwm.h"
 #include <stdlib.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>

+#include <X11/Xutil.h>

 
 /* static */
 
 typedef struct {
        unsigned long mod;
        KeySym keysym;
 
 /* static */
 
 typedef struct {
        unsigned long mod;
        KeySym keysym;

-       void (*func)(Arg *arg);
-       Arg arg;
+       void (*func)(const char *arg);
+       const char *arg;

 } Key;
 
 } Key;
 

-KEYS
-
-#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define CLEANMASK(mask)                (mask & ~(numlockmask | LockMask))

 #define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 
 #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) {
 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;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
                        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;


@@ -38,7 +43,6 @@ movemouse(Client *c) {
                XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
                switch (ev.type) {
                case ButtonRelease:
                XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
                switch (ev.type) {
                case ButtonRelease:

-                       resize(c, True);

                        XUngrabPointer(dpy, CurrentTime);
                        return;
                case ConfigureRequest:
                        XUngrabPointer(dpy, CurrentTime);
                        return;
                case ConfigureRequest:


@@ -48,17 +52,17 @@ movemouse(Client *c) {
                        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 + 2 * c->border)) < SNAP)
-                               c->x = wax + waw - c->w - 2 * c->border;
-                       if(abs(way - c->y) < SNAP)
-                               c->y = way;
-                       else if(abs((way + wah) - (c->y + c->h + 2 * c->border)) < SNAP)
-                               c->y = way + wah - c->h - 2 * c->border;
-                       resize(c, False);
+                       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;
                }
        }


@@ -81,7 +85,6 @@ resizemouse(Client *c) {
                XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask , &ev);
                switch(ev.type) {
                case ButtonRelease:
                XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask , &ev);
                switch(ev.type) {
                case ButtonRelease:

-                       resize(c, True);

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


@@ -94,11 +97,11 @@ resizemouse(Client *c) {
                        break;
                case MotionNotify:
                        XSync(dpy, False);
                        break;
                case MotionNotify:
                        XSync(dpy, False);

-                       nw = ev.xmotion.x - ocx - 2 * c->border + 1;
-                       c->w = nw > 0 ? nw : 1;
-                       nh = ev.xmotion.y - ocy - 2 * c->border + 1;
-                       c->h = nh > 0 ? nh : 1;
-                       resize(c, True);
+                       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;
                }
        }


@@ -106,58 +109,46 @@ resizemouse(Client *c) {
 
 static void
 buttonpress(XEvent *e) {
 
 static void
 buttonpress(XEvent *e) {

-       int x;
-       Arg a;
+       unsigned int i, x;

        Client *c;
        XButtonPressedEvent *ev = &e->xbutton;
 
        if(barwin == ev->window) {
                x = 0;
        Client *c;
        XButtonPressedEvent *ev = &e->xbutton;
 
        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) {
                                if(ev->button == Button1) {
                                        if(ev->state & MODKEY)
                        if(ev->x < x) {
                                if(ev->button == Button1) {
                                        if(ev->state & MODKEY)

-                                               tag(&a);
+                                               tag(tags[i]);

                                        else
                                        else

-                                               view(&a);
+                                               view(tags[i]);

                                }
                                else if(ev->button == Button3) {
                                        if(ev->state & MODKEY)
                                }
                                else if(ev->button == Button3) {
                                        if(ev->state & MODKEY)

-                                               toggletag(&a);
+                                               toggletag(tags[i]);

                                        else
                                        else

-                                               toggleview(&a);
+                                               toggleview(tags[i]);

                                }
                                return;
                        }
                }
                                }
                                return;
                        }
                }

-               if(ev->x < x + bmw)
-                       switch(ev->button) {
-                       case Button1:
-                               togglemode(NULL);
-                               break;
-                       case Button4:
-                               a.i = 1;
-                               incnmaster(&a);
-                               break;
-                       case Button5:
-                               a.i = -1;
-                               incnmaster(&a);
-                               break;
-                       }
+               if((ev->x < x + blw) && ev->button == Button1)
+                       setlayout(NULL);

        }
        else if((c = getclient(ev->window))) {
                focus(c);
                if(CLEANMASK(ev->state) != MODKEY)
                        return;
        }
        else if((c = getclient(ev->window))) {
                focus(c);
                if(CLEANMASK(ev->state) != MODKEY)
                        return;

-               if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) {
+               if(ev->button == Button1 && (isfloating() || c->isfloating)) {

                        restack();
                        movemouse(c);
                }
                else if(ev->button == Button2)
                        zoom(NULL);
                        restack();
                        movemouse(c);
                }
                else if(ev->button == Button2)
                        zoom(NULL);

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

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


@@ -172,19 +163,29 @@ configurerequest(XEvent *e) {
 
        if((c = getclient(ev->window))) {
                c->ismax = False;
 
        if((c = getclient(ev->window))) {
                c->ismax = False;

-               c->border = (ev->value_mask & CWBorderWidth) ? ev->border_width : c->border;
-               if((!c->isfloat && (arrange != dofloat))
-                       || ((ev->value_mask & (CWX | CWY)) && !(ev->value_mask & (CWWidth | CWHeight))))
-                       configure(c);
-               else {
-                       c->x = (ev->value_mask & CWX) ? ev->x : c->x;
-                       c->y = (ev->value_mask & CWY) ? ev->y : c->y;
-                       c->w = (ev->value_mask & CWWidth) ? ev->width : c->w;
-                       c->h = (ev->value_mask & CWHeight) ? ev->height : c->h;
-                       resize(c, False);
-                       if(!isvisible(c))
-                               XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+               if(ev->value_mask & CWBorderWidth)
+                       c->border = ev->border_width;
+               if(c->isfixed || c->isfloating || isfloating()) {
+                       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((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
+                       configure(c);

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


@@ -199,6 +200,21 @@ configurerequest(XEvent *e) {
        XSync(dpy, False);
 }
 
        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();
+               arrange();
+       }
+}
+

 static void
 destroynotify(XEvent *e) {
        Client *c;
 static void
 destroynotify(XEvent *e) {
        Client *c;


@@ -215,12 +231,11 @@ enternotify(XEvent *e) {
 
        if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
                return;
 
        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;
                focus(c);
        else if(ev->window == root) {
                selscreen = True;

-               for(c = stack; c && !isvisible(c); c = c->snext);
-               focus(c);
+               focus(NULL);

        }
 }
 
        }
 }
 


@@ -236,20 +251,20 @@ expose(XEvent *e) {
 
 static void
 keypress(XEvent *e) {
 
 static void
 keypress(XEvent *e) {

-       static unsigned int len = sizeof key / sizeof key[0];
+       KEYS
+       unsigned int len = sizeof keys / sizeof keys[0];

        unsigned int i;
        KeySym keysym;
        XKeyEvent *ev = &e->xkey;
 
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        unsigned int i;
        KeySym keysym;
        XKeyEvent *ev = &e->xkey;
 
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);

-       for(i = 0; i < len; i++) {
-               if(keysym == key[i].keysym
-                       && CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
+       for(i = 0; i < len; i++)
+               if(keysym == keys[i].keysym
+               && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))

                {
                {

-                       if(key[i].func)
-                               key[i].func(&key[i].arg);
+                       if(keys[i].func)
+                               keys[i].func(keys[i].arg);

                }
                }

-       }

 }
 
 static void
 }
 
 static void


@@ -297,7 +312,7 @@ propertynotify(XEvent *e) {
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);

-                               if(!c->isfloat && (c->isfloat = (trans != 0)))
+                               if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))

                                        arrange();
                                break;
                        case XA_WM_NORMAL_HINTS:
                                        arrange();
                                break;
                        case XA_WM_NORMAL_HINTS:


@@ -326,6 +341,7 @@ unmapnotify(XEvent *e) {
 void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,
        [ConfigureRequest] = configurerequest,
 void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,
        [ConfigureRequest] = configurerequest,

+       [ConfigureNotify] = configurenotify,

        [DestroyNotify] = destroynotify,
        [EnterNotify] = enternotify,
        [LeaveNotify] = leavenotify,
        [DestroyNotify] = destroynotify,
        [EnterNotify] = enternotify,
        [LeaveNotify] = leavenotify,


@@ -339,31 +355,21 @@ void (*handler[LASTEvent]) (XEvent *) = {
 
 void
 grabkeys(void) {
 
 void
 grabkeys(void) {

-       static unsigned int len = sizeof key / sizeof key[0];
+       KEYS
+       unsigned int len = sizeof keys / sizeof keys[0];

        unsigned int i;
        KeyCode code;
 
        XUngrabKey(dpy, AnyKey, AnyModifier, root);
        for(i = 0; i < len; i++) {
        unsigned int i;
        KeyCode code;
 
        XUngrabKey(dpy, AnyKey, AnyModifier, root);
        for(i = 0; i < len; i++) {

-               code = XKeysymToKeycode(dpy, key[i].keysym);
-               XGrabKey(dpy, code, key[i].mod, root, True,
+               code = XKeysymToKeycode(dpy, keys[i].keysym);
+               XGrabKey(dpy, code, keys[i].mod, root, True,

                                GrabModeAsync, GrabModeAsync);
                                GrabModeAsync, GrabModeAsync);

-               XGrabKey(dpy, code, key[i].mod | LockMask, root, True,
+               XGrabKey(dpy, code, keys[i].mod | LockMask, root, True,

                                GrabModeAsync, GrabModeAsync);
                                GrabModeAsync, GrabModeAsync);

-               XGrabKey(dpy, code, key[i].mod | numlockmask, root, True,
+               XGrabKey(dpy, code, keys[i].mod | numlockmask, root, True,

                                GrabModeAsync, GrabModeAsync);
                                GrabModeAsync, GrabModeAsync);

-               XGrabKey(dpy, code, key[i].mod | numlockmask | LockMask, root, True,
+               XGrabKey(dpy, code, keys[i].mod | numlockmask | LockMask, root, True,

                                GrabModeAsync, GrabModeAsync);
        }
 }
                                GrabModeAsync, GrabModeAsync);
        }
 }

-
-void
-procevent(void) {
-       XEvent ev;
-
-       while(XPending(dpy)) {
-               XNextEvent(dpy, &ev);
-               if(handler[ev.type])
-                       (handler[ev.type])(&ev); /* call handler */
-       }
-}