X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=client.c;h=9dd08b1ca6dae9d223a06fad6559a124db1ffb7b;hp=68d10a7333402f402fc317221f55120a4f4f9dd8;hb=36672d0401299a5230b516ca4575365d9f45dd35;hpb=83aa110c6fabbf5f5a14b698a6ca22072cb80629

diff --git a/client.c b/client.c
index 68d10a7..9dd08b1 100644
--- a/client.c
+++ b/client.c
@@ -1,7 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 #include "dwm.h"
 #include <stdlib.h>
-#include <string.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
@@ -98,7 +97,7 @@ attach(Client *c) {
 
 void
 ban(Client *c) {
-	if (c->isbanned)
+	if(c->isbanned)
 		return;
 	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
 	c->isbanned = True;
@@ -135,7 +134,7 @@ detach(Client *c) {
 
 void
 focus(Client *c) {
-	if((!c && selscreen)|| (c && !isvisible(c)))
+	if((!c && selscreen) || (c && !isvisible(c)))
 		for(c = stack; c && !isvisible(c); c = c->snext);
 	if(sel && sel != c) {
 		grabbuttons(sel, False);
@@ -179,6 +178,7 @@ killclient(const char *arg) {
 
 void
 manage(Window w, XWindowAttributes *wa) {
+	unsigned int i;
 	Client *c, *t = NULL;
 	Window trans;
 	Status rettrans;
@@ -219,31 +219,31 @@ 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];
+	applyrules(c);
 	if(!c->isfloating)
 		c->isfloating = (rettrans == Success) || c->isfixed;
 	attach(c);
 	attachstack(c);
+	XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
 	ban(c);
-	XMapWindow(dpy, w);
-	setclientstate(c, NormalState);
-	focus(c);
-	lt->arrange();
+	XMapWindow(dpy, c->win);
+	arrange();
 }
 
 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
-	float dx, dy, max, min, ratio;
-	XWindowChanges wc;
+	double dx, dy, max, min, ratio;
+	XWindowChanges wc; 
 
-	if(w <= 0 || h <= 0)
-		return;
 	if(sizehints) {
-		if(c->minay > 0 && c->maxay > 0 && (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);
+		if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0 && (w - c->basew) > 0) {
+			dx = (double)(w - c->basew);
+			dy = (double)(h - c->baseh);
+			min = (double)(c->minax) / (double)(c->minay);
+			max = (double)(c->maxax) / (double)(c->maxay);
 			ratio = dx / dy;
 			if(max > 0 && min > 0 && ratio > 0) {
 				if(ratio < min) {
@@ -297,18 +297,8 @@ 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();
-}
-
-void
 unban(Client *c) {
-	if (!c->isbanned)
+	if(!c->isbanned)
 		return;
 	XMoveWindow(dpy, c->win, c->x, c->y);
 	c->isbanned = False;
@@ -334,7 +324,7 @@ unmanage(Client *c) {
 	XSync(dpy, False);
 	XSetErrorHandler(xerror);
 	XUngrabServer(dpy);
-	lt->arrange();
+	arrange();
 }
 
 void
@@ -391,27 +381,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);
 }