const char *symbol;
void (*arrange)(void);
Bool isfloating;
-} Layout;
+} Layout; /* TODO: layout should keep an auxilliary pointer to its Geometry,
+ instead of having all those layout specific vars globally */
typedef struct {
const char *prop;
void configure(Client *c);
void configurenotify(XEvent *e);
void configurerequest(XEvent *e);
+unsigned int counttiled(void);
void destroynotify(XEvent *e);
void detach(Client *c);
void detachstack(Client *c);
void run(void);
void scan(void);
void setclientstate(Client *c, long state);
+void setdefaultgeoms(void);
void setlayout(const char *arg);
void setup(void);
void spawn(const char *arg);
unsigned int textw(const char *text);
void tileh(void);
void tilehstack(unsigned int n);
-unsigned int tilemaster(void);
+Client *tilemaster(unsigned int n);
+void tileresize(Client *c, int x, int y, int w, int h);
void tilev(void);
void tilevstack(unsigned int n);
void togglefloating(const char *arg);
void unban(Client *c);
void unmanage(Client *c);
void unmapnotify(XEvent *e);
+void updatebarpos(void);
void updatesizehints(Client *c);
void updatetitle(Client *c);
void updatewmhints(Client *c);
DC dc = {0};
Layout *lt = NULL;
Window root, barwin;
+void (*setgeoms)(void) = setdefaultgeoms;
/* configuration, allows nested code to access above variables */
#include "config.h"
XConfigureEvent *ev = &e->xconfigure;
if(ev->window == root && (ev->width != sw || ev->height != sh)) {
- sw = ev->width;
- sh = ev->height;
- XFreePixmap(dpy, dc.drawable);
- dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen));
- XMoveResizeWindow(dpy, barwin, bx, by, bw, bh);
+ setgeoms();
+ updatebarpos();
arrange();
}
}
XSync(dpy, False);
}
+unsigned int
+counttiled(void) {
+ unsigned int n;
+ Client *c;
+
+ for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++);
+ return n;
+}
+
void
destroynotify(XEvent *e) {
Client *c;
PropModeReplace, (unsigned char *)data, 2);
}
+void
+setdefaultgeoms(void) {
+
+ /* screen dimensions */
+ sx = 0;
+ sy = 0;
+ sw = DisplayWidth(dpy, screen);
+ sh = DisplayHeight(dpy, screen);
+
+ /* bar position */
+ bx = sx;
+ by = sy;
+ bw = sw;
+ bh = dc.font.height + 2;
+
+ /* window area */
+ wx = sx;
+ wy = sy + bh;
+ ww = sw;
+ wh = sh - bh;
+
+ /* master area */
+ mx = wx;
+ my = wy;
+ mw = ((float)sw) * 0.55;
+ mh = wh;
+
+ /* tile area */
+ tx = mx + mw;
+ ty = wy;
+ tw = ww - mw;
+ th = wh;
+
+ /* monocle area */
+ mox = wx;
+ moy = wy;
+ mow = ww;
+ moh = wh;
+}
+
void
setlayout(const char *arg) {
static Layout *revert = 0;
/* init screen */
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);
- sx = 0;
- sy = 0;
- sw = DisplayWidth(dpy, screen);
- sh = DisplayHeight(dpy, screen);
+ initfont(FONT);
+
+ /* apply default geometries */
+ setgeoms();
/* init atoms */
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
dc.sel[ColBG] = getcolor(SELBGCOLOR);
dc.sel[ColFG] = getcolor(SELFGCOLOR);
initfont(FONT);
- dc.h = bh = dc.font.height + 2;
+ dc.h = bh;
dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
dc.gc = XCreateGC(dpy, root, 0, 0);
XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
/* init layouts */
lt = &layouts[0];
- /* bar position */
- bx = BX; by = BY; bw = BW;
-
- /* window area */
- wx = WX; wy = WY; ww = WW; wh = WH;
-
- /* master area */
- mx = MX; my = MY; mw = MW; mh = MH;
-
- /* tile area */
- tx = TX; ty = TY; tw = TW; th = TH;
-
- /* monocle area */
- mox = MOX; moy = MOY; mow = MOW; moh = MOH;
-
/* init bar */
for(blw = i = 0; i < LENGTH(layouts); i++) {
i = textw(layouts[i].symbol);
return textnw(text, strlen(text)) + dc.font.height;
}
-void
-tileresize(Client *c, int x, int y, int w, int h) {
- resize(c, x, y, w, h, RESIZEHINTS);
- if((RESIZEHINTS) && ((c->h < bh) || (c->h > h) || (c->w < bh) || (c->w > w)))
- /* client doesn't accept size constraints */
- resize(c, x, y, w, h, False);
-}
-
void
tileh(void) {
- tilehstack(tilemaster());
-}
-
-void
-tilehstack(unsigned int n) {
- int i, x, w;
+ int x, w;
+ unsigned int i, n = counttiled();
Client *c;
if(n == 0)
return;
+ c = tilemaster(n);
+ if(--n == 0)
+ return;
x = tx;
w = tw / n;
if(w < bh)
w = tw;
- for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++)
- if(i > 0) {
- if(i > 1 && i == n) /* remainder */
- tileresize(c, x, ty, (tx + tw) - x - 2 * c->border,
- th - 2 * c->border);
- else
- tileresize(c, x, ty, w - 2 * c->border,
- th - 2 * c->border);
- if(w != tw)
- x = c->x + c->w + 2 * c->border;
- }
+ for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
+ if(i + 1 == n) /* remainder */
+ tileresize(c, x, ty, (tx + tw) - x - 2 * c->border, th - 2 * c->border);
+ else
+ tileresize(c, x, ty, w - 2 * c->border, th - 2 * c->border);
+ if(w != tw)
+ x = c->x + c->w + 2 * c->border;
+ }
}
-unsigned int
-tilemaster(void) {
- unsigned int n;
- Client *c, *mc;
+Client *
+tilemaster(unsigned int n) {
+ Client *c = nexttiled(clients);
- for(n = 0, mc = c = nexttiled(clients); c; c = nexttiled(c->next))
- n++;
- if(n == 0)
- return 0;
if(n == 1)
- tileresize(mc, mox, moy, mow - 2 * mc->border, moh - 2 * mc->border);
+ tileresize(c, mox, moy, mow - 2 * c->border, moh - 2 * c->border);
else
- tileresize(mc, mx, my, mw - 2 * mc->border, mh - 2 * mc->border);
- return n - 1;
+ tileresize(c, mx, my, mw - 2 * c->border, mh - 2 * c->border);
+ return c;
}
void
-tilev(void) {
- tilevstack(tilemaster());
+tileresize(Client *c, int x, int y, int w, int h) {
+ resize(c, x, y, w, h, RESIZEHINTS);
+ if((RESIZEHINTS) && ((c->h < bh) || (c->h > h) || (c->w < bh) || (c->w > w)))
+ /* client doesn't accept size constraints */
+ resize(c, x, y, w, h, False);
}
void
-tilevstack(unsigned int n) {
- int i, y, h;
+tilev(void) {
+ int y, h;
+ unsigned int i, n = counttiled();
Client *c;
if(n == 0)
return;
+ c = tilemaster(n);
+ if(--n == 0)
+ return;
y = ty;
h = th / n;
if(h < bh)
h = th;
- for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++)
- if(i > 0) {
- if(i > 1 && i == n) /* remainder */
- tileresize(c, tx, y, tw - 2 * c->border,
- (ty + th) - y - 2 * c->border);
- else
- tileresize(c, tx, y, tw - 2 * c->border,
- h - 2 * c->border);
- if(h != th)
- y = c->y + c->h + 2 * c->border;
- }
+ for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
+ if(i + 1 == n) /* remainder */
+ tileresize(c, tx, y, tw - 2 * c->border, (ty + th) - y - 2 * c->border);
+ else
+ tileresize(c, tx, y, tw - 2 * c->border, h - 2 * c->border);
+ if(h != th)
+ y = c->y + c->h + 2 * c->border;
+ }
}
void
unmanage(c);
}
+void
+updatebarpos(void) {
+
+ if(dc.drawable != 0)
+ XFreePixmap(dpy, dc.drawable);
+ dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen));
+ XMoveResizeWindow(dpy, barwin, bx, by, bw, bh);
+}
+
void
updatesizehints(Client *c) {
long msize;