s/unsigned long/ulong/
825d6cb9
1 file(s) · +11 −10
| 61 | 61 | ||
| 62 | 62 | /* typedefs */ |
|
| 63 | 63 | typedef unsigned int uint; |
|
| 64 | + | typedef unsigned long ulong; |
|
| 64 | 65 | typedef struct Client Client; |
|
| 65 | 66 | struct Client { |
|
| 66 | 67 | char name[256]; |
|
| 79 | 80 | ||
| 80 | 81 | typedef struct { |
|
| 81 | 82 | int x, y, w, h; |
|
| 82 | - | unsigned long norm[ColLast]; |
|
| 83 | - | unsigned long sel[ColLast]; |
|
| 83 | + | ulong norm[ColLast]; |
|
| 84 | + | ulong sel[ColLast]; |
|
| 84 | 85 | Drawable drawable; |
|
| 85 | 86 | GC gc; |
|
| 86 | 87 | struct { |
|
| 93 | 94 | } DC; /* draw context */ |
|
| 94 | 95 | ||
| 95 | 96 | typedef struct { |
|
| 96 | - | unsigned long mod; |
|
| 97 | + | ulong mod; |
|
| 97 | 98 | KeySym keysym; |
|
| 98 | 99 | void (*func)(const void *arg); |
|
| 99 | 100 | const void *arg; |
|
| 129 | 130 | void detach(Client *c); |
|
| 130 | 131 | void detachstack(Client *c); |
|
| 131 | 132 | void drawbar(void); |
|
| 132 | - | void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]); |
|
| 133 | - | void drawtext(const char *text, unsigned long col[ColLast], Bool invert); |
|
| 133 | + | void drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]); |
|
| 134 | + | void drawtext(const char *text, ulong col[ColLast], Bool invert); |
|
| 134 | 135 | void *emallocz(uint size); |
|
| 135 | 136 | void enternotify(XEvent *e); |
|
| 136 | 137 | void eprint(const char *errstr, ...); |
|
| 140 | 141 | void focusnext(const void *arg); |
|
| 141 | 142 | void focusprev(const void *arg); |
|
| 142 | 143 | Client *getclient(Window w); |
|
| 143 | - | unsigned long getcolor(const char *colstr); |
|
| 144 | + | ulong getcolor(const char *colstr); |
|
| 144 | 145 | long getstate(Window w); |
|
| 145 | 146 | Bool gettextprop(Window w, Atom atom, char *text, uint size); |
|
| 146 | 147 | void grabbuttons(Client *c, Bool focused); |
|
| 539 | 540 | } |
|
| 540 | 541 | ||
| 541 | 542 | void |
|
| 542 | - | drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) { |
|
| 543 | + | drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]) { |
|
| 543 | 544 | int x; |
|
| 544 | 545 | XGCValues gcv; |
|
| 545 | 546 | XRectangle r = { dc.x, dc.y, dc.w, dc.h }; |
|
| 560 | 561 | } |
|
| 561 | 562 | ||
| 562 | 563 | void |
|
| 563 | - | drawtext(const char *text, unsigned long col[ColLast], Bool invert) { |
|
| 564 | + | drawtext(const char *text, ulong col[ColLast], Bool invert) { |
|
| 564 | 565 | int x, y, w, h; |
|
| 565 | 566 | uint len, olen; |
|
| 566 | 567 | XRectangle r = { dc.x, dc.y, dc.w, dc.h }; |
|
| 707 | 708 | return c; |
|
| 708 | 709 | } |
|
| 709 | 710 | ||
| 710 | - | unsigned long |
|
| 711 | + | ulong |
|
| 711 | 712 | getcolor(const char *colstr) { |
|
| 712 | 713 | Colormap cmap = DefaultColormap(dpy, screen); |
|
| 713 | 714 | XColor color; |
|
| 722 | 723 | int format, status; |
|
| 723 | 724 | long result = -1; |
|
| 724 | 725 | unsigned char *p = NULL; |
|
| 725 | - | unsigned long n, extra; |
|
| 726 | + | ulong n, extra; |
|
| 726 | 727 | Atom real; |
|
| 727 | 728 | ||
| 728 | 729 | status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState], |
|