X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=44c0b308a1d57dc2d81641ec251f07371f35b0f1;hb=6b25d06d7d159bf89d740847fedc876ab0137b6b;hp=3270160d2e1d72022c728d66dba7f50cc4eeba2f;hpb=9d739090750ffb3b3a64e86e2331215b8901c360;p=dwm.git

diff --git a/view.c b/view.c
index 3270160..44c0b30 100644
--- a/view.c
+++ b/view.c
@@ -6,28 +6,60 @@
 
 /* static */
 
-static void
-reorder()
-{
-	Client *c, *orig, *p;
+static Client *
+minclient(void) {
+	Client *c, *min;
+
+	if((clients && clients->isfloat) || arrange == dofloat)
+		return clients; /* don't touch floating order */
+	for(min = c = clients; c; c = c->next)
+		if(c->weight < min->weight)
+			min = c;
+	return min;
+}
 
-	orig = clients;
-	clients = NULL;
+static Client *
+nexttiled(Client *c) {
+	for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
+	return c;
+}
 
-	while((c = orig)) {
-		orig = orig->next;
-		detach(c);
+static void
+reorder(void) {
+	Client *c, *newclients, *tail;
 
-		for(p = clients; p && p->next && p->weight <= c->weight; p = p->next);
-		c->prev = p;
-		if(p) {
-			if((c->next = p->next))
-				c->next->prev = c;
-			p->next = c;
+	newclients = tail = NULL;
+	while((c = minclient())) {
+		detach(c);
+		if(tail) {
+			c->prev = tail;
+			tail->next = c;
+			tail = c;
 		}
 		else
-			clients = c;
+			tail = newclients = c;
+	}
+	clients = newclients;
+}
+
+static void
+togglemax(Client *c)
+{
+	XEvent ev;
+	if((c->ismax = !c->ismax)) {
+		c->rx = c->x; c->x = sx;
+		c->ry = c->y; c->y = bh;
+		c->rw = c->w; c->w = sw;
+		c->rh = c->h; c->h = sh - bh - 2;
+	}
+	else {
+		c->x = c->rx;
+		c->y = c->ry;
+		c->w = c->rw;
+		c->h = c->rh;
 	}
+	resize(c, True, TopLeft);
+	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 /* extern */
@@ -35,8 +67,7 @@ reorder()
 void (*arrange)(Arg *) = DEFMODE;
 
 void
-detach(Client *c)
-{
+detach(Client *c) {
 	if(c->prev)
 		c->prev->next = c->next;
 	if(c->next)
@@ -47,30 +78,25 @@ detach(Client *c)
 }
 
 void
-dofloat(Arg *arg)
-{
+dofloat(Arg *arg) {
 	Client *c;
 
 	for(c = clients; c; c = c->next) {
-		c->ismax = False;
 		if(isvisible(c)) {
 			resize(c, True, TopLeft);
 		}
 		else
 			ban(c);
 	}
-	if(!sel || !isvisible(sel))
-		sel = getnext(clients);
-	if(sel)
-		focus(sel);
-	else
-		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+	if(!sel || !isvisible(sel)) {
+		for(c = stack; c && !isvisible(c); c = c->snext);
+		focus(c);
+	}
 	restack();
 }
 
 void
-dotile(Arg *arg)
-{
+dotile(Arg *arg) {
 	int h, i, n, w;
 	Client *c;
 
@@ -85,12 +111,13 @@ dotile(Arg *arg)
 		h = sh - bh;
 
 	for(i = 0, c = clients; c; c = c->next) {
-		c->ismax = False;
 		if(isvisible(c)) {
 			if(c->isfloat) {
 				resize(c, True, TopLeft);
 				continue;
 			}
+			if(c->ismax)
+				togglemax(c);
 			if(n == 1) {
 				c->x = sx;
 				c->y = sy + bh;
@@ -124,18 +151,15 @@ dotile(Arg *arg)
 		else
 			ban(c);
 	}
-	if(!sel || !isvisible(sel))
-		sel = getnext(clients);
-	if(sel)
-		focus(sel);
-	else
-		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+	if(!sel || !isvisible(sel)) {
+		for(c = stack; c && !isvisible(c); c = c->snext);
+		focus(c);
+	}
 	restack();
 }
 
 void
-focusnext(Arg *arg)
-{
+focusnext(Arg *arg) {
 	Client *c;
    
 	if(!sel)
@@ -150,8 +174,7 @@ focusnext(Arg *arg)
 }
 
 void
-focusprev(Arg *arg)
-{
+focusprev(Arg *arg) {
 	Client *c;
 
 	if(!sel)
@@ -168,8 +191,7 @@ focusprev(Arg *arg)
 }
 
 Bool
-isvisible(Client *c)
-{
+isvisible(Client *c) {
 	unsigned int i;
 
 	for(i = 0; i < ntags; i++)
@@ -179,60 +201,54 @@ isvisible(Client *c)
 }
 
 void
-restack()
-{
-	static unsigned int nwins = 0;
-	static Window *wins = NULL;
-	unsigned int f, fi, m, mi, n;
+resizecol(Arg *arg) {
+	unsigned int n;
 	Client *c;
-	XEvent ev;
 
-	for(f = 0, m = 0, c = clients; c; c = c->next)
-		if(isvisible(c)) {
-			if(c->isfloat || arrange == dofloat)
-				f++;
-			else
-				m++;
-		}
-	if(!(n = 2 * (f + m))) {
-		drawstatus();
+	for(n = 0, c = clients; c; c = c->next)
+		if(isvisible(c) && !c->isfloat)
+			n++;
+	if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
 		return;
+
+	if(sel == getnext(clients)) {
+		if(mw + arg->i > sw - 100 || mw + arg->i < 100)
+			return;
+		mw += arg->i;
 	}
-	if(nwins < n) {
-		nwins = n;
-		wins = erealloc(wins, nwins * sizeof(Window));
+	else {
+		if(mw - arg->i > sw - 100 || mw - arg->i < 100)
+			return;
+		mw -= arg->i;
 	}
+	arrange(NULL);
+}
 
-	fi = 0;
-	mi = 2 * f;
-	if(sel->isfloat || arrange == dofloat) {
-		wins[fi++] = sel->twin;
-		wins[fi++] = sel->win;
+void
+restack(void) {
+	Client *c;
+	XEvent ev;
+
+	if(!sel) {
+		drawstatus();
+		return;
 	}
-	else {
-		wins[mi++] = sel->twin;
-		wins[mi++] = sel->win;
+	if(sel->isfloat || arrange == dofloat) {
+		XRaiseWindow(dpy, sel->win);
+		XRaiseWindow(dpy, sel->twin);
 	}
-	for(c = clients; c; c = c->next)
-		if(isvisible(c) && c != sel) {
-			if(c->isfloat || arrange == dofloat) {
-				wins[fi++] = c->twin;
-				wins[fi++] = c->win;
-			}
-			else {
-				wins[mi++] = c->twin;
-				wins[mi++] = c->win;
-			}
+	if(arrange != dofloat)
+		for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+			XLowerWindow(dpy, c->twin);
+			XLowerWindow(dpy, c->win);
 		}
-	XRestackWindows(dpy, wins, n);
 	drawall();
 	XSync(dpy, False);
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
-togglemode(Arg *arg)
-{
+togglemode(Arg *arg) {
 	arrange = (arrange == dofloat) ? dotile : dofloat;
 	if(sel)
 		arrange(NULL);
@@ -241,8 +257,7 @@ togglemode(Arg *arg)
 }
 
 void
-toggleview(Arg *arg)
-{
+toggleview(Arg *arg) {
 	unsigned int i;
 
 	seltag[arg->i] = !seltag[arg->i];
@@ -254,10 +269,8 @@ toggleview(Arg *arg)
 }
 
 void
-view(Arg *arg)
-{
+view(Arg *arg) {
 	unsigned int i;
-	Client *c;
 
 	for(i = 0; i < ntags; i++)
 		seltag[i] = False;
@@ -267,19 +280,41 @@ view(Arg *arg)
 }
 
 void
-zoom(Arg *arg)
-{
-	Client *c = sel;
+viewall(Arg *arg) {
+	unsigned int i;
+
+	for(i = 0; i < ntags; i++)
+		seltag[i] = True;
+	reorder();
+	arrange(NULL);
+}
+
+void
+zoom(Arg *arg) {
+	unsigned int n;
+	Client *c;
 
-	if(!c || (arrange != dotile) || c->isfloat || c->ismax)
+	if(!sel)
+		return;
+
+	if(sel->isfloat || (arrange == dofloat)) {
+		togglemax(sel);
+		return;
+	}
+
+	for(n = 0, c = clients; c; c = c->next)
+		if(isvisible(c) && !c->isfloat)
+			n++;
+	if(n < 2 || (arrange == dofloat))
 		return;
 
-	if(c == getnext(clients))
-		if(!(c = getnext(c->next)))
+	if((c = sel) == nexttiled(clients))
+		if(!(c = nexttiled(c->next)))
 			return;
 	detach(c);
+	if(clients)
+		clients->prev = c;
 	c->next = clients;
-	clients->prev = c;
 	clients = c;
 	focus(c);
 	arrange(NULL);