X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=c03770b5cf4435d0f3e3c3f89162c8fbfd5d7ec9;hb=b18e6840152b300f2db8ff8dca16aee0839f864b;hp=915a89037ae4d90725e41a84e96435f5e59d168b;hpb=2feb3afe784cbd9d900bd70aad91431a4b25f2ab;p=dwm.git

diff --git a/client.c b/client.c
index 915a890..c03770b 100644
--- a/client.c
+++ b/client.c
@@ -7,6 +7,8 @@
 
 /* static */
 
+static char buf[128];
+
 static void
 attachstack(Client *c) {
 	c->snext = stack;
@@ -179,8 +181,24 @@ killclient(const char *arg) {
 		XKillClient(dpy, sel->win);
 }
 
+Bool
+getprops(Client *c) {
+	unsigned int i;
+	Bool result = False;
+
+	if(gettextprop(c->win, dwmprops, buf, sizeof buf)) {
+		for(i = 0; i < ntags && i < sizeof buf - 1 && buf[i] != '\0'; i++)
+			if((c->tags[i] = buf[i] == '1'))
+				result = True;
+		if(i < sizeof buf - 1 && buf[i] != '\0')
+			c->isfloating = buf[i] == '1';
+	}
+	return result;
+}
+
 void
 manage(Window w, XWindowAttributes *wa) {
+	unsigned int i;
 	Client *c, *t = NULL;
 	Window trans;
 	Status rettrans;
@@ -221,22 +239,26 @@ manage(Window w, XWindowAttributes *wa) {
 	updatetitle(c);
 	if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
 		for(t = clients; t && t->win != trans; t = t->next);
-	settags(c, t);
+	if(t)
+		for(i = 0; i < ntags; i++)
+			c->tags[i] = t->tags[i];
+	if(!getprops(c))
+		applyrules(c);
 	if(!c->isfloating)
 		c->isfloating = (rettrans == Success) || c->isfixed;
+	setprops(c);
 	attach(c);
 	attachstack(c);
 	XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
-	setclientstate(c, IconicState);
-	c->isbanned = True;
-	focus(c);
-	lt->arrange();
+	ban(c);
+	arrange();
 }
 
 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 	double dx, dy, max, min, ratio;
 	XWindowChanges wc; 
+
 	if(sizehints) {
 		if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0 && (w - c->basew) > 0) {
 			dx = (double)(w - c->basew);
@@ -271,9 +293,9 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 			w -= (w - c->basew) % c->incw;
 		if(c->inch)
 			h -= (h - c->baseh) % c->inch;
-		if(w <= 0 || h <= 0)
-			return;
 	}
+	if(w <= 0 || h <= 0)
+		return;
 	/* offscreen appearance fixes */
 	if(x > sw)
 		x = sw - w - 2 * c->border;
@@ -296,13 +318,16 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 }
 
 void
-togglefloating(const char *arg) {
-	if(!sel || lt->arrange == floating)
-		return;
-	sel->isfloating = !sel->isfloating;
-	if(sel->isfloating)
-		resize(sel, sel->x, sel->y, sel->w, sel->h, True);
-	lt->arrange();
+setprops(Client *c) {
+	unsigned int i;
+
+	for(i = 0; i < ntags && i < sizeof buf - 1; i++)
+		buf[i] = c->tags[i] ? '1' : '0';
+	if(i < sizeof buf - 1)
+		buf[i++] = c->isfloating ? '1' : '0';
+	buf[i] = '\0';
+	XChangeProperty(dpy, c->win, dwmprops, XA_STRING, 8,
+			PropModeReplace, (unsigned char *)buf, i);
 }
 
 void
@@ -315,7 +340,7 @@ unban(Client *c) {
 }
 
 void
-unmanage(Client *c) {
+unmanage(Client *c, long state) {
 	XWindowChanges wc;
 
 	wc.border_width = c->oldborder;
@@ -328,13 +353,14 @@ unmanage(Client *c) {
 	if(sel == c)
 		focus(NULL);
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-	setclientstate(c, WithdrawnState);
+	setclientstate(c, state);
 	free(c->tags);
 	free(c);
 	XSync(dpy, False);
 	XSetErrorHandler(xerror);
 	XUngrabServer(dpy);
-	lt->arrange();
+	if(state != NormalState)
+		arrange();
 }
 
 void
@@ -391,27 +417,6 @@ updatesizehints(Client *c) {
 
 void
 updatetitle(Client *c) {
-	char **list = NULL;
-	int n;
-	XTextProperty name;
-
-	name.nitems = 0;
-	c->name[0] = 0;
-	XGetTextProperty(dpy, c->win, &name, netatom[NetWMName]);
-	if(!name.nitems)
-		XGetWMName(dpy, c->win, &name);
-	if(!name.nitems)
-		return;
-	if(name.encoding == XA_STRING)
-		strncpy(c->name, (char *)name.value, sizeof c->name - 1);
-	else {
-		if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
-		&& n > 0 && *list)
-		{
-			strncpy(c->name, *list, sizeof c->name - 1);
-			XFreeStringList(list);
-		}
-	}
-	c->name[sizeof c->name - 1] = '\0';
-	XFree(name.value);
+	if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
+		gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
 }