# HG changeset patch # User arg@10ksloc.org # Date 1154436361 -7200 # Node ID 5267e1204367d602e8b88b447f5e3f4bb1580385 # Parent a94577c9de73d7081adddfbac2e2684e5b91e79f uppercasing all define'd values (uppercase-prefixed should only be enum field qualifiers) diff -r a94577c9de73 -r 5267e1204367 client.c --- a/client.c Tue Aug 01 14:03:29 2006 +0200 +++ b/client.c Tue Aug 01 14:46:01 2006 +0200 @@ -244,11 +244,11 @@ 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 -r a94577c9de73 -r 5267e1204367 config.mk --- a/config.mk Tue Aug 01 14:03:29 2006 +0200 +++ b/config.mk Tue Aug 01 14:46:01 2006 +0200 @@ -11,17 +11,17 @@ 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 -r a94577c9de73 -r 5267e1204367 dwm.h --- a/dwm.h Tue Aug 01 14:03:29 2006 +0200 +++ b/dwm.h Tue Aug 01 14:46:01 2006 +0200 @@ -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 -r a94577c9de73 -r 5267e1204367 event.c --- a/event.c Tue Aug 01 14:03:29 2006 +0200 +++ b/event.c Tue Aug 01 14:46:01 2006 +0200 @@ -32,12 +32,12 @@ 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 @@ 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: