#define LENGTH(x) (sizeof x / sizeof x[0])
#define MAXTAGLEN 16
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
+#define DEFGEOM(GEONAME,BX,BY,BW,WX,WY,WW,WH,MX,MY,MW,MH,TX,TY,TW,TH,MOX,MOY,MOW,MOH) \
+void GEONAME(void) { \
+ bx = (BX); by = (BY); bw = (BW); \
+ wx = (WX); wy = (WY); ww = (WW); wh = (WH); \
+ mx = (MX); my = (MY); mw = (MW); mh = (MH); \
+ tx = (TX); ty = (TY); tw = (TW); th = (TH); \
+ mox = (MOX); moy = (MOY); mow = (MOW); moh = (MOH); \
+}
/* enums */
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int minax, maxax, minay, maxay;
long flags;
- unsigned int border, oldborder;
+ unsigned int bw, oldbw;
Bool isbanned, isfixed, isfloating, isurgent;
Bool *tags;
Client *next;
} DC; /* draw context */
typedef struct {
+ const char *symbol;
+ void (*apply)(void);
+} Geom;
+
+typedef struct {
unsigned long mod;
KeySym keysym;
void (*func)(const char *arg);
} Rule;
/* function declarations */
-void applygeom(const char *arg);
void applyrules(Client *c);
void arrange(void);
void attach(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);
char stext[256], buf[256];
int screen, sx, sy, sw, sh;
int (*xerrorxlib)(Display *, XErrorEvent *);
-int bx, by, bw, bh, blw, mx, my, mw, mh, mox, moy, mow, moh, tx, ty, tw, th, wx, wy, ww, wh;
+int bx, by, bw, bh, blw, bgw, mx, my, mw, mh, mox, moy, mow, moh, tx, ty, tw, th, wx, wy, ww, wh;
unsigned int numlockmask = 0;
void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
Cursor cursor[CurLast];
Display *dpy;
DC dc = {0};
+Geom *geom = NULL;
Layout *lt = NULL;
Window root, barwin;
/* function implementations */
void
-applygeometry(const char *arg) {
- static const char *lastArg = NULL;
- char delim, 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; i < LENGTH(map) && e; e++)
- if(*e == ' ' || *e == 0) {
- delim = *e;
- *e = 0;
- op = 0;
- /* check if there is an operator */
- for(p = s; p < e && *p != '-' && *p != '+' && *p != '*'; p++);
- if(*p) {
- op = *p;
- *p = 0;
- }
- val = getdouble(s);
- if(op && p > s) { /* intermediate operand, e.g. H-B */
- *(map[i]) = (int)val;
- s = ++p;
- val = getdouble(s);
- }
- switch(op) {
- default: *(map[i]) = (int)val; break;
- case '-': *(map[i]) -= (int)val; break;
- case '+': *(map[i]) += (int)val; break;
- case '*': *(map[i]) = (int)(((double)*(map[i])) * val); break;
- }
- if(delim == 0)
- e = NULL;
- else
- s = ++e;
- i++;
- }
-}
-
-void
applyrules(Client *c) {
unsigned int i;
Bool matched = False;
XGetClassHint(dpy, c->win, &ch);
for(i = 0; i < LENGTH(rules); i++) {
r = &rules[i];
- if(strstr(c->name, r->title)
+ if(r->title && 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)))
{
XButtonPressedEvent *ev = &e->xbutton;
if(ev->window == barwin) {
- x = 0;
+ x = bgw;
for(i = 0; i < LENGTH(tags); i++) {
x += textw(tags[i]);
- if(ev->x < x) {
+ if(ev->x > bgw && ev->x < x) {
if(ev->button == Button1) {
if(ev->state & MODKEY)
tag(tags[i]);
ce.y = c->y;
ce.width = c->w;
ce.height = c->h;
- ce.border_width = c->border;
+ ce.border_width = c->bw;
ce.above = None;
ce.override_redirect = False;
XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
configurenotify(XEvent *e) {
XConfigureEvent *ev = &e->xconfigure;
- if(ev->window == root && (ev->width != sw || ev->height != sh))
+ if(ev->window == root && (ev->width != sw || ev->height != sh)) {
+ sw = ev->width;
+ sh = ev->height;
setgeom(NULL);
+ }
}
void
if((c = getclient(ev->window))) {
if(ev->value_mask & CWBorderWidth)
- c->border = ev->border_width;
+ c->bw = ev->border_width;
if(c->isfixed || c->isfloating || lt->isfloating) {
if(ev->value_mask & CWX)
c->x = sx + ev->x;
Client *c;
dc.x = 0;
+ dc.w = bgw;
+ drawtext(geom->symbol, dc.norm, False);
+ dc.x += bgw;
for(c = stack; c && !isvisible(c); c = c->snext);
for(i = 0; i < LENGTH(tags); i++) {
dc.w = textw(tags[i]);
idxoftag(const char *t) {
unsigned int i;
- for(i = 0; (i < LENGTH(tags)) && (tags[i] != t); i++);
+ for(i = 0; (i < LENGTH(tags)) && strcmp(tags[i], t); i++);
return (i < LENGTH(tags)) ? i : 0;
}
c->y = wa->y;
c->w = wa->width;
c->h = wa->height;
- c->oldborder = wa->border_width;
+ c->oldbw = wa->border_width;
if(c->w == sw && c->h == sh) {
c->x = sx;
c->y = sy;
- c->border = wa->border_width;
+ c->bw = wa->border_width;
}
else {
- if(c->x + c->w + 2 * c->border > wx + ww)
- c->x = wx + ww - c->w - 2 * c->border;
- if(c->y + c->h + 2 * c->border > wy + wh)
- c->y = wy + wh - c->h - 2 * c->border;
+ if(c->x + c->w + 2 * c->bw > wx + ww)
+ c->x = wx + ww - c->w - 2 * c->bw;
+ if(c->y + c->h + 2 * c->bw > wy + wh)
+ c->y = wy + wh - c->h - 2 * c->bw;
if(c->x < wx)
c->x = wx;
if(c->y < wy)
c->y = wy;
- c->border = BORDERPX;
+ c->bw = BORDERPX;
}
- wc.border_width = c->border;
+ wc.border_width = c->bw;
XConfigureWindow(dpy, w, CWBorderWidth, &wc);
XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
configure(c); /* propagates border_width, if size doesn't change */
for(c = clients; c; c = c->next)
if(isvisible(c))
- resize(c, mox, moy, mow, moh, RESIZEHINTS);
+ resize(c, mox, moy, mow - 2 * c->bw, moh - 2 * c->bw, RESIZEHINTS);
}
void
ny = ocy + (ev.xmotion.y - y1);
if(abs(wx - nx) < SNAP)
nx = wx;
- else if(abs((wx + ww) - (nx + c->w + 2 * c->border)) < SNAP)
- nx = wx + ww - c->w - 2 * c->border;
+ else if(abs((wx + ww) - (nx + c->w + 2 * c->bw)) < SNAP)
+ nx = wx + ww - c->w - 2 * c->bw;
if(abs(wy - ny) < SNAP)
ny = wy;
- else if(abs((wy + wh) - (ny + c->h + 2 * c->border)) < SNAP)
- ny = wy + wh - c->h - 2 * c->border;
+ else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < SNAP)
+ ny = wy + wh - c->h - 2 * c->bw;
if(!c->isfloating && !lt->isfloating && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
togglefloating(NULL);
if((lt->isfloating) || c->isfloating)
if(w <= 0 || h <= 0)
return;
if(x > sx + sw)
- x = sw - w - 2 * c->border;
+ x = sw - w - 2 * c->bw;
if(y > sy + sh)
- y = sh - h - 2 * c->border;
- if(x + w + 2 * c->border < sx)
+ y = sh - h - 2 * c->bw;
+ if(x + w + 2 * c->bw < sx)
x = sx;
- if(y + h + 2 * c->border < sy)
+ if(y + h + 2 * c->bw < sy)
y = sy;
if(c->x != x || c->y != y || c->w != w || c->h != h) {
c->x = wc.x = x;
c->y = wc.y = y;
c->w = wc.width = w;
c->h = wc.height = h;
- wc.border_width = c->border;
+ wc.border_width = c->bw;
XConfigureWindow(dpy, c->win,
CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
configure(c);
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
None, cursor[CurResize], CurrentTime) != GrabSuccess)
return;
- XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1);
+ XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
for(;;) {
XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask , &ev);
switch(ev.type) {
case ButtonRelease:
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
- c->w + c->border - 1, c->h + c->border - 1);
+ c->w + c->bw - 1, c->h + c->bw - 1);
XUngrabPointer(dpy, CurrentTime);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
return;
break;
case MotionNotify:
XSync(dpy, False);
- if((nw = ev.xmotion.x - ocx - 2 * c->border + 1) <= 0)
+ if((nw = ev.xmotion.x - ocx - 2 * c->bw + 1) <= 0)
nw = 1;
- if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
+ if((nh = ev.xmotion.y - ocy - 2 * c->bw + 1) <= 0)
nh = 1;
if(!c->isfloating && !lt->isfloating && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
togglefloating(NULL);
PropModeReplace, (unsigned char *)data, 2);
}
-double
-getdouble(const char *s) {
- char *endp;
- double result = 0;
-
- 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;
- }
- return result;
-}
-
void
setgeom(const char *arg) {
- applygeometry(arg);
+ unsigned int i;
+
+ for(i = 0; arg && i < LENGTH(geoms); i++)
+ if(!strcmp(geoms[i].symbol, arg))
+ break;
+ if(i == LENGTH(geoms))
+ return;
+ geom = &geoms[i];
+ geom->apply();
updatebarpos();
arrange();
}
void
setup(void) {
- unsigned int i;
+ unsigned int i, w;
XSetWindowAttributes wa;
/* init screen */
root = RootWindow(dpy, screen);
initfont(FONT);
- /* apply default dimensions */
+ /* apply default geometry */
sx = 0;
sy = 0;
sw = DisplayWidth(dpy, screen);
sh = DisplayHeight(dpy, screen);
- applygeometry(GEOMETRY);
+ bh = dc.font.height + 2;
+ geom = &geoms[0];
+ geom->apply();
/* init atoms */
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
/* init bar */
for(blw = i = 0; i < LENGTH(layouts); i++) {
- i = textw(layouts[i].symbol);
- if(i > blw)
- blw = i;
+ w = textw(layouts[i].symbol);
+ if(w > blw)
+ blw = w;
+ }
+ for(bgw = i = 0; i < LENGTH(geoms); i++) {
+ w = textw(geoms[i].symbol);
+ if(w > bgw)
+ bgw = w;
}
wa.override_redirect = 1;
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);
+ tileresize(c, x, ty, (tx + tw) - x - 2 * c->bw, th - 2 * c->bw);
else
- tileresize(c, x, ty, w - 2 * c->border, th - 2 * c->border);
+ tileresize(c, x, ty, w - 2 * c->bw, th - 2 * c->bw);
if(w != tw)
- x = c->x + c->w + 2 * c->border;
+ x = c->x + c->w + 2 * c->bw;
}
}
Client *c = nexttiled(clients);
if(n == 1)
- tileresize(c, mox, moy, mow - 2 * c->border, moh - 2 * c->border);
+ tileresize(c, mox, moy, mow - 2 * c->bw, moh - 2 * c->bw);
else
- tileresize(c, mx, my, mw - 2 * c->border, mh - 2 * c->border);
+ tileresize(c, mx, my, mw - 2 * c->bw, mh - 2 * c->bw);
return c;
}
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);
+ tileresize(c, tx, y, tw - 2 * c->bw, (ty + th) - y - 2 * c->bw);
else
- tileresize(c, tx, y, tw - 2 * c->border, h - 2 * c->border);
+ tileresize(c, tx, y, tw - 2 * c->bw, h - 2 * c->bw);
if(h != th)
- y = c->y + c->h + 2 * c->border;
+ y = c->y + c->h + 2 * c->bw;
}
}
unmanage(Client *c) {
XWindowChanges wc;
- wc.border_width = c->oldborder;
+ wc.border_width = c->oldbw;
/* The server grab construct avoids race conditions. */
XGrabServer(dpy);
XSetErrorHandler(xerrordummy);
Got questions, comments, patches, etc.? Contact Jason Woofenden