#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[seltags])
+#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 MAXTAGLEN 16
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
#define WIDTH(x) ((x)->w + 2 * (x)->bw)
#define HEIGHT(x) ((x)->h + 2 * (x)->bw)
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;
} Layout;
typedef struct {
+ int wx, wy, ww, wh;
+ unsigned int seltags;
+ unsigned int sellt;
+} Monitor;
+
+typedef struct {
const char *class;
const char *instance;
const char *title;
} Rule;
/* function declarations */
-static void adjustborder(Client *c, unsigned int bw);
static void applyrules(Client *c);
+static Bool applysizehints(Client *c, int *x, int *y, int *w, int *h);
static void arrange(void);
static void attach(Client *c);
static void attachstack(Client *c);
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, Bool sizehints);
+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 run(void);
static void setlayout(const Arg *arg);
static void setmfact(const Arg *arg);
static void setup(void);
-static void showhide(Client *c, unsigned int ntiled);
+static void showhide(Client *c);
static void sigchld(int signal);
static void spawn(const Arg *arg);
static void tag(const Arg *arg);
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 wx, wy, ww, wh; /* window area geometry x, y, width, height, bar excluded */
-static unsigned int seltags = 0, sellt = 0;
static int (*xerrorxlib)(Display *, XErrorEvent *);
static unsigned int numlockmask = 0;
static void (*handler[LASTEvent]) (XEvent *) = {
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;
/* configuration, allows nested code to access above variables */
#include "config.h"
/* function implementations */
void
-adjustborder(Client *c, unsigned int bw) {
- XWindowChanges wc;
-
- if(c->bw != bw) {
- c->bw = wc.border_width = bw;
- XConfigureWindow(dpy, c->win, CWBorderWidth, &wc);
- }
-}
-
-void
applyrules(Client *c) {
unsigned int i;
Rule *r;
XClassHint ch = { 0 };
/* rule matching */
+ c->isfloating = c->tags = 0;
if(XGetClassHint(dpy, c->win, &ch)) {
for(i = 0; i < LENGTH(rules); i++) {
r = &rules[i];
&& (!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 & TAGMASK ? r->tags & TAGMASK : tagset[seltags];
+ c->tags |= r->tags;
}
}
if(ch.res_class)
if(ch.res_name)
XFree(ch.res_name);
}
- if(!c->tags)
- c->tags = tagset[seltags];
+ c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : tagset[mon[c->mon].seltags];
+}
+
+Bool
+applysizehints(Client *c, int *x, int *y, int *w, int *h) {
+ Bool baseismin;
+
+ /* set minimum possible */
+ *w = MAX(1, *w);
+ *h = MAX(1, *h);
+
+ if(*x > sx + sw)
+ *x = sw - WIDTH(c);
+ if(*y > sy + sh)
+ *y = sh - HEIGHT(c);
+ if(*x + *w + 2 * c->bw < sx)
+ *x = sx;
+ if(*y + *h + 2 * c->bw < sy)
+ *y = sy;
+ if(*h < bh)
+ *h = bh;
+ if(*w < bh)
+ *w = bh;
+
+ if(resizehints || c->isfloating) {
+ /* see last two sentences in ICCCM 4.1.2.3 */
+ baseismin = c->basew == c->minw && c->baseh == c->minh;
+
+ if(!baseismin) { /* temporarily remove base dimensions */
+ *w -= c->basew;
+ *h -= c->baseh;
+ }
+
+ /* adjust for aspect limits */
+ if(c->mina > 0 && c->maxa > 0) {
+ if(c->maxa < (float)*w / *h)
+ *w = *h * c->maxa;
+ else if(c->mina < (float)*h / *w)
+ *h = *w * c->mina;
+ }
+
+ if(baseismin) { /* increment calculation requires this */
+ *w -= c->basew;
+ *h -= c->baseh;
+ }
+
+ /* adjust for increment value */
+ if(c->incw)
+ *w -= *w % c->incw;
+ if(c->inch)
+ *h -= *h % c->inch;
+
+ /* restore base dimensions */
+ *w += c->basew;
+ *h += c->baseh;
+
+ *w = MAX(*w, c->minw);
+ *h = MAX(*h, c->minh);
+
+ if(c->maxw)
+ *w = MIN(*w, c->maxw);
+
+ if(c->maxh)
+ *h = MIN(*h, c->maxh);
+ }
+ return *x != c->x || *y != c->y || *w != c->w || *h != c->h;
}
void
arrange(void) {
- unsigned int nt;
- Client *c;
-
- for(nt = 0, c = nexttiled(clients); c; c = nexttiled(c->next), nt++);
- showhide(stack, nt);
+ showhide(stack);
focus(NULL);
- if(lt[sellt]->arrange)
- lt[sellt]->arrange();
+ if(lt[selmon->sellt]->arrange)
+ lt[selmon->sellt]->arrange();
restack();
}
}
else if(ev->x < x + blw)
click = ClkLtSymbol;
- else if(ev->x > wx + ww - TEXTW(stext))
+ else if(ev->x > selmon->wx + selmon->ww - TEXTW(stext))
click = ClkStatusText;
else
click = ClkWinTitle;
Layout foo = { "", NULL };
view(&a);
- lt[sellt] = &foo;
+ lt[selmon->sellt] = &foo;
while(stack)
unmanage(stack);
if(dc.font.set)
if((c = getclient(ev->window))) {
if(ev->value_mask & CWBorderWidth)
c->bw = ev->border_width;
- else if(c->isfloating || !lt[sellt]->arrange) {
+ else if(c->isfloating || !lt[selmon->sellt]->arrange) {
if(ev->value_mask & CWX)
c->x = sx + ev->x;
if(ev->value_mask & CWY)
dc.x = 0;
for(i = 0; i < LENGTH(tags); i++) {
dc.w = TEXTW(tags[i]);
- col = tagset[seltags] & 1 << i ? dc.sel : dc.norm;
+ col = tagset[selmon->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);
dc.x += dc.w;
}
if(blw > 0) {
dc.w = blw;
- drawtext(lt[sellt]->symbol, dc.norm, False);
+ drawtext(lt[selmon->sellt]->symbol, dc.norm, False);
x = dc.x + dc.w;
}
else
x = dc.x;
dc.w = TEXTW(stext);
- dc.x = ww - dc.w;
+ dc.x = selmon->ww - dc.w;
if(dc.x < x) {
dc.x = x;
- dc.w = ww - x;
+ dc.w = selmon->ww - 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, ww, bh, 0, 0);
+ XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, selmon->ww, bh, 0, 0);
XSync(dpy, False);
}
for(i = 0; i < LENGTH(buttons); i++)
if(buttons[i].click == ClkClientWin)
for(j = 0; j < LENGTH(modifiers); j++)
- XGrabButton(dpy, buttons[i].button, buttons[i].mask | modifiers[j], c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, buttons[i].button,
+ buttons[i].mask | modifiers[j],
+ c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
} else
XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
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++);
/* 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 */
- c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= wx) && (c->x + (c->w / 2) < wx + ww)) ? bh : sy);
+ /* 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->bw = borderpx;
}
void
monocle(void) {
- unsigned int n;
Client *c;
+ Monitor *m;
- for(n = 0, c = nexttiled(clients); c && n < 2; c = nexttiled(c->next), n++);
for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
- adjustborder(c, n == 1 ? 0 : borderpx);
- resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints);
+ m = &mon[c->mon];
+ resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw);
}
}
None, cursor[CurMove], CurrentTime) != GrabSuccess)
return;
XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui);
- if(usegrab)
- XGrabServer(dpy);
do {
XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
switch (ev.type) {
case MotionNotify:
nx = ocx + (ev.xmotion.x - x);
ny = ocy + (ev.xmotion.y - y);
- 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 + WIDTH(c))) < snap)
- nx = wx + ww - WIDTH(c);
- if(abs(wy - ny) < snap)
- ny = wy;
- else if(abs((wy + wh) - (ny + HEIGHT(c))) < snap)
- ny = wy + wh - HEIGHT(c);
- if(!c->isfloating && lt[sellt]->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
+ if(snap && nx >= selmon->wx && nx <= selmon->wx + selmon->ww
+ && ny >= selmon->wy && ny <= selmon->wy + selmon->wh) {
+ if(abs(selmon->wx - nx) < snap)
+ nx = selmon->wx;
+ else if(abs((selmon->wx + selmon->ww) - (nx + WIDTH(c))) < snap)
+ nx = selmon->wx + selmon->ww - WIDTH(c);
+ if(abs(selmon->wy - ny) < snap)
+ ny = selmon->wy;
+ else if(abs((selmon->wy + selmon->wh) - (ny + HEIGHT(c))) < snap)
+ ny = selmon->wy + selmon->wh - HEIGHT(c);
+ if(!c->isfloating && lt[selmon->sellt]->arrange
+ && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
togglefloating(NULL);
}
- if(!lt[sellt]->arrange || c->isfloating)
- resize(c, nx, ny, c->w, c->h, False);
+ if(!lt[selmon->sellt]->arrange || c->isfloating)
+ resize(c, nx, ny, c->w, c->h);
break;
}
}
while(ev.type != ButtonRelease);
- if(usegrab)
- XUngrabServer(dpy);
XUngrabPointer(dpy, CurrentTime);
}
}
void
-resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
+resize(Client *c, int x, int y, int w, int h) {
XWindowChanges wc;
- if(sizehints) {
- /* see last two sentences in ICCCM 4.1.2.3 */
- Bool baseismin = c->basew == c->minw && c->baseh == c->minh;
-
- /* set minimum possible */
- w = MAX(1, w);
- h = MAX(1, h);
-
- if(!baseismin) { /* temporarily remove base dimensions */
- w -= c->basew;
- h -= c->baseh;
- }
-
- /* adjust for aspect limits */
- if(c->mina > 0 && c->maxa > 0) {
- if(c->maxa < (float)w / h)
- w = h * c->maxa;
- else if(c->mina < (float)h / w)
- h = w * c->mina;
- }
-
- if(baseismin) { /* increment calculation requires this */
- w -= c->basew;
- h -= c->baseh;
- }
-
- /* adjust for increment value */
- if(c->incw)
- w -= w % c->incw;
- if(c->inch)
- h -= h % c->inch;
-
- /* restore base dimensions */
- w += c->basew;
- h += c->baseh;
-
- w = MAX(w, c->minw);
- h = MAX(h, c->minh);
-
- if(c->maxw)
- w = MIN(w, c->maxw);
-
- if(c->maxh)
- h = MIN(h, c->maxh);
- }
- if(w <= 0 || h <= 0)
- return;
- if(x > sx + sw)
- x = sw - WIDTH(c);
- if(y > sy + sh)
- y = sh - HEIGHT(c);
- if(x + w + 2 * c->bw < sx)
- x = sx;
- if(y + h + 2 * c->bw < sy)
- y = sy;
- if(h < bh)
- h = bh;
- if(w < bh)
- w = bh;
- if(c->x != x || c->y != y || c->w != w || c->h != h) {
+ if(applysizehints(c, &x, &y, &w, &h)) {
c->x = wc.x = x;
c->y = wc.y = y;
c->w = wc.width = w;
None, cursor[CurResize], CurrentTime) != GrabSuccess)
return;
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
- if(usegrab)
- XGrabServer(dpy);
do {
XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
switch(ev.type) {
nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
- if(snap && nw >= wx && nw <= wx + ww
- && nh >= wy && nh <= wy + wh) {
- if(!c->isfloating && lt[sellt]->arrange
+ if(snap && nw >= selmon->wx && nw <= selmon->wx + selmon->ww
+ && nh >= selmon->wy && nh <= selmon->wy + selmon->wh) {
+ if(!c->isfloating && lt[selmon->sellt]->arrange
&& (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
togglefloating(NULL);
}
- if(!lt[sellt]->arrange || c->isfloating)
- resize(c, c->x, c->y, nw, nh, True);
+ if(!lt[selmon->sellt]->arrange || c->isfloating)
+ resize(c, c->x, c->y, nw, nh);
break;
}
}
while(ev.type != ButtonRelease);
- if(usegrab)
- XUngrabServer(dpy);
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
XUngrabPointer(dpy, CurrentTime);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
drawbar();
if(!sel)
return;
- if(sel->isfloating || !lt[sellt]->arrange)
+ if(sel->isfloating || !lt[selmon->sellt]->arrange)
XRaiseWindow(dpy, sel->win);
- if(lt[sellt]->arrange) {
+ if(lt[selmon->sellt]->arrange) {
wc.stack_mode = Below;
wc.sibling = barwin;
for(c = stack; c; c = c->snext)
void
setlayout(const Arg *arg) {
- if(!arg || !arg->v || arg->v != lt[sellt])
- sellt ^= 1;
+ if(!arg || !arg->v || arg->v != lt[selmon->sellt])
+ selmon->sellt ^= 1;
if(arg && arg->v)
- lt[sellt] = (Layout *)arg->v;
+ lt[selmon->sellt] = (Layout *)arg->v;
if(sel)
arrange();
else
setmfact(const Arg *arg) {
float f;
- if(!arg || !lt[sellt]->arrange)
+ if(!arg || !lt[selmon->sellt]->arrange)
return;
f = arg->f < 1.0 ? arg->f + mfact : arg->f - 1.0;
if(f < 0.1 || f > 0.9)
dc.sel[ColBG] = getcolor(selbgcolor);
dc.sel[ColFG] = getcolor(selfgcolor);
dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
- dc.gc = XCreateGC(dpy, root, 0, 0);
+ dc.gc = XCreateGC(dpy, root, 0, NULL);
XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
if(!dc.font.set)
XSetFont(dpy, dc.gc, dc.font.xfont->fid);
blw = MAX(blw, w);
}
- wa.override_redirect = 1;
+ wa.override_redirect = True;
wa.background_pixmap = ParentRelative;
wa.event_mask = ButtonPressMask|ExposureMask;
- barwin = XCreateWindow(dpy, root, wx, by, ww, bh, 0, DefaultDepth(dpy, screen),
+ 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]);
}
void
-showhide(Client *c, unsigned int ntiled) {
+showhide(Client *c) {
if(!c)
return;
if(ISVISIBLE(c)) { /* show clients top down */
- if(c->isfloating || ntiled > 1) /* avoid unnecessary border reverts */
- adjustborder(c, borderpx);
XMoveWindow(dpy, c->win, c->x, c->y);
- if(!lt[sellt]->arrange || c->isfloating)
- resize(c, c->x, c->y, c->w, c->h, True);
- showhide(c->snext, ntiled);
+ if(!lt[selmon->sellt]->arrange || c->isfloating)
+ resize(c, c->x, c->y, c->w, c->h);
+ showhide(c->snext);
}
else { /* hide clients bottom up */
- showhide(c->snext, ntiled);
+ showhide(c->snext);
XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
}
}
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++);
if(n == 0)
/* master */
c = nexttiled(clients);
- mw = mfact * ww;
- adjustborder(c, n == 1 ? 0 : borderpx);
- resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
+ m = &mon[c->mon];
+ mw = 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)
return;
/* tile stack */
- x = (wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : wx + mw;
- y = wy;
- w = (wx + mw > c->x + c->w) ? wx + ww - x : ww - mw;
- h = wh / n;
+ x = (m->wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : m->wx + mw;
+ y = m->wy;
+ w = (m->wx + mw > c->x + c->w) ? m->wx + m->ww - x : m->ww - mw;
+ h = m->wh / n;
if(h < bh)
- h = wh;
+ h = m->wh;
for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
- adjustborder(c, borderpx);
resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
- ? wy + wh - y - 2 * c->bw : h - 2 * c->bw), resizehints);
- if(h != wh)
+ ? m->wy + m->wh - y - 2 * c->bw : h - 2 * c->bw));
+ if(h != m->wh)
y = c->y + HEIGHT(c);
}
}
return;
sel->isfloating = !sel->isfloating || sel->isfixed;
if(sel->isfloating)
- resize(sel, sel->x, sel->y, sel->w, sel->h, True);
+ resize(sel, sel->x, sel->y, sel->w, sel->h);
arrange();
}
return;
mask = sel->tags ^ (arg->ui & TAGMASK);
- if(sel && mask) {
+ if(mask) {
sel->tags = mask;
arrange();
}
void
toggleview(const Arg *arg) {
- unsigned int mask = tagset[seltags] ^ (arg->ui & TAGMASK);
+ unsigned int mask = tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
if(mask) {
- tagset[seltags] = mask;
+ tagset[selmon->seltags] = mask;
arrange();
}
}
updatebar(void) {
if(dc.drawable != 0)
XFreePixmap(dpy, dc.drawable);
- dc.drawable = XCreatePixmap(dpy, root, ww, bh, DefaultDepth(dpy, screen));
- XMoveResizeWindow(dpy, barwin, wx, by, ww, bh);
+ dc.drawable = XCreatePixmap(dpy, root, selmon->ww, bh, DefaultDepth(dpy, screen));
+ XMoveResizeWindow(dpy, barwin, selmon->wx, by, selmon->ww, bh);
}
void
updategeom(void) {
#ifdef XINERAMA
- int n, i = 0;
+ int di, x, y, n;
+ unsigned int dui, i = 0;
+ Bool pquery;
+ Client *c;
+ Window dummy;
XineramaScreenInfo *info = NULL;
/* window area geometry */
if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
- if(n > 1) {
- int di, x, y;
- unsigned int dui;
- Window dummy;
- if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui))
- for(i = 0; i < n; i++)
- if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
- break;
+ 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];
}
- wx = info[i].x_org;
- wy = showbar && topbar ? info[i].y_org + bh : info[i].y_org;
- ww = info[i].width;
- wh = showbar ? info[i].height - bh : 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
{
- wx = sx;
- wy = showbar && topbar ? sy + bh : sy;
- ww = sw;
- wh = showbar ? sh - bh : sh;
+ 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;
}
/* bar position */
- by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;
+ by = showbar ? (topbar ? selmon->wy - bh : selmon->wy + selmon->wh) : -bh;
}
void
modmap = XGetModifierMapping(dpy);
for(i = 0; i < 8; i++)
for(j = 0; j < modmap->max_keypermod; j++)
- if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
+ if(modmap->modifiermap[i * modmap->max_keypermod + j]
+ == XKeysymToKeycode(dpy, XK_Num_Lock))
numlockmask = (1 << i);
XFreeModifiermap(modmap);
}
void
view(const Arg *arg) {
- if((arg->ui & TAGMASK) == tagset[seltags])
+ if((arg->ui & TAGMASK) == tagset[selmon->seltags])
return;
- seltags ^= 1; /* toggle sel tagset */
+ selmon->seltags ^= 1; /* toggle sel tagset */
if(arg->ui & TAGMASK)
- tagset[seltags] = arg->ui & TAGMASK;
+ tagset[selmon->seltags] = arg->ui & TAGMASK;
arrange();
}
zoom(const Arg *arg) {
Client *c = sel;
- if(!lt[sellt]->arrange || lt[sellt]->arrange == monocle || (sel && sel->isfloating))
+ if(!lt[selmon->sellt]->arrange || lt[selmon->sellt]->arrange == monocle || (sel && sel->isfloating))
return;
if(c == nexttiled(clients))
if(!c || !(c = nexttiled(c->next)))
die("usage: dwm [-v]\n");
if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
- fprintf(stderr, "warning: no locale support\n");
+ fputs("warning: no locale support\n", stderr);
- if(!(dpy = XOpenDisplay(0)))
+ if(!(dpy = XOpenDisplay(NULL)))
die("dwm: cannot open display\n");
checkotherwm();
Got questions, comments, patches, etc.? Contact Jason Woofenden