moved focus{next,prev} and nexttiled from client.c to layout.c (because those are...

[dwm.git] / layout.c

diff --git a/layout.c b/layout.c
index d754afb..e5f635c 100644 (file)
--- a/layout.c
+++ b/layout.c
@@ -69,6 +69,38 @@ LAYOUTS
 /* extern */
 
 void
+focusnext(Arg *arg) {
+       Client *c;
+   
+       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();
+       }
+}
+
+void
+focusprev(Arg *arg) {
+       Client *c;
+
+       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();
+       }
+}
+
+void
 incnmaster(Arg *arg) {
        if((lt->arrange != tile) || (nmaster + arg->i < 1)
        || (wah / (nmaster + arg->i) <= 2 * BORDERPX))
@@ -93,6 +125,12 @@ initlayouts(void) {
        }
 }
 
+Client *
+nexttiled(Client *c) {
+       for(; c && (c->isversatile || !isvisible(c)); c = c->next);
+       return c;
+}
+
 void
 resizemaster(Arg *arg) {
        if(lt->arrange != tile)
@@ -154,14 +192,6 @@ setlayout(Arg *arg) {
 }
 
 void
-toggleversatile(Arg *arg) {
-       if(!sel || lt->arrange == versatile)
-               return;
-       sel->isversatile = !sel->isversatile;
-       lt->arrange();
-}
-
-void
 versatile(void) {
        Client *c;