renamed seltag into seltags

[dwm.git] / layout.c

diff --git a/layout.c b/layout.c
index 0002397..46e82c2 100644 (file)
--- a/layout.c
+++ b/layout.c
@@ -1,12 +1,25 @@
 /* See LICENSE file for copyright and license details. */
 #include "dwm.h"
-#include <stdio.h>
 #include <stdlib.h>
 
+/* static */
+
+typedef struct {
+       const char *symbol;
+       void (*arrange)(void);
+} Layout;
+
 unsigned int blw = 0;
-Layout *lt = NULL;
+static Layout *lt = NULL;
 
-/* static */
+static void
+floating(void) { /* default floating layout */
+       Client *c;
+
+       for(c = clients; c; c = c->next)
+               if(isvisible(c))
+                       resize(c, c->x, c->y, c->w, c->h, True);
+}
 
 static unsigned int nlayouts = 0;
 
@@ -15,40 +28,44 @@ LAYOUTS
 /* extern */
 
 void
-floating(const char *arg) {
+arrange(void) {
        Client *c;
 
-       if(lt->arrange != floating)
-               return;
-
        for(c = clients; c; c = c->next)
-               if(isvisible(c)) {
+               if(isvisible(c))
                        unban(c);
-                       resize(c, c->x, c->y, c->w, c->h, True);
-               }
                else
                        ban(c);
+       lt->arrange();
        focus(NULL);
        restack();
 }
 
 void
-focusclient(const char *arg) {
+focusnext(const char *arg) {
        Client *c;
-   
-       if(!sel || !arg)
+
+       if(!sel)
                return;
-       if(atoi(arg) < 0) {
-               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);
-               }
+       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();
        }
-       else {
-               for(c = sel->next; c && !isvisible(c); c = c->next);
-               if(!c)
-                       for(c = clients; c && !isvisible(c); c = c->next);
+}
+
+void
+focusprev(const char *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);
@@ -56,14 +73,31 @@ focusclient(const char *arg) {
        }
 }
 
+const char *
+getsymbol(void)
+{
+       return lt->symbol;
+}
+
+Bool
+isfloating(void) {
+       return lt->arrange == floating;
+}
+
+Bool
+isarrange(void (*func)())
+{
+       return func == lt->arrange;
+}
+
 void
 initlayouts(void) {
        unsigned int i, w;
 
-       lt = &layout[0];
-       nlayouts = sizeof layout / sizeof layout[0];
+       lt = &layouts[0];
+       nlayouts = sizeof layouts / sizeof layouts[0];
        for(blw = i = 0; i < nlayouts; i++) {
-               w = textw(layout[i].symbol);
+               w = textw(layouts[i].symbol);
                if(w > blw)
                        blw = w;
        }
@@ -110,88 +144,29 @@ setlayout(const char *arg) {
 
        if(!arg) {
                lt++;
-               if(lt == layout + nlayouts)
-                       lt = layout;
+               if(lt == layouts + nlayouts)
+                       lt = layouts;
        }
        else {
                i = atoi(arg);
                if(i < 0 || i >= nlayouts)
                        return;
-               lt = &layout[i];
+               lt = &layouts[i];
        }
        if(sel)
-               lt->arrange(NULL);
+               arrange();
        else
                drawstatus();
 }
 
 void
-tile(const char *arg) {
-       static double master = MASTER;
-       double delta;
-       unsigned int i, n, nx, ny, nw, nh, mw, th;
-       Client *c;
-
-       if(lt->arrange != tile)
-               return;
-
-       /* arg handling, manipulate master */
-       if(arg && (1 == sscanf(arg, "%lf", &delta))) {
-               if(delta + master > 0.1 && delta + master < 0.9)
-                       master += delta;
-       }
-
-       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
-               n++;
-
-       /* window geoms */
-       mw = (n == 1) ? waw : master * waw;
-       th = (n > 1) ? wah / (n - 1) : 0;
-       if(n > 1 && th < bh)
-               th = wah;
-
-       nx = wax;
-       ny = way;
-       for(i = 0, c = clients; c; c = c->next)
-               if(isvisible(c)) {
-                       unban(c);
-                       if(c->isfloating)
-                               continue;
-                       c->ismax = False;
-                       if(i == 0) { /* master */
-                               nw = mw - 2 * c->border;
-                               nh = wah - 2 * c->border;
-                       }
-                       else {  /* tile window */
-                               if(i == 1) {
-                                       ny = way;
-                                       nx += mw;
-                               }
-                               nw = waw - mw - 2 * c->border;
-                               if(i + 1 == n) /* remainder */
-                                       nh = (way + wah) - ny - 2 * c->border;
-                               else
-                                       nh = th - 2 * c->border;
-                       }
-                       resize(c, nx, ny, nw, nh, False);
-                       if(n > 1 && th != wah)
-                               ny += nh;
-                       i++;
-               }
-               else
-                       ban(c);
-       focus(NULL);
-       restack();
-}
-
-void
 togglebar(const char *arg) {
        if(bpos == BarOff)
                bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
        else
                bpos = BarOff;
        updatebarpos();
-       lt->arrange(NULL);
+       arrange();
 }
 
 void
@@ -212,18 +187,3 @@ togglemax(const char *arg) {
        drawstatus();
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
-
-void
-zoom(const char *arg) {
-       Client *c;
-
-       if(!sel || lt->arrange == floating || sel->isfloating)
-               return;
-       if((c = sel) == nexttiled(clients))
-               if(!(c = nexttiled(c->next)))
-                       return;
-       detach(c);
-       attach(c);
-       focus(c);
-       lt->arrange(NULL);
-}