X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=dbc49972399c1acd54018a8191880459fa7a8545;hp=05fbf58479a373583f26c6c2eeeb955b64e88c1e;hb=88e6eb4a3a3552d6b503481164aafc1c994d5a50;hpb=32f36ab2d58b7bcbadc0b1c9c88654cdf906c71d

diff --git a/dwm.c b/dwm.c
index 05fbf58..dbc4997 100644
--- a/dwm.c
+++ b/dwm.c
@@ -166,7 +166,7 @@ void setmfact(const void *arg);
 void setup(void);
 void spawn(const void *arg);
 void tag(const void *arg);
-uint textnw(const char *text, uint len);
+int textnw(const char *text, uint len);
 void tile(void);
 void togglebar(const void *arg);
 void togglefloating(const void *arg);
@@ -296,7 +296,8 @@ attachstack(Client *c) {
 
 void
 buttonpress(XEvent *e) {
-	uint i, x, mask;
+	uint i, mask;
+	int x;
 	Client *c;
 	XButtonPressedEvent *ev = &e->xbutton;
 
@@ -736,8 +737,7 @@ void
 grabbuttons(Client *c, Bool focused) {
 	int i, j;
 	uint buttons[]   = { Button1, Button2, Button3 };
-	uint modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask,
-				MODKEY|numlockmask|LockMask} ;
+	uint modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask, MODKEY|numlockmask|LockMask };
 
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 	if(focused)
@@ -1309,7 +1309,8 @@ setmfact(const void *arg) {
 
 void
 setup(void) {
-	uint i, w;
+	uint i;
+	int w;
 	XSetWindowAttributes wa;
 
 	/* init screen */
@@ -1414,7 +1415,7 @@ tag(const void *arg) {
 	}
 }
 
-uint
+int
 textnw(const char *text, uint len) {
 	XRectangle r;