From 77f8c075c48e510e064b8f0b7b823a7e1f9f44b7 Mon Sep 17 00:00:00 2001 From: "arg@10ksloc.org" Date: Tue, 1 Aug 2006 14:46:01 +0200 Subject: [PATCH] uppercasing all define'd values (uppercase-prefixed should only be enum field qualifiers) --- client.c | 6 +++--- config.mk | 18 +++++++++--------- dwm.h | 4 ++-- event.c | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/client.c b/client.c index 646bcc1..7bc6772 100644 --- 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 d65472e..b3c8cf7 100644 --- 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 -# flags -CFLAGS = -O3 ${INCS} -DVERSION=\"${VERSION}\" -DCONFIG=\"${CONFIG}\" -LDFLAGS = ${LIBS} -#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" -DCONFIG=\"${CONFIGH}\" -#LDFLAGS = -g ${LIBS} - -# compiler -CC = cc - # 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=\"${CONFIG}\" +#LDFLAGS = -g ${LIBS} + +# compiler +CC = cc diff --git a/dwm.h b/dwm.h index f7bebb0..f57a8ce 100644 --- 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 967be91..99216b3 100644 --- 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: