X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=646bcc16ff7578f083460f93acc46c7ea0e9c5f8;hb=7b5638f61d5c8b5a76bc3f7a5962cb7490da3b6b;hp=89ca5fb6ed31f3ccef39d0798d45fd0cb9918952;hpb=0a4342098b6d01367c69782c643cb685f1cd3c3d;p=dwm.git

diff --git a/client.c b/client.c
index 89ca5fb..646bcc1 100644
--- a/client.c
+++ b/client.c
@@ -73,8 +73,8 @@ focusnext(Arg *arg)
 	if(sel->ismax)
 		togglemax(NULL);
 
-	if(!(c = getnext(sel->next, tsel)))
-		c = getnext(clients, tsel);
+	if(!(c = getnext(sel->next)))
+		c = getnext(clients);
 	if(c) {
 		higher(c);
 		focus(c);
@@ -244,11 +244,11 @@ manage(Window w, XWindowAttributes *wa)
 	c->next = clients;
 	clients = c;
 
-	XGrabButton(dpy, Button1, MODKEY, c->win, False, ButtonPressMask,
+	XGrabButton(dpy, Button1, MODKEY, c->win, False, ButtonMask,
 			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button2, MODKEY, c->win, False, ButtonPressMask,
+	XGrabButton(dpy, Button2, MODKEY, c->win, False, ButtonMask,
 			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button3, MODKEY, c->win, False, ButtonPressMask,
+	XGrabButton(dpy, Button3, MODKEY, c->win, False, ButtonMask,
 			GrabModeAsync, GrabModeSync, None, None);
 
 	if(!c->isfloat)
@@ -260,63 +260,37 @@ manage(Window w, XWindowAttributes *wa)
 	arrange(NULL);
 
 	/* mapping the window now prevents flicker */
-	if(c->tags[tsel]) {
-		XMapRaised(dpy, c->win);
-		XMapRaised(dpy, c->title);
+	XMapRaised(dpy, c->win);
+	XMapRaised(dpy, c->title);
+	if(c->tags[tsel])
 		focus(c);
-	}
-	else {
-		XMapRaised(dpy, c->win);
-		XMapRaised(dpy, c->title);
-
-	}
 }
 
 void
-pop(Client *c)
-{
-	Client **l;
-
-	for(l = &clients; *l && *l != c; l = &(*l)->next);
-	if(c->prev)
-		c->prev->next = c->next;
-	if(c->next)
-		c->next->prev = c->prev;
-	*l = c->next;
-
-	c->prev = NULL;
-	if(clients)
-		clients->prev = c;
-	c->next = clients;
-	clients = c;
-	arrange(NULL);
-}
-
-void
-resize(Client *c, Bool inc, Corner sticky)
+resize(Client *c, Bool sizehints, Corner sticky)
 {
 	int bottom = c->y + c->h;
 	int right = c->x + c->w;
 	XConfigureEvent e;
 
-	if(inc) {
+	if(sizehints) {
 		if(c->incw)
 			c->w -= (c->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;
 	}
 	if(c->x > sw) /* might happen on restart */
 		c->x = sw - c->w;
 	if(c->y > sh)
 		c->y = sh - c->h;
-	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;
 	if(sticky == TopRight || sticky == BotRight)
 		c->x = right - c->w;
 	if(sticky == BotLeft || sticky == BotRight)
@@ -457,7 +431,7 @@ unmanage(Client *c)
 		c->next->prev = c->prev;
 	*l = c->next;
 	if(sel == c) {
-		sel = getnext(c->next, tsel);
+		sel = getnext(c->next);
 		if(!sel)
 			sel = getprev(c->prev);
 		if(!sel)
@@ -476,16 +450,29 @@ unmanage(Client *c)
 void
 zoom(Arg *arg)
 {
-	Client *c;
+	Client *c, **l;
 
 	if(!sel)
 		return;
 
-	if(sel == getnext(clients, tsel) && sel->next)  {
-		if((c = getnext(sel->next, tsel)))
+	if(sel == getnext(clients) && sel->next)  {
+		if((c = getnext(sel->next)))
 			sel = c;
 	}
 
-	pop(sel);
+	/* pop */
+	for(l = &clients; *l && *l != sel; l = &(*l)->next);
+	if(sel->prev)
+		sel->prev->next = sel->next;
+	if(sel->next)
+		sel->next->prev = sel->prev;
+	*l = sel->next;
+
+	sel->prev = NULL;
+	if(clients)
+		clients->prev = sel;
+	sel->next = clients;
+	clients = sel;
+	arrange(NULL);
 	focus(sel);
 }