#include <X11/Xlib.h>
#include <X11/Xproto.h>
#include <X11/Xutil.h>
+#ifdef XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif
/* macros */
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
-#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask))
-#define LENGTH(x) (sizeof x / sizeof x[0])
-#define MAXTAGLEN 16
-#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
+#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask))
+#define LENGTH(x) (sizeof x / sizeof x[0])
+#define MAXTAGLEN 16
+#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
/* enums */
-enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
-enum { ColBorder, ColFG, ColBG, ColLast }; /* color */
-enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
+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 */
/* typedefs */
typedef struct {
const char *symbol;
void (*arrange)(void);
+ void (*updategeom)(void);
} Layout;
typedef struct {
Bool isoccupied(unsigned int t);
Bool isprotodel(Client *c);
Bool isurgent(unsigned int t);
-Bool isvisible(Client *c, Bool *cmp);
+Bool isvisible(Client *c);
void keypress(XEvent *e);
void killclient(const char *arg);
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);
+Client *nextunfloating(Client *c);
void propertynotify(XEvent *e);
void quit(const char *arg);
void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
void tag(const char *arg);
unsigned int textnw(const char *text, unsigned int len);
unsigned int textw(const char *text);
-void tileresize(Client *c, int x, int y, int w, int h);
void tile(void);
+void tileresize(Client *c, int x, int y, int w, int h);
+void togglebar(const char *arg);
void togglefloating(const char *arg);
void togglelayout(const char *arg);
void toggletag(const char *arg);
void updatebar(void);
void updategeom(void);
void updatesizehints(Client *c);
+void updatetilegeom(void);
void updatetitle(Client *c);
void updatewmhints(Client *c);
void view(const char *arg);
-void viewprevtag(const char *arg); /* views previous selected tags */
+void viewprevtag(const char *arg);
int xerror(Display *dpy, XErrorEvent *ee);
int xerrordummy(Display *dpy, XErrorEvent *ee);
int xerrorstart(Display *dpy, XErrorEvent *ee);
/* variables */
char stext[256];
int screen, sx, sy, sw, sh;
-int (*xerrorxlib)(Display *, XErrorEvent *);
-int bx, by, bw, bh, blw, mx, my, mw, mh, tx, ty, tw, th, wx, wy, ww, wh;
+int bx, by, bw, bh, blw, wx, wy, ww, wh;
+int mx, my, mw, mh, tx, ty, tw, th;
int seltags = 0;
-double mfact;
+int (*xerrorxlib)(Display *, XErrorEvent *);
unsigned int numlockmask = 0;
void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
Client *c;
for(c = clients; c; c = c->next)
- if(isvisible(c, NULL)) {
+ if(isvisible(c)) {
unban(c);
if(!lt->arrange || c->isfloating)
resize(c, c->x, c->y, c->w, c->h, True);
restack();
movemouse(c);
}
- else if(ev->button == Button2) {
- if(lt->arrange && c->isfloating)
- togglefloating(NULL);
- else
- zoom(NULL);
- }
+ else if(ev->button == Button2)
+ togglefloating(NULL);
else if(ev->button == Button3 && !c->isfixed) {
restack();
resizemouse(c);
if((ev->value_mask & (CWX|CWY))
&& !(ev->value_mask & (CWWidth|CWHeight)))
configure(c);
- if(isvisible(c, NULL))
+ if(isvisible(c))
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
}
else
Client *c;
dc.x = 0;
- for(c = stack; c && !isvisible(c, NULL); c = c->snext);
+ for(c = stack; c && !isvisible(c); c = c->snext);
for(i = 0; i < LENGTH(tags); i++) {
dc.w = textw(tags[i]);
if(tagset[seltags][i]) {
void
focus(Client *c) {
- if(!c || (c && !isvisible(c, NULL)))
- for(c = stack; c && !isvisible(c, NULL); c = c->snext);
+ if(!c || (c && !isvisible(c)))
+ for(c = stack; c && !isvisible(c); c = c->snext);
if(sel && sel != c) {
grabbuttons(sel, False);
XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
if(!sel)
return;
- for(c = sel->next; c && !isvisible(c, arg ? sel->tags : NULL); c = c->next);
+ for(c = sel->next; c && !isvisible(c); c = c->next);
if(!c)
- for(c = clients; c && !isvisible(c, arg ? sel->tags : NULL); c = c->next);
+ for(c = clients; c && !isvisible(c); c = c->next);
if(c) {
focus(c);
restack();
if(!sel)
return;
- for(c = sel->prev; c && !isvisible(c, arg ? sel->tags : NULL); c = c->prev);
+ for(c = sel->prev; c && !isvisible(c); c = c->prev);
if(!c) {
for(c = clients; c && c->next; c = c->next);
- for(; c && !isvisible(c, arg ? sel->tags : NULL); c = c->prev);
+ for(; c && !isvisible(c); c = c->prev);
}
if(c) {
focus(c);
}
Bool
-isvisible(Client *c, Bool *cmp) {
+isvisible(Client *c) {
unsigned int i;
- if(!cmp)
- cmp = tagset[seltags];
for(i = 0; i < LENGTH(tags); i++)
- if(c->tags[i] && cmp[i])
+ if(c->tags[i] && tagset[seltags][i])
return True;
return False;
}
c->bw = wa->border_width;
}
else {
- 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;
- c->x = MAX(c->x, wx);
- c->y = MAX(c->y, wy);
- c->bw = BORDERPX;
+ if(c->x + c->w + 2 * c->bw > sx + sw)
+ c->x = sx + sw - c->w - 2 * c->bw;
+ if(c->y + c->h + 2 * c->bw > sy + sh)
+ c->y = sy + sh - c->h - 2 * c->bw;
+ c->x = MAX(c->x, sx);
+ c->y = MAX(c->y, by == 0 ? bh : sy);
+ c->bw = borderpx;
}
wc.border_width = c->bw;
}
void
-monocle(void) {
- Client *c;
-
- for(c = clients; c; c = c->next)
- if(!c->isfloating && isvisible(c, NULL))
- resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, 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(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;
- 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;
- if(!c->isfloating && lt->arrange && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
- togglefloating(NULL);
+ if(snap && nx >= wx && nx <= wx + ww
+ && ny >= wy && ny <= wy + wh) {
+ 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;
+ 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;
+ if(!c->isfloating && lt->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
+ togglefloating(NULL);
+ }
if(!lt->arrange || c->isfloating)
resize(c, nx, ny, c->w, c->h, False);
break;
}
Client *
-nexttiled(Client *c) {
- for(; c && (c->isfloating || !isvisible(c, NULL)); c = c->next);
+nextunfloating(Client *c) {
+ for(; c && (c->isfloating || !isvisible(c)); c = c->next);
return c;
}
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);
- if(!c->isfloating && lt->arrange && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP)) {
- togglefloating(NULL);
+
+ if(snap && nw >= wx && nw <= wx + ww
+ && nh >= wy && nh <= wy + wh) {
+ if(!c->isfloating && lt->arrange
+ && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
+ togglefloating(NULL);
}
if(!lt->arrange || c->isfloating)
resize(c, c->x, c->y, nw, nh, True);
wc.stack_mode = Below;
wc.sibling = barwin;
for(c = stack; c; c = c->snext)
- if(!c->isfloating && isvisible(c, NULL)) {
+ if(!c->isfloating && isvisible(c)) {
XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
wc.sibling = c->win;
}
PropModeReplace, (unsigned char *)data, 2);
}
-/* TODO: move this into tile.c */
void
setmfact(const char *arg) {
double d;
- if(!lt->arrange) /* TODO: check this against the actual tile() function */
+ if(!arg || lt->arrange != tile)
return;
- if(!arg)
- mfact = MFACT;
else {
d = strtod(arg, NULL);
if(arg[0] == '-' || arg[0] == '+')
return;
mfact = d;
}
- updategeom();
+ updatetilegeom();
arrange();
}
sw = DisplayWidth(dpy, screen);
sh = DisplayHeight(dpy, screen);
bh = dc.font.height + 2;
- mfact = MFACT;
updategeom();
/* init atoms */
}
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
tile(void) {
- int y, h;
+ int x, y, h, w;
unsigned int i, n;
Client *c;
- for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++);
+ for(n = 0, c = nextunfloating(clients); c; c = nextunfloating(c->next), n++);
if(n == 0)
return;
/* master */
- c = nexttiled(clients);
+ c = nextunfloating(clients);
if(n == 1)
tileresize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
return;
/* tile stack */
+ x = (tx > c->x + c->w) ? c->x + c->w + 2 * c->bw : tw;
y = ty;
+ w = (tx > c->x + c->w) ? wx + ww - x : tw;
h = th / n;
if(h < bh)
h = th;
- for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
+ for(i = 0, c = nextunfloating(c->next); c; c = nextunfloating(c->next), i++) {
if(i + 1 == n) /* remainder */
- tileresize(c, tx, y, tw - 2 * c->bw, (ty + th) - y - 2 * c->bw);
+ tileresize(c, x, y, w - 2 * c->bw, (ty + th) - y - 2 * c->bw);
else
- tileresize(c, tx, y, tw - 2 * c->bw, h - 2 * c->bw);
+ tileresize(c, x, y, w - 2 * c->bw, h - 2 * c->bw);
if(h != th)
y = c->y + c->h + 2 * c->bw;
}
}
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
+togglebar(const char *arg) {
+ showbar = !showbar;
+ updategeom();
+ updatebar();
+ arrange();
+}
+
+void
togglefloating(const char *arg) {
if(!sel)
return;
void
updategeom(void) {
-
- /* bar geometry */
- bx = 0;
- by = 0;
- bw = sw;
+ int i;
+#ifdef XINERAMA
+ XineramaScreenInfo *info = NULL;
/* window area geometry */
- wx = sx;
- wy = sy + bh;
- ww = sw;
- wh = sh - bh;
+ if(XineramaIsActive(dpy)) {
+ info = XineramaQueryScreens(dpy, &i);
+ wx = info[0].x_org;
+ wy = showbar && topbar ? info[0].y_org + bh : info[0].y_org;
+ ww = info[0].width;
+ wh = showbar ? info[0].height - bh : info[0].height;
+ XFree(info);
+ }
+ else
+#endif
+ {
+ wx = sx;
+ wy = showbar && topbar ? sy + bh : sy;
+ ww = sw;
+ wh = showbar ? sh - bh : sh;
+ }
- /* master area geometry */
- mx = wx;
- my = wy;
- mw = mfact * ww;
- mh = wh;
+ /* bar geometry*/
+ bx = wx;
+ by = showbar ? (topbar ? 0 : wy + wh) : -bh;
+ bw = ww;
- /* tile area geometry */
- tx = mx + mw;
- ty = wy;
- tw = ww - mw;
- th = wh;
+ /* update layout geometries */
+ for(i = 0; i < LENGTH(layouts); i++)
+ if(layouts[i].updategeom)
+ layouts[i].updategeom();
}
void
}
void
+updatetilegeom(void) {
+ /* master area geometry */
+ mx = wx;
+ my = wy;
+ mw = mfact * ww;
+ mh = wh;
+
+ /* tile area geometry */
+ tx = mx + mw;
+ ty = wy;
+ tw = ww - mw;
+ th = wh;
+}
+
+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);
return -1;
}
-/* TODO: move this into tile.c */
void
zoom(const char *arg) {
Client *c = sel;
- if(c == nexttiled(clients))
- if(!c || !(c = nexttiled(c->next)))
+ if(c == nextunfloating(clients))
+ if(!c || !(c = nextunfloating(c->next)))
return;
- if(lt->arrange && !sel->isfloating) { /* TODO: check this against tile() */
+ if(lt->arrange == tile && !sel->isfloating) {
detach(c);
attach(c);
focus(c);
Got questions, comments, patches, etc.? Contact Jason Woofenden