const char *symbol;
void (*arrange)(void);
Bool isfloating;
-} Layout;
+} Layout;
typedef struct {
- const char *prop;
+ const char *class;
+ const char *instance;
+ const char *title;
const char *tag;
Bool isfloating;
} Rule;
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 focusprev(const char *arg);
Client *getclient(Window w);
unsigned long getcolor(const char *colstr);
+double getdouble(const char *s);
long getstate(Window w);
Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
void grabbuttons(Client *c, Bool focused);
void run(void);
void scan(void);
void setclientstate(Client *c, long state);
+void setgeom(const char *arg);
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);
XGetClassHint(dpy, c->win, &ch);
for(i = 0; i < LENGTH(rules); i++) {
r = &rules[i];
- if(strstr(c->name, r->prop)
- || (ch.res_class && strstr(ch.res_class, r->prop))
- || (ch.res_name && strstr(ch.res_name, r->prop)))
+ if(strstr(c->name, r->title)
+ || (ch.res_class && r->class && strstr(ch.res_class, r->class))
+ || (ch.res_name && r->instance && strstr(ch.res_name, r->instance)))
{
c->isfloating = r->isfloating;
if(r->tag) {
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);
+ setgeom(NULL);
+ 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;
}
void
-monocle(void) {
+monocle(void) {
Client *c;
for(c = clients; c; c = c->next)
PropModeReplace, (unsigned char *)data, 2);
}
+/**
+ * Idea:
+ *
+ * having a geom syntax as follows, which is interpreted as integer.
+ *
+ * [-,+][<0..n>|<W,H,B>]
+ *
+ *
+ * B = bar height, W = DisplayWidth(), H = DisplayHeight()
+ *
+ * -/+/* /: is relative to current
+ *
+ * Then we would come down with <bx>,<by>,<bw>,<bh>,...
+ *
+ * "0 0 W B 0 0 W W N E B,W,B,
+ *
+ *
+ */
+
+double
+getdouble(const char *s) {
+ char *endp;
+ double result = 0;
+
+ fprintf(stderr, "getdouble '%s'\n", s);
+ switch(*s) {
+ default:
+ result = strtod(s, &endp);
+ if(s == endp || *endp != 0)
+ result = strtol(s, &endp, 0);
+ break;
+ case 'B': result = dc.font.height + 2; break;
+ case 'W': result = sw; break;
+ case 'H': result = sh; break;
+ }
+ fprintf(stderr, "getdouble returns '%f'\n", result);
+ return result;
+}
+
+void
+setgeom(const char *arg) {
+ static const char *lastArg = NULL;
+ char op, *s, *e, *p;
+ double val;
+ int i, *map[] = { &bx, &by, &bw, &bh,
+ &wx, &wy, &ww, &wh,
+ &mx, &my, &mw, &mh,
+ &tx, &ty, &tw, &th,
+ &mox, &moy, &mow, &moh };
+
+ if(!arg)
+ arg = lastArg;
+ else
+ lastArg = arg;
+ if(!lastArg)
+ return;
+ strncpy(buf, arg, sizeof buf);
+ for(i = 0, e = s = buf; e && *e; e++)
+ if(*e == ' ') {
+ *e = 0;
+ fprintf(stderr, "next geom arg='%s'\n", s);
+ op = 0;
+ /* check if there is an operator */
+ for(p = s; *p && *p != '-' && *p != '+' && *p != '*' && *p != ':'; p++);
+ if(*p) {
+ op = *p;
+ *p = 0;
+ }
+ val = getdouble(s);
+ fprintf(stderr, "val1: %d\n", val);
+ if(p > s) { /* intermediate operand, e.g. H-B */
+ *(map[i]) = val;
+ s = ++p;
+ val = getdouble(s);
+ fprintf(stderr, "val2: %d\n", val);
+ }
+ switch(op) {
+ default: *(map[i]) = val; break;
+ case '-': *(map[i]) -= val; break;
+ case '+': *(map[i]) += val; break;
+ case '*': *(map[i]) *= val; break;
+ case ':': if(val != 0) *(map[i]) /= val; break;
+ }
+ fprintf(stderr, "map[i]='%d'\n", val);
+ s = ++e;
+ i++;
+ }
+ updatebarpos();
+ arrange();
+}
+
void
setlayout(const char *arg) {
static Layout *revert = 0;
/* init screen */
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);
+ initfont(FONT);
+
+ /* apply default dimensions */
sx = 0;
sy = 0;
sw = DisplayWidth(dpy, screen);
sh = DisplayHeight(dpy, screen);
+ setgeom(GEOMETRY);
/* 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;