Mercurial > aewl

changeset 714:7034ee0f48d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
small changes
author Anselm R. Garbe <arg@suckless.org>
date Tue, 23 Jan 2007 12:29:17 +0100 (2007-01-23)
parents ef2c267884f3
children 5b3e4cdb6674
files client.c dwm.h event.c main.c
diffstat 4 files changed, 11 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/client.c	Tue Jan 23 12:04:22 2007 +0100
+++ b/client.c	Tue Jan 23 12:29:17 2007 +0100
@@ -85,20 +85,22 @@
 		grabbuttons(sel, False);
 		XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
 	}
-	sel = c;
-	if(!issel)
-		return;
 	if(c) {
 		detachstack(c);
 		c->snext = stack;
 		stack = c;
 		grabbuttons(c, True);
+	}
+	sel = c;
+	drawstatus();
+	if(!activescreen)
+		return;
+	if(sel) {
 		XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
 		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 	}
 	else
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-	drawstatus();
 }
 
 Client *
--- a/dwm.h	Tue Jan 23 12:04:22 2007 +0100
+++ b/dwm.h	Tue Jan 23 12:29:17 2007 +0100
@@ -93,7 +93,7 @@
 extern void (*handler[LASTEvent])(XEvent *);	/* event handler */
 extern void (*arrange)(void);			/* arrange function, indicates mode  */
 extern Atom wmatom[WMLast], netatom[NetLast];
-extern Bool running, issel, *seltag;		/* seltag is array of Bool */
+extern Bool activescreen, running, *seltag;		/* seltag is array of Bool */
 extern Client *clients, *sel, *stack;		/* global client list and stack */
 extern Cursor cursor[CurLast];
 extern DC dc;					/* global draw context */
--- a/event.c	Tue Jan 23 12:04:22 2007 +0100
+++ b/event.c	Tue Jan 23 12:29:17 2007 +0100
@@ -230,7 +230,7 @@
 	if((c = getclient(ev->window)) && isvisible(c))
 		focus(c);
 	else if(ev->window == root) {
-		issel = True;
+		activescreen = True;
 		for(c = stack; c && !isvisible(c); c = c->snext);
 		focus(c);
 	}
@@ -269,7 +269,7 @@
 	XCrossingEvent *ev = &e->xcrossing;
 
 	if((ev->window == root) && !ev->same_screen) {
-		issel = False;
+		activescreen = False;
 		focus(NULL);
 	}
 }
--- a/main.c	Tue Jan 23 12:04:22 2007 +0100
+++ b/main.c	Tue Jan 23 12:29:17 2007 +0100
@@ -23,7 +23,7 @@
 unsigned int master, nmaster, ntags, numlockmask;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
-Bool issel = True;
+Bool activescreen = True;
 Client *clients = NULL;
 Client *sel = NULL;
 Client *stack = NULL;
@@ -156,7 +156,7 @@
 	dc.gc = XCreateGC(dpy, root, 0, 0);
 	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
 	/* multihead support */
-	issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
+	activescreen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
 }
 
 /*