X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=layout.c;h=46e82c2ad834b943ecabd8b932a1a6b7b602522c;hb=a923298d3577dca0e69fd70edbef56c7822258e3;hp=92c6a53060e72d36b612ce52d2c0ec1c91d5bd5d;hpb=9fdd2cd1a9dbe9b533fab9a8a98b9849dc4c7b59;p=dwm.git diff --git a/layout.c b/layout.c index 92c6a53..46e82c2 100644 --- a/layout.c +++ b/layout.c @@ -1,126 +1,55 @@ -/* © 2006-2007 Anselm R. Garbe - * © 2006-2007 Sander van Dijk - * © 2007 Premysl Hruby - * © 2007 Szabolcs Nagy - * See LICENSE file for license details. */ +/* See LICENSE file for copyright and license details. */ #include "dwm.h" #include -unsigned int blw = 0; -Layout *lt = NULL; - /* static */ -static unsigned int nlayouts = 0; -static unsigned int masterw = MASTERWIDTH; -static unsigned int nmaster = NMASTER; +typedef struct { + const char *symbol; + void (*arrange)(void); +} Layout; -static void -ban(Client *c) { - if (c->isbanned) - return; - XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); - c->isbanned = True; -} - -static void -unban(Client *c) { - if (!c->isbanned) - return; - XMoveWindow(dpy, c->win, c->x, c->y); - c->isbanned = False; -} +unsigned int blw = 0; +static Layout *lt = NULL; static void -tile(void) { - unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th; +floating(void) { /* default floating layout */ Client *c; - for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next)) - n++; - /* window geoms */ - mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1); - mw = (n > nmaster) ? (waw * masterw) / 1000 : waw; - th = (n > nmaster) ? wah / (n - nmaster) : 0; - tw = waw - mw; - - for(i = 0, c = clients; c; c = c->next) - if(isvisible(c)) { - unban(c); - if(c->isfloating) - continue; - c->ismax = False; - nx = wax; - ny = way; - if(i < nmaster) { - ny += i * mh; - nw = mw - 2 * c->border; - nh = mh; - if(i + 1 == (n < nmaster ? n : nmaster)) /* remainder */ - nh = wah - mh * i; - nh -= 2 * c->border; - } - else { /* tile window */ - nx += mw; - nw = tw - 2 * c->border; - if(th > 2 * c->border) { - ny += (i - nmaster) * th; - nh = th; - if(i + 1 == n) /* remainder */ - nh = wah - th * (i - nmaster); - nh -= 2 * c->border; - } - else /* fallback if th <= 2 * c->border */ - nh = wah - 2 * c->border; - } - resize(c, nx, ny, nw, nh, False); - i++; - } - else - ban(c); - focus(NULL); - restack(); + 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 /* extern */ void -floating(void) { +arrange(void) { Client *c; for(c = clients; c; c = c->next) - if(isvisible(c)) { - if(c->isbanned) - XMoveWindow(dpy, c->win, c->x, c->y); - c->isbanned = False; - resize(c, c->x, c->y, c->w, c->h, True); - } + if(isvisible(c)) + unban(c); 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); - } - } - else { - for(c = sel->next; c && !isvisible(c); c = c->next); - if(!c) - for(c = clients; c && !isvisible(c); c = c->next); - } + 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(); @@ -128,49 +57,47 @@ focusclient(const char *arg) { } void -incmasterw(const char *arg) { - int i; - if(lt->arrange != tile) +focusprev(const char *arg) { + Client *c; + + if(!sel) return; - if(!arg) - masterw = MASTERWIDTH; - else { - i = atoi(arg); - if(waw * (masterw + i) / 1000 >= waw - 2 * BORDERPX - || waw * (masterw + i) / 1000 <= 2 * BORDERPX) - return; - masterw += i; + 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(); } - lt->arrange(); } -void -incnmaster(const char *arg) { - int i; +const char * +getsymbol(void) +{ + return lt->symbol; +} - if(!arg) - nmaster = NMASTER; - else { - i = atoi(arg); - if((lt->arrange != tile) || (nmaster + i < 1) - || (wah / (nmaster + i) <= 2 * BORDERPX)) - return; - nmaster += i; - } - if(sel) - lt->arrange(); - else - drawstatus(); +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; } @@ -186,6 +113,7 @@ void restack(void) { Client *c; XEvent ev; + XWindowChanges wc; drawstatus(); if(!sel) @@ -193,12 +121,17 @@ restack(void) { if(sel->isfloating || lt->arrange == floating) XRaiseWindow(dpy, sel->win); if(lt->arrange != floating) { - if(!sel->isfloating) - XLowerWindow(dpy, sel->win); + wc.stack_mode = Below; + wc.sibling = barwin; + if(!sel->isfloating) { + XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc); + wc.sibling = sel->win; + } for(c = nexttiled(clients); c; c = nexttiled(c->next)) { if(c == sel) continue; - XLowerWindow(dpy, c->win); + XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc); + wc.sibling = c->win; } } XSync(dpy, False); @@ -211,17 +144,17 @@ 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(); + arrange(); else drawstatus(); } @@ -233,7 +166,7 @@ togglebar(const char *arg) { else bpos = BarOff; updatebarpos(); - lt->arrange(); + arrange(); } void @@ -247,25 +180,10 @@ togglemax(const char *arg) { sel->ry = sel->y; sel->rw = sel->w; sel->rh = sel->h; - resize(sel, wax, way, waw - 2 * BORDERPX, wah - 2 * BORDERPX, True); + resize(sel, wax, way, waw - 2 * sel->border, wah - 2 * sel->border, True); } else resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True); 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(); -}