-/**
- * TODO
- * - treat monocle as floating layout, actually otherwise certain monocled windows don't get raised
- * - use WX, WY, WW, WH for window snapping/resizing/mouse
- * - MOX, MOY, MOW, MOH should only be used in the case of monocle layout and of n==1 in tiled
- * - simplify tile()
- */
/* See LICENSE file for copyright and license details.
*
* dynamic window manager is designed like any other X client as well. It is
#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>
struct Client {
char name[256];
int x, y, w, h;
- int rx, ry, rw, rh;
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int minax, maxax, minay, maxay;
long flags;
typedef struct {
const char *symbol;
void (*arrange)(void);
-} Layout;
+ Bool isfloating;
+} 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);
void tag(const char *arg);
unsigned int textnw(const char *text, unsigned int len);
unsigned int textw(const char *text);
-void tile(void);
+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);
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);
char stext[256], buf[256];
int screen, sx, sy, sw, sh;
int (*xerrorxlib)(Display *, XErrorEvent *);
-unsigned int bh, 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 dozoom = True;
Bool otherwm, readin;
Bool running = True;
Bool *prevtags;
DC dc = {0};
Layout *lt = NULL;
Window root, barwin;
+void (*setgeoms)(void) = setdefaultgeoms;
/* configuration, allows nested code to access above variables */
#include "config.h"
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;
}
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();
}
}
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);
}
+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;
drawtext(lt->symbol, dc.norm, False);
x = dc.x + dc.w;
dc.w = textw(stext);
- dc.x = BW - dc.w;
+ dc.x = bw - dc.w;
if(dc.x < x) {
dc.x = x;
- dc.w = BW - 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, BW, 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;
- dozoom = False;
for(c = clients; c; c = c->next)
if(isvisible(c))
resize(c, c->x, c->y, c->w, c->h, True);
if(sel && sel != c) {
grabbuttons(sel, False);
XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
- if(lt->arrange == monocle)
- resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
}
if(c) {
detachstack(c);
attachstack(c);
grabbuttons(c, True);
- if(lt->arrange == monocle) {
- if(sel != c) {
- c->rx = c->x;
- c->ry = c->y;
- c->rw = c->w;
- c->rh = c->h;
- }
- resize(c, MOX, MOY, MOW, MOH, RESIZEHINTS);
- }
}
sel = c;
if(c) {
c->tags = emallocz(TAGSZ);
c->win = w;
- c->x = c->rx = wa->x + sx;
- c->y = c->ry = wa->y + sy;
- c->w = c->rw = wa->width;
- c->h = c->rh = wa->height;
+ /* 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 > sx + sw)
- c->x = sx + sw - c->w - 2 * c->border;
- if(c->y + c->h + 2 * c->border > sy + sh)
- c->y = sy + sh - c->h - 2 * c->border;
- if(c->x < sx)
- c->x = sx;
- if(c->y < sy)
- c->y = sy;
+ 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]);
}
void
-monocle(void) {
- dozoom = False;
+monocle(void) {
+ Client *c;
+
+ for(c = clients; c; c = c->next)
+ if(isvisible(c))
+ resize(c, mox, moy, mow, moh, RESIZEHINTS);
}
void
XSync(dpy, False);
nx = ocx + (ev.xmotion.x - x1);
ny = ocy + (ev.xmotion.y - y1);
- if(abs(sx - nx) < SNAP)
- nx = sx;
- else if(abs((sx + sw) - (nx + c->w + 2 * c->border)) < SNAP)
- nx = sx + sw - c->w - 2 * c->border;
- if(abs(sy - ny) < SNAP)
- ny = sy;
- else if(abs((sy + sh) - (ny + c->h + 2 * c->border)) < SNAP)
- ny = sy + sh - 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);
}
+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;
unsigned int i;
if(!arg)
break;
if(i == LENGTH(layouts))
return;
- lt = &layouts[i];
+ if(revert && &layouts[i] == lt)
+ lt = revert;
+ else {
+ revert = lt;
+ lt = &layouts[i];
+ }
if(sel)
arrange();
else
/* 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);
wa.background_pixmap = ParentRelative;
wa.event_mask = ButtonPressMask|ExposureMask;
- barwin = XCreateWindow(dpy, root, BX, BY, BW, 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]);
}
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;
- dozoom = True;
- nx = MX;
- ny = MY;
- 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) ? MOW : MW;
- th = (n > 1) ? TH / (n - 1) : 0;
- if(n > 1 && th < bh)
- th = TH;
+ 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 = MH - 2 * c->border;
- }
- else { /* tile window */
- if(i == 1) {
- ny = TY;
- nx = TX;
- nw = TW - 2 * c->border;
- }
- if(i + 1 == n) /* remainder */
- nh = (TY + TH) - 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 != TH)
- 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;
+ }
+}
+
+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
+ 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;
}
}
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;
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)))