dwm-meillo
changeset 148:5267e1204367
uppercasing all define'd values (uppercase-prefixed should only be enum field qualifiers)
| author | arg@10ksloc.org |
|---|---|
| date | Tue, 01 Aug 2006 14:46:01 +0200 |
| parents | a94577c9de73 |
| children | 332fcc6d4f88 |
| files | client.c config.mk dwm.h event.c |
| diffstat | 4 files changed, 18 insertions(+), 18 deletions(-) [+] |
line diff
1.1 --- a/client.c Tue Aug 01 14:03:29 2006 +0200 1.2 +++ b/client.c Tue Aug 01 14:46:01 2006 +0200 1.3 @@ -244,11 +244,11 @@ 1.4 c->next = clients; 1.5 clients = c; 1.6 1.7 - XGrabButton(dpy, Button1, MODKEY, c->win, False, ButtonMask, 1.8 + XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK, 1.9 GrabModeAsync, GrabModeSync, None, None); 1.10 - XGrabButton(dpy, Button2, MODKEY, c->win, False, ButtonMask, 1.11 + XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK, 1.12 GrabModeAsync, GrabModeSync, None, None); 1.13 - XGrabButton(dpy, Button3, MODKEY, c->win, False, ButtonMask, 1.14 + XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK, 1.15 GrabModeAsync, GrabModeSync, None, None); 1.16 1.17 if(!c->isfloat)
2.1 --- a/config.mk Tue Aug 01 14:03:29 2006 +0200 2.2 +++ b/config.mk Tue Aug 01 14:46:01 2006 +0200 2.3 @@ -11,17 +11,17 @@ 2.4 INCS = -I/usr/lib -I${X11INC} 2.5 LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 2.6 2.7 -# flags 2.8 -CFLAGS = -O3 ${INCS} -DVERSION=\"${VERSION}\" -DCONFIG=\"${CONFIG}\" 2.9 -LDFLAGS = ${LIBS} 2.10 -#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" -DCONFIG=\"${CONFIGH}\" 2.11 -#LDFLAGS = -g ${LIBS} 2.12 - 2.13 -# compiler 2.14 -CC = cc 2.15 - 2.16 # dwm version 2.17 VERSION = 0.6 2.18 2.19 # default config.h 2.20 CONFIG = config.h 2.21 + 2.22 +# flags 2.23 +CFLAGS = -O3 ${INCS} -DVERSION=\"${VERSION}\" -DCONFIG=\"${CONFIG}\" 2.24 +LDFLAGS = ${LIBS} 2.25 +#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" -DCONFIG=\"${CONFIG}\" 2.26 +#LDFLAGS = -g ${LIBS} 2.27 + 2.28 +# compiler 2.29 +CC = cc
3.1 --- a/dwm.h Tue Aug 01 14:03:29 2006 +0200 3.2 +++ b/dwm.h Tue Aug 01 14:46:01 2006 +0200 3.3 @@ -7,8 +7,8 @@ 3.4 #include CONFIG 3.5 3.6 /* mask shorthands, used in event.c and client.c */ 3.7 -#define ButtonMask (ButtonPressMask | ButtonReleaseMask) 3.8 -#define MouseMask (ButtonMask | PointerMotionMask) 3.9 +#define BUTTONMASK (ButtonPressMask | ButtonReleaseMask) 3.10 +#define MOUSEMASK (BUTTONMASK | PointerMotionMask) 3.11 3.12 typedef union Arg Arg; 3.13 typedef struct Client Client;
4.1 --- a/event.c Tue Aug 01 14:03:29 2006 +0200 4.2 +++ b/event.c Tue Aug 01 14:46:01 2006 +0200 4.3 @@ -32,12 +32,12 @@ 4.4 4.5 ocx = c->x; 4.6 ocy = c->y; 4.7 - if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync, 4.8 + if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, 4.9 None, cursor[CurMove], CurrentTime) != GrabSuccess) 4.10 return; 4.11 XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui); 4.12 for(;;) { 4.13 - XMaskEvent(dpy, MouseMask | ExposureMask, &ev); 4.14 + XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev); 4.15 switch (ev.type) { 4.16 default: break; 4.17 case Expose: 4.18 @@ -65,12 +65,12 @@ 4.19 4.20 ocx = c->x; 4.21 ocy = c->y; 4.22 - if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync, 4.23 + if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, 4.24 None, cursor[CurResize], CurrentTime) != GrabSuccess) 4.25 return; 4.26 XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h); 4.27 for(;;) { 4.28 - XMaskEvent(dpy, MouseMask | ExposureMask, &ev); 4.29 + XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev); 4.30 switch(ev.type) { 4.31 default: break; 4.32 case Expose: