X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=client.c;h=60f1cbeff8777bc9f16cbb0bddc8bba0550a4300;hp=98b46a3883b1d2eda02f633de6ccfd213413ea1c;hb=6651dd7fd9e8e95cfc6c472f1adfeff41735d798;hpb=1c2d673ded697f4b131f8700ce98392fbb383b2e

diff --git a/client.c b/client.c
index 98b46a3..60f1cbe 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"
@@ -156,7 +155,6 @@ gravitate(Client *c, Bool invert) {
 		dy = -(c->h);
 		break;
 	}
-
 	switch (c->grav) {
 	default:
 		break;
@@ -177,7 +175,6 @@ gravitate(Client *c, Bool invert) {
 		dx = -(c->w + c->border);
 		break;
 	}
-
 	if(invert) {
 		dx = -dx;
 		dy = -dy;
@@ -210,19 +207,16 @@ manage(Window w, XWindowAttributes *wa) {
 	c->w = c->tw = wa->width;
 	c->h = wa->height;
 	c->th = bh;
-
 	c->border = 0;
 	updatesize(c);
-
 	if(c->x + c->w + 2 * BORDERPX > sw)
 		c->x = sw - c->w - 2 * BORDERPX;
-	if(c->x < 0)
-		c->x = 0;
+	if(c->x < sx)
+		c->x = sx;
 	if(c->y + c->h + 2 * BORDERPX > sh)
-		c->y = sh - c->h - 2;
+		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);
@@ -230,12 +224,10 @@ 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);
 	updatetitle(c);
 	settags(c, getclient(trans));
@@ -244,13 +236,11 @@ manage(Window w, XWindowAttributes *wa) {
 			|| (c->maxw && c->minw &&
 				c->maxw == c->minw && c->maxh == c->minh);
 	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);
@@ -283,17 +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 < 0)
-		c->x = 0;
+	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;
@@ -392,20 +380,16 @@ unmanage(Client *c) {
 	/* The server grab construct avoids race conditions. */
 	XGrabServer(dpy);
 	XSetErrorHandler(xerrordummy);
-
 	detach(c);
 	detachstack(c);
 	if(sel == c) {
 		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);