X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=fce0a2555e06ed5071a0d54a12cff2c8b3eed4ad;hb=051a404b66dfa4f87f98411da61320a93a146ec8;hp=29157de7623815a0ba089e562a23168195f5250c;hpb=9086f98068693d22321be2bdc6779e7be7e751c7;p=dwm.git

diff --git a/dwm.c b/dwm.c
index 29157de..fce0a25 100644
--- a/dwm.c
+++ b/dwm.c
@@ -44,16 +44,17 @@
 #endif
 
 /* macros */
-#define MAX(a, b)       ((a) > (b) ? (a) : (b))
-#define MIN(a, b)       ((a) < (b) ? (a) : (b))
-#define BUTTONMASK      (ButtonPressMask|ButtonReleaseMask)
-#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask))
-#define LENGTH(x)       (sizeof x / sizeof x[0])
-#define MAXTAGLEN       16
-#define MOUSEMASK       (BUTTONMASK|PointerMotionMask)
-#define TAGMASK         ((int)((1LL << LENGTH(tags)) - 1))
-#define TEXTW(x)        (textnw(x, strlen(x)) + dc.font.height)
-#define ISVISIBLE(x)    (x->tags & tagset[seltags])
+#define BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)
+#define CLEANMASK(mask)         (mask & ~(numlockmask|LockMask))
+#define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
+#define ISVISIBLE(x)            (x->tags & tagset[seltags])
+#define LENGTH(x)               (sizeof x / sizeof x[0])
+#define MAX(a, b)               ((a) > (b) ? (a) : (b))
+#define MIN(a, b)               ((a) < (b) ? (a) : (b))
+#define MAXTAGLEN               16
+#define MOUSEMASK               (BUTTONMASK|PointerMotionMask)
+#define TAGMASK                 ((int)((1LL << LENGTH(tags)) - 1))
+#define TEXTW(x)                (textnw(x, strlen(x)) + dc.font.height)
 
 /* enums */
 enum { CurNormal, CurResize, CurMove, CurLast };        /* cursor */
@@ -158,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);
@@ -203,8 +202,10 @@ static void zoom(const Arg *arg);
 
 /* variables */
 static char stext[256];
-static int screen, sx, sy, sw, sh;
-static int by, bh, blw, wx, wy, ww, wh;
+static int screen;
+static int sx, sy, sw, sh; /* display geometry x, y, width, height */ 
+static int by, bh, blw;    /* bar geometry y, height and layout symbol width */
+static int wx, wy, ww, wh; /* window area geometry x, y, width, height, bar excluded */
 static unsigned int seltags = 0, sellt = 0;
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static unsigned int numlockmask = 0;
@@ -223,7 +224,7 @@ static void (*handler[LASTEvent]) (XEvent *) = {
 	[UnmapNotify] = unmapnotify
 };
 static Atom wmatom[WMLast], netatom[NetLast];
-static Bool otherwm, readin;
+static Bool otherwm;
 static Bool running = True;
 static unsigned int tagset[] = {1, 1}; /* after start, first tag is selected */
 static Client *clients = NULL;
@@ -348,7 +349,7 @@ checkotherwm(void) {
 
 void
 cleanup(void) {
-	Arg a = {.i = ~0};
+	Arg a = {.ui = ~0};
 	Layout foo = { "", NULL };
 
 	close(STDIN_FILENO);
@@ -499,19 +500,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) {
@@ -740,7 +745,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);
 }
@@ -748,6 +753,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;
 
@@ -763,14 +769,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);
 	}
 }
 
@@ -815,16 +816,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;
@@ -839,16 +830,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;
@@ -886,8 +867,7 @@ killclient(const Arg *arg) {
 void
 manage(Window w, XWindowAttributes *wa) {
 	Client *c, *t = NULL;
-	Status rettrans;
-	Window trans;
+	Window trans = 0;
 	XWindowChanges wc;
 
 	if(!(c = calloc(1, sizeof(Client))))
@@ -903,7 +883,7 @@ manage(Window w, XWindowAttributes *wa) {
 	if(c->w == sw && c->h == sh) {
 		c->x = sx;
 		c->y = sy;
-		c->bw = wa->border_width;
+		c->bw = 0;
 	}
 	else {
 		if(c->x + c->w + 2 * c->bw > sx + sw)
@@ -924,14 +904,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);
@@ -974,7 +954,7 @@ monocle(void) {
 
 void
 movemouse(const Arg *arg) {
-	int x1, y1, ocx, ocy, di, nx, ny;
+	int x, y, ocx, ocy, di, nx, ny;
 	unsigned int dui;
 	Client *c;
 	Window dummy;
@@ -988,7 +968,7 @@ movemouse(const Arg *arg) {
 	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
 	None, cursor[CurMove], CurrentTime) != GrabSuccess)
 		return;
-	XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
+	XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui);
 	for(;;) {
 		XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
 		switch (ev.type) {
@@ -1002,8 +982,8 @@ movemouse(const Arg *arg) {
 			break;
 		case MotionNotify:
 			XSync(dpy, False);
-			nx = ocx + (ev.xmotion.x - x1);
-			ny = ocy + (ev.xmotion.y - y1);
+			nx = ocx + (ev.xmotion.x - x);
+			ny = ocy + (ev.xmotion.y - y);
 			if(snap && nx >= wx && nx <= wx + ww
 			        && ny >= wy && ny <= wy + wh) {
 				if(abs(wx - nx) < snap)
@@ -1218,7 +1198,6 @@ run(void) {
 	/* main event loop, also reads status text from stdin */
 	XSync(dpy, False);
 	xfd = ConnectionNumber(dpy);
-	readin = True;
 	offset = 0;
 	len = sizeof stext - 1;
 	sbuf[len] = stext[len] = '\0'; /* 0-terminator is never touched */
@@ -1557,16 +1536,24 @@ updatebar(void) {
 void
 updategeom(void) {
 #ifdef XINERAMA
-	int i;
+	int n, i = 0;
 	XineramaScreenInfo *info = NULL;
 
 	/* window area geometry */
-	if(XineramaIsActive(dpy)) {
-		info = XineramaQueryScreens(dpy, &i);
-		wx = info[xidx].x_org;
-		wy = showbar && topbar ?  info[xidx].y_org + bh : info[xidx].y_org;
-		ww = info[xidx].width;
-		wh = showbar ? info[xidx].height - bh : info[xidx].height;
+	if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) { 
+		if(n > 1) {
+			int di, x, y;
+			unsigned int dui;
+			Window dummy;
+			if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui))
+				for(i = 0; i < n; i++)
+					if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
+						break;
+		}
+		wx = info[i].x_org;
+		wy = showbar && topbar ?  info[i].y_org + bh : info[i].y_org;
+		ww = info[i].width;
+		wh = showbar ? info[i].height - bh : info[i].height;
 		XFree(info);
 	}
 	else
@@ -1654,11 +1641,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();
 }