enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
/* typedefs */
+typedef struct Monitor Monitor;
typedef struct Client Client;
struct Client {
char name[256];
Client *prev;
Client *snext;
Window win;
- int monitor;
+ Monitor *monitor;
};
typedef struct {
const char *arg;
} Key;
-typedef struct Monitor Monitor;
typedef struct {
const char *symbol;
void (*arrange)(Monitor *);
} Regs;
struct Monitor {
- unsigned int id;
int sx, sy, sw, sh, wax, way, wah, waw;
double mwfact;
Bool *seltags;
/* function declarations */
void applyrules(Client *c);
-void arrange(void);
+void arrange(Monitor *m);
void attach(Client *c);
void attachstack(Client *c);
void ban(Client *c);
void grabkeys(void);
unsigned int idxoftag(const char *tag);
void initfont(const char *fontstr);
-Bool isoccupied(unsigned int monitor, unsigned int t);
+Bool isoccupied(Monitor *monitor, unsigned int t);
Bool isprotodel(Client *c);
-Bool isurgent(unsigned int monitor, unsigned int t);
-Bool isvisible(Client *c, int monitor);
+Bool isurgent(Monitor *monitor, unsigned int t);
+Bool isvisible(Client *c, Monitor *m);
void keypress(XEvent *e);
void killclient(const char *arg);
void manage(Window w, XWindowAttributes *wa);
void mappingnotify(XEvent *e);
void maprequest(XEvent *e);
+Monitor *monitorat(void);
void movemouse(Client *c);
-Client *nexttiled(Client *c, int monitor);
+Client *nexttiled(Client *c, Monitor *monitor);
void propertynotify(XEvent *e);
void quit(const char *arg);
void reapply(const char *arg);
int xerrordummy(Display *dsply, XErrorEvent *ee);
int xerrorstart(Display *dsply, XErrorEvent *ee);
void zoom(const char *arg);
-int monitorat(void);
void movetomonitor(const char *arg);
void selectmonitor(const char *arg);
/* variables */
char stext[256];
int mcount = 1;
-int selmonitor = 0;
+Monitor *selmonitor;
int screen;
int (*xerrorxlib)(Display *, XErrorEvent *);
unsigned int bh, bpos;
if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {
if (rules[i].monitor >= 0 && rules[i].monitor < mcount) {
matched_monitor = True;
- c->monitor = rules[i].monitor;
+ c->monitor = &monitors[rules[i].monitor];
}
c->isfloating = rules[i].isfloating;
if(ch.res_name)
XFree(ch.res_name);
if(!matched_tag)
- memcpy(c->tags, monitors[monitorat()].seltags, sizeof initags);
+ memcpy(c->tags, monitorat()->seltags, sizeof initags);
if (!matched_monitor)
c->monitor = monitorat();
}
void
-arrange(void) {
+arrange(Monitor *m) {
+ unsigned int i;
Client *c;
for(c = clients; c; c = c->next)
else
ban(c);
- monitors[selmonitor].layout->arrange(&monitors[selmonitor]);
+ if(m)
+ m->layout->arrange(m);
+ else
+ for(i = 0; i < mcount; i++)
+ monitors[i].layout->arrange(&monitors[i]);
focus(NULL);
- restack(&monitors[selmonitor]);
+ restack(m);
}
void
ban(Client *c) {
if(c->isbanned)
return;
- XMoveWindow(dpy, c->win, c->x + 3 * monitors[c->monitor].sw, c->y);
+ XMoveWindow(dpy, c->win, c->x + 3 * c->monitor->sw, c->y);
c->isbanned = True;
}
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
- Monitor *m = &monitors[monitorat()];
+ Monitor *m = monitorat();
if(ev->window == m->barwin) {
x = 0;
if(CLEANMASK(ev->state) != MODKEY)
return;
if(ev->button == Button1) {
- restack(&monitors[c->monitor]);
+ restack(c->monitor);
movemouse(c);
}
else if(ev->button == Button2) {
zoom(NULL);
}
else if(ev->button == Button3 && !c->isfixed) {
- restack(&monitors[c->monitor]);
+ restack(c->monitor);
resizemouse(c);
}
}
void
configurenotify(XEvent *e) {
XConfigureEvent *ev = &e->xconfigure;
- Monitor *m = &monitors[selmonitor];
+ Monitor *m = selmonitor;
if(ev->window == root && (ev->width != m->sw || ev->height != m->sh)) {
/* TODO -- update Xinerama dimensions here */
dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(root, screen), bh, DefaultDepth(dpy, screen));
XResizeWindow(dpy, m->barwin, m->sw, bh);
updatebarpos(m);
- arrange();
+ arrange(m);
}
}
XWindowChanges wc;
if((c = getclient(ev->window))) {
- Monitor *m = &monitors[c->monitor];
+ Monitor *m = c->monitor;
if(ev->value_mask & CWBorderWidth)
c->border = ev->border_width;
if(c->isfixed || c->isfloating || (floating == m->layout->arrange)) {
Client *c;
dc.x = 0;
- for(c = stack; c && !isvisible(c, m->id); c = c->snext);
+ for(c = stack; c && !isvisible(c, m); c = c->snext);
for(j = 0; j < LENGTH(tags); j++) {
dc.w = textw(tags[j]);
if(m->seltags[j]) {
- drawtext(m, tags[j], dc.sel, isurgent(m->id, j));
- drawsquare(m, c && c->tags[j] && c->monitor == m->id,
- isoccupied(m->id, j), isurgent(m->id, j), dc.sel);
+ drawtext(m, tags[j], dc.sel, isurgent(m, j));
+ drawsquare(m, c && c->tags[j] && c->monitor == m,
+ isoccupied(m, j), isurgent(m, j), dc.sel);
}
else {
- drawtext(m, tags[j], dc.norm, isurgent(m->id, j));
- drawsquare(m, c && c->tags[j] && c->monitor == m->id,
- isoccupied(m->id, j), isurgent(m->id, j), dc.norm);
+ drawtext(m, tags[j], dc.norm, isurgent(m, j));
+ drawsquare(m, c && c->tags[j] && c->monitor == m,
+ isoccupied(m, j), isurgent(m, j), dc.norm);
}
dc.x += dc.w;
}
dc.w = blw;
drawtext(m, m->layout->symbol, dc.norm, False);
x = dc.x + dc.w;
- if(m->id == selmonitor) {
+ if(m == selmonitor) {
dc.w = textw(stext);
dc.x = m->sw - dc.w;
if(dc.x < x) {
focus(c);
else {
selmonitor = monitorat();
- fprintf(stderr, "updating selmonitor %d\n", selmonitor);
+ fprintf(stderr, "updating selmonitor %d\n", selmonitor - monitors);
focus(NULL);
}
}
domwfact = dozoom = False;
for(c = clients; c; c = c->next)
- if(isvisible(c, m->id))
+ if(isvisible(c, m))
resize(c, c->x, c->y, c->w, c->h, True);
}
void
focus(Client *c) {
- Monitor *m;
-
if(c)
selmonitor = c->monitor;
- m = &monitors[selmonitor];
if(!c || (c && !isvisible(c, selmonitor)))
for(c = stack; c && !isvisible(c, c->monitor); c = c->snext);
if(sel && sel != c) {
}
else
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
- drawbar(&monitors[selmonitor]);
+ drawbar(selmonitor);
}
void
for(c = clients; c && !isvisible(c, selmonitor); c = c->next);
if(c) {
focus(c);
- restack(&monitors[c->monitor]);
+ restack(c->monitor);
}
}
}
if(c) {
focus(c);
- restack(&monitors[c->monitor]);
+ restack(c->monitor);
}
}
}
Bool
-isoccupied(unsigned int monitor, unsigned int t) {
+isoccupied(Monitor *monitor, unsigned int t) {
Client *c;
for(c = clients; c; c = c->next)
}
Bool
-isurgent(unsigned int monitor, unsigned int t) {
+isurgent(Monitor *monitor, unsigned int t) {
Client *c;
for(c = clients; c; c = c->next)
}
Bool
-isvisible(Client *c, int monitor) {
+isvisible(Client *c, Monitor *m) {
unsigned int i;
- if(c->monitor != monitor)
+ if(c->monitor != m)
return False;
for(i = 0; i < LENGTH(tags); i++)
- if(c->tags[i] && monitors[c->monitor].seltags[i])
+ if(c->tags[i] && c->monitor->seltags[i])
return True;
return False;
}
applyrules(c);
- m = &monitors[c->monitor];
+ m = c->monitor;
c->x = wa->x + m->sx;
c->y = wa->y + m->sy;
ban(c);
XMapWindow(dpy, c->win);
setclientstate(c, NormalState);
- arrange();
+ arrange(m);
}
void
manage(ev->window, &wa);
}
-int
+Monitor *
monitorat() {
int i, x, y;
Window win;
for(i = 0; i < mcount; i++) {
if((x >= monitors[i].sx && x < monitors[i].sx + monitors[i].sw)
&& (y >= monitors[i].sy && y < monitors[i].sy + monitors[i].sh)) {
- return i;
+ return &monitors[i];
}
}
- return 0;
+ return NULL;
}
void
ocx = nx = c->x;
ocy = ny = c->y;
- m = &monitors[c->monitor];
+ m = c->monitor;
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
None, cursor[CurMove], CurrentTime) != GrabSuccess)
return;
ny = m->way;
else if(abs((m->way + m->wah) - (ny + c->h + 2 * c->border)) < SNAP)
ny = m->way + m->wah - c->h - 2 * c->border;
- if((m->layout->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
+ if(!c->isfloating && (m->layout->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
togglefloating(NULL);
if((m->layout->arrange == floating) || c->isfloating)
resize(c, nx, ny, c->w, c->h, False);
}
Client *
-nexttiled(Client *c, int monitor) {
+nexttiled(Client *c, Monitor *monitor) {
for(; c && (c->isfloating || !isvisible(c, monitor)); c = c->next);
return c;
}
case XA_WM_TRANSIENT_FOR:
XGetTransientForHint(dpy, c->win, &trans);
if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
- arrange();
+ arrange(c->monitor);
break;
case XA_WM_NORMAL_HINTS:
updatesizehints(c);
break;
case XA_WM_HINTS:
updatewmhints(c);
- drawbar(&monitors[c->monitor]);
+ drawbar(c->monitor);
break;
}
if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
updatetitle(c);
if(c == sel)
- drawbar(&monitors[c->monitor]);
+ drawbar(c->monitor);
}
}
}
memcpy(c->tags, zerotags, sizeof zerotags);
applyrules(c);
}
- arrange();
+ arrange(NULL);
}
void
Monitor *m;
XWindowChanges wc;
- m = &monitors[c->monitor];
-
+ m = c->monitor;
if(sizehints) {
/* set minimum possible */
if (w < 1)
x = m->sx;
if(y + h + 2 * c->border < m->sy)
y = m->sy;
+ fprintf(stderr, "resize %d %d %d %d (%d %d %d %d)\n", x, y , w, h, m->sx, m->sy, m->sw, m->sh);
if(c->x != x || c->y != y || c->w != w || c->h != h) {
c->x = wc.x = x;
c->y = wc.y = y;
ocx = c->x;
ocy = c->y;
- m = &monitors[c->monitor];
+ m = c->monitor;
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
None, cursor[CurResize], CurrentTime) != GrabSuccess)
return;
nw = 1;
if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
nh = 1;
- if((m->layout->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
+ if(!c->isfloating && (m->layout->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
togglefloating(NULL);
if((m->layout->arrange == floating) || c->isfloating)
resize(c, c->x, c->y, nw, nh, True);
XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
wc.sibling = sel->win;
}
- for(c = nexttiled(clients, m->id); c; c = nexttiled(c->next, m->id)) {
+ for(c = nexttiled(clients, m); c; c = nexttiled(c->next, m)) {
if(c == sel)
continue;
XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
}
break;
}
- drawbar(&monitors[selmonitor]);
+ drawbar(selmonitor);
}
while(XPending(dpy)) {
XNextEvent(dpy, &ev);
void
setlayout(const char *arg) {
unsigned int i;
- Monitor *m = &monitors[monitorat()];
+ Monitor *m = monitorat();
if(!arg) {
m->layout++;
m->layout = &layouts[i];
}
if(sel)
- arrange();
+ arrange(m);
else
drawbar(m);
}
setmwfact(const char *arg) {
double delta;
- Monitor *m = &monitors[monitorat()];
+ Monitor *m = monitorat();
if(!domwfact)
return;
else if(m->mwfact > 0.9)
m->mwfact = 0.9;
}
- arrange();
+ arrange(m);
}
void
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
// init screens/monitors first
- mcount = 1;
if((isxinerama = XineramaIsActive(dpy)))
info = XineramaQueryScreens(dpy, &mcount);
- monitors = emallocz(mcount * sizeof(Monitor));
+ selmonitor = monitors = emallocz(mcount * sizeof(Monitor));
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);
for(i = 0; i < mcount; i++) {
/* init geometry */
m = &monitors[i];
- m->id = i;
- if (mcount != 1 && isxinerama) {
+ if(mcount != 1 && isxinerama) {
m->sx = info[i].x_org;
m->sy = info[i].y_org;
m->sw = info[i].width;
compileregs();
selmonitor = monitorat();
- fprintf(stderr, "selmonitor == %d\n", selmonitor);
+ fprintf(stderr, "selmonitor == %d\n", selmonitor - monitors);
}
void
for(i = 0; i < LENGTH(tags); i++)
sel->tags[i] = (NULL == arg);
sel->tags[idxoftag(arg)] = True;
- arrange();
+ arrange(sel->monitor);
}
unsigned int
Client *c, *mc;
domwfact = dozoom = True;
-
- nx = ny = nw = 0; /* gcc stupidity requires this */
-
- for(n = 0, c = nexttiled(clients, m->id); c; c = nexttiled(c->next, m->id))
+ nx = m->wax;
+ ny = m->way;
+ nw = 0;
+ for(n = 0, c = nexttiled(clients, m); c; c = nexttiled(c->next, m))
n++;
/* window geoms */
if(n > 1 && th < bh)
th = m->wah;
- for(i = 0, c = mc = nexttiled(clients, m->id); c; c = nexttiled(c->next, m->id)) {
+ for(i = 0, c = mc = nexttiled(clients, m); c; c = nexttiled(c->next, m)) {
if(i == 0) { /* master */
nx = m->wax;
ny = m->way;
else
nh = th - 2 * c->border;
}
+ fprintf(stderr, "tile %d %d %d %d\n", nx, ny, nw, nh);
resize(c, nx, ny, nw, nh, RESIZEHINTS);
if((RESIZEHINTS) && ((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw)))
/* client doesn't accept size constraints */
resize(c, nx, ny, nw, nh, False);
if(n > 1 && th != m->wah)
ny = c->y + c->h + 2 * c->border;
-
i++;
}
}
+
void
togglebar(const char *arg) {
if(bpos == BarOff)
bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
else
bpos = BarOff;
- updatebarpos(&monitors[monitorat()]);
- arrange();
+ updatebarpos(monitorat());
+ arrange(monitorat());
}
void
sel->isfloating = !sel->isfloating;
if(sel->isfloating)
resize(sel, sel->x, sel->y, sel->w, sel->h, True);
- arrange();
+ arrange(sel->monitor);
}
void
for(j = 0; j < LENGTH(tags) && !sel->tags[j]; j++);
if(j == LENGTH(tags))
sel->tags[i] = True; /* at least one tag must be enabled */
- arrange();
+ arrange(sel->monitor);
}
void
toggleview(const char *arg) {
unsigned int i, j;
-
- Monitor *m = &monitors[monitorat()];
+ Monitor *m = monitorat();
i = idxoftag(arg);
m->seltags[i] = !m->seltags[i];
for(j = 0; j < LENGTH(tags) && !m->seltags[j]; j++);
if(j == LENGTH(tags))
m->seltags[i] = True; /* at least one tag must be viewed */
- arrange();
+ arrange(m);
}
void
void
unmanage(Client *c) {
+ Monitor *m = c->monitor;
XWindowChanges wc;
wc.border_width = c->oldborder;
XSync(dpy, False);
XSetErrorHandler(xerror);
XUngrabServer(dpy);
- arrange();
+ arrange(m);
}
void
view(const char *arg) {
unsigned int i;
Bool tmp[LENGTH(tags)];
- Monitor *m = &monitors[monitorat()];
+ Monitor *m = monitorat();
for(i = 0; i < LENGTH(tags); i++)
tmp[i] = (NULL == arg);
if(memcmp(m->seltags, tmp, sizeof initags) != 0) {
memcpy(m->prevtags, m->seltags, sizeof initags);
memcpy(m->seltags, tmp, sizeof initags);
- arrange();
+ arrange(m);
}
}
viewprevtag(const char *arg) {
static Bool tmp[LENGTH(tags)];
- Monitor *m = &monitors[monitorat()];
+ Monitor *m = monitorat();
memcpy(tmp, m->seltags, sizeof initags);
memcpy(m->seltags, m->prevtags, sizeof initags);
memcpy(m->prevtags, tmp, sizeof initags);
- arrange();
+ arrange(m);
}
void
detach(c);
attach(c);
focus(c);
- arrange();
+ arrange(c->monitor);
}
void
movetomonitor(const char *arg) {
- if (sel) {
- sel->monitor = arg ? atoi(arg) : (sel->monitor+1) % mcount;
+ int i;
- memcpy(sel->tags, monitors[sel->monitor].seltags, sizeof initags);
- resize(sel, monitors[sel->monitor].wax, monitors[sel->monitor].way, sel->w, sel->h, True);
- arrange();
+ if (sel)
+ return;
+ if(arg)
+ i = atoi(arg);
+ else {
+ for(i = 0; &monitors[i] != sel->monitor && i < mcount; i++);
+ i++;
}
+ sel->monitor = &monitors[i % mcount];
+
+ memcpy(sel->tags, sel->monitor->seltags, sizeof initags);
+ resize(sel, sel->monitor->wax, sel->monitor->way, sel->w, sel->h, True);
+ arrange(sel->monitor);
}
void
selectmonitor(const char *arg) {
- Monitor *m = &monitors[arg ? atoi(arg) : (monitorat()+1) % mcount];
+ int i;
+ Monitor *m;
+ if(arg)
+ i = atoi(arg);
+ else {
+ for(i = 0; &monitors[i] != sel->monitor && i < mcount; i++);
+ i++;
+ }
+ m = &monitors[i % mcount];
XWarpPointer(dpy, None, root, 0, 0, 0, 0, m->wax+m->waw/2, m->way+m->wah/2);
focus(NULL);
}
int
main(int argc, char *argv[]) {
+ fprintf(stderr, "%u\n", sizeof("jsjsjsjsjssjsj"));
if(argc == 2 && !strcmp("-v", argv[1]))
- eprint("dwm-"VERSION", © 2006-2008 Anselm R. Garbe, Sander van Dijk, "
- "Jukka Salmi, Premysl Hruby, Szabolcs Nagy, Christof Musik\n");
+ eprint("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");
else if(argc != 1)
eprint("usage: dwm [-v]\n");
Got questions, comments, patches, etc.? Contact Jason Woofenden