#include <sys/select.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include <regex.h>
#include <X11/cursorfont.h>
#include <X11/keysym.h>
#include <X11/Xatom.h>
#include <X11/Xlib.h>
#include <X11/Xproto.h>
#include <X11/Xutil.h>
-#ifdef XINERAMA
-#include <X11/extensions/Xinerama.h>
-#endif
/* macros */
#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
#define MAXTAGLEN 16
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
-
/* enums */
-enum { BarTop, BarBot, BarOff }; /* bar position */
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
enum { ColBorder, ColFG, ColBG, ColLast }; /* color */
enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
typedef struct {
const char *symbol;
void (*arrange)(void);
-} Layout;
+ Bool isfloating;
+} 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 manage(Window w, XWindowAttributes *wa);
void mappingnotify(XEvent *e);
void maprequest(XEvent *e);
+void monocle(void);
void movemouse(Client *c);
Client *nexttiled(Client *c);
void propertynotify(XEvent *e);
void run(void);
void scan(void);
void setclientstate(Client *c, long state);
+void setgeom(const char *arg);
void setlayout(const char *arg);
-void setmwfact(const char *arg);
void setup(void);
void spawn(const char *arg);
void tag(const char *arg);
unsigned int textnw(const char *text, unsigned int len);
unsigned int textw(const char *text);
-void tile(void);
-void togglebar(const char *arg);
+void tileh(void);
+void tilehstack(unsigned int n);
+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 toggletag(const char *arg);
void toggleview(const char *arg);
int xerrordummy(Display *dpy, XErrorEvent *ee);
int xerrorstart(Display *dpy, XErrorEvent *ee);
void zoom(const char *arg);
-void selectview(const char *arg);
/* variables */
char stext[256], buf[256];
-double mwfact;
-int screen, sx, sy, sw, sh, wax, way, waw, wah, xscreens;
+int screen, sx, sy, sw, sh;
int (*xerrorxlib)(Display *, XErrorEvent *);
-unsigned int bh, bpos;
-unsigned int blw = 0;
+int bx, by, bw, bh, blw, 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,
[UnmapNotify] = unmapnotify
};
Atom wmatom[WMLast], netatom[NetLast];
-Bool domwfact = True;
-Bool dozoom = True;
Bool otherwm, readin;
Bool running = True;
Bool *prevtags;
Cursor cursor[CurLast];
Display *dpy;
DC dc = {0};
-Layout *lt;
+Layout *lt = NULL;
Window root, barwin;
-#ifdef XINERAMA
-XineramaScreenInfo *info = NULL;
-#endif
/* configuration, allows nested code to access above variables */
#include "config.h"
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) {
ban(Client *c) {
if(c->isbanned)
return;
- XMoveWindow(dpy, c->win, c->x + 3 * sw, c->y);
+ XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
c->isbanned = True;
}
return;
}
}
- if((ev->x < x + blw) && ev->button == Button1)
- setlayout(NULL);
}
else if((c = getclient(ev->window))) {
focus(c);
void
cleanup(void) {
-
close(STDIN_FILENO);
while(stack) {
unban(stack);
XFreeFontSet(dpy, dc.font.set);
else
XFreeFont(dpy, dc.font.xfont);
-
XUngrabKey(dpy, AnyKey, AnyModifier, root);
XFreePixmap(dpy, dc.drawable);
XFreeGC(dpy, dc.gc);
XFreeCursor(dpy, cursor[CurResize]);
XFreeCursor(dpy, cursor[CurMove]);
XDestroyWindow(dpy, barwin);
-#if XINERAMA
- if(info)
- XFree(info);
-#endif
XSync(dpy, False);
XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
}
XConfigureEvent *ev = &e->xconfigure;
if(ev->window == root && (ev->width != sw || ev->height != sh)) {
- /* TODO -- use Xinerama dimensions here ? */
- sw = ev->width;
- sh = ev->height;
- XFreePixmap(dpy, dc.drawable);
- dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(root, screen), bh, DefaultDepth(dpy, screen));
- XResizeWindow(dpy, barwin, sw, bh);
+ setgeom(NULL);
updatebarpos();
arrange();
}
XConfigureRequestEvent *ev = &e->xconfigurerequest;
XWindowChanges wc;
- /* TODO -- consider Xinerama if necessary when centering */
if((c = getclient(ev->window))) {
if(ev->value_mask & CWBorderWidth)
c->border = ev->border_width;
- if(c->isfixed || c->isfloating || (floating == lt->arrange)) {
+ if(c->isfixed || c->isfloating || lt->isfloating) {
if(ev->value_mask & CWX)
c->x = sx + ev->x;
if(ev->value_mask & CWY)
XSync(dpy, False);
}
-Bool
-conflicts(Client *c, unsigned int tidx) {
- unsigned int i;
+unsigned int
+counttiled(void) {
+ unsigned int n;
+ Client *c;
- for(i = 0; i < LENGTH(tags); i++)
- if(c->tags[i])
- return True; /* conflict */
- return False;
+ for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++);
+ return n;
}
void
drawtext(lt->symbol, dc.norm, False);
x = dc.x + dc.w;
dc.w = textw(stext);
- dc.x = sw - dc.w;
+ dc.x = bw - dc.w;
if(dc.x < x) {
dc.x = x;
- dc.w = sw - x;
+ dc.w = bw - x;
}
drawtext(stext, dc.norm, False);
if((dc.w = dc.x - x) > bh) {
else
drawtext(NULL, dc.norm, False);
}
- XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
+ XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
XSync(dpy, False);
}
floating(void) { /* default floating layout */
Client *c;
- domwfact = dozoom = False;
for(c = clients; c; c = c->next)
if(isvisible(c))
resize(c, c->x, c->y, c->w, c->h, True);
c->tags = emallocz(TAGSZ);
c->win = w;
- applyrules(c);
-
- c->x = wa->x + sx;
- c->y = wa->y + sy;
+ /* geometry */
+ c->x = wa->x;
+ c->y = wa->y;
c->w = wa->width;
c->h = wa->height;
c->oldborder = wa->border_width;
-
if(c->w == sw && c->h == sh) {
c->x = sx;
c->y = sy;
c->border = wa->border_width;
}
else {
- if(c->x + c->w + 2 * c->border > wax + waw)
- c->x = wax + waw - c->w - 2 * c->border;
- if(c->y + c->h + 2 * c->border > way + wah)
- c->y = way + wah - c->h - 2 * c->border;
- if(c->x < wax)
- c->x = wax;
- if(c->y < way)
- c->y = way;
+ 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 < wx)
+ c->x = wx;
+ if(c->y < wy)
+ c->y = wy;
c->border = BORDERPX;
}
+
wc.border_width = c->border;
XConfigureWindow(dpy, w, CWBorderWidth, &wc);
XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
for(t = clients; t && t->win != trans; t = t->next);
if(t)
memcpy(c->tags, t->tags, TAGSZ);
+ else
+ applyrules(c);
if(!c->isfloating)
c->isfloating = (rettrans == Success) || c->isfixed;
attach(c);
}
void
+monocle(void) {
+ Client *c;
+
+ for(c = clients; c; c = c->next)
+ if(isvisible(c))
+ resize(c, mox, moy, mow, moh, RESIZEHINTS);
+}
+
+void
movemouse(Client *c) {
int x1, y1, ocx, ocy, di, nx, ny;
unsigned int dui;
XSync(dpy, False);
nx = ocx + (ev.xmotion.x - x1);
ny = ocy + (ev.xmotion.y - y1);
- if(abs(wax - nx) < SNAP)
- nx = wax;
- else if(abs((wax + waw) - (nx + c->w + 2 * c->border)) < SNAP)
- nx = wax + waw - c->w - 2 * c->border;
- if(abs(way - ny) < SNAP)
- ny = way;
- else if(abs((way + wah) - (ny + c->h + 2 * c->border)) < SNAP)
- ny = way + wah - c->h - 2 * c->border;
- if(!c->isfloating && (lt->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
+ 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;
+ 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;
+ if(!c->isfloating && !lt->isfloating && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
togglefloating(NULL);
- if((lt->arrange == floating) || c->isfloating)
+ if((lt->isfloating) || c->isfloating)
resize(c, nx, ny, c->w, c->h, False);
break;
}
nw = 1;
if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
nh = 1;
- if(!c->isfloating && (lt->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
+ if(!c->isfloating && !lt->isfloating && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
togglefloating(NULL);
- if((lt->arrange == floating) || c->isfloating)
+ if((lt->isfloating) || c->isfloating)
resize(c, c->x, c->y, nw, nh, True);
break;
}
drawbar();
if(!sel)
return;
- if(sel->isfloating || (lt->arrange == floating))
+ if(sel->isfloating || lt->isfloating)
XRaiseWindow(dpy, sel->win);
- if(lt->arrange != floating) {
+ if(!lt->isfloating) {
wc.stack_mode = Below;
wc.sibling = barwin;
if(!sel->isfloating) {
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;
unsigned int i;
- if(!arg) {
- lt++;
- if(lt == &layouts[LENGTH(layouts)])
- lt = &layouts[0];
- }
+ if(!arg)
+ return;
+ for(i = 0; i < LENGTH(layouts); i++)
+ if(!strcmp(arg, layouts[i].symbol))
+ break;
+ if(i == LENGTH(layouts))
+ return;
+ if(revert && &layouts[i] == lt)
+ lt = revert;
else {
- for(i = 0; i < LENGTH(layouts); i++)
- if(arg == layouts[i].symbol)
- break;
- if(i == LENGTH(layouts))
- return;
+ revert = lt;
lt = &layouts[i];
}
if(sel)
}
void
-setmwfact(const char *arg) {
- double delta;
-
- if(!domwfact)
- return;
- /* arg handling, manipulate mwfact */
- if(arg == NULL)
- mwfact = MWFACT;
- else if(sscanf(arg, "%lf", &delta) == 1) {
- if(arg[0] == '+' || arg[0] == '-')
- mwfact += delta;
- else
- mwfact = delta;
- if(mwfact < 0.1)
- mwfact = 0.1;
- else if(mwfact > 0.9)
- mwfact = 0.9;
- }
- arrange();
-}
-
-void
setup(void) {
unsigned int i;
XSetWindowAttributes wa;
/* 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);
cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
-#ifdef XINERAMA
- if(XineramaIsActive(dpy))
- info = XineramaQueryScreens(dpy, &xscreens);
-#endif
-
/* init appearance */
dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
dc.norm[ColBG] = getcolor(NORMBGCOLOR);
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);
seltags[0] = prevtags[0] = True;
/* init layouts */
- mwfact = MWFACT;
lt = &layouts[0];
- /* TODO: Xinerama hints ? */
/* init bar */
for(blw = i = 0; i < LENGTH(layouts); i++) {
i = textw(layouts[i].symbol);
blw = i;
}
- bpos = BARPOS;
wa.override_redirect = 1;
wa.background_pixmap = ParentRelative;
wa.event_mask = ButtonPressMask|ExposureMask;
- barwin = XCreateWindow(dpy, root, sx, sy, sw, bh, 0, DefaultDepth(dpy, screen),
+ barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
CopyFromParent, DefaultVisual(dpy, screen),
CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
XDefineCursor(dpy, barwin, cursor[CurNormal]);
- updatebarpos();
XMapRaised(dpy, barwin);
strcpy(stext, "dwm-"VERSION);
drawbar();
}
void
-tile(void) {
- unsigned int i, n, nx, ny, nw, nh, mw, th;
- Client *c, *mc;
+tileh(void) {
+ int x, w;
+ unsigned int i, n = counttiled();
+ Client *c;
- domwfact = dozoom = True;
- nx = wax;
- ny = way;
- nw = 0;
- for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
- n++;
+ if(n == 0)
+ return;
+ c = tilemaster(n);
+ if(--n == 0)
+ return;
- /* window geoms */
- mw = (n == 1) ? waw : mwfact * waw;
- th = (n > 1) ? wah / (n - 1) : 0;
- if(n > 1 && th < bh)
- th = wah;
+ x = tx;
+ w = tw / n;
+ if(w < bh)
+ w = tw;
- for(i = 0, c = mc = nexttiled(clients); c; c = nexttiled(c->next)) {
- if(i == 0) { /* master */
- nw = mw - 2 * c->border;
- nh = wah - 2 * c->border;
- }
- else { /* tile window */
- if(i == 1) {
- ny = way;
- nx += mc->w + 2 * mc->border;
- nw = waw - mw - 2 * c->border;
- }
- if(i + 1 == n) /* remainder */
- nh = (way + wah) - ny - 2 * c->border;
- else
- nh = th - 2 * c->border;
- }
- resize(c, nx, ny, nw, nh, RESIZEHINTS);
- if((RESIZEHINTS) && ((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw)))
- /* client doesn't accept size constraints */
- resize(c, nx, ny, nw, nh, False);
- if(n > 1 && th != wah)
- ny = c->y + c->h + 2 * c->border;
- i++;
+ 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;
}
}
-void
-togglebar(const char *arg) {
- if(bpos == BarOff)
- bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
+Client *
+tilemaster(unsigned int n) {
+ Client *c = nexttiled(clients);
+
+ if(n == 1)
+ tileresize(c, mox, moy, mow - 2 * c->border, moh - 2 * c->border);
else
- bpos = BarOff;
- updatebarpos();
- arrange();
+ tileresize(c, mx, my, mw - 2 * c->border, mh - 2 * c->border);
+ return c;
+}
+
+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
+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(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
if(!sel)
return;
i = idxoftag(arg);
- if(conflicts(sel, i))
- return;
sel->tags[i] = !sel->tags[i];
for(j = 0; j < LENGTH(tags) && !sel->tags[j]; j++);
if(j == LENGTH(tags))
void
updatebarpos(void) {
- XEvent ev;
- wax = sx;
- way = sy;
- wah = sh;
- waw = sw;
- switch(bpos) {
- default:
- wah -= bh;
- way += bh;
- XMoveWindow(dpy, barwin, sx, sy);
- break;
- case BarBot:
- wah -= bh;
- XMoveWindow(dpy, barwin, sx, sy + wah);
- break;
- case BarOff:
- XMoveWindow(dpy, barwin, sx, sy - bh);
- break;
- }
- XSync(dpy, False);
- while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+ 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
XWMHints *wmh;
if((wmh = XGetWMHints(dpy, c->win))) {
- c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
+ if(c == sel)
+ sel->isurgent = False;
+ else
+ c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
XFree(wmh);
}
}
zoom(const char *arg) {
Client *c = sel;
- if(!sel || !dozoom || sel->isfloating)
+ if(!sel || lt->isfloating || sel->isfloating)
return;
if(c == nexttiled(clients))
if(!(c = nexttiled(c->next)))
Got questions, comments, patches, etc.? Contact Jason Woofenden