+//#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
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 updategeom(void);
void
attach(Client *c) {
- c->next = selmon->clients;
- selmon->clients = c;
+ c->next = c->mon->clients;
+ c->mon->clients = c;
}
void
attachstack(Client *c) {
- c->snext = selmon->stack;
- selmon->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;
+ /* 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;
}
else
x = dc.x;
- if(m == selmon) {
+ 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.w = m->ww - x;
}
drawtext(stext, dc.norm, False);
- if((dc.w = dc.x - x) > bh) {
- dc.x = x;
- if(selmon->sel) {
- drawtext(selmon->sel->name, dc.sel, False);
- drawsquare(selmon->sel->isfixed, selmon->sel->isfloating, False, dc.sel);
- }
- else
- drawtext(NULL, dc.norm, False);
- }
}
else {
+ dc.x = m->ww;
+ }
+ if((dc.w = dc.x - x) > bh) {
dc.x = x;
- dc.w = m->ww - x;
- drawtext(NULL, dc.norm, False);
+ 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, m->barwin, dc.gc, 0, 0, m->ww, bh, 0, 0);
XSync(dpy, False);
focus(Client *c) {
if(!c || !ISVISIBLE(c))
for(c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
- if(selmon->sel && selmon->sel != c) {
- grabbuttons(selmon->sel, False);
- XSetWindowBorder(dpy, selmon->sel->win, dc.norm[ColBorder]);
- }
+ if(selmon->sel)
+ unfocus(selmon->sel);
if(c) {
+ if(c->mon != selmon)
+ selmon = c->mon;
if(c->isurgent)
clearurgent(c);
detachstack(c);
for(i = 0, m = mons; m; m = m->next, i++)
if(i == arg->ui) {
- selmon = m;
- focus(NULL);
+ if(m->stack)
+ focus(m->stack);
+ else {
+ unfocus(selmon->stack);
+ selmon = m;
+ focus(NULL);
+ }
drawbars();
break;
}
Client *
getclient(Window w) {
- Client *c = NULL;
+ Client *c;
Monitor *m;
for(m = mons; m; m = m->next)
- for(c = m->clients; c && c->win != w; c = c->next);
- return c;
+ for(c = m->clients; c; c = c->next)
+ if(c->win == w)
+ return c;
+ return NULL;
}
unsigned long
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 */
- c->y = MAX(c->y, ((selmon->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;
}
Client *
nexttiled(Client *c) {
- // TODO: m handling
for(; c && (c->isfloating || !ISVISIBLE(c)); c = c->next);
return c;
}
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);
}
XWindowChanges wc;
drawbars();
- if(!selmon->sel)
+ if(!m->sel)
return;
- if(m == selmon && (selmon->sel->isfloating || !lt[m->sellt]->arrange))
- XRaiseWindow(dpy, selmon->sel->win);
+ if(m->sel->isfloating || !lt[m->sellt]->arrange)
+ XRaiseWindow(dpy, m->sel->win);
if(lt[m->sellt]->arrange) {
wc.stack_mode = Below;
wc.sibling = m->barwin;
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) {
- selmon->sel->m = m;
+ detach(c);
+ detachstack(c);
+ c->mon = m;
+ attach(c);
+ attachstack(c);
+ m->sel = c;
+ for(c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
+ selmon->sel = c;
arrange();
break;
}
}
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(selmon->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
updategeom(void) {
- int i, n = 1;
+ int i, di, n = 1, x, y;
+ unsigned int dui;
Client *c;
Monitor *newmons = NULL, *m, *tm;
+ Window dummy;
-#ifdef XINERAMA
+#ifdef XINULATOR
+ n = 2;
+#elif defined(XINERAMA)
XineramaScreenInfo *info = NULL;
if(XineramaIsActive(dpy))
}
/* initialise monitor(s) */
-#ifdef XINERAMA
+#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->showbar = showbar;
m->topbar = topbar;
updatebarpos(m);
- /* reassign all clients with same screen number */
- for(tm = mons; tm; tm = tm->next)
- if(tm->screen_number == m->screen_number) {
- m->clients = tm->clients;
- m->stack = tm->stack;
- tm->clients = NULL;
- tm->stack = NULL;
- for(c = m->clients; c; c = c->next)
- c->mon = m;
- }
}
/* reassign left over clients of disappeared monitors */
- for(tm = mons; tm; tm = tm->next) {
+ for(tm = mons; tm; tm = tm->next)
while(tm->clients) {
- c = tm->clients->next;
- tm->clients->next = newmons->clients;
- tm->clients->mon = newmons;
- newmons->clients = tm->clients;
- tm->clients = c;
+ c = tm->clients;
+ tm->clients = c->next;
+ detachstack(c);
+ c->mon = newmons;
+ attach(c);
+ attachstack(c);
}
- while(tm->stack) {
- c = tm->stack->snext;
- tm->stack->snext = newmons->stack;
- newmons->stack = tm->stack;
- tm->stack = c;
- }
- }
/* select focused monitor */
- if(!selmon) {
- selmon = newmons;
- int di, x, y;
- unsigned int dui;
- Window dummy;
- 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;
- }
- }
+ 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();
Got questions, comments, patches, etc.? Contact Jason Woofenden