#define MIN(a, b) ((a) < (b) ? (a) : (b))
#define MAXTAGLEN 16
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
+#define NOBORDER(x) ((x) - 2 * c->bw)
#define TAGMASK ((int)((1LL << LENGTH(tags)) - 1))
#define TEXTW(x) (textnw(x, strlen(x)) + dc.font.height)
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
enum { ColBorder, ColFG, ColBG, ColLast }; /* color */
enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
-enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
+enum { WMProtocols, WMDelete, WMState, WMLast }; /* default atoms */
enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
static void grabbuttons(Client *c, Bool focused);
static void grabkeys(void);
static void initfont(const char *fontstr);
-static Bool isoccupied(unsigned int t);
static Bool isprotodel(Client *c);
-static Bool isurgent(unsigned int t);
static void keypress(XEvent *e);
static void killclient(const Arg *arg);
static void manage(Window w, XWindowAttributes *wa);
static void unmapnotify(XEvent *e);
static void updatebar(void);
static void updategeom(void);
+static void updatenumlockmask(void);
static void updatesizehints(Client *c);
static void updatetitle(Client *c);
static void updatewmhints(Client *c);
/* variables */
static char stext[256];
-static int screen, sx, sy, sw, sh;
-static int by, bh, blw, wx, wy, ww, wh;
+static int screen;
+static int sx, sy, sw, sh; /* X display screen geometry x, y, width, height */
+static int by, bh, blw; /* bar geometry y, height and layout symbol width */
+static int wx, wy, ww, wh; /* window area geometry x, y, width, height, bar excluded */
static unsigned int seltags = 0, sellt = 0;
static int (*xerrorxlib)(Display *, XErrorEvent *);
static unsigned int numlockmask = 0;
[UnmapNotify] = unmapnotify
};
static Atom wmatom[WMLast], netatom[NetLast];
-static Bool otherwm, readin;
+static Bool otherwm;
static Bool running = True;
-static unsigned int tagset[] = {1, 1}; /* after start, first tag is selected */
static Client *clients = NULL;
static Client *sel = NULL;
static Client *stack = NULL;
static Cursor cursor[CurLast];
static Display *dpy;
-static DC dc = {0};
+static DC dc;
static Layout *lt[] = { NULL, NULL };
static Window root, barwin;
/* configuration, allows nested code to access above variables */
XClassHint ch = { 0 };
/* rule matching */
- XGetClassHint(dpy, c->win, &ch);
- for(i = 0; i < LENGTH(rules); i++) {
- r = &rules[i];
- if((!r->title || strstr(c->name, r->title))
- && (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
- && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
- c->isfloating = r->isfloating;
- c->tags |= r->tags & TAGMASK;
+ if(XGetClassHint(dpy, c->win, &ch)) {
+ for(i = 0; i < LENGTH(rules); i++) {
+ r = &rules[i];
+ if((!r->title || strstr(c->name, r->title))
+ && (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
+ && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
+ c->isfloating = r->isfloating;
+ c->tags |= r->tags & TAGMASK;
+ }
}
+ if(ch.res_class)
+ XFree(ch.res_class);
+ if(ch.res_name)
+ XFree(ch.res_name);
}
- if(ch.res_class)
- XFree(ch.res_class);
- if(ch.res_name)
- XFree(ch.res_name);
if(!c->tags)
c->tags = tagset[seltags];
}
void
cleanup(void) {
- Arg a = {.i = ~0};
+ Arg a = {.ui = ~0};
Layout foo = { "", NULL };
close(STDIN_FILENO);
void
drawbar(void) {
- int i, x;
+ int x;
+ unsigned int i, occ = 0, urg = 0;
+ unsigned long *col;
+ Client *c;
+
+ for(c = clients; c; c = c->next) {
+ occ |= c->tags;
+ if(c->isurgent)
+ urg |= c->tags;
+ }
dc.x = 0;
for(i = 0; i < LENGTH(tags); i++) {
dc.w = TEXTW(tags[i]);
- if(tagset[seltags] & 1 << i) {
- drawtext(tags[i], dc.sel, isurgent(i));
- drawsquare(sel && sel->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel);
- }
- else {
- drawtext(tags[i], dc.norm, isurgent(i));
- drawsquare(sel && sel->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm);
- }
+ col = tagset[seltags] & 1 << i ? dc.sel : dc.norm;
+ drawtext(tags[i], col, urg & 1 << i);
+ drawsquare(sel && sel->tags & 1 << i, occ & 1 << i, urg & 1 << i, col);
dc.x += dc.w;
}
if(blw > 0) {
void
drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
+ char buf[256];
int i, x, y, h, len, olen;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
- char buf[256];
XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
if(!text)
return;
olen = strlen(text);
- len = MIN(olen, sizeof buf);
- memcpy(buf, text, len);
h = dc.font.ascent + dc.font.descent;
y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
x = dc.x + (h / 2);
/* shorten text if necessary */
- for(; len && (i = textnw(buf, len)) > dc.w - h; len--);
+ for(len = MIN(olen, sizeof buf); len && textnw(text, len) > dc.w - h; len--);
if(!len)
return;
+ memcpy(buf, text, len);
if(len < olen)
for(i = len; i && i > len - 3; buf[--i] = '.');
XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);
void
grabbuttons(Client *c, Bool focused) {
- unsigned int i, j;
- unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
-
- XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
- if(focused) {
- for(i = 0; i < LENGTH(buttons); i++)
- if(buttons[i].click == ClkClientWin)
- for(j = 0; j < LENGTH(modifiers); j++)
- XGrabButton(dpy, buttons[i].button, buttons[i].mask | modifiers[j], c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
- } else
- XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
- BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+ updatenumlockmask();
+ {
+ unsigned int i, j;
+ unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
+ XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+ if(focused) {
+ for(i = 0; i < LENGTH(buttons); i++)
+ if(buttons[i].click == ClkClientWin)
+ for(j = 0; j < LENGTH(modifiers); j++)
+ XGrabButton(dpy, buttons[i].button, buttons[i].mask | modifiers[j], c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+ } else
+ XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
+ BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+ }
}
void
grabkeys(void) {
- unsigned int i, j;
- KeyCode code;
- XModifierKeymap *modmap;
-
- /* init modifier map */
- modmap = XGetModifierMapping(dpy);
- for(i = 0; i < 8; i++)
- for(j = 0; j < modmap->max_keypermod; j++) {
- if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
- numlockmask = (1 << i);
+ updatenumlockmask();
+ { /* grab keys */
+ unsigned int i, j;
+ unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
+ KeyCode code;
+
+ XUngrabKey(dpy, AnyKey, AnyModifier, root);
+ for(i = 0; i < LENGTH(keys); i++) {
+ code = XKeysymToKeycode(dpy, keys[i].keysym);
+ for(j = 0; j < LENGTH(modifiers); j++)
+ XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, True,
+ GrabModeAsync, GrabModeAsync);
}
- XFreeModifiermap(modmap);
-
- XUngrabKey(dpy, AnyKey, AnyModifier, root);
- for(i = 0; i < LENGTH(keys); i++) {
- code = XKeysymToKeycode(dpy, keys[i].keysym);
- XGrabKey(dpy, code, keys[i].mod, root, True,
- GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, code, keys[i].mod|LockMask, root, True,
- GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, code, keys[i].mod|numlockmask, root, True,
- GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, code, keys[i].mod|numlockmask|LockMask, root, True,
- GrabModeAsync, GrabModeAsync);
}
}
int i, n;
missing = NULL;
- if(dc.font.set)
- XFreeFontSet(dpy, dc.font.set);
dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
if(missing) {
while(n--)
}
}
else {
- if(dc.font.xfont)
- XFreeFont(dpy, dc.font.xfont);
- dc.font.xfont = NULL;
if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
&& !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
die("error, cannot load font: '%s'\n", fontstr);
}
Bool
-isoccupied(unsigned int t) {
- Client *c;
-
- for(c = clients; c; c = c->next)
- if(c->tags & 1 << t)
- return True;
- return False;
-}
-
-Bool
isprotodel(Client *c) {
int i, n;
Atom *protocols;
return ret;
}
-Bool
-isurgent(unsigned int t) {
- Client *c;
-
- for(c = clients; c; c = c->next)
- if(c->isurgent && c->tags & 1 << t)
- return True;
- return False;
-}
-
void
keypress(XEvent *e) {
unsigned int i;
void
manage(Window w, XWindowAttributes *wa) {
Client *c, *t = NULL;
- Status rettrans;
- Window trans;
+ Window trans = None;
XWindowChanges wc;
if(!(c = calloc(1, sizeof(Client))))
if(c->w == sw && c->h == sh) {
c->x = sx;
c->y = sy;
- c->bw = wa->border_width;
+ c->bw = 0;
}
else {
if(c->x + c->w + 2 * c->bw > sx + sw)
- c->x = sx + sw - c->w - 2 * c->bw;
+ c->x = sx + sw - NOBORDER(c->w);
if(c->y + c->h + 2 * c->bw > sy + sh)
- c->y = sy + sh - c->h - 2 * c->bw;
+ c->y = sy + sh - NOBORDER(c->h);
c->x = MAX(c->x, sx);
/* only fix client y-offset, if the client center might cover the bar */
c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= wx) && (c->x + (c->w / 2) < wx + ww)) ? bh : sy);
XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
grabbuttons(c, False);
updatetitle(c);
- if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
- for(t = clients; t && t->win != trans; t = t->next);
+ if(XGetTransientForHint(dpy, w, &trans))
+ t = getclient(trans);
if(t)
c->tags = t->tags;
else
applyrules(c);
if(!c->isfloating)
- c->isfloating = (rettrans == Success) || c->isfixed;
+ c->isfloating = trans != None || c->isfixed;
if(c->isfloating)
XRaiseWindow(dpy, c->win);
attach(c);
Client *c;
for(c = nexttiled(clients); c; c = nexttiled(c->next))
- resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints);
+ resize(c, wx, wy, NOBORDER(ww), NOBORDER(wh), resizehints);
}
void
if(!(c = sel))
return;
restack();
- ocx = nx = c->x;
- ocy = ny = c->y;
+ ocx = c->x;
+ ocy = c->y;
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
None, cursor[CurMove], CurrentTime) != GrabSuccess)
return;
XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui);
- for(;;) {
+ do {
XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
switch (ev.type) {
- case ButtonRelease:
- XUngrabPointer(dpy, CurrentTime);
- return;
case ConfigureRequest:
case Expose:
case MapRequest:
if(abs(wx - nx) < snap)
nx = wx;
else if(abs((wx + ww) - (nx + c->w + 2 * c->bw)) < snap)
- nx = wx + ww - c->w - 2 * c->bw;
+ nx = wx + ww - NOBORDER(c->w);
if(abs(wy - ny) < snap)
ny = wy;
else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < snap)
- ny = wy + wh - c->h - 2 * c->bw;
+ ny = wy + wh - NOBORDER(c->h);
if(!c->isfloating && lt[sellt]->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
togglefloating(NULL);
}
break;
}
}
+ while(ev.type != ButtonRelease);
+ XUngrabPointer(dpy, CurrentTime);
}
Client *
XWindowChanges wc;
if(sizehints) {
+ /* see last two sentences in ICCCM 4.1.2.3 */
+ Bool baseismin = c->basew == c->minw && c->baseh == c->minh;
+
/* set minimum possible */
w = MAX(1, w);
h = MAX(1, h);
- /* temporarily remove base dimensions */
- w -= c->basew;
- h -= c->baseh;
+ if(!baseismin) { /* temporarily remove base dimensions */
+ w -= c->basew;
+ h -= c->baseh;
+ }
/* adjust for aspect limits */
if(c->mina > 0 && c->maxa > 0) {
- if(c->maxa < (float) w/h)
+ if(c->maxa < (float)(w / h))
w = h * c->maxa;
- else if(c->mina > (float) h/w)
+ else if(c->mina < (float)(h / w))
h = w * c->mina;
}
+ if(baseismin) { /* increment calculation requires this */
+ w -= c->basew;
+ h -= c->baseh;
+ }
+
/* adjust for increment value */
if(c->incw)
w -= w % c->incw;
if(w <= 0 || h <= 0)
return;
if(x > sx + sw)
- x = sw - w - 2 * c->bw;
+ x = sw - NOBORDER(w);
if(y > sy + sh)
- y = sh - h - 2 * c->bw;
+ y = sh - NOBORDER(h);
if(x + w + 2 * c->bw < sx)
x = sx;
if(y + h + 2 * c->bw < sy)
None, cursor[CurResize], CurrentTime) != GrabSuccess)
return;
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);
+ do {
+ XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
switch(ev.type) {
- case ButtonRelease:
- XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
- c->w + c->bw - 1, c->h + c->bw - 1);
- XUngrabPointer(dpy, CurrentTime);
- while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
- return;
case ConfigureRequest:
case Expose:
case MapRequest:
break;
case MotionNotify:
XSync(dpy, False);
- nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
- nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
+ nw = MAX(ev.xmotion.x - NOBORDER(ocx) + 1, 1);
+ nh = MAX(ev.xmotion.y - NOBORDER(ocy) + 1, 1);
if(snap && nw >= wx && nw <= wx + ww
&& nh >= wy && nh <= wy + wh) {
break;
}
}
+ while(ev.type != ButtonRelease);
+ XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
+ XUngrabPointer(dpy, CurrentTime);
+ while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
}
void
/* main event loop, also reads status text from stdin */
XSync(dpy, False);
xfd = ConnectionNumber(dpy);
- readin = True;
offset = 0;
len = sizeof stext - 1;
sbuf[len] = stext[len] = '\0'; /* 0-terminator is never touched */
void
scan(void) {
unsigned int i, num;
- Window *wins, d1, d2;
+ Window d1, d2, *wins = NULL;
XWindowAttributes wa;
- wins = NULL;
if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
for(i = 0; i < num; i++) {
if(!XGetWindowAttributes(dpy, wins[i], &wa)
&& (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
manage(wins[i], &wa);
}
+ if(wins)
+ XFree(wins);
}
- if(wins)
- XFree(wins);
}
void
/* init atoms */
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
- wmatom[WMName] = XInternAtom(dpy, "WM_NAME", False);
wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
XSelectInput(dpy, root, wa.event_mask);
-
- /* grab keys */
grabkeys();
}
/* master */
c = nexttiled(clients);
mw = mfact * ww;
- resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
+ resize(c, wx, wy, NOBORDER(n == 1 ? ww : mw), NOBORDER(wh), resizehints);
if(--n == 0)
return;
h = wh;
for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
- resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
- ? (wy + wh) - y : h) - 2 * c->bw, resizehints);
+ resize(c, x, y, NOBORDER(w), /* remainder */ ((i + 1 == n)
+ ? NOBORDER(wy + wh) - y : h), resizehints);
if(h != wh)
y = c->y + c->h + 2 * c->bw;
}
void
toggletag(const Arg *arg) {
- unsigned int mask = sel->tags ^ (arg->ui & TAGMASK);
+ unsigned int mask;
+ if (!sel)
+ return;
+
+ mask = sel->tags ^ (arg->ui & TAGMASK);
if(sel && mask) {
sel->tags = mask;
arrange();
}
void
+updatenumlockmask(void) {
+ unsigned int i, j;
+ XModifierKeymap *modmap;
+
+ numlockmask = 0;
+ modmap = XGetModifierMapping(dpy);
+ for(i = 0; i < 8; i++)
+ for(j = 0; j < modmap->max_keypermod; j++)
+ if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
+ numlockmask = (1 << i);
+ XFreeModifiermap(modmap);
+}
+
+void
updatesizehints(Client *c) {
long msize;
XSizeHints size;
void
updatetitle(Client *c) {
if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
- gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
+ gettextprop(c->win, XA_WM_NAME, c->name, sizeof c->name);
}
void
void
view(const Arg *arg) {
- if(arg && (arg->i & TAGMASK) == tagset[seltags])
+ if((arg->ui & TAGMASK) == tagset[seltags])
return;
seltags ^= 1; /* toggle sel tagset */
- if(arg && (arg->ui & TAGMASK))
- tagset[seltags] = arg->i & TAGMASK;
+ if(arg->ui & TAGMASK)
+ tagset[seltags] = arg->ui & TAGMASK;
clearurgent();
arrange();
}
Got questions, comments, patches, etc.? Contact Jason Woofenden