X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/8a6679b3b4999559059df3ae9e08951099511036..d7734f996ff2eae29fea14af76711d7f51648c10:/client.c

diff --git a/client.c b/client.c
index 0a7df77..c65a42b 100644
--- a/client.c
+++ b/client.c
@@ -1,5 +1,4 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
@@ -11,11 +10,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,63 +51,68 @@ grabbuttons(Client *c, Bool focus)
 	else
 		XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
 				GrabModeAsync, GrabModeSync, None, None);
-
-}
-
-static void
-resizetitle(Client *c)
-{
-	c->tw = textw(c->name);
-	if(c->tw > c->w)
-		c->tw = c->w + 2;
-	c->tx = c->x + c->w - c->tw + 2;
-	c->ty = c->y;
-	if(isvisible(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)
-{
-	Client *old = sel;
+configure(Client *c) {
+	XEvent synev;
+
+	synev.type = ConfigureNotify;
+	synev.xconfigure.display = dpy;
+	synev.xconfigure.event = c->win;
+	synev.xconfigure.window = c->win;
+	synev.xconfigure.x = c->x;
+	synev.xconfigure.y = c->y;
+	synev.xconfigure.width = c->w;
+	synev.xconfigure.height = c->h;
+	synev.xconfigure.border_width = c->border;
+	synev.xconfigure.above = None;
+	XSendEvent(dpy, c->win, True, NoEventMask, &synev);
+}
+
+void
+focus(Client *c) {
+	Client *old;
 
-	if(!issel)
+	if(!issel || (c && !isvisible(c)))
 		return;
 	if(!sel)
 		sel = c;
 	else if(sel != c) {
-		if(sel->ismax)
-			togglemax(NULL);
+		old = sel;
 		sel = c;
-		grabbuttons(old, False);
-		drawtitle(old);
+		if(old) {
+			grabbuttons(old, False);
+			drawtitle(old);
+		}
+	}
+	if(c) {
+		detachstack(c);
+		c->snext = stack;
+		stack = c;
+		grabbuttons(c, True);
+		drawtitle(c);
+		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 	}
-	grabbuttons(c, True);
-	drawtitle(c);
-	XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+	else
+		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 }
 
 Client *
-getclient(Window w)
-{
+getclient(Window w) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
@@ -112,8 +122,7 @@ getclient(Window w)
 }
 
 Client *
-getctitle(Window w)
-{
+getctitle(Window w) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
@@ -123,8 +132,7 @@ getctitle(Window w)
 }
 
 void
-gravitate(Client *c, Bool invert)
-{
+gravitate(Client *c, Bool invert) {
 	int dx = 0, dy = 0;
 
 	switch(c->grav) {
@@ -147,7 +155,6 @@ gravitate(Client *c, Bool invert)
 		dy = -(c->h);
 		break;
 	}
-
 	switch (c->grav) {
 	default:
 		break;
@@ -168,7 +175,6 @@ gravitate(Client *c, Bool invert)
 		dx = -(c->w + c->border);
 		break;
 	}
-
 	if(invert) {
 		dx = -dx;
 		dy = -dy;
@@ -178,8 +184,7 @@ gravitate(Client *c, Bool invert)
 }
 
 void
-killclient(Arg *arg)
-{
+killclient(Arg *arg) {
 	if(!sel)
 		return;
 	if(sel->proto & PROTODELWIN)
@@ -189,10 +194,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;
 
@@ -204,19 +207,16 @@ manage(Window w, XWindowAttributes *wa)
 	c->w = c->tw = wa->width;
 	c->h = wa->height;
 	c->th = bh;
-
 	c->border = 0;
-	setsize(c);
-
-	if(c->x + c->w + 2 > sw)
-		c->x = sw - c->w - 2;
-	if(c->x < 0)
-		c->x = 0;
-	if(c->y + c->h + 2 > sh)
-		c->y = sh - c->h - 2;
+	updatesize(c);
+	if(c->x + c->w + 2 * BORDERPX > sw)
+		c->x = sw - c->w - 2 * BORDERPX;
+	if(c->x < sx)
+		c->x = sx;
+	if(c->y + c->h + 2 * BORDERPX > sh)
+		c->y = sh - c->h - 2 * BORDERPX;
 	if(c->h != sh && c->y < bh)
 		c->y = bh;
-
 	c->proto = getproto(c->win);
 	XSelectInput(dpy, c->win,
 		StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
@@ -224,38 +224,33 @@ manage(Window w, XWindowAttributes *wa)
 	twa.override_redirect = 1;
 	twa.background_pixmap = ParentRelative;
 	twa.event_mask = ExposureMask | EnterWindowMask;
-
 	c->twin = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
 			0, DefaultDepth(dpy, screen), CopyFromParent,
 			DefaultVisual(dpy, screen),
 			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);
+	updatetitle(c);
+	settags(c, getclient(trans));
 	if(!c->isfloat)
 		c->isfloat = trans
 			|| (c->maxw && c->minw &&
 				c->maxw == c->minw && c->maxh == c->minh);
-
-	attach(c);
-
-	settitle(c);
-	if(isvisible(c))
-		sel = c;
-	arrange(NULL);
+	resizetitle(c);
+	if(clients)
+		clients->prev = c;
+	c->next = clients;
+	c->snext = stack;
+	stack = clients = c;
+	ban(c);
 	XMapWindow(dpy, c->win);
 	XMapWindow(dpy, c->twin);
 	if(isvisible(c))
 		focus(c);
+	arrange();
 }
 
 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;
@@ -278,7 +273,15 @@ resize(Client *c, Bool sizehints, Corner sticky)
 		c->x = right - c->w;
 	if(sticky == BotLeft || sticky == BotRight)
 		c->y = bottom - c->h;
-
+	/* offscreen appearance fixes */
+	if(c->x + c->w < sx)
+		c->x = sx;
+	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;
@@ -287,14 +290,27 @@ resize(Client *c, Bool sizehints, Corner sticky)
 	if(c->w == sw && c->h == sh)
 		wc.border_width = 0;
 	else
-		wc.border_width = 1;
-	XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+		wc.border_width = BORDERPX;
+	XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
+	configure(c);
 	XSync(dpy, False);
 }
 
 void
-setsize(Client *c)
-{
+resizetitle(Client *c) {
+	c->tw = textw(c->name);
+	if(c->tw > c->w)
+		c->tw = c->w + 2 * BORDERPX;
+	c->tx = c->x + c->w - c->tw + 2 * BORDERPX;
+	c->ty = c->y;
+	if(isvisible(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);
+}
+
+void
+updatesize(Client *c) {
 	long msize;
 	XSizeHints size;
 
@@ -332,8 +348,7 @@ setsize(Client *c)
 }
 
 void
-settitle(Client *c)
-{
+updatetitle(Client *c) {
 	char **list = NULL;
 	int n;
 	XTextProperty name;
@@ -356,68 +371,27 @@ settitle(Client *c)
 		}
 	}
 	XFree(name.value);
-	resizetitle(c);
 }
 
 void
-togglemax(Arg *arg)
-{
-	int ox, oy, ow, oh;
-	XEvent ev;
-
-	if(!sel)
-		return;
+unmanage(Client *c) {
+	Client *nc;
 
-	if((sel->ismax = !sel->ismax)) {
-		ox = sel->x;
-		oy = sel->y;
-		ow = sel->w;
-		oh = sel->h;
-		sel->x = sx;
-		sel->y = sy + bh;
-		sel->w = sw - 2;
-		sel->h = sh - 2 - bh;
-
-		restack();
-		resize(sel, arrange == dofloat, TopLeft);
-
-		sel->x = ox;
-		sel->y = oy;
-		sel->w = ow;
-		sel->h = oh;
-	}
-	else
-		resize(sel, False, TopLeft);
-	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
-
-void
-unmanage(Client *c)
-{
-	Client *tc;
-	Window trans;
+	/* The server grab construct avoids race conditions. */
 	XGrabServer(dpy);
 	XSetErrorHandler(xerrordummy);
-
-	XGetTransientForHint(dpy, c->win, &trans);
-
-	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-	XDestroyWindow(dpy, c->twin);
-
 	detach(c);
+	detachstack(c);
 	if(sel == c) {
-		if(trans && (tc = getclient(trans)) && isvisible(tc))
-			sel = tc;
-		else
-			sel = getnext(clients);
+		for(nc = stack; nc && !isvisible(nc); nc = nc->snext);
+		focus(nc);
 	}
+	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+	XDestroyWindow(dpy, c->twin);
 	free(c->tags);
 	free(c);
-
 	XSync(dpy, False);
 	XSetErrorHandler(xerror);
 	XUngrabServer(dpy);
-	if(sel)
-		focus(sel);
-	arrange(NULL);
+	arrange();
 }