yet another fix of copyright compactisition

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 3086284..c41c975 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
@@ -112,27 +113,29 @@ 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;
                        }
@@ -140,16 +143,7 @@ buttonpress(XEvent *e) {
                if(ev->x < x + blw)
                        switch(ev->button) {
                        case Button1:
-                               a.i = -1;
-                               setlayout(&a);
-                               break;
-                       case Button4:
-                               a.i = 1;
-                               incnmaster(&a);
-                               break;
-                       case Button5:
-                               a.i = -1;
-                               incnmaster(&a);
+                               setlayout(NULL);
                                break;
                        }
        }
@@ -157,14 +151,14 @@ buttonpress(XEvent *e) {
                focus(c);
                if(CLEANMASK(ev->state) != MODKEY)
                        return;
-               if(ev->button == Button1 && (lt->arrange == versatile || c->isversatile)) {
+               if(ev->button == Button1 && (lt->arrange == floating || c->isfloating)) {
                        restack();
                        movemouse(c);
                }
                else if(ev->button == Button2)
                        zoom(NULL);
                else if(ev->button == Button3
-               && (lt->arrange == versatile || c->isversatile) && !c->isfixed)
+               && (lt->arrange == floating || c->isfloating) && !c->isfixed)
                {
                        restack();
                        resizemouse(c);
@@ -180,9 +174,7 @@ 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->isversatile || (lt->arrange == versatile)) {
+               if(c->isfixed || c->isfloating || (lt->arrange == floating)) {
                        if(ev->value_mask & CWX)
                                c->x = ev->x;
                        if(ev->value_mask & CWY)
@@ -197,8 +189,12 @@ configurerequest(XEvent *e) {
                        if(isvisible(c))
                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
                }
-               else
+               else {
+                       if(ev->value_mask & CWBorderWidth)
+                               c->border = ev->border_width;
                        configure(c);
+                       c->border = BORDERPX;
+               }
        }
        else {
                wc.x = ev->x;
@@ -261,7 +257,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);
                }
 }
 
@@ -310,7 +306,7 @@ propertynotify(XEvent *e) {
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);
-                               if(!c->isversatile && (c->isversatile = (getclient(trans) != NULL)))
+                               if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
                                        lt->arrange();
                                break;
                        case XA_WM_NORMAL_HINTS: