X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=68d10a7333402f402fc317221f55120a4f4f9dd8;hb=51a94a2f147e490101f33b276c83389e48307425;hp=c4b0941a996b753e665e7abc41ecc91f8548df22;hpb=9fdd2cd1a9dbe9b533fab9a8a98b9849dc4c7b59;p=dwm.git

diff --git a/client.c b/client.c
index c4b0941..68d10a7 100644
--- a/client.c
+++ b/client.c
@@ -1,8 +1,4 @@
-/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
- * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * © 2007 Premysl Hruby <dfenze at gmail dot com>
- * © 2007 Szabolcs Nagy <nszabolcs at gmail dot com>
- * See LICENSE file for license details. */
+/* See LICENSE file for copyright and license details. */
 #include "dwm.h"
 #include <stdlib.h>
 #include <string.h>
@@ -101,6 +97,14 @@ attach(Client *c) {
 }
 
 void
+ban(Client *c) {
+	if (c->isbanned)
+		return;
+	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+	c->isbanned = True;
+}
+
+void
 configure(Client *c) {
 	XConfigureEvent ce;
 
@@ -131,7 +135,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);
@@ -220,8 +224,7 @@ manage(Window w, XWindowAttributes *wa) {
 		c->isfloating = (rettrans == Success) || c->isfixed;
 	attach(c);
 	attachstack(c);
-	c->isbanned = True;
-	XMoveWindow(dpy, w, c->x + 2 * sw, c->y);
+	ban(c);
 	XMapWindow(dpy, w);
 	setclientstate(c, NormalState);
 	focus(c);
@@ -304,6 +307,37 @@ togglefloating(const char *arg) {
 }
 
 void
+unban(Client *c) {
+	if (!c->isbanned)
+		return;
+	XMoveWindow(dpy, c->win, c->x, c->y);
+	c->isbanned = False;
+}
+
+void
+unmanage(Client *c) {
+	XWindowChanges wc;
+
+	wc.border_width = c->oldborder;
+	/* The server grab construct avoids race conditions. */
+	XGrabServer(dpy);
+	XSetErrorHandler(xerrordummy);
+	XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
+	detach(c);
+	detachstack(c);
+	if(sel == c)
+		focus(NULL);
+	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+	setclientstate(c, WithdrawnState);
+	free(c->tags);
+	free(c);
+	XSync(dpy, False);
+	XSetErrorHandler(xerror);
+	XUngrabServer(dpy);
+	lt->arrange();
+}
+
+void
 updatesizehints(Client *c) {
 	long msize;
 	XSizeHints size;
@@ -381,26 +415,3 @@ updatetitle(Client *c) {
 	c->name[sizeof c->name - 1] = '\0';
 	XFree(name.value);
 }
-
-void
-unmanage(Client *c) {
-	XWindowChanges wc;
-
-	wc.border_width = c->oldborder;
-	/* The server grab construct avoids race conditions. */
-	XGrabServer(dpy);
-	XSetErrorHandler(xerrordummy);
-	XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
-	detach(c);
-	detachstack(c);
-	if(sel == c)
-		focus(NULL);
-	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-	setclientstate(c, WithdrawnState);
-	free(c->tags);
-	free(c);
-	XSync(dpy, False);
-	XSetErrorHandler(xerror);
-	XUngrabServer(dpy);
-	lt->arrange();
-}