+//#define XINULATOR /* debug, simulates dual head */
/* See LICENSE file for copyright and license details.
*
* dynamic window manager is designed like any other X client as well. It is
#include <X11/Xutil.h>
#ifdef XINERAMA
#include <X11/extensions/Xinerama.h>
-#endif
+#endif /* XINERAMA */
/* macros */
#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask))
#define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
-#define ISVISIBLE(x) (x->tags & tagset[selmon->seltags])
-#define LENGTH(x) (sizeof x / sizeof x[0])
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#define ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags]))
+#define LENGTH(X) (sizeof X / sizeof X[0])
+#define MAX(A, B) ((A) > (B) ? (A) : (B))
+#define MIN(A, B) ((A) < (B) ? (A) : (B))
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
-#define WIDTH(x) ((x)->w + 2 * (x)->bw)
-#define HEIGHT(x) ((x)->h + 2 * (x)->bw)
+#define WIDTH(X) ((X)->w + 2 * (X)->bw)
+#define HEIGHT(X) ((X)->h + 2 * (X)->bw)
#define TAGMASK ((int)((1LL << LENGTH(tags)) - 1))
-#define TEXTW(x) (textnw(x, strlen(x)) + dc.font.height)
+#define TEXTW(X) (textnw(X, strlen(X)) + dc.font.height)
/* enums */
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
const Arg arg;
} Button;
+typedef struct Monitor Monitor;
typedef struct Client Client;
struct Client {
char name[256];
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int bw, oldbw;
unsigned int tags;
- unsigned int mon;
Bool isfixed, isfloating, isurgent;
Client *next;
Client *snext;
+ Monitor *mon;
Window win;
};
typedef struct {
const char *symbol;
- void (*arrange)(void);
+ void (*arrange)(Monitor *);
} Layout;
-typedef struct {
- int wx, wy, ww, wh;
+struct Monitor {
+ int screen_number;
+ float mfact;
+ int by, btx; /* bar geometry */
+ int my, mh; /* vertical screen size*/
+ int wx, wy, ww, wh; /* window area */
unsigned int seltags;
unsigned int sellt;
-} Monitor;
+ unsigned int tagset[2];
+ Bool showbar;
+ Bool topbar;
+ Client *clients;
+ Client *sel;
+ Client *stack;
+ Monitor *next;
+ Window barwin;
+};
typedef struct {
const char *class;
static void buttonpress(XEvent *e);
static void checkotherwm(void);
static void cleanup(void);
+static void cleanupmons(void);
static void clearurgent(Client *c);
static void configure(Client *c);
static void configurenotify(XEvent *e);
static void detach(Client *c);
static void detachstack(Client *c);
static void die(const char *errstr, ...);
-static void drawbar(void);
+static void drawbar(Monitor *m);
+static void drawbars();
static void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
static void drawtext(const char *text, unsigned long col[ColLast], Bool invert);
static void enternotify(XEvent *e);
static void manage(Window w, XWindowAttributes *wa);
static void mappingnotify(XEvent *e);
static void maprequest(XEvent *e);
-static void monocle(void);
+static void monocle(Monitor *m);
static void movemouse(const Arg *arg);
static Client *nexttiled(Client *c);
static void propertynotify(XEvent *e);
static void quit(const Arg *arg);
static void resize(Client *c, int x, int y, int w, int h);
static void resizemouse(const Arg *arg);
-static void restack(void);
+static void restack(Monitor *m);
static void run(void);
static void scan(void);
static void setclientstate(Client *c, long state);
static void spawn(const Arg *arg);
static void tag(const Arg *arg);
static int textnw(const char *text, unsigned int len);
-static void tile(void);
+static void tile(Monitor *);
static void togglebar(const Arg *arg);
static void togglefloating(const Arg *arg);
static void toggletag(const Arg *arg);
static void toggleview(const Arg *arg);
+static void unfocus(Client *c);
static void unmanage(Client *c);
static void unmapnotify(XEvent *e);
-static void updatebar(void);
static void updategeom(void);
+static void updatebarpos(Monitor *m);
+static void updatebars(void);
static void updatenumlockmask(void);
static void updatesizehints(Client *c);
static void updatestatus(void);
static int xerrordummy(Display *dpy, XErrorEvent *ee);
static int xerrorstart(Display *dpy, XErrorEvent *ee);
static void zoom(const Arg *arg);
+#ifdef XINERAMA
+static void focusmon(const Arg *arg);
+static void tagmon(const Arg *arg);
+#endif /* XINERAMA */
/* variables */
static char stext[256];
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 sx, sy, sw, sh; /* X display screen geometry x, y, width, height */
+static int bh, blw = 0; /* bar geometry */
static int (*xerrorxlib)(Display *, XErrorEvent *);
static unsigned int numlockmask = 0;
static void (*handler[LASTEvent]) (XEvent *) = {
static Atom wmatom[WMLast], netatom[NetLast];
static Bool otherwm;
static Bool running = True;
-static Client *clients = NULL;
-static Client *sel = NULL;
-static Client *stack = NULL;
static Cursor cursor[CurLast];
static Display *dpy;
static DC dc;
static Layout *lt[] = { NULL, NULL };
-static Monitor *mon = NULL, *selmon = NULL;
-static unsigned int nmons;
-static Window root, barwin;
+static Monitor *mons = NULL, *selmon = NULL;
+static Window root;
/* configuration, allows nested code to access above variables */
#include "config.h"
&& (!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;
+ c->tags |= r->tags;
}
}
if(ch.res_class)
if(ch.res_name)
XFree(ch.res_name);
}
- c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : tagset[mon[c->mon].seltags];
+ c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];
}
Bool
void
arrange(void) {
- showhide(stack);
+ Monitor *m;
+
+ /* optimise two loops into one, check focus(NULL) */
+ for(m = mons; m; m = m->next)
+ showhide(m->stack);
focus(NULL);
- if(lt[selmon->sellt]->arrange)
- lt[selmon->sellt]->arrange();
- restack();
+ for(m = mons; m; m = m->next) {
+ if(lt[m->sellt]->arrange)
+ lt[m->sellt]->arrange(m);
+ restack(m);
+ }
}
void
attach(Client *c) {
- c->next = clients;
- clients = c;
+ c->next = c->mon->clients;
+ c->mon->clients = c;
}
void
attachstack(Client *c) {
- c->snext = stack;
- stack = c;
+ c->snext = c->mon->stack;
+ c->mon->stack = c;
}
void
unsigned int i, x, click;
Arg arg = {0};
Client *c;
+ Monitor *m;
XButtonPressedEvent *ev = &e->xbutton;
click = ClkRootWin;
- if(ev->window == barwin) {
- i = x = 0;
- do x += TEXTW(tags[i]); while(ev->x >= x && ++i < LENGTH(tags));
+ /* focus monitor if necessary */
+ for(m = mons; m; m = m->next)
+ if(ev->window == m->barwin) {
+ if(m != selmon) {
+ unfocus(selmon->stack);
+ selmon = m;
+ focus(NULL);
+ }
+ break;
+ }
+ if(ev->window == selmon->barwin && ev->x >= selmon->btx) {
+ i = 0;
+ x = selmon->btx;
+ do
+ x += TEXTW(tags[i]);
+ while(ev->x >= x && ++i < LENGTH(tags));
if(i < LENGTH(tags)) {
click = ClkTagBar;
arg.ui = 1 << i;
cleanup(void) {
Arg a = {.ui = ~0};
Layout foo = { "", NULL };
+ Monitor *m;
view(&a);
lt[selmon->sellt] = &foo;
- while(stack)
- unmanage(stack);
+
+ /* TODO: consider simplifying cleanup code of the stack, perhaps do that in cleanmons() ? */
+ for(m = mons; m; m = m->next)
+ while(m->stack)
+ unmanage(m->stack);
if(dc.font.set)
XFreeFontSet(dpy, dc.font.set);
else
XFreeCursor(dpy, cursor[CurNormal]);
XFreeCursor(dpy, cursor[CurResize]);
XFreeCursor(dpy, cursor[CurMove]);
- XDestroyWindow(dpy, barwin);
+ cleanupmons();
XSync(dpy, False);
XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
}
+void
+cleanupmons(void) {
+ Monitor *m;
+
+ while(mons) {
+ m = mons->next;
+ XUnmapWindow(dpy, mons->barwin);
+ XDestroyWindow(dpy, mons->barwin);
+ free(mons);
+ mons = m;
+ }
+}
+
void
clearurgent(Client *c) {
XWMHints *wmh;
void
configurenotify(XEvent *e) {
+ Monitor *m;
XConfigureEvent *ev = &e->xconfigure;
if(ev->window == root && (ev->width != sw || ev->height != sh)) {
sw = ev->width;
sh = ev->height;
updategeom();
- updatebar();
+ if(dc.drawable != 0)
+ XFreePixmap(dpy, dc.drawable);
+ dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
+ updatebars();
+ for(m = mons; m; m = m->next)
+ XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
arrange();
}
}
detach(Client *c) {
Client **tc;
- for(tc = &clients; *tc && *tc != c; tc = &(*tc)->next);
+ for(tc = &c->mon->clients; *tc && *tc != c; tc = &(*tc)->next);
*tc = c->next;
}
detachstack(Client *c) {
Client **tc;
- for(tc = &stack; *tc && *tc != c; tc = &(*tc)->snext);
+ for(tc = &c->mon->stack; *tc && *tc != c; tc = &(*tc)->snext);
*tc = c->snext;
}
}
void
-drawbar(void) {
+drawbar(Monitor *m) {
int x;
unsigned int i, occ = 0, urg = 0;
unsigned long *col;
Client *c;
- for(c = clients; c; c = c->next) {
+ for(c = m->clients; c; c = c->next) {
occ |= c->tags;
if(c->isurgent)
urg |= c->tags;
}
dc.x = 0;
+#ifdef XINERAMA
+ {
+ char buf[2];
+ buf[0] = m->screen_number + '0';
+ buf[1] = '\0';
+ dc.w = TEXTW(buf);
+ drawtext(buf, selmon == m ? dc.sel : dc.norm, True);
+ dc.x += dc.w;
+ }
+#endif /* XINERAMA */
+ m->btx = dc.x;
for(i = 0; i < LENGTH(tags); i++) {
dc.w = TEXTW(tags[i]);
- col = tagset[selmon->seltags] & 1 << i ? dc.sel : dc.norm;
+ col = m->tagset[m->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);
+ drawsquare(m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
+ occ & 1 << i, urg & 1 << i, col);
dc.x += dc.w;
}
if(blw > 0) {
dc.w = blw;
- drawtext(lt[selmon->sellt]->symbol, dc.norm, False);
+ drawtext(lt[m->sellt]->symbol, dc.norm, False);
x = dc.x + dc.w;
}
else
x = dc.x;
- dc.w = TEXTW(stext);
- dc.x = selmon->ww - dc.w;
- if(dc.x < x) {
- dc.x = x;
- dc.w = selmon->ww - x;
+ if(m == selmon) { /* status is only drawn on selected monitor */
+ dc.w = TEXTW(stext);
+ dc.x = m->ww - dc.w;
+ if(dc.x < x) {
+ dc.x = x;
+ dc.w = m->ww - x;
+ }
+ drawtext(stext, dc.norm, False);
+ }
+ else {
+ dc.x = m->ww;
}
- drawtext(stext, dc.norm, False);
if((dc.w = dc.x - x) > bh) {
dc.x = x;
- if(sel) {
- drawtext(sel->name, dc.sel, False);
- drawsquare(sel->isfixed, sel->isfloating, False, dc.sel);
+ if(m->sel) {
+ col = m == selmon ? dc.sel : dc.norm;
+ drawtext(m->sel->name, col, False);
+ drawsquare(m->sel->isfixed, m->sel->isfloating, False, col);
}
else
drawtext(NULL, dc.norm, False);
}
- XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, selmon->ww, bh, 0, 0);
+ XCopyArea(dpy, dc.drawable, m->barwin, dc.gc, 0, 0, m->ww, bh, 0, 0);
XSync(dpy, False);
}
+void
+drawbars() {
+ Monitor *m;
+
+ for(m = mons; m; m = m->next)
+ drawbar(m);
+}
+
void
drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
int x;
void
expose(XEvent *e) {
+ Monitor *m;
XExposeEvent *ev = &e->xexpose;
- if(ev->count == 0 && (ev->window == barwin))
- drawbar();
+ if(ev->count == 0)
+ for(m = mons; m; m = m->next)
+ if(ev->window == m->barwin) {
+ drawbar(m);
+ break;
+ }
}
void
focus(Client *c) {
if(!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]);
- }
+ for(c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
+ if(selmon->sel)
+ unfocus(selmon->sel);
if(c) {
+ if(c->mon != selmon)
+ selmon = c->mon;
if(c->isurgent)
clearurgent(c);
detachstack(c);
}
else
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
- sel = c;
- drawbar();
+ selmon->sel = c;
+ drawbars();
}
void
focusin(XEvent *e) { /* there are some broken focus acquiring clients */
XFocusChangeEvent *ev = &e->xfocus;
- if(sel && ev->window != sel->win)
- XSetInputFocus(dpy, sel->win, RevertToPointerRoot, CurrentTime);
+ if(selmon->sel && ev->window != selmon->sel->win)
+ XSetInputFocus(dpy, selmon->sel->win, RevertToPointerRoot, CurrentTime);
}
+#ifdef XINERAMA
+void
+focusmon(const Arg *arg) {
+ unsigned int i;
+ Monitor *m;
+
+ for(i = 0, m = mons; m; m = m->next, i++)
+ if(i == arg->ui) {
+ if(m->stack)
+ focus(m->stack);
+ else {
+ unfocus(selmon->stack);
+ selmon = m;
+ focus(NULL);
+ }
+ drawbars();
+ break;
+ }
+}
+#endif /* XINERAMA */
+
void
focusstack(const Arg *arg) {
Client *c = NULL, *i;
- if(!sel)
+ if(!selmon->sel)
return;
- if (arg->i > 0) {
- for(c = sel->next; c && !ISVISIBLE(c); c = c->next);
+ if(arg->i > 0) {
+ for(c = selmon->sel->next; c && !ISVISIBLE(c); c = c->next);
if(!c)
- for(c = clients; c && !ISVISIBLE(c); c = c->next);
+ for(c = selmon->clients; c && !ISVISIBLE(c); c = c->next);
}
else {
- for(i = clients; i != sel; i = i->next)
+ for(i = selmon->clients; i != selmon->sel; i = i->next)
if(ISVISIBLE(i))
c = i;
if(!c)
}
if(c) {
focus(c);
- restack();
+ restack(selmon);
}
}
Client *
getclient(Window w) {
Client *c;
+ Monitor *m;
- for(c = clients; c && c->win != w; c = c->next);
- return c;
+ for(m = mons; m; m = m->next)
+ for(c = m->clients; c; c = c->next)
+ if(c->win == w)
+ return c;
+ return NULL;
}
unsigned long
killclient(const Arg *arg) {
XEvent ev;
- if(!sel)
+ if(!selmon->sel)
return;
- if(isprotodel(sel)) {
+ if(isprotodel(selmon->sel)) {
ev.type = ClientMessage;
- ev.xclient.window = sel->win;
+ ev.xclient.window = selmon->sel->win;
ev.xclient.message_type = wmatom[WMProtocols];
ev.xclient.format = 32;
ev.xclient.data.l[0] = wmatom[WMDelete];
ev.xclient.data.l[1] = CurrentTime;
- XSendEvent(dpy, sel->win, False, NoEventMask, &ev);
+ XSendEvent(dpy, selmon->sel->win, False, NoEventMask, &ev);
}
else
- XKillClient(dpy, sel->win);
+ XKillClient(dpy, selmon->sel->win);
}
void
die("fatal: could not malloc() %u bytes\n", sizeof(Client));
*c = cz;
c->win = w;
- for(c->mon = 0; selmon != &mon[c->mon]; c->mon++);
+ c->mon = selmon;
/* geometry */
c->x = wa->x;
c->y = sy + sh - HEIGHT(c);
c->x = MAX(c->x, sx);
/* only fix client y-offset, if the client center might cover the bar */
- /* TODO: is c always attached to selmon? */
- c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= selmon->wx)
- && (c->x + (c->w / 2) < selmon->wx + selmon->ww)) ? bh : sy);
+ c->y = MAX(c->y, ((c->mon->by == 0) && (c->x + (c->w / 2) >= c->mon->wx)
+ && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : sy);
c->bw = borderpx;
}
}
void
-monocle(void) {
+monocle(Monitor *m) {
Client *c;
- Monitor *m;
- for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
- m = &mon[c->mon];
+ for(c = nexttiled(m->clients); c; c = nexttiled(c->next))
resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw);
- }
}
void
Window dummy;
XEvent ev;
- if(!(c = sel))
+ if(!(c = selmon->sel))
return;
- restack();
+ restack(selmon);
ocx = c->x;
ocy = c->y;
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
break;
case XA_WM_HINTS:
updatewmhints(c);
- drawbar();
+ drawbars();
break;
}
if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
updatetitle(c);
- if(c == sel)
- drawbar();
+ if(c == selmon->sel)
+ drawbars();
}
}
}
c->w = wc.width = w;
c->h = wc.height = h;
wc.border_width = c->bw;
- XConfigureWindow(dpy, c->win,
- CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+ XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
configure(c);
XSync(dpy, False);
}
Client *c;
XEvent ev;
- if(!(c = sel))
+ if(!(c = selmon->sel))
return;
- restack();
+ restack(selmon);
ocx = c->x;
ocy = c->y;
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
}
void
-restack(void) {
+restack(Monitor *m) {
Client *c;
XEvent ev;
XWindowChanges wc;
- drawbar();
- if(!sel)
+ drawbars();
+ if(!m->sel)
return;
- if(sel->isfloating || !lt[selmon->sellt]->arrange)
- XRaiseWindow(dpy, sel->win);
- if(lt[selmon->sellt]->arrange) {
+ if(m->sel->isfloating || !lt[m->sellt]->arrange)
+ XRaiseWindow(dpy, m->sel->win);
+ if(lt[m->sellt]->arrange) {
wc.stack_mode = Below;
- wc.sibling = barwin;
- for(c = stack; c; c = c->snext)
+ wc.sibling = m->barwin;
+ for(c = m->stack; c; c = c->snext)
if(!c->isfloating && ISVISIBLE(c)) {
XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
wc.sibling = c->win;
selmon->sellt ^= 1;
if(arg && arg->v)
lt[selmon->sellt] = (Layout *)arg->v;
- if(sel)
+ if(selmon->sel)
arrange();
else
- drawbar();
+ drawbars();
}
/* arg > 1.0 will set mfact absolutly */
if(!arg || !lt[selmon->sellt]->arrange)
return;
- f = arg->f < 1.0 ? arg->f + mfact : arg->f - 1.0;
+ f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
if(f < 0.1 || f > 0.9)
return;
- mfact = f;
+ selmon->mfact = f;
arrange();
}
netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
/* init cursors */
- wa.cursor = cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
+ cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
if(!dc.font.set)
XSetFont(dpy, dc.gc, dc.font.xfont->fid);
- /* init bar */
+ /* init bars */
for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
w = TEXTW(layouts[i].symbol);
blw = MAX(blw, w);
}
-
- wa.override_redirect = True;
- wa.background_pixmap = ParentRelative;
- wa.event_mask = ButtonPressMask|ExposureMask;
-
- barwin = XCreateWindow(dpy, root, selmon->wx, by, selmon->ww, bh, 0, DefaultDepth(dpy, screen),
- CopyFromParent, DefaultVisual(dpy, screen),
- CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
- XDefineCursor(dpy, barwin, cursor[CurNormal]);
- XMapRaised(dpy, barwin);
+ updatebars();
updatestatus();
/* EWMH support per view */
PropModeReplace, (unsigned char *) netatom, NetLast);
/* select for events */
+ wa.cursor = cursor[CurNormal];
wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask
|EnterWindowMask|LeaveWindowMask|StructureNotifyMask
|PropertyChangeMask;
return;
if(ISVISIBLE(c)) { /* show clients top down */
XMoveWindow(dpy, c->win, c->x, c->y);
- if(!lt[selmon->sellt]->arrange || c->isfloating)
+ if(!lt[c->mon->sellt]->arrange || c->isfloating)
resize(c, c->x, c->y, c->w, c->h);
showhide(c->snext);
}
void
tag(const Arg *arg) {
- if(sel && arg->ui & TAGMASK) {
- sel->tags = arg->ui & TAGMASK;
+ if(selmon->sel && arg->ui & TAGMASK) {
+ selmon->sel->tags = arg->ui & TAGMASK;
arrange();
}
}
+#ifdef XINERAMA
+void
+tagmon(const Arg *arg) {
+ unsigned int i;
+ Client *c;
+ Monitor *m;
+
+ if(!(c = selmon->sel))
+ return;
+ for(i = 0, m = mons; m; m = m->next, i++)
+ if(i == arg->ui) {
+ detach(c);
+ detachstack(c);
+ c->mon = m;
+ c->tags = m->seltags; /* assign tags of target monitor */
+ attach(c);
+ attachstack(c);
+ m->sel = c;
+ for(c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
+ selmon->sel = c;
+ arrange();
+ break;
+ }
+}
+#endif /* XINERAMA */
+
int
textnw(const char *text, unsigned int len) {
XRectangle r;
}
void
-tile(void) {
+tile(Monitor *m) {
int x, y, h, w, mw;
unsigned int i, n;
Client *c;
- Monitor *m;
- for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++);
+ for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
if(n == 0)
return;
/* master */
- c = nexttiled(clients);
- m = &mon[c->mon];
- mw = mfact * m->ww;
+ c = nexttiled(m->clients);
+ mw = m->mfact * m->ww;
resize(c, m->wx, m->wy, (n == 1 ? m->ww : mw) - 2 * c->bw, m->wh - 2 * c->bw);
if(--n == 0)
void
togglebar(const Arg *arg) {
- showbar = !showbar;
- updategeom();
- updatebar();
+ selmon->showbar = !selmon->showbar;
+ updatebarpos(selmon);
+ XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
arrange();
}
void
togglefloating(const Arg *arg) {
- if(!sel)
+ if(!selmon->sel)
return;
- sel->isfloating = !sel->isfloating || sel->isfixed;
- if(sel->isfloating)
- resize(sel, sel->x, sel->y, sel->w, sel->h);
+ selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
+ if(selmon->sel->isfloating)
+ resize(selmon->sel, selmon->sel->x, selmon->sel->y, selmon->sel->w, selmon->sel->h);
arrange();
}
toggletag(const Arg *arg) {
unsigned int mask;
- if (!sel)
+ if(!selmon->sel)
return;
- mask = sel->tags ^ (arg->ui & TAGMASK);
+ mask = selmon->sel->tags ^ (arg->ui & TAGMASK);
if(mask) {
- sel->tags = mask;
+ selmon->sel->tags = mask;
arrange();
}
}
void
toggleview(const Arg *arg) {
- unsigned int mask = tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
+ unsigned int mask = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
if(mask) {
- tagset[selmon->seltags] = mask;
+ selmon->tagset[selmon->seltags] = mask;
arrange();
}
}
+void
+unfocus(Client *c) {
+ if(!c)
+ return;
+ grabbuttons(c, False);
+ XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
+ XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+}
+
void
unmanage(Client *c) {
XWindowChanges wc;
XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
detach(c);
detachstack(c);
- if(sel == c)
+ if(c->mon->sel == c) {
+ /* TODO: consider separate the next code into a function or into detachstack? */
+ Client *tc;
+ for(tc = c->mon->stack; tc && !ISVISIBLE(tc); tc = tc->snext);
+ c->mon->sel = tc;
focus(NULL);
+ }
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
setclientstate(c, WithdrawnState);
free(c);
}
void
-updatebar(void) {
- if(dc.drawable != 0)
- XFreePixmap(dpy, dc.drawable);
- dc.drawable = XCreatePixmap(dpy, root, selmon->ww, bh, DefaultDepth(dpy, screen));
- XMoveResizeWindow(dpy, barwin, selmon->wx, by, selmon->ww, bh);
+updatebars(void) {
+ Monitor *m;
+ XSetWindowAttributes wa;
+
+ wa.override_redirect = True;
+ wa.background_pixmap = ParentRelative;
+ wa.event_mask = ButtonPressMask|ExposureMask;
+
+ for(m = mons; m; m = m->next) {
+ m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
+
+ CopyFromParent, DefaultVisual(dpy, screen),
+ CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
+ XDefineCursor(dpy, m->barwin, cursor[CurNormal]);
+ XMapRaised(dpy, m->barwin);
+ }
+}
+
+void
+updatebarpos(Monitor *m) {
+ m->wy = m->my;
+ m->wh = m->mh;
+ if(m->showbar) {
+ m->wh -= bh;
+ m->by = m->topbar ? m->wy : m->wy + m->wh;
+ m->wy = m->topbar ? m->wy + bh : m->wy;
+ }
+ else
+ m->by = -bh;
}
void
updategeom(void) {
-#ifdef XINERAMA
- int di, x, y, n;
- unsigned int dui, i = 0;
- Bool pquery;
+ int i, di, n = 1, x, y;
+ unsigned int dui;
Client *c;
+ Monitor *newmons = NULL, *m, *tm;
Window dummy;
+
+#ifdef XINULATOR
+ n = 2;
+#elif defined(XINERAMA)
XineramaScreenInfo *info = NULL;
- /* window area geometry */
- if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
- nmons = (unsigned int)n;
- for(c = clients; c; c = c->next)
- if(c->mon >= nmons)
- c->mon = nmons - 1;
- if(!(mon = (Monitor *)realloc(mon, sizeof(Monitor) * nmons)))
- die("fatal: could not realloc() %u bytes\n", sizeof(Monitor) * nmons);
- pquery = XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui);
- for(i = 0; i < nmons; i++) {
- /* TODO: consider re-using XineramaScreenInfo */
- mon[i].wx = info[i].x_org;
- mon[i].wy = info[i].y_org;
- mon[i].ww = info[i].width;
- mon[i].wh = info[i].height;
- mon[i].seltags = 0;
- mon[i].sellt = 0;
- if(pquery && INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
- selmon = &mon[i];
+ if(XineramaIsActive(dpy))
+ info = XineramaQueryScreens(dpy, &n);
+#endif
+ /* allocate monitor(s) for the new geometry setup */
+ for(i = 0; i < n; i++) {
+ m = (Monitor *)malloc(sizeof(Monitor));
+ m->next = newmons;
+ newmons = m;
+ }
+
+ /* initialise monitor(s) */
+#ifdef XINULATOR
+ if(1) {
+ m = newmons;
+ m->screen_number = 0;
+ m->wx = sx;
+ m->my = m->wy = sy;
+ m->ww = sw;
+ m->mh = m->wh = sh / 2;
+ m = newmons->next;
+ m->screen_number = 1;
+ m->wx = sx;
+ m->my = m->wy = sy + sh / 2;
+ m->ww = sw;
+ m->mh = m->wh = sh / 2;
+ }
+ else
+#elif defined(XINERAMA)
+ if(XineramaIsActive(dpy)) {
+ for(i = 0, m = newmons; m; m = m->next, i++) {
+ m->screen_number = info[i].screen_number;
+ m->wx = info[i].x_org;
+ m->my = m->wy = info[i].y_org;
+ m->ww = info[i].width;
+ m->mh = m->wh = info[i].height;
}
- /* bar adjustments of selmon */
- selmon->wy = showbar && topbar ? selmon->wy + bh : selmon->wy;
- selmon->wh = showbar ? selmon->wh - bh : selmon->wh;
XFree(info);
}
else
#endif
+ /* default monitor setup */
{
- nmons = 1;
- if(!(mon = (Monitor *)realloc(mon, sizeof(Monitor))))
- die("fatal: could not realloc() %u bytes\n", sizeof(Monitor));
- selmon = &mon[0];
- mon[0].wx = sx;
- mon[0].wy = showbar && topbar ? sy + bh : sy;
- mon[0].ww = sw;
- mon[0].wh = showbar ? sh - bh : sh;
- mon[0].seltags = 0;
- mon[0].sellt = 0;
+ m->screen_number = 0;
+ m->wx = sx;
+ m->my = m->wy = sy;
+ m->ww = sw;
+ m->mh = m->wh = sh;
}
- /* bar position */
- by = showbar ? (topbar ? selmon->wy - bh : selmon->wy + selmon->wh) : -bh;
+ /* bar geometry setup */
+ for(m = newmons; m; m = m->next) {
+ /* TODO: consider removing the following values from config.h */
+ m->clients = NULL;
+ m->sel = NULL;
+ m->stack = NULL;
+ m->seltags = 0;
+ m->sellt = 0;
+ m->tagset[0] = m->tagset[1] = 1;
+ m->mfact = mfact;
+ m->showbar = showbar;
+ m->topbar = topbar;
+ updatebarpos(m);
+ }
+
+ /* reassign left over clients of disappeared monitors */
+ for(tm = mons; tm; tm = tm->next)
+ while(tm->clients) {
+ c = tm->clients;
+ tm->clients = c->next;
+ detachstack(c);
+ c->mon = newmons;
+ attach(c);
+ attachstack(c);
+ }
+
+ /* select focused monitor */
+ selmon = newmons;
+ if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui))
+ for(m = newmons; m; m = m->next)
+ if(INRECT(x, y, m->wx, m->wy, m->ww, m->wh)) {
+ selmon = m;
+ break;
+ }
+
+ /* final assignment of new monitors */
+ cleanupmons();
+ mons = newmons;
}
void
if(!XGetWMNormalHints(dpy, c->win, &size, &msize))
/* size is uninitialized, ensure that size.flags aren't used */
- size.flags = PSize;
+ size.flags = PSize;
if(size.flags & PBaseSize) {
c->basew = size.base_width;
c->baseh = size.base_height;
updatestatus() {
if(!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
strcpy(stext, "dwm-"VERSION);
- drawbar();
+ drawbar(selmon);
}
void
XWMHints *wmh;
if((wmh = XGetWMHints(dpy, c->win))) {
- if(c == sel && wmh->flags & XUrgencyHint) {
+ if(c == selmon->sel && wmh->flags & XUrgencyHint) {
wmh->flags &= ~XUrgencyHint;
XSetWMHints(dpy, c->win, wmh);
}
void
view(const Arg *arg) {
- if((arg->ui & TAGMASK) == tagset[selmon->seltags])
+ if((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
return;
selmon->seltags ^= 1; /* toggle sel tagset */
if(arg->ui & TAGMASK)
- tagset[selmon->seltags] = arg->ui & TAGMASK;
+ selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
arrange();
}
void
zoom(const Arg *arg) {
- Client *c = sel;
+ Client *c = selmon->sel;
- if(!lt[selmon->sellt]->arrange || lt[selmon->sellt]->arrange == monocle || (sel && sel->isfloating))
+ if(!lt[selmon->sellt]->arrange || lt[selmon->sellt]->arrange == monocle || (selmon->sel && selmon->sel->isfloating))
return;
- if(c == nexttiled(clients))
+ if(c == nexttiled(selmon->clients))
if(!c || !(c = nexttiled(c->next)))
return;
detach(c);