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

diff --git a/client.c b/client.c
index 40e5b3c..dff398a 100644
--- a/client.c
+++ b/client.c
@@ -3,7 +3,6 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
-
 #include <stdlib.h>
 #include <string.h>
 #include <X11/Xatom.h>
@@ -16,16 +15,20 @@ resizetitle(Client *c)
 {
 	int i;
 
-	c->bw = 0;
-	for(i = 0; i < TLast; i++)
+	c->tw = 0;
+	for(i = 0; i < ntags; i++)
 		if(c->tags[i])
-			c->bw += textw(c->tags[i]);
-	c->bw += textw(c->name);
-	if(c->bw > *c->w)
-		c->bw = *c->w + 2;
-	c->bx = *c->x + *c->w - c->bw + 2;
-	c->by = *c->y;
-	XMoveResizeWindow(dpy, c->title, c->bx, c->by, c->bw, c->bh);
+			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(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);
+
 }
 
 static int
@@ -39,23 +42,24 @@ xerrordummy(Display *dsply, XErrorEvent *ee)
 void
 ban(Client *c)
 {
-	XMoveWindow(dpy, c->win, *c->x + 2 * sw, *c->y);
-	XMoveWindow(dpy, c->title, c->bx + 2 * sw, c->by);
+	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+	XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
 }
 
 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
@@ -66,12 +70,11 @@ focusnext(Arg *arg)
 	if(!sel)
 		return;
 
-	if(!(c = getnext(sel->next, tsel)))
-		c = getnext(clients, tsel);
+	if(!(c = getnext(sel->next)))
+		c = getnext(clients);
 	if(c) {
-		higher(c);
-		c->revert = sel;
 		focus(c);
+		restack();
 	}
 }
 
@@ -83,9 +86,13 @@ focusprev(Arg *arg)
 	if(!sel)
 		return;
 
-	if((c = sel->revert && sel->revert->tags[tsel] ? sel->revert : NULL)) {
-		higher(c);
+	if(!(c = getprev(sel->prev))) {
+		for(c = clients; c && c->next; c = c->next);
+		c = getprev(c);
+	}
+	if(c) {
 		focus(c);
+		restack();
 	}
 }
 
@@ -93,6 +100,7 @@ Client *
 getclient(Window w)
 {
 	Client *c;
+
 	for(c = clients; c; c = c->next)
 		if(c->win == w)
 			return c;
@@ -103,6 +111,7 @@ Client *
 getctitle(Window w)
 {
 	Client *c;
+
 	for(c = clients; c; c = c->next)
 		if(c->title == w)
 			return c;
@@ -115,6 +124,8 @@ gravitate(Client *c, Bool invert)
 	int dx = 0, dy = 0;
 
 	switch(c->grav) {
+	default:
+		break;
 	case StaticGravity:
 	case NorthWestGravity:
 	case NorthGravity:
@@ -124,18 +135,18 @@ gravitate(Client *c, Bool invert)
 	case EastGravity:
 	case CenterGravity:
 	case WestGravity:
-		dy = -(*c->h / 2) + c->border;
+		dy = -(c->h / 2) + c->border;
 		break;
 	case SouthEastGravity:
 	case SouthGravity:
 	case SouthWestGravity:
-		dy = -(*c->h);
-		break;
-	default:
+		dy = -(c->h);
 		break;
 	}
 
 	switch (c->grav) {
+	default:
+		break;
 	case StaticGravity:
 	case NorthWestGravity:
 	case WestGravity:
@@ -145,14 +156,12 @@ gravitate(Client *c, Bool invert)
 	case NorthGravity:
 	case CenterGravity:
 	case SouthGravity:
-		dx = -(*c->w / 2) + c->border;
+		dx = -(c->w / 2) + c->border;
 		break;
 	case NorthEastGravity:
 	case EastGravity:
 	case SouthEastGravity:
-		dx = -(*c->w + c->border);
-		break;
-	default:
+		dx = -(c->w + c->border);
 		break;
 	}
 
@@ -160,15 +169,8 @@ gravitate(Client *c, Bool invert)
 		dx = -dx;
 		dy = -dy;
 	}
-	*c->x += dx;
-	*c->y += dy;
-}
-
-void
-higher(Client *c)
-{
-	XRaiseWindow(dpy, c->win);
-	XRaiseWindow(dpy, c->title);
+	c->x += dx;
+	c->y += dy;
 }
 
 void
@@ -176,187 +178,145 @@ killclient(Arg *arg)
 {
 	if(!sel)
 		return;
-	if(sel->proto & WM_PROTOCOL_DELWIN)
+	if(sel->proto & PROTODELWIN)
 		sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
 	else
 		XKillClient(dpy, sel->win);
 }
 
 void
-lower(Client *c)
-{
-	XLowerWindow(dpy, c->title);
-	XLowerWindow(dpy, c->win);
-}
-
-void
 manage(Window w, XWindowAttributes *wa)
 {
-	int diff;
-	Client *c;
-	XSetWindowAttributes twa;
+	Client *c, *tc;
 	Window trans;
+	XSetWindowAttributes twa;
 
 	c = emallocz(sizeof(Client));
+	c->tags = emallocz(ntags * sizeof(Bool));
 	c->win = w;
-	c->bx = c->fx = c->tx = wa->x;
-	c->by = c->fy = c->ty = wa->y;
-	if(c->fy < bh)
-		c->by = c->fy = c->ty += bh;
-	c->bw = c->fw = c->tw = wa->width;
-	c->fh = c->th = wa->height;
-	c->bh = bh;
-
-	diff = sw - c->fw;
-	c->fx = random() % (diff ? diff : 1);
-	diff = sh - c->fh;
-	c->fy = random() % (diff ? diff : 1);
-
-	c->border = 1;
-	c->proto = getproto(c->win);
+	c->x = c->tx = wa->x;
+	c->y = c->ty = wa->y;
+	c->w = c->tw = wa->width;
+	c->h = wa->height;
+	c->th = bh;
+
+	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 = bh;
+
+	c->proto = getproto(c->win);
 	XSelectInput(dpy, c->win,
-			StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
+		StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
 	XGetTransientForHint(dpy, c->win, &trans);
 	twa.override_redirect = 1;
 	twa.background_pixmap = ParentRelative;
-	twa.event_mask = ExposureMask;
+	twa.event_mask = ExposureMask | EnterWindowMask;
 
-	c->title = XCreateWindow(dpy, root, c->bx, c->by, c->bw, c->bh,
+	c->title = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
 			0, DefaultDepth(dpy, screen), CopyFromParent,
 			DefaultVisual(dpy, screen),
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 
-	settags(c);
-
+	if(clients)
+		clients->prev = c;
 	c->next = clients;
 	clients = c;
 
-	XGrabButton(dpy, Button1, ControlMask, c->win, False, ButtonPressMask,
+	XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
+	XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,
+	XGrabButton(dpy, Button1, MODKEY | numlockmask, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
+	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)
 		c->isfloat = trans
-			|| ((c->maxw == c->minw) && (c->maxh == c->minh));
-
-	setgeom(c);
+			|| (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 */
-	if(c->tags[tsel]) {
-		XMapRaised(dpy, c->win);
-		XMapRaised(dpy, c->title);
+	XMapWindow(dpy, c->win);
+	XMapWindow(dpy, c->title);
+	if(isvisible(c))
 		focus(c);
-	}
-	else {
-		ban(c);
-		XMapRaised(dpy, c->win);
-		XMapRaised(dpy, c->title);
-		XSync(dpy, False);
-	}
 }
 
 void
-maximize(Arg *arg)
+resize(Client *c, Bool sizehints, Corner sticky)
 {
-	if(!sel)
-		return;
-	*sel->x = sx;
-	*sel->y = sy + bh;
-	*sel->w = sw - 2 * sel->border;
-	*sel->h = sh - 2 * sel->border - bh;
-	higher(sel);
-	resize(sel, False, TopLeft);
-}
-
-void
-pop(Client *c)
-{
-	Client **l;
-	for(l = &clients; *l && *l != c; l = &(*l)->next);
-	*l = c->next;
-
-	c->next = clients; /* pop */
-	clients = c;
-	arrange(NULL);
-}
+	int bottom = c->y + c->h;
+	int right = c->x + c->w;
+	XWindowChanges wc;
 
-void
-resize(Client *c, Bool inc, Corner sticky)
-{
-	XConfigureEvent e;
-	int right = *c->x + *c->w;
-	int bottom = *c->y + *c->h;
-
-	if(inc) {
+	if(sizehints) {
 		if(c->incw)
-			*c->w -= (*c->w - c->basew) % c->incw;
+			c->w -= (c->w - c->basew) % c->incw;
 		if(c->inch)
-			*c->h -= (*c->h - c->baseh) % 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 == BottomRight)
-		*c->x = right - *c->w;
-	if(sticky == BottomLeft || sticky == BottomRight)
-		*c->y = bottom - *c->h;
+	if(sticky == TopRight || sticky == BotRight)
+		c->x = right - c->w;
+	if(sticky == BotLeft || sticky == BotRight)
+		c->y = bottom - c->h;
+
 	resizetitle(c);
-	XSetWindowBorderWidth(dpy, c->win, 1);
-	XMoveResizeWindow(dpy, c->win, *c->x, *c->y, *c->w, *c->h);
-	e.type = ConfigureNotify;
-	e.event = c->win;
-	e.window = c->win;
-	e.x = *c->x;
-	e.y = *c->y;
-	e.width = *c->w;
-	e.height = *c->h;
-	e.border_width = c->border;
-	e.above = None;
-	e.override_redirect = False;
-	XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&e);
+	wc.x = c->x;
+	wc.y = c->y;
+	wc.width = c->w;
+	wc.height = c->h;
+	if(c->w == sw && c->h == sh)
+		wc.border_width = 0;
+	else
+		wc.border_width = 1;
+	XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
 	XSync(dpy, False);
 }
 
 void
-setgeom(Client *c)
-{
-	if((arrange == dotile) && !c->isfloat) {
-		c->x = &c->tx;
-		c->y = &c->ty;
-		c->w = &c->tw;
-		c->h = &c->th;
-	}
-	else {
-		c->x = &c->fx;
-		c->y = &c->fy;
-		c->w = &c->fw;
-		c->h = &c->fh;
-	}
-}
-
-void
 setsize(Client *c)
 {
-	XSizeHints size;
 	long msize;
+	XSizeHints size;
+
 	if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
 		size.flags = PSize;
 	c->flags = size.flags;
@@ -393,9 +353,9 @@ setsize(Client *c)
 void
 settitle(Client *c)
 {
-	XTextProperty name;
-	int n;
 	char **list = NULL;
+	int n;
+	XTextProperty name;
 
 	name.nitems = 0;
 	c->name[0] = 0;
@@ -419,32 +379,63 @@ settitle(Client *c)
 }
 
 void
-unmanage(Client *c)
+togglemax(Arg *arg)
 {
-	Client **l;
+	int ox, oy, ow, oh;
+	XEvent ev;
+
+	if(!sel)
+		return;
 
+	if((sel->ismax = !sel->ismax)) {
+		ox = sel->x;
+		oy = sel->y;
+		ow = sel->w;
+		oh = sel->h;
+		sel->x = sx;
+		sel->y = sy + bh;
+		sel->w = sw - 2;
+		sel->h = sh - 2 - bh;
+
+		restack();
+		resize(sel, arrange == dofloat, TopLeft);
+
+		sel->x = ox;
+		sel->y = oy;
+		sel->w = ow;
+		sel->h = oh;
+	}
+	else
+		resize(sel, False, TopLeft);
+	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+}
+
+void
+unmanage(Client *c)
+{
 	XGrabServer(dpy);
 	XSetErrorHandler(xerrordummy);
 
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 	XDestroyWindow(dpy, c->title);
 
-	for(l = &clients; *l && *l != c; l = &(*l)->next);
-	*l = c->next;
-	for(l = &clients; *l; l = &(*l)->next)
-		if((*l)->revert == c)
-			(*l)->revert = NULL;
+	if(c->prev)
+		c->prev->next = c->next;
+	if(c->next)
+		c->next->prev = c->prev;
+	if(c == clients)
+		clients = c->next;
 	if(sel == c)
-		sel = sel->revert ? sel->revert : clients;
-
+		sel = getnext(clients);
+	free(c->tags);
 	free(c);
 
 	XSync(dpy, False);
 	XSetErrorHandler(xerror);
 	XUngrabServer(dpy);
-	arrange(NULL);
 	if(sel)
 		focus(sel);
+	arrange(NULL);
 }
 
 void
@@ -452,14 +443,24 @@ zoom(Arg *arg)
 {
 	Client *c;
 
-	if(!sel)
+	if(!sel || (arrange != dotile) || sel->isfloat || sel->ismax)
 		return;
 
-	if(sel == getnext(clients, tsel) && sel->next)  {
-		if((c = getnext(sel->next, tsel)))
+	if(sel == getnext(clients))  {
+		if((c = getnext(sel->next)))
 			sel = c;
+		else
+			return;
 	}
 
-	pop(sel);
+	/* pop */
+	sel->prev->next = sel->next;
+	if(sel->next)
+		sel->next->prev = sel->prev;
+	sel->prev = NULL;
+	clients->prev = sel;
+	sel->next = clients;
+	clients = sel;
 	focus(sel);
+	arrange(NULL);
 }