diff -r 89ea2acd2646 -r b938876de936 layout.c --- a/layout.c Mon Aug 13 18:24:15 2007 +0200 +++ b/layout.c Mon Aug 13 19:13:54 2007 +0200 @@ -2,11 +2,25 @@ #include "dwm.h" #include +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) { + 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; LAYOUTS @@ -14,19 +28,15 @@ /* extern */ void -floating(void) { +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(); } @@ -55,6 +65,23 @@ } } +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; @@ -119,7 +146,7 @@ lt = &layout[i]; } if(sel) - lt->arrange(); + arrange(); else drawstatus(); } @@ -131,7 +158,7 @@ else bpos = BarOff; updatebarpos(); - lt->arrange(); + arrange(); } void