X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=2aa1955d4a2591500de12dacf07f27a685c580da;hb=6d5f67a0922d40d52290c12f9c0d937f4121406e;hp=79cd698258cf8daab33f476bfe1de0e876ae6866;hpb=39ed54a468f339535f82cce2c0a79b92e74a7c09;p=dwm.git

diff --git a/client.c b/client.c
index 79cd698..2aa1955 100644
--- a/client.c
+++ b/client.c
@@ -10,8 +10,15 @@
 /* static */
 
 static void
+attachstack(Client *c) {
+	c->snext = stack;
+	stack = c;
+}
+
+static void
 detachstack(Client *c) {
 	Client **tc;
+
 	for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
 	*tc = c->snext;
 }
@@ -53,13 +60,47 @@ grabbuttons(Client *c, Bool focused) {
 				GrabModeAsync, GrabModeSync, None, None);
 }
 
+static Bool
+isprotodel(Client *c) {
+	int i, n;
+	Atom *protocols;
+	Bool ret = False;
+
+	if(XGetWMProtocols(dpy, c->win, &protocols, &n)) {
+		for(i = 0; !ret && i < n; i++)
+			if(protocols[i] == wmatom[WMDelete])
+				ret = True;
+		XFree(protocols);
+	}
+	return ret;
+}
+
 static void
 setclientstate(Client *c, long state) {
 	long data[] = {state, None};
+
 	XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
 			PropModeReplace, (unsigned char *)data, 2);
 }
 
+static void
+togglemax(Client *c) {
+	XEvent ev;
+
+	if(c->isfixed)
+		return;
+	if((c->ismax = !c->ismax)) {
+		c->rx = c->x;
+		c->ry = c->y;
+		c->rw = c->w;
+		c->rh = c->h;
+		resize(c, wax, way, waw - 2 * BORDERPX, wah - 2 * BORDERPX, True);
+	}
+	else
+		resize(c, c->rx, c->ry, c->rw, c->rh, True);
+	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+}
+
 static int
 xerrordummy(Display *dsply, XErrorEvent *ee) {
 	return 0;
@@ -68,6 +109,14 @@ xerrordummy(Display *dsply, XErrorEvent *ee) {
 /* extern */
 
 void
+attach(Client *c) {
+	if(clients)
+		clients->prev = c;
+	c->next = clients;
+	clients = c;
+}
+
+void
 configure(Client *c) {
 	XConfigureEvent ce;
 
@@ -86,6 +135,17 @@ configure(Client *c) {
 }
 
 void
+detach(Client *c) {
+	if(c->prev)
+		c->prev->next = c->next;
+	if(c->next)
+		c->next->prev = c->prev;
+	if(c == clients)
+		clients = c->next;
+	c->next = c->prev = NULL;
+}
+
+void
 focus(Client *c) {
 	if(c && !isvisible(c))
 		return;
@@ -95,8 +155,7 @@ focus(Client *c) {
 	}
 	if(c) {
 		detachstack(c);
-		c->snext = stack;
-		stack = c;
+		attachstack(c);
 		grabbuttons(c, True);
 	}
 	sel = c;
@@ -111,29 +170,36 @@ focus(Client *c) {
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 }
 
-Client *
-getclient(Window w) {
+void
+focusnext(Arg *arg) {
 	Client *c;
-
-	for(c = clients; c; c = c->next)
-		if(c->win == w)
-			return c;
-	return NULL;
+   
+	if(!sel)
+		return;
+	for(c = sel->next; c && !isvisible(c); c = c->next);
+	if(!c)
+		for(c = clients; c && !isvisible(c); c = c->next);
+	if(c) {
+		focus(c);
+		restack();
+	}
 }
 
-Bool
-isprotodel(Client *c) {
-	int i, n;
-	Atom *protocols;
-	Bool ret = False;
+void
+focusprev(Arg *arg) {
+	Client *c;
 
-	if(XGetWMProtocols(dpy, c->win, &protocols, &n)) {
-		for(i = 0; !ret && i < n; i++)
-			if(protocols[i] == wmatom[WMDelete])
-				ret = True;
-		XFree(protocols);
+	if(!sel)
+		return;
+	for(c = sel->prev; c && !isvisible(c); c = c->prev);
+	if(!c) {
+		for(c = clients; c && c->next; c = c->next);
+		for(; c && !isvisible(c); c = c->prev);
+	}
+	if(c) {
+		focus(c);
+		restack();
 	}
-	return ret;
 }
 
 void
@@ -176,31 +242,34 @@ manage(Window w, XWindowAttributes *wa) {
 			c->y = way;
 	}
 	updatesizehints(c);
-	XSelectInput(dpy, c->win,
+	XSelectInput(dpy, w,
 		StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
-	XGetTransientForHint(dpy, c->win, &trans);
+	XGetTransientForHint(dpy, w, &trans);
 	grabbuttons(c, False);
 	wc.border_width = c->border;
-	XConfigureWindow(dpy, c->win, CWBorderWidth, &wc);
-	XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
+	XConfigureWindow(dpy, w, CWBorderWidth, &wc);
+	XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
 	configure(c); /* propagates border_width, if size doesn't change */
 	updatetitle(c);
-	t = getclient(trans);
+	for(t = clients; t && t->win != trans; t = t->next);
 	settags(c, t);
-	if(!c->isfloat)
-		c->isfloat = (t != 0) || c->isfixed;
-	if(clients)
-		clients->prev = c;
-	c->next = clients;
-	c->snext = stack;
-	stack = clients = c;
+	if(!c->versatile)
+		c->versatile = (t != NULL) || c->isfixed;
+	attach(c);
+	attachstack(c);
 	c->isbanned = True;
-	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-	XMapWindow(dpy, c->win);
+	XMoveWindow(dpy, w, c->x + 2 * sw, c->y);
+	XMapWindow(dpy, w);
 	setclientstate(c, NormalState);
 	if(isvisible(c))
 		focus(c);
-	arrange();
+	lt->arrange();
+}
+
+Client *
+nexttiled(Client *c) {
+	for(; c && (c->versatile || !isvisible(c)); c = c->next);
+	return c;
 }
 
 void
@@ -361,5 +430,27 @@ unmanage(Client *c) {
 	XSync(dpy, False);
 	XSetErrorHandler(xerror);
 	XUngrabServer(dpy);
-	arrange();
+	lt->arrange();
+}
+
+void
+zoom(Arg *arg) {
+	unsigned int n;
+	Client *c;
+
+	if(!sel)
+		return;
+	if(sel->versatile || (lt->arrange == versatile)) {
+		togglemax(sel);
+		return;
+	}
+	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+		n++;
+	if((c = sel) == nexttiled(clients))
+		if(!(c = nexttiled(c->next)))
+			return;
+	detach(c);
+	attach(c);
+	focus(c);
+	lt->arrange();
 }