X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/f8181f64e2ba4fca4e85036c48cf90a2151794fc..2e95bc04135936ff8adc75e57e21f5edab56e0d6:/client.c?ds=sidebyside

diff --git a/client.c b/client.c
index b122427..e7a3864 100644
--- a/client.c
+++ b/client.c
@@ -7,14 +7,7 @@
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
-/* static functions */
-
-static void
-detachstack(Client *c) {
-	Client **tc;
-	for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
-	*tc = c->snext;
-}
+/* static */
 
 static void
 grabbuttons(Client *c, Bool focused) {
@@ -53,74 +46,83 @@ grabbuttons(Client *c, Bool focused) {
 				GrabModeAsync, GrabModeSync, None, None);
 }
 
+static void
+setclientstate(Client *c, long state) {
+	long data[] = {state, None};
+	XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
+			PropModeReplace, (unsigned char *)data, 2);
+}
+
 static int
 xerrordummy(Display *dsply, XErrorEvent *ee) {
 	return 0;
 }
 
-/* extern functions */
+/* extern */
 
 void
 configure(Client *c) {
-	XEvent synev;
+	XConfigureEvent ce;
 
-	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);
+	ce.type = ConfigureNotify;
+	ce.display = dpy;
+	ce.event = c->win;
+	ce.window = c->win;
+	ce.x = c->x;
+	ce.y = c->y;
+	ce.width = c->w;
+	ce.height = c->h;
+	ce.border_width = c->border;
+	ce.above = None;
+	ce.override_redirect = False;
+	XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
 }
 
 void
 focus(Client *c) {
-	Client *old;
-
-	if(!issel || (c && !isvisible(c)))
+	if(c && !isvisible(c))
 		return;
-	if(!sel)
-		sel = c;
-	else if(sel != c) {
-		old = sel;
-		sel = c;
-		if(old) {
-			grabbuttons(old, False);
-			XSetWindowBorder(dpy, old->win, dc.norm[ColBorder]);
-		}
+	if(sel && sel != c) {
+		grabbuttons(sel, False);
+		XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
 	}
 	if(c) {
 		detachstack(c);
-		c->snext = stack;
-		stack = c;
+		attachstack(c);
 		grabbuttons(c, True);
+	}
+	sel = c;
+	drawstatus();
+	if(!selscreen)
+		return;
+	if(c) {
 		XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
 		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 	}
 	else
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-	drawstatus();
 }
 
-Client *
-getclient(Window w) {
-	Client *c;
+Bool
+isprotodel(Client *c) {
+	int i, n;
+	Atom *protocols;
+	Bool ret = False;
 
-	for(c = clients; c; c = c->next)
-		if(c->win == w)
-			return c;
-	return NULL;
+	if(XGetWMProtocols(dpy, c->win, &protocols, &n)) {
+		for(i = 0; !ret && i < n; i++)
+			if(protocols[i] == wmatom[WMDelete])
+				ret = True;
+		XFree(protocols);
+	}
+	return ret;
 }
 
 void
 killclient(Arg *arg) {
 	if(!sel)
 		return;
-	if(sel->proto & PROTODELWIN)
+	if(isprotodel(sel))
 		sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
 	else
 		XKillClient(dpy, sel->win);
@@ -128,91 +130,124 @@ killclient(Arg *arg) {
 
 void
 manage(Window w, XWindowAttributes *wa) {
-	Client *c;
+	Client *c, *t;
 	Window trans;
+	XWindowChanges wc;
 
 	c = emallocz(sizeof(Client));
 	c->tags = emallocz(ntags * sizeof(Bool));
 	c->win = w;
-	c->border = 0;
 	c->x = wa->x;
 	c->y = wa->y;
 	c->w = wa->width;
 	c->h = wa->height;
-	updatesizehints(c);
-	if(c->x + c->w + 2 * BORDERPX > sw)
-		c->x = sw - c->w - 2 * BORDERPX;
-	if(c->x < sx)
+	if(c->w == sw && c->h == sh) {
+		c->border = 0;
 		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);
+		c->y = sy;
+	}
+	else {
+		c->border = BORDERPX;
+		if(c->x + c->w + 2 * c->border > wax + waw)
+			c->x = wax + waw - c->w - 2 * c->border;
+		if(c->y + c->h + 2 * c->border > way + wah)
+			c->y = way + wah - c->h - 2 * c->border;
+		if(c->x < wax)
+			c->x = wax;
+		if(c->y < way)
+			c->y = way;
+	}
+	updatesizehints(c);
 	XSelectInput(dpy, c->win,
 		StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
 	XGetTransientForHint(dpy, c->win, &trans);
 	grabbuttons(c, False);
+	wc.border_width = c->border;
+	XConfigureWindow(dpy, c->win, CWBorderWidth, &wc);
+	XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
+	configure(c); /* propagates border_width, if size doesn't change */
 	updatetitle(c);
-	settags(c, getclient(trans));
+	t = getclient(trans);
+	settags(c, t);
 	if(!c->isfloat)
-		c->isfloat = trans || c->isfixed;
-	if(clients)
-		clients->prev = c;
-	c->next = clients;
-	c->snext = stack;
-	stack = clients = c;
+		c->isfloat = (t != 0) || c->isfixed;
+	attach(c);
+	attachstack(c);
+	c->isbanned = True;
 	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
 	XMapWindow(dpy, c->win);
+	setclientstate(c, NormalState);
 	if(isvisible(c))
 		focus(c);
 	arrange();
 }
 
 void
-resize(Client *c, Bool sizehints, Corner sticky) {
-	int bottom = c->y + c->h;
-	int right = c->x + c->w;
+resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
+	float actual, dx, dy, max, min;
 	XWindowChanges wc;
 
+	if(w <= 0 || h <= 0)
+		return;
 	if(sizehints) {
+		if(c->minw && w < c->minw)
+			w = c->minw;
+		if(c->minh && h < c->minh)
+			h = c->minh;
+		if(c->maxw && w > c->maxw)
+			w = c->maxw;
+		if(c->maxh && h > c->maxh)
+			h = c->maxh;
+		/* inspired by algorithm from fluxbox */
+		if(c->minay > 0 && c->maxay && (h - c->baseh) > 0) {
+			dx = (float)(w - c->basew);
+			dy = (float)(h - c->baseh);
+			min = (float)(c->minax) / (float)(c->minay);
+			max = (float)(c->maxax) / (float)(c->maxay);
+			actual = dx / dy;
+			if(max > 0 && min > 0 && actual > 0) {
+				if(actual < min) {
+					dy = (dx * min + dy) / (min * min + 1);
+					dx = dy * min;
+					w = (int)dx + c->basew;
+					h = (int)dy + c->baseh;
+				}
+				else if(actual > max) {
+					dy = (dx * min + dy) / (max * max + 1);
+					dx = dy * min;
+					w = (int)dx + c->basew;
+					h = (int)dy + c->baseh;
+				}
+			}
+		}
 		if(c->incw)
-			c->w -= (c->w - c->basew) % c->incw;
+			w -= (w - c->basew) % c->incw;
 		if(c->inch)
-			c->h -= (c->h - c->baseh) % c->inch;
-		if(c->minw && c->w < c->minw)
-			c->w = c->minw;
-		if(c->minh && c->h < c->minh)
-			c->h = c->minh;
-		if(c->maxw && c->w > c->maxw)
-			c->w = c->maxw;
-		if(c->maxh && c->h > c->maxh)
-			c->h = c->maxh;
+			h -= (h - c->baseh) % c->inch;
 	}
-	if(sticky == TopRight || sticky == BotRight)
-		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;
-	wc.x = c->x;
-	wc.y = c->y;
-	wc.width = c->w;
-	wc.height = c->h;
-	if(c->w == sw && c->h == sh)
-		wc.border_width = 0;
+	if(w == sw && h == sh)
+		c->border = 0;
 	else
-		wc.border_width = BORDERPX;
-	XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
-	configure(c);
-	XSync(dpy, False);
+		c->border = BORDERPX;
+	/* offscreen appearance fixes */
+	if(x > sw)
+		x = sw - w - 2 * c->border;
+	if(y > sh)
+		y = sh - h - 2 * c->border;
+	if(x + w + 2 * c->border < sx)
+		x = sx;
+	if(y + h + 2 * c->border < sy)
+		y = sy;
+	if(c->x != x || c->y != y || c->w != w || c->h != h) {
+		c->x = wc.x = x;
+		c->y = wc.y = y;
+		c->w = wc.width = w;
+		c->h = wc.height = h;
+		wc.border_width = c->border;
+		XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
+		configure(c);
+		XSync(dpy, False);
+	}
 }
 
 void
@@ -247,8 +282,16 @@ updatesizehints(Client *c) {
 	}
 	else
 		c->minw = c->minh = 0;
-	c->isfixed = (c->maxw && c->minw && c->maxh && c->minh &&
-				c->maxw == c->minw && c->maxh == c->minh);
+	if(c->flags & PAspect) {
+		c->minax = size.min_aspect.x;
+		c->minay = size.min_aspect.y;
+		c->maxax = size.max_aspect.x;
+		c->maxay = size.max_aspect.y;
+	}
+	else
+		c->minax = c->minay = c->maxax = c->maxay = 0;
+	c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
+			&& c->maxw == c->minw && c->maxh == c->minh);
 }
 
 void
@@ -268,7 +311,7 @@ updatetitle(Client *c) {
 		strncpy(c->name, (char *)name.value, sizeof c->name);
 	else {
 		if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
-				&& n > 0 && *list)
+		&& n > 0 && *list)
 		{
 			strncpy(c->name, *list, sizeof c->name);
 			XFreeStringList(list);
@@ -291,6 +334,7 @@ unmanage(Client *c) {
 		focus(nc);
 	}
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+	setclientstate(c, WithdrawnState);
 	free(c->tags);
 	free(c);
 	XSync(dpy, False);