X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=view.c;h=5de34c0b170e1efa2748cb85ca7759095c256d92;hb=30d928591dbdb40d06c5973f6f3bda7a0c16e3e7;hp=ac336e304ab25897c83b5dda2a922ded94f72e94;hpb=016c54196e682ae8658854febb746b0437a010dc;p=dwm.git

diff --git a/view.c b/view.c
index ac336e3..5de34c0 100644
--- a/view.c
+++ b/view.c
@@ -3,65 +3,45 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
+#include <stdio.h>
 
 /* static */
 
 static Client *
-getslot(Client *c)
+minclient()
 {
-	unsigned int i, tic;
-	Client *p;
-
-	for(tic = 0; tic < ntags && !c->tags[tic]; tic++);
-	for(p = clients; p; p = p->next) {
-		for(i = 0; i < ntags && !p->tags[i]; i++);
-		if(tic < i)
-			return p;
-	}
-	return p;
+	Client *c, *min;
+
+	for(min = c = clients; c; c = c->next)
+		if(c->weight < min->weight)
+			min = c;
+	return min;
 }
 
-static Client *
-tail()
+
+static void
+reorder()
 {
-	Client *c;
-	for(c = clients; c && c->next; c = c->next);
-	return c;
+	Client *c, *newclients, *tail;
+
+	newclients = tail = NULL;
+	while((c = minclient())) {
+		detach(c);
+		if(tail) {
+			c->prev = tail;
+			tail->next = c;
+			tail = c;
+		}
+		else
+			tail = newclients = c;
+	}
+	clients = newclients;
 }
 
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
 
-void
-attach(Client *c)
-{
-	Client *p;
-
-	if(!clients) {
-		clients = c;
-		return;
-	}
-	if(!(p = getnext(clients)) && !(p = getslot(c))) {
-		p = tail();
-		c->prev = p;
-		p->next = c;
-		return;
-	}
-
-	if(p == clients) {
-		c->next = clients;
-		clients->prev = c;
-		clients = c;
-	}
-	else {
-		p->prev->next = c;
-		c->prev = p->prev;
-		p->prev = c;
-		c->next = p;
-	}
-}
-
 void
 detach(Client *c)
 {
@@ -87,9 +67,7 @@ dofloat(Arg *arg)
 		else
 			ban(c);
 	}
-	if(!sel || !isvisible(sel))
-		sel = getnext(clients);
-	if(sel)
+	if((sel = getnext(clients)))
 		focus(sel);
 	else
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
@@ -152,9 +130,7 @@ dotile(Arg *arg)
 		else
 			ban(c);
 	}
-	if(!sel || !isvisible(sel))
-		sel = getnext(clients);
-	if(sel)
+	if((sel = getnext(clients)))
 		focus(sel);
 	else
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
@@ -277,6 +253,7 @@ toggleview(Arg *arg)
 	for(i = 0; i < ntags && !seltag[i]; i++);
 	if(i == ntags)
 		seltag[arg->i] = True; /* cannot toggle last view */
+	reorder();
 	arrange(NULL);
 }
 
@@ -284,10 +261,12 @@ void
 view(Arg *arg)
 {
 	unsigned int i;
+	Client *c;
 
 	for(i = 0; i < ntags; i++)
 		seltag[i] = False;
 	seltag[arg->i] = True;
+	reorder();
 	arrange(NULL);
 }
 
@@ -303,7 +282,9 @@ zoom(Arg *arg)
 		if(!(c = getnext(c->next)))
 			return;
 	detach(c);
-	attach(c);
+	c->next = clients;
+	clients->prev = c;
+	clients = c;
 	focus(c);
 	arrange(NULL);
 }