gmarx
/
dwm-macbookair
mirror of https://github.com/gmarxcc/dwm-macbookair
1
1
Fork 0
Code Issues 0 Projects 0 Releases 0 Wiki Activity
Browse Source

s/unsigned int/uint/

main
Anselm R Garbe 17 years ago
parent
8e05f6c592
commit
c3fa9e879f
1 changed files with 34 additions and 33 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +34
    -33
      dwm.c

+ 34
- 33
dwm.c View File

@ -60,6 +60,7 @@ enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */ enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
/* typedefs */ /* typedefs */
typedef unsigned int uint;
typedef struct Client Client; typedef struct Client Client;
struct Client { struct Client {
char name[256]; char name[256];
@ -67,9 +68,9 @@ struct Client {
int basew, baseh, incw, inch, maxw, maxh, minw, minh; int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int minax, maxax, minay, maxay; int minax, maxax, minay, maxay;
long flags; long flags;
unsigned int bw, oldbw;
uint bw, oldbw;
Bool isbanned, isfixed, isfloating, isurgent; Bool isbanned, isfixed, isfloating, isurgent;
unsigned int tags;
uint tags;
Client *next; Client *next;
Client *prev; Client *prev;
Client *snext; Client *snext;
@ -108,7 +109,7 @@ typedef struct {
const char *class; const char *class;
const char *instance; const char *instance;
const char *title; const char *title;
unsigned int tags;
uint tags;
Bool isfloating; Bool isfloating;
} Rule; } Rule;
@ -130,7 +131,7 @@ 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, unsigned long col[ColLast]);
void drawtext(const char *text, unsigned long col[ColLast], Bool invert); void drawtext(const char *text, unsigned long col[ColLast], Bool invert);
void *emallocz(unsigned int size);
void *emallocz(uint size);
void enternotify(XEvent *e); void enternotify(XEvent *e);
void eprint(const char *errstr, ...); void eprint(const char *errstr, ...);
void expose(XEvent *e); void expose(XEvent *e);
@ -141,13 +142,13 @@ void focusprev(const void *arg);
Client *getclient(Window w); Client *getclient(Window w);
unsigned long getcolor(const char *colstr); unsigned long getcolor(const char *colstr);
long getstate(Window w); long getstate(Window w);
Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
Bool gettextprop(Window w, Atom atom, char *text, uint size);
void grabbuttons(Client *c, Bool focused); void grabbuttons(Client *c, Bool focused);
void grabkeys(void); void grabkeys(void);
void initfont(const char *fontstr); void initfont(const char *fontstr);
Bool isoccupied(unsigned int t);
Bool isoccupied(uint t);
Bool isprotodel(Client *c); Bool isprotodel(Client *c);
Bool isurgent(unsigned int t);
Bool isurgent(uint t);
Bool isvisible(Client *c); Bool isvisible(Client *c);
void keypress(XEvent *e); void keypress(XEvent *e);
void killclient(const void *arg); void killclient(const void *arg);
@ -168,8 +169,8 @@ void setmfact(const void *arg);
void setup(void); void setup(void);
void spawn(const void *arg); void spawn(const void *arg);
void tag(const void *arg); void tag(const void *arg);
unsigned int textnw(const char *text, unsigned int len);
unsigned int textw(const char *text);
uint textnw(const char *text, uint len);
uint textw(const char *text);
void tile(void); void tile(void);
void tileresize(Client *c, int x, int y, int w, int h); void tileresize(Client *c, int x, int y, int w, int h);
void togglebar(const void *arg); void togglebar(const void *arg);
@ -198,9 +199,9 @@ char stext[256];
int screen, sx, sy, sw, sh; int screen, sx, sy, sw, sh;
int bx, by, bw, bh, blw, wx, wy, ww, wh; int bx, by, bw, bh, blw, wx, wy, ww, wh;
int mx, my, mw, mh, tx, ty, tw, th; int mx, my, mw, mh, tx, ty, tw, th;
unsigned int seltags = 0;
uint seltags = 0;
int (*xerrorxlib)(Display *, XErrorEvent *); int (*xerrorxlib)(Display *, XErrorEvent *);
unsigned int numlockmask = 0;
uint numlockmask = 0;
void (*handler[LASTEvent]) (XEvent *) = { void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress, [ButtonPress] = buttonpress,
[ConfigureRequest] = configurerequest, [ConfigureRequest] = configurerequest,
@ -218,7 +219,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
Atom wmatom[WMLast], netatom[NetLast]; Atom wmatom[WMLast], netatom[NetLast];
Bool otherwm, readin; Bool otherwm, readin;
Bool running = True; Bool running = True;
unsigned int tagset[] = {1, 1}; /* after start, first tag is selected */
uint tagset[] = {1, 1}; /* after start, first tag is selected */
Client *clients = NULL; Client *clients = NULL;
Client *sel = NULL; Client *sel = NULL;
Client *stack = NULL; Client *stack = NULL;
@ -232,14 +233,14 @@ Window root, barwin;
/* configuration, allows nested code to access above variables */ /* configuration, allows nested code to access above variables */
#include "config.h" #include "config.h"
/* check if all tags will fit into a unsigned int bitarray. */
/* check if all tags will fit into a uint bitarray. */
static char tags_is_a_sign_that_your_IQ[sizeof(int) * 8 < LENGTH(tags) ? -1 : 1]; static char tags_is_a_sign_that_your_IQ[sizeof(int) * 8 < LENGTH(tags) ? -1 : 1];
/* function implementations */ /* function implementations */
void void
applyrules(Client *c) { applyrules(Client *c) {
unsigned int i;
uint i;
Rule *r; Rule *r;
XClassHint ch = { 0 }; XClassHint ch = { 0 };
@ -305,7 +306,7 @@ ban(Client *c) {
void void
buttonpress(XEvent *e) { buttonpress(XEvent *e) {
unsigned int i, x, mask;
uint i, x, mask;
Client *c; Client *c;
XButtonPressedEvent *ev = &e->xbutton; XButtonPressedEvent *ev = &e->xbutton;
@ -561,7 +562,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, unsigned long col[ColLast], Bool invert) {
int x, y, w, h; int x, y, w, h;
unsigned int 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 };
char buf[256]; char buf[256];
@ -596,7 +597,7 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
} }
void * void *
emallocz(unsigned int size) {
emallocz(uint size) {
void *res = calloc(1, size); void *res = calloc(1, size);
if(!res) if(!res)
@ -735,7 +736,7 @@ getstate(Window w) {
} }
Bool Bool
gettextprop(Window w, Atom atom, char *text, unsigned int size) {
gettextprop(Window w, Atom atom, char *text, uint size) {
char **list = NULL; char **list = NULL;
int n; int n;
XTextProperty name; XTextProperty name;
@ -763,8 +764,8 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
void void
grabbuttons(Client *c, Bool focused) { grabbuttons(Client *c, Bool focused) {
int i, j; int i, j;
unsigned int buttons[] = { Button1, Button2, Button3 };
unsigned int modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask,
uint buttons[] = { Button1, Button2, Button3 };
uint modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask,
MODKEY|numlockmask|LockMask} ; MODKEY|numlockmask|LockMask} ;
XUngrabButton(dpy, AnyButton, AnyModifier, c->win); XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
@ -780,7 +781,7 @@ grabbuttons(Client *c, Bool focused) {
void void
grabkeys(void) { grabkeys(void) {
unsigned int i, j;
uint i, j;
KeyCode code; KeyCode code;
XModifierKeymap *modmap; XModifierKeymap *modmap;
@ -848,7 +849,7 @@ initfont(const char *fontstr) {
} }
Bool Bool
isoccupied(unsigned int t) {
isoccupied(uint t) {
Client *c; Client *c;
for(c = clients; c; c = c->next) for(c = clients; c; c = c->next)
@ -873,7 +874,7 @@ isprotodel(Client *c) {
} }
Bool Bool
isurgent(unsigned int t) {
isurgent(uint t) {
Client *c; Client *c;
for(c = clients; c; c = c->next) for(c = clients; c; c = c->next)
@ -889,7 +890,7 @@ isvisible(Client *c) {
void void
keypress(XEvent *e) { keypress(XEvent *e) {
unsigned int i;
uint i;
KeySym keysym; KeySym keysym;
XKeyEvent *ev; XKeyEvent *ev;
@ -1004,7 +1005,7 @@ maprequest(XEvent *e) {
void void
movemouse(Client *c) { movemouse(Client *c) {
int x1, y1, ocx, ocy, di, nx, ny; int x1, y1, ocx, ocy, di, nx, ny;
unsigned int dui;
uint dui;
Window dummy; Window dummy;
XEvent ev; XEvent ev;
@ -1230,7 +1231,7 @@ run(void) {
char sbuf[sizeof stext]; char sbuf[sizeof stext];
fd_set rd; fd_set rd;
int r, xfd; int r, xfd;
unsigned int len, offset;
uint len, offset;
XEvent ev; XEvent ev;
/* main event loop, also reads status text from stdin */ /* main event loop, also reads status text from stdin */
@ -1286,7 +1287,7 @@ run(void) {
void void
scan(void) { scan(void) {
unsigned int i, num;
uint i, num;
Window *wins, d1, d2; Window *wins, d1, d2;
XWindowAttributes wa; XWindowAttributes wa;
@ -1336,7 +1337,7 @@ setmfact(const void *arg) {
void void
setup(void) { setup(void) {
unsigned int i, w;
uint i, w;
XSetWindowAttributes wa; XSetWindowAttributes wa;
/* init screen */ /* init screen */
@ -1441,8 +1442,8 @@ tag(const void *arg) {
} }
} }
unsigned int
textnw(const char *text, unsigned int len) {
uint
textnw(const char *text, uint len) {
XRectangle r; XRectangle r;
if(dc.font.set) { if(dc.font.set) {
@ -1452,7 +1453,7 @@ textnw(const char *text, unsigned int len) {
return XTextWidth(dc.font.xfont, text, len); return XTextWidth(dc.font.xfont, text, len);
} }
unsigned int
uint
textw(const char *text) { textw(const char *text) {
return textnw(text, strlen(text)) + dc.font.height; return textnw(text, strlen(text)) + dc.font.height;
} }
@ -1460,7 +1461,7 @@ textw(const char *text) {
void void
tile(void) { tile(void) {
int x, y, h, w; int x, y, h, w;
unsigned int i, n;
uint i, n;
Client *c; Client *c;
for(n = 0, c = nextunfloating(clients); c; c = nextunfloating(c->next), n++); for(n = 0, c = nextunfloating(clients); c; c = nextunfloating(c->next), n++);
@ -1524,7 +1525,7 @@ togglefloating(const void *arg) {
void void
togglelayout(const void *arg) { togglelayout(const void *arg) {
unsigned int i;
uint i;
if(!arg) { if(!arg) {
if(++lt == &layouts[LENGTH(layouts)]) if(++lt == &layouts[LENGTH(layouts)])


Write Preview
Loading…
Cancel
Save