s/unsigned long/ulong/

new_dwm
Anselm R Garbe 17 years ago
parent f852504014
commit 825d6cb93a

21
dwm.c

@ -61,6 +61,7 @@ enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
/* typedefs */ /* typedefs */
typedef unsigned int uint; typedef unsigned int uint;
typedef unsigned long ulong;
typedef struct Client Client; typedef struct Client Client;
struct Client { struct Client {
char name[256]; char name[256];
@ -79,8 +80,8 @@ struct Client {
typedef struct { typedef struct {
int x, y, w, h; int x, y, w, h;
unsigned long norm[ColLast]; ulong norm[ColLast];
unsigned long sel[ColLast]; ulong sel[ColLast];
Drawable drawable; Drawable drawable;
GC gc; GC gc;
struct { struct {
@ -93,7 +94,7 @@ typedef struct {
} DC; /* draw context */ } DC; /* draw context */
typedef struct { typedef struct {
unsigned long mod; ulong mod;
KeySym keysym; KeySym keysym;
void (*func)(const void *arg); void (*func)(const void *arg);
const void *arg; const void *arg;
@ -129,8 +130,8 @@ void destroynotify(XEvent *e);
void detach(Client *c); void detach(Client *c);
void detachstack(Client *c); void detachstack(Client *c);
void drawbar(void); void drawbar(void);
void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]); void drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]);
void drawtext(const char *text, unsigned long col[ColLast], Bool invert); void drawtext(const char *text, ulong col[ColLast], Bool invert);
void *emallocz(uint size); void *emallocz(uint size);
void enternotify(XEvent *e); void enternotify(XEvent *e);
void eprint(const char *errstr, ...); void eprint(const char *errstr, ...);
@ -140,7 +141,7 @@ void focusin(XEvent *e);
void focusnext(const void *arg); void focusnext(const void *arg);
void focusprev(const void *arg); void focusprev(const void *arg);
Client *getclient(Window w); Client *getclient(Window w);
unsigned long getcolor(const char *colstr); ulong getcolor(const char *colstr);
long getstate(Window w); long getstate(Window w);
Bool gettextprop(Window w, Atom atom, char *text, uint size); Bool gettextprop(Window w, Atom atom, char *text, uint size);
void grabbuttons(Client *c, Bool focused); void grabbuttons(Client *c, Bool focused);
@ -539,7 +540,7 @@ drawbar(void) {
} }
void void
drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) { drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]) {
int x; int x;
XGCValues gcv; XGCValues gcv;
XRectangle r = { dc.x, dc.y, dc.w, dc.h }; XRectangle r = { dc.x, dc.y, dc.w, dc.h };
@ -560,7 +561,7 @@ drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
} }
void void
drawtext(const char *text, unsigned long col[ColLast], Bool invert) { drawtext(const char *text, ulong col[ColLast], Bool invert) {
int x, y, w, h; int x, y, w, h;
uint len, olen; uint len, olen;
XRectangle r = { dc.x, dc.y, dc.w, dc.h }; XRectangle r = { dc.x, dc.y, dc.w, dc.h };
@ -707,7 +708,7 @@ getclient(Window w) {
return c; return c;
} }
unsigned long ulong
getcolor(const char *colstr) { getcolor(const char *colstr) {
Colormap cmap = DefaultColormap(dpy, screen); Colormap cmap = DefaultColormap(dpy, screen);
XColor color; XColor color;
@ -722,7 +723,7 @@ getstate(Window w) {
int format, status; int format, status;
long result = -1; long result = -1;
unsigned char *p = NULL; unsigned char *p = NULL;
unsigned long n, extra; ulong n, extra;
Atom real; Atom real;
status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState], status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],

Loading…
Cancel
Save