uppercasing all define'd values (uppercase-prefixed should only be enum field qualifiers)
77f8c075
4 file(s) · +16 −16
| 244 | 244 | c->next = clients; |
|
| 245 | 245 | clients = c; |
|
| 246 | 246 | ||
| 247 | - | XGrabButton(dpy, Button1, MODKEY, c->win, False, ButtonMask, |
|
| 247 | + | XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK, |
|
| 248 | 248 | GrabModeAsync, GrabModeSync, None, None); |
|
| 249 | - | XGrabButton(dpy, Button2, MODKEY, c->win, False, ButtonMask, |
|
| 249 | + | XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK, |
|
| 250 | 250 | GrabModeAsync, GrabModeSync, None, None); |
|
| 251 | - | XGrabButton(dpy, Button3, MODKEY, c->win, False, ButtonMask, |
|
| 251 | + | XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK, |
|
| 252 | 252 | GrabModeAsync, GrabModeSync, None, None); |
|
| 253 | 253 | ||
| 254 | 254 | if(!c->isfloat) |
| 11 | 11 | INCS = -I/usr/lib -I${X11INC} |
|
| 12 | 12 | LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 |
|
| 13 | 13 | ||
| 14 | + | # dwm version |
|
| 15 | + | VERSION = 0.6 |
|
| 16 | + | ||
| 17 | + | # default config.h |
|
| 18 | + | CONFIG = config.h |
|
| 19 | + | ||
| 14 | 20 | # flags |
|
| 15 | 21 | CFLAGS = -O3 ${INCS} -DVERSION=\"${VERSION}\" -DCONFIG=\"${CONFIG}\" |
|
| 16 | 22 | LDFLAGS = ${LIBS} |
|
| 17 | - | #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" -DCONFIG=\"${CONFIGH}\" |
|
| 23 | + | #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" -DCONFIG=\"${CONFIG}\" |
|
| 18 | 24 | #LDFLAGS = -g ${LIBS} |
|
| 19 | 25 | ||
| 20 | 26 | # compiler |
|
| 21 | 27 | CC = cc |
|
| 22 | - | ||
| 23 | - | # dwm version |
|
| 24 | - | VERSION = 0.6 |
|
| 25 | - | ||
| 26 | - | # default config.h |
|
| 27 | - | CONFIG = config.h |
| 7 | 7 | #include CONFIG |
|
| 8 | 8 | ||
| 9 | 9 | /* mask shorthands, used in event.c and client.c */ |
|
| 10 | - | #define ButtonMask (ButtonPressMask | ButtonReleaseMask) |
|
| 11 | - | #define MouseMask (ButtonMask | PointerMotionMask) |
|
| 10 | + | #define BUTTONMASK (ButtonPressMask | ButtonReleaseMask) |
|
| 11 | + | #define MOUSEMASK (BUTTONMASK | PointerMotionMask) |
|
| 12 | 12 | ||
| 13 | 13 | typedef union Arg Arg; |
|
| 14 | 14 | typedef struct Client Client; |
| 32 | 32 | ||
| 33 | 33 | ocx = c->x; |
|
| 34 | 34 | ocy = c->y; |
|
| 35 | - | if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync, |
|
| 35 | + | if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, |
|
| 36 | 36 | None, cursor[CurMove], CurrentTime) != GrabSuccess) |
|
| 37 | 37 | return; |
|
| 38 | 38 | XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui); |
|
| 39 | 39 | for(;;) { |
|
| 40 | - | XMaskEvent(dpy, MouseMask | ExposureMask, &ev); |
|
| 40 | + | XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev); |
|
| 41 | 41 | switch (ev.type) { |
|
| 42 | 42 | default: break; |
|
| 43 | 43 | case Expose: |
|
| 65 | 65 | ||
| 66 | 66 | ocx = c->x; |
|
| 67 | 67 | ocy = c->y; |
|
| 68 | - | if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync, |
|
| 68 | + | if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, |
|
| 69 | 69 | None, cursor[CurResize], CurrentTime) != GrabSuccess) |
|
| 70 | 70 | return; |
|
| 71 | 71 | XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h); |
|
| 72 | 72 | for(;;) { |
|
| 73 | - | XMaskEvent(dpy, MouseMask | ExposureMask, &ev); |
|
| 73 | + | XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev); |
|
| 74 | 74 | switch(ev.type) { |
|
| 75 | 75 | default: break; |
|
| 76 | 76 | case Expose: |
|