X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=8591a7d85ef505993db0f765c2acbf4367dbeb97;hb=06f7eed103057e55201e143fd319afd4bd410bdb;hp=279f831f8a3c9893523ccf1419af53e7d7928462;hpb=b279cef670e4d0e744e50331fce7a1f4a4e73798;p=dwm.git

diff --git a/dwm.c b/dwm.c
index 279f831..8591a7d 100644
--- a/dwm.c
+++ b/dwm.c
@@ -159,9 +159,7 @@ static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
 static void grabbuttons(Client *c, Bool focused);
 static void grabkeys(void);
 static void initfont(const char *fontstr);
-static Bool isoccupied(unsigned int t);
 static Bool isprotodel(Client *c);
-static Bool isurgent(unsigned int t);
 static void keypress(XEvent *e);
 static void killclient(const Arg *arg);
 static void manage(Window w, XWindowAttributes *wa);
@@ -349,7 +347,7 @@ checkotherwm(void) {
 
 void
 cleanup(void) {
-	Arg a = {.i = ~0};
+	Arg a = {.ui = ~0};
 	Layout foo = { "", NULL };
 
 	close(STDIN_FILENO);
@@ -500,19 +498,23 @@ die(const char *errstr, ...) {
 
 void
 drawbar(void) {
-	int i, x;
+	int x;
+	unsigned int i, occ = 0, urg = 0;
+	unsigned long *col;
+	Client *c;
+
+	for(c = clients; c; c = c->next) {
+		occ |= c->tags;
+		if(c->isurgent)
+			urg |= c->tags;
+	}
 
 	dc.x = 0;
 	for(i = 0; i < LENGTH(tags); i++) {
 		dc.w = TEXTW(tags[i]);
-		if(tagset[seltags] & 1 << i) {
-			drawtext(tags[i], dc.sel, isurgent(i));
-			drawsquare(sel && sel->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel);
-		}
-		else {
-			drawtext(tags[i], dc.norm, isurgent(i));
-			drawsquare(sel && sel->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm);
-		}
+		col = tagset[seltags] & 1 << i ? dc.sel : dc.norm;
+		drawtext(tags[i], col, urg & 1 << i);
+		drawsquare(sel && sel->tags & 1 << i, occ & 1 << i, urg & 1 << i, col);
 		dc.x += dc.w;
 	}
 	if(blw > 0) {
@@ -741,7 +743,7 @@ grabbuttons(Client *c, Bool focused) {
 			if(buttons[i].click == ClkClientWin)
 				for(j = 0; j < LENGTH(modifiers); j++)
 					XGrabButton(dpy, buttons[i].button, buttons[i].mask | modifiers[j], c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
-        } else
+	} else
 		XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
 		            BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
 }
@@ -749,6 +751,7 @@ grabbuttons(Client *c, Bool focused) {
 void
 grabkeys(void) {
 	unsigned int i, j;
+	unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
 	KeyCode code;
 	XModifierKeymap *modmap;
 
@@ -764,14 +767,9 @@ grabkeys(void) {
 	XUngrabKey(dpy, AnyKey, AnyModifier, root);
 	for(i = 0; i < LENGTH(keys); i++) {
 		code = XKeysymToKeycode(dpy, keys[i].keysym);
-		XGrabKey(dpy, code, keys[i].mod, root, True,
-				GrabModeAsync, GrabModeAsync);
-		XGrabKey(dpy, code, keys[i].mod|LockMask, root, True,
-				GrabModeAsync, GrabModeAsync);
-		XGrabKey(dpy, code, keys[i].mod|numlockmask, root, True,
-				GrabModeAsync, GrabModeAsync);
-		XGrabKey(dpy, code, keys[i].mod|numlockmask|LockMask, root, True,
-				GrabModeAsync, GrabModeAsync);
+		for(j = 0; j < LENGTH(modifiers); j++)
+			XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, True,
+			         GrabModeAsync, GrabModeAsync);
 	}
 }
 
@@ -816,16 +814,6 @@ initfont(const char *fontstr) {
 }
 
 Bool
-isoccupied(unsigned int t) {
-	Client *c;
-
-	for(c = clients; c; c = c->next)
-		if(c->tags & 1 << t)
-			return True;
-	return False;
-}
-
-Bool
 isprotodel(Client *c) {
 	int i, n;
 	Atom *protocols;
@@ -840,16 +828,6 @@ isprotodel(Client *c) {
 	return ret;
 }
 
-Bool
-isurgent(unsigned int t) {
-	Client *c;
-
-	for(c = clients; c; c = c->next)
-		if(c->isurgent && c->tags & 1 << t)
-			return True;
-	return False;
-}
-
 void
 keypress(XEvent *e) {
 	unsigned int i;
@@ -887,7 +865,6 @@ killclient(const Arg *arg) {
 void
 manage(Window w, XWindowAttributes *wa) {
 	Client *c, *t = NULL;
-	Status rettrans;
 	Window trans;
 	XWindowChanges wc;
 
@@ -925,14 +902,14 @@ manage(Window w, XWindowAttributes *wa) {
 	XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
 	grabbuttons(c, False);
 	updatetitle(c);
-	if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
-		for(t = clients; t && t->win != trans; t = t->next);
+	if(XGetTransientForHint(dpy, w, &trans))
+		t = getclient(trans);
 	if(t)
 		c->tags = t->tags;
 	else
 		applyrules(c);
 	if(!c->isfloating)
-		c->isfloating = (rettrans == Success) || c->isfixed;
+		c->isfloating = trans || c->isfixed;
 	if(c->isfloating)
 		XRaiseWindow(dpy, c->win);
 	attach(c);
@@ -1662,11 +1639,11 @@ updatewmhints(Client *c) {
 
 void
 view(const Arg *arg) {
-	if(arg && (arg->i & TAGMASK) == tagset[seltags])
+	if(arg && (arg->ui & TAGMASK) == tagset[seltags])
 		return;
 	seltags ^= 1; /* toggle sel tagset */
 	if(arg && (arg->ui & TAGMASK))
-		tagset[seltags] = arg->i & TAGMASK;
+		tagset[seltags] = arg->ui & TAGMASK;
 	clearurgent();
 	arrange();
 }