X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=33b3c564118d1ee61b4fb9bbda80653043de7434;hb=28aba061ec2a6fa7923ea00b43e1335a27a73c06;hp=4f2a69cf4df733914254f493e018575a712abac1;hpb=0915da8842fd6e16b804ae3205ec2f6baaaa342c;p=dwm.git

diff --git a/client.c b/client.c
index 4f2a69c..33b3c56 100644
--- a/client.c
+++ b/client.c
@@ -11,11 +11,17 @@
 /* static functions */
 
 static void
-grabbuttons(Client *c, Bool focus)
-{
+detachstack(Client *c) {
+	Client **tc;
+	for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+	*tc = c->snext;
+}
+
+static void
+grabbuttons(Client *c, Bool focused) {
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 
-	if(focus) {
+	if(focused) {
 		XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
 				GrabModeAsync, GrabModeSync, None, None);
 		XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
@@ -46,12 +52,10 @@ grabbuttons(Client *c, Bool focus)
 	else
 		XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
 				GrabModeAsync, GrabModeSync, None, None);
-
 }
 
 static void
-resizetitle(Client *c)
-{
+resizetitle(Client *c) {
 	c->tw = textw(c->name);
 	if(c->tw > c->w)
 		c->tw = c->w + 2;
@@ -61,30 +65,26 @@ resizetitle(Client *c)
 		XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th);
 	else
 		XMoveResizeWindow(dpy, c->twin, c->tx + 2 * sw, c->ty, c->tw, c->th);
-
 }
 
 static int
-xerrordummy(Display *dsply, XErrorEvent *ee)
-{
+xerrordummy(Display *dsply, XErrorEvent *ee) {
 	return 0;
 }
 
 /* extern functions */
 
 void
-ban(Client *c)
-{
+ban(Client *c) {
 	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
 	XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty);
 }
 
 void
-focus(Client *c)
-{
+focus(Client *c) {
 	Client *old;
 
-	if(!issel)
+	if(!issel || (c && !isvisible(c)))
 		return;
 	if(!sel)
 		sel = c;
@@ -99,6 +99,9 @@ focus(Client *c)
 		}
 	}
 	if(c) {
+		detachstack(c);
+		c->snext = stack;
+		stack = c;
 		grabbuttons(c, True);
 		drawtitle(c);
 		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
@@ -108,8 +111,7 @@ focus(Client *c)
 }
 
 Client *
-getclient(Window w)
-{
+getclient(Window w) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
@@ -119,8 +121,7 @@ getclient(Window w)
 }
 
 Client *
-getctitle(Window w)
-{
+getctitle(Window w) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
@@ -130,8 +131,7 @@ getctitle(Window w)
 }
 
 void
-gravitate(Client *c, Bool invert)
-{
+gravitate(Client *c, Bool invert) {
 	int dx = 0, dy = 0;
 
 	switch(c->grav) {
@@ -185,8 +185,7 @@ gravitate(Client *c, Bool invert)
 }
 
 void
-killclient(Arg *arg)
-{
+killclient(Arg *arg) {
 	if(!sel)
 		return;
 	if(sel->proto & PROTODELWIN)
@@ -196,10 +195,8 @@ killclient(Arg *arg)
 }
 
 void
-manage(Window w, XWindowAttributes *wa)
-{
-	unsigned int i;
-	Client *c, *tc;
+manage(Window w, XWindowAttributes *wa) {
+	Client *c;
 	Window trans;
 	XSetWindowAttributes twa;
 
@@ -213,7 +210,7 @@ manage(Window w, XWindowAttributes *wa)
 	c->th = bh;
 
 	c->border = 0;
-	setsize(c);
+	updatesize(c);
 
 	if(c->x + c->w + 2 > sw)
 		c->x = sw - c->w - 2;
@@ -238,11 +235,7 @@ manage(Window w, XWindowAttributes *wa)
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 
 	grabbuttons(c, False);
-	if((tc = getclient(trans))) /* inherit tags */
-		for(i = 0; i < ntags; i++)
-			c->tags[i] = tc->tags[i];
-	else
-		settags(c);
+	settags(c, getclient(trans));
 	if(!c->isfloat)
 		c->isfloat = trans
 			|| (c->maxw && c->minw &&
@@ -251,9 +244,10 @@ manage(Window w, XWindowAttributes *wa)
 	if(clients)
 		clients->prev = c;
 	c->next = clients;
-	clients = c;
+	c->snext = stack;
+	stack = clients = c;
 
-	settitle(c);
+	updatetitle(c);
 	ban(c);
 	XMapWindow(dpy, c->win);
 	XMapWindow(dpy, c->twin);
@@ -263,8 +257,7 @@ manage(Window w, XWindowAttributes *wa)
 }
 
 void
-resize(Client *c, Bool sizehints, Corner sticky)
-{
+resize(Client *c, Bool sizehints, Corner sticky) {
 	int bottom = c->y + c->h;
 	int right = c->x + c->w;
 	XWindowChanges wc;
@@ -288,6 +281,16 @@ resize(Client *c, Bool sizehints, Corner sticky)
 	if(sticky == BotLeft || sticky == BotRight)
 		c->y = bottom - c->h;
 
+	/* offscreen appearance fixes */
+	if(c->x + c->w < 0)
+		c->x = 0;
+	if(c->y + c->h < bh)
+		c->y = bh;
+	if(c->x > sw)
+		c->x = sw - c->w;
+	if(c->y > sh)
+		c->y = sh - c->h;
+
 	resizetitle(c);
 	wc.x = c->x;
 	wc.y = c->y;
@@ -297,13 +300,12 @@ resize(Client *c, Bool sizehints, Corner sticky)
 		wc.border_width = 0;
 	else
 		wc.border_width = 1;
-	XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+	XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
 	XSync(dpy, False);
 }
 
 void
-setsize(Client *c)
-{
+updatesize(Client *c) {
 	long msize;
 	XSizeHints size;
 
@@ -341,8 +343,7 @@ setsize(Client *c)
 }
 
 void
-settitle(Client *c)
-{
+updatetitle(Client *c) {
 	char **list = NULL;
 	int n;
 	XTextProperty name;
@@ -369,8 +370,7 @@ settitle(Client *c)
 }
 
 void
-togglemax(Arg *arg)
-{
+togglemax(Arg *arg) {
 	int ox, oy, ow, oh;
 	Client *c;
 	XEvent ev;
@@ -405,21 +405,17 @@ togglemax(Arg *arg)
 }
 
 void
-unmanage(Client *c)
-{
-	Client *tc, *fc;
-	Window trans;
+unmanage(Client *c) {
+	Client *nc;
+
 	XGrabServer(dpy);
 	XSetErrorHandler(xerrordummy);
 
 	detach(c);
+	detachstack(c);
 	if(sel == c) {
-		XGetTransientForHint(dpy, c->win, &trans);
-		if(trans && (tc = getclient(trans)) && isvisible(tc))
-			fc = tc;
-		else
-			fc = getnext(clients);
-		focus(fc);
+		for(nc = stack; nc && !isvisible(nc); nc = nc->snext);
+		focus(nc);
 	}
 
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);