uppercasing all define'd values (uppercase-prefixed should only be enum field qualifiers)

diff --git a/client.c b/client.c
index 646bcc16ff7578f083460f93acc46c7ea0e9c5f8..7bc6772d57d7c130908112bafebc3fb693aaf42d 100644 (file)
--- a/client.c
+++ b/client.c
@@ -244,11 +244,11 @@ manage(Window w, XWindowAttributes *wa)
        c->next = clients;
        clients = c;
 
-       XGrabButton(dpy, Button1, MODKEY, c->win, False, ButtonMask,
+       XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, Button2, MODKEY, c->win, False, ButtonMask,
+       XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, Button3, MODKEY, c->win, False, ButtonMask,
+       XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
 
        if(!c->isfloat)

diff --git a/config.mk b/config.mk
index d65472e97048513dbc94d4c2cbc4c9cf94258259..b3c8cf749010010175a262f09df62edf4fc6d0ab 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -11,17 +11,17 @@ X11LIB = /usr/X11R6/lib
 INCS = -I/usr/lib -I${X11INC}
 LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
 
+# dwm version
+VERSION = 0.6
+
+# default config.h
+CONFIG = config.h
+
 # flags
 CFLAGS = -O3 ${INCS} -DVERSION=\"${VERSION}\" -DCONFIG=\"${CONFIG}\"
 LDFLAGS = ${LIBS}
-#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" -DCONFIG=\"${CONFIGH}\"
+#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" -DCONFIG=\"${CONFIG}\"
 #LDFLAGS = -g ${LIBS}
 
 # compiler
 CC = cc
-
-# dwm version
-VERSION = 0.6
-
-# default config.h
-CONFIG = config.h

diff --git a/dwm.h b/dwm.h
index f7bebb05ef5899664b2d3ea452164afcda0eb58f..f57a8ce23787b48858cf6e6f61bd94158416d70a 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -7,8 +7,8 @@
 #include CONFIG
 
 /* mask shorthands, used in event.c and client.c */
-#define ButtonMask     (ButtonPressMask | ButtonReleaseMask)
-#define MouseMask      (ButtonMask | PointerMotionMask)
+#define BUTTONMASK     (ButtonPressMask | ButtonReleaseMask)
+#define MOUSEMASK      (BUTTONMASK | PointerMotionMask)
 
 typedef union Arg Arg;
 typedef struct Client Client;

diff --git a/event.c b/event.c
index 967be91cd7f7fee4eacabb5488a434f7efe5b602..99216b3cb54a64c07c389c288b14f7256642d01c 100644 (file)
--- a/event.c
+++ b/event.c
@@ -32,12 +32,12 @@ movemouse(Client *c)
 
        ocx = c->x;
        ocy = c->y;
-       if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
+       if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
                        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;
        XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
        for(;;) {
-               XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
+               XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
                switch (ev.type) {
                default: break;
                case Expose:
@@ -65,12 +65,12 @@ resizemouse(Client *c)
 
        ocx = c->x;
        ocy = c->y;
-       if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
+       if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
                                None, cursor[CurResize], CurrentTime) != GrabSuccess)
                return;
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
        for(;;) {
-               XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
+               XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
                switch(ev.type) {
                default: break;
                case Expose: