#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[mon[x->mon].seltags])
-#define LENGTH(x) (sizeof x / sizeof x[0])
+#define ISVISIBLE(M, C) ((M) == (&mon[C->mon]) && (C->tags & tagset[M->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)
typedef struct {
char symbol[4];
+ float mfact;
int by, btx; /* bar geometry */
int wx, wy, ww, wh; /* window area */
unsigned int seltags;
static DC dc;
static Layout *lt[] = { NULL, NULL };
static Monitor *mon = NULL, *selmon = NULL;
-static unsigned int nmons;
+static unsigned int nmons = 0;
static Window root;
/* configuration, allows nested code to access above variables */
#include "config.h"
updategeom();
if(dc.drawable != 0)
XFreePixmap(dpy, dc.drawable);
- dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
+ dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
for(i = 0; i < nmons; i++)
XMoveResizeWindow(dpy, mon[i].barwin, mon[i].wx, mon[i].by, mon[i].ww, bh);
arrange();
c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */
if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
configure(c);
- if(ISVISIBLE(c))
+ if(ISVISIBLE((&mon[c->mon]), c))
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
}
else
}
}
else {
+ dc.x = x;
dc.w = m->ww - x;
drawtext(NULL, dc.norm, False);
}
unsigned int i;
XExposeEvent *ev = &e->xexpose;
- for(i = 0; i < nmons; i++)
- if(ev->count == 0 && (ev->window == mon[i].barwin)) {
- drawbar(&mon[i]);
- break;
- }
+ if(ev->count == 0)
+ for(i = 0; i < nmons; i++)
+ if(ev->window == mon[i].barwin) {
+ drawbar(&mon[i]);
+ break;
+ }
}
void
focus(Client *c) {
- if(!c || !ISVISIBLE(c))
- for(c = stack; c && !ISVISIBLE(c); c = c->snext);
+ if(!c || !ISVISIBLE((&mon[c->mon]), c))
+ for(c = stack; c && !ISVISIBLE(selmon, c); c = c->snext);
if(sel && sel != c) {
grabbuttons(sel, False);
XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
if(!sel)
return;
if(arg->i > 0) {
- for(c = sel->next; c && !ISVISIBLE(c); c = c->next);
+ for(c = sel->next; c && !ISVISIBLE(selmon, c); c = c->next);
if(!c)
- for(c = clients; c && !ISVISIBLE(c); c = c->next);
+ for(c = clients; c && !ISVISIBLE(selmon, c); c = c->next);
}
else {
for(i = clients; i != sel; i = i->next)
- if(ISVISIBLE(i))
+ if(ISVISIBLE(selmon, i))
c = i;
if(!c)
for(; i; i = i->next)
- if(ISVISIBLE(i))
+ if(ISVISIBLE(selmon, i))
c = i;
}
if(c) {
Client *
nexttiled(Monitor *m, Client *c) {
// TODO: m handling
- for(; c && (c->isfloating || m != &mon[c->mon] || !ISVISIBLE(c)); c = c->next);
+ for(; c && (c->isfloating || !ISVISIBLE(m, c)); c = c->next);
return c;
}
wc.stack_mode = Below;
wc.sibling = m->barwin;
for(c = stack; c; c = c->snext)
- if(!c->isfloating && m == &mon[c->mon] && ISVISIBLE(c)) {
+ if(!c->isfloating && ISVISIBLE(m, c)) {
XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
wc.sibling = c->win;
}
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();
}
showhide(Client *c) {
if(!c)
return;
- if(ISVISIBLE(c)) { /* show clients top down */
+ if(ISVISIBLE((&mon[c->mon]), c)) { /* show clients top down */
XMoveWindow(dpy, c->win, c->x, c->y);
if(!lt[selmon->sellt]->arrange || c->isfloating)
resize(c, c->x, c->y, c->w, c->h);
/* master */
c = nexttiled(m, clients);
- mw = mfact * m->ww;
+ 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
updategeom(void) {
#ifdef XINERAMA
- int di, x, y, n;
- unsigned int dui, i = 0;
- Bool pquery;
+ int n;
+ unsigned int i = 0;
Client *c;
- Window dummy;
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++) {
+ if(n != nmons) {
+ for(c = clients; c; c = c->next)
+ if(c->mon >= n)
+ c->mon = n - 1;
+ if(!(mon = (Monitor *)realloc(mon, sizeof(Monitor) * n)))
+ die("fatal: could not realloc() %u bytes\n", sizeof(Monitor) * nmons);
+ }
+ for(i = 0; i < n ; i++) {
/* TODO: consider re-using XineramaScreenInfo */
mon[i].symbol[0] = '[';
mon[i].symbol[1] = '0' + info[i].screen_number;
mon[i].symbol[2] = ']';
mon[i].symbol[3] = 0;
- mon[i].showbar = showbar;
- mon[i].topbar = topbar;
+ if(!selmon) { /* not initialised yet */
+ mon[i].mfact = mfact;
+ mon[i].showbar = showbar;
+ mon[i].topbar = topbar;
+ }
mon[i].wx = info[i].x_org;
mon[i].wy = mon[i].showbar && mon[i].topbar ? info[i].y_org + bh : info[i].y_org;
mon[i].ww = info[i].width;
mon[i].by = mon[i].topbar ? info[i].y_org : mon[i].wy + mon[i].wh;
else
mon[i].by = -bh;
- if(pquery && INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
- selmon = &mon[i];
+ }
+ nmons = (unsigned int)n;
+ if(!selmon) {
+ selmon = &mon[0];
+ int di, x, y;
+ unsigned int dui;
+ Window dummy;
+ if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui))
+ for(i = 0; i < nmons; i++)
+ if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height)) {
+ selmon = &mon[i];
+ break;
+ }
}
XFree(info);
}
else
#endif /* XINERAMA */
{
- nmons = 1;
- if(!(mon = (Monitor *)realloc(mon, sizeof(Monitor))))
- die("fatal: could not realloc() %u bytes\n", sizeof(Monitor));
- selmon = &mon[0];
- mon[0].symbol[0] = '[';
- mon[0].symbol[1] = '0';
- mon[0].symbol[2] = ']';
- mon[0].symbol[3] = 0;
- mon[0].showbar = showbar;
- mon[0].topbar = topbar;
+ if(!mon) {
+ nmons = 1;
+ if(!(mon = (Monitor *)malloc(sizeof(Monitor))))
+ die("fatal: could not malloc() %u bytes\n", sizeof(Monitor));
+ }
+ if(!selmon) {
+ mon[0].symbol[0] = '[';
+ mon[0].symbol[1] = '0';
+ mon[0].symbol[2] = ']';
+ mon[0].symbol[3] = 0;
+ mon[0].mfact = mfact;
+ mon[0].showbar = showbar;
+ mon[0].topbar = topbar;
+ }
mon[0].wx = sx;
mon[0].wy = mon[0].showbar && mon[0].topbar ? sy + bh : sy;
mon[0].ww = sw;
mon[0].by = mon[0].topbar ? sy : mon[0].wy + mon[0].wh;
else
mon[0].by = -bh;
+ selmon = &mon[0];
}
}