X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=dff398a4aa2eac8da7fa67623207d3dced80b7ac;hb=b43989207a949cbc17182b451aa527afe542c98f;hp=b6bda928c5a41a8f23c1853feeaf64c1166a4c24;hpb=95e8d12b7189d4cd01b8ae8ecebfa5835a1809e6;p=dwm.git

diff --git a/client.c b/client.c
index b6bda92..dff398a 100644
--- a/client.c
+++ b/client.c
@@ -16,15 +16,15 @@ resizetitle(Client *c)
 	int i;
 
 	c->tw = 0;
-	for(i = 0; i < TLast; i++)
+	for(i = 0; i < ntags; i++)
 		if(c->tags[i])
-			c->tw += textw(c->tags[i]);
+			c->tw += textw(tags[i]);
 	c->tw += textw(c->name);
 	if(c->tw > c->w)
 		c->tw = c->w + 2;
 	c->tx = c->x + c->w - c->tw + 2;
 	c->ty = c->y;
-	if(c->tags[tsel])
+	if(isvisible(c))
 		XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
 	else
 		XMoveResizeWindow(dpy, c->title, c->tx + 2 * sw, c->ty, c->tw, c->th);
@@ -50,15 +50,16 @@ void
 focus(Client *c)
 {
 	Client *old = sel;
-	XEvent ev;
 
+	if (!issel)
+		return;
+	if(sel && sel->ismax)
+		togglemax(NULL);
 	sel = c;
 	if(old && old != c)
 		drawtitle(old);
 	drawtitle(c);
 	XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-	XSync(dpy, False);
-	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
@@ -69,14 +70,11 @@ focusnext(Arg *arg)
 	if(!sel)
 		return;
 
-	if(sel->ismax)
-		togglemax(NULL);
-
 	if(!(c = getnext(sel->next)))
 		c = getnext(clients);
 	if(c) {
-		higher(c);
 		focus(c);
+		restack();
 	}
 }
 
@@ -88,16 +86,13 @@ focusprev(Arg *arg)
 	if(!sel)
 		return;
 
-	if(sel->ismax)
-		togglemax(NULL);
-
 	if(!(c = getprev(sel->prev))) {
 		for(c = clients; c && c->next; c = c->next);
 		c = getprev(c);
 	}
 	if(c) {
-		higher(c);
 		focus(c);
+		restack();
 	}
 }
 
@@ -179,13 +174,6 @@ gravitate(Client *c, Bool invert)
 }
 
 void
-higher(Client *c)
-{
-	XRaiseWindow(dpy, c->win);
-	XRaiseWindow(dpy, c->title);
-}
-
-void
 killclient(Arg *arg)
 {
 	if(!sel)
@@ -197,20 +185,14 @@ killclient(Arg *arg)
 }
 
 void
-lower(Client *c)
-{
-	XLowerWindow(dpy, c->title);
-	XLowerWindow(dpy, c->win);
-}
-
-void
 manage(Window w, XWindowAttributes *wa)
 {
-	Client *c;
+	Client *c, *tc;
 	Window trans;
 	XSetWindowAttributes twa;
 
 	c = emallocz(sizeof(Client));
+	c->tags = emallocz(ntags * sizeof(Bool));
 	c->win = w;
 	c->x = c->tx = wa->x;
 	c->y = c->ty = wa->y;
@@ -221,8 +203,14 @@ manage(Window w, XWindowAttributes *wa)
 	c->border = 0;
 	setsize(c);
 
+	if(c->x + c->w + 2 > sw)
+		c->x = sw - c->w - 2;
+	if(c->x < 0)
+		c->x = 0;
+	if(c->y + c->h + 2 > sh)
+		c->y = sh - c->h - 2;
 	if(c->h != sh && c->y < bh)
-		c->y = c->ty = bh;
+		c->y = bh;
 
 	c->proto = getproto(c->win);
 	XSelectInput(dpy, c->win,
@@ -244,10 +232,30 @@ manage(Window w, XWindowAttributes *wa)
 
 	XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
+	XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
+			GrabModeAsync, GrabModeSync, None, None);
+	XGrabButton(dpy, Button1, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+			GrabModeAsync, GrabModeSync, None, None);
+	XGrabButton(dpy, Button1, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+			GrabModeAsync, GrabModeSync, None, None);
+
 	XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
+	XGrabButton(dpy, Button2, MODKEY | LockMask, c->win, False, BUTTONMASK,
+			GrabModeAsync, GrabModeSync, None, None);
+	XGrabButton(dpy, Button2, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+			GrabModeAsync, GrabModeSync, None, None);
+	XGrabButton(dpy, Button2, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+			GrabModeAsync, GrabModeSync, None, None);
+
 	XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
+	XGrabButton(dpy, Button3, MODKEY | LockMask, c->win, False, BUTTONMASK,
+			GrabModeAsync, GrabModeSync, None, None);
+	XGrabButton(dpy, Button3, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+			GrabModeAsync, GrabModeSync, None, None);
+	XGrabButton(dpy, Button3, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+			GrabModeAsync, GrabModeSync, None, None);
 
 	settags(c);
 	if(!c->isfloat)
@@ -255,12 +263,12 @@ manage(Window w, XWindowAttributes *wa)
 			|| (c->maxw && c->minw &&
 				c->maxw == c->minw && c->maxh == c->minh);
 	settitle(c);
+	if(isvisible(c))
+		sel = c;
 	arrange(NULL);
-
-	/* mapping the window now prevents flicker */
-	XMapRaised(dpy, c->win);
-	XMapRaised(dpy, c->title);
-	if(c->tags[tsel])
+	XMapWindow(dpy, c->win);
+	XMapWindow(dpy, c->title);
+	if(isvisible(c))
 		focus(c);
 }
 
@@ -269,7 +277,6 @@ resize(Client *c, Bool sizehints, Corner sticky)
 {
 	int bottom = c->y + c->h;
 	int right = c->x + c->w;
-	/*XConfigureEvent e;*/
 	XWindowChanges wc;
 
 	if(sizehints) {
@@ -286,10 +293,6 @@ resize(Client *c, Bool sizehints, Corner sticky)
 		if(c->maxh && c->h > c->maxh)
 			c->h = c->maxh;
 	}
-	if(c->x > right) /* might happen on restart */
-		c->x = right - c->w;
-	if(c->y > bottom)
-		c->y = bottom - c->h;
 	if(sticky == TopRight || sticky == BotRight)
 		c->x = right - c->w;
 	if(sticky == BotLeft || sticky == BotRight)
@@ -394,8 +397,8 @@ togglemax(Arg *arg)
 		sel->w = sw - 2;
 		sel->h = sh - 2 - bh;
 
-		higher(sel);
-		resize(sel, False, TopLeft);
+		restack();
+		resize(sel, arrange == dofloat, TopLeft);
 
 		sel->x = ox;
 		sel->y = oy;
@@ -422,21 +425,17 @@ unmanage(Client *c)
 		c->next->prev = c->prev;
 	if(c == clients)
 		clients = c->next;
-	if(sel == c) {
-		sel = getnext(c->next);
-		if(!sel)
-			sel = getprev(c->prev);
-		if(!sel)
-			sel = clients;
-	}
+	if(sel == c)
+		sel = getnext(clients);
+	free(c->tags);
 	free(c);
 
 	XSync(dpy, False);
 	XSetErrorHandler(xerror);
 	XUngrabServer(dpy);
-	arrange(NULL);
 	if(sel)
 		focus(sel);
+	arrange(NULL);
 }
 
 void
@@ -444,24 +443,24 @@ zoom(Arg *arg)
 {
 	Client *c;
 
-	if(!sel)
+	if(!sel || (arrange != dotile) || sel->isfloat || sel->ismax)
 		return;
 
-	if(sel == getnext(clients) && sel->next)  {
+	if(sel == getnext(clients))  {
 		if((c = getnext(sel->next)))
 			sel = c;
+		else
+			return;
 	}
 
 	/* pop */
-	if(sel->prev)
-		sel->prev->next = sel->next;
+	sel->prev->next = sel->next;
 	if(sel->next)
 		sel->next->prev = sel->prev;
 	sel->prev = NULL;
-	if(clients)
-		clients->prev = sel;
+	clients->prev = sel;
 	sel->next = clients;
 	clients = sel;
-	arrange(NULL);
 	focus(sel);
+	arrange(NULL);
 }