uppercasing all define'd values (uppercase-prefixed should only be enum field qualifiers)
This commit is contained in:
parent
33b4821cd6
commit
77f8c075c4
4 changed files with 18 additions and 18 deletions
6
client.c
6
client.c
|
@ -244,11 +244,11 @@ manage(Window w, XWindowAttributes *wa)
|
||||||
c->next = clients;
|
c->next = clients;
|
||||||
clients = c;
|
clients = c;
|
||||||
|
|
||||||
XGrabButton(dpy, Button1, MODKEY, c->win, False, ButtonMask,
|
XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
|
||||||
GrabModeAsync, GrabModeSync, None, None);
|
GrabModeAsync, GrabModeSync, None, None);
|
||||||
XGrabButton(dpy, Button2, MODKEY, c->win, False, ButtonMask,
|
XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK,
|
||||||
GrabModeAsync, GrabModeSync, None, None);
|
GrabModeAsync, GrabModeSync, None, None);
|
||||||
XGrabButton(dpy, Button3, MODKEY, c->win, False, ButtonMask,
|
XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK,
|
||||||
GrabModeAsync, GrabModeSync, None, None);
|
GrabModeAsync, GrabModeSync, None, None);
|
||||||
|
|
||||||
if(!c->isfloat)
|
if(!c->isfloat)
|
||||||
|
|
18
config.mk
18
config.mk
|
@ -11,17 +11,17 @@ X11LIB = /usr/X11R6/lib
|
||||||
INCS = -I/usr/lib -I${X11INC}
|
INCS = -I/usr/lib -I${X11INC}
|
||||||
LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
|
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
|
# dwm version
|
||||||
VERSION = 0.6
|
VERSION = 0.6
|
||||||
|
|
||||||
# default config.h
|
# default config.h
|
||||||
CONFIG = 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
|
||||||
|
|
4
dwm.h
4
dwm.h
|
@ -7,8 +7,8 @@
|
||||||
#include CONFIG
|
#include CONFIG
|
||||||
|
|
||||||
/* mask shorthands, used in event.c and client.c */
|
/* mask shorthands, used in event.c and client.c */
|
||||||
#define ButtonMask (ButtonPressMask | ButtonReleaseMask)
|
#define BUTTONMASK (ButtonPressMask | ButtonReleaseMask)
|
||||||
#define MouseMask (ButtonMask | PointerMotionMask)
|
#define MOUSEMASK (BUTTONMASK | PointerMotionMask)
|
||||||
|
|
||||||
typedef union Arg Arg;
|
typedef union Arg Arg;
|
||||||
typedef struct Client Client;
|
typedef struct Client Client;
|
||||||
|
|
8
event.c
8
event.c
|
@ -32,12 +32,12 @@ movemouse(Client *c)
|
||||||
|
|
||||||
ocx = c->x;
|
ocx = c->x;
|
||||||
ocy = c->y;
|
ocy = c->y;
|
||||||
if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
|
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
|
||||||
None, cursor[CurMove], CurrentTime) != GrabSuccess)
|
None, cursor[CurMove], CurrentTime) != GrabSuccess)
|
||||||
return;
|
return;
|
||||||
XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
|
XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
|
||||||
for(;;) {
|
for(;;) {
|
||||||
XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
|
XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
|
||||||
switch (ev.type) {
|
switch (ev.type) {
|
||||||
default: break;
|
default: break;
|
||||||
case Expose:
|
case Expose:
|
||||||
|
@ -65,12 +65,12 @@ resizemouse(Client *c)
|
||||||
|
|
||||||
ocx = c->x;
|
ocx = c->x;
|
||||||
ocy = c->y;
|
ocy = c->y;
|
||||||
if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
|
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
|
||||||
None, cursor[CurResize], CurrentTime) != GrabSuccess)
|
None, cursor[CurResize], CurrentTime) != GrabSuccess)
|
||||||
return;
|
return;
|
||||||
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
|
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
|
||||||
for(;;) {
|
for(;;) {
|
||||||
XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
|
XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
|
||||||
switch(ev.type) {
|
switch(ev.type) {
|
||||||
default: break;
|
default: break;
|
||||||
case Expose:
|
case Expose:
|
||||||
|
|
Loading…
Reference in a new issue