int screen_number;
float mfact;
int by, btx; /* bar geometry */
- int my, mh; /* vertical screen size*/
+ int mx, my, mw, mh; /* screen size */
int wx, wy, ww, wh; /* window area */
unsigned int seltags;
unsigned int sellt;
static void detachstack(Client *c);
static void die(const char *errstr, ...);
static void drawbar(Monitor *m);
-static void drawbars();
+static void drawbars(void);
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 focusstack(const Arg *arg);
static Client *getclient(Window w);
static unsigned long getcolor(const char *colstr);
+static Monitor *getmon(Window w);
+static Monitor *getmonn(unsigned int n);
+static Monitor *getmonxy(int x, int y);
+static Bool getrootpointer(int *x, int *y);
static long getstate(Window w);
static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
static void grabbuttons(Client *c, Bool focused);
static void restack(Monitor *m);
static void run(void);
static void scan(void);
+static void sendmon(Client *c, Monitor *m);
static void setclientstate(Client *c, long state);
static void setlayout(const Arg *arg);
static void setmfact(const Arg *arg);
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((m = getmon(ev->window)) && m != selmon) {
+ unfocus(selmon->sel);
+ selmon = m;
+ focus(NULL);
+ }
if(ev->window == selmon->barwin && ev->x >= selmon->btx) {
i = 0;
x = selmon->btx;
void
configurerequest(XEvent *e) {
Client *c;
+ Monitor *m;
XConfigureRequestEvent *ev = &e->xconfigurerequest;
XWindowChanges wc;
if(ev->value_mask & CWBorderWidth)
c->bw = ev->border_width;
else if(c->isfloating || !lt[selmon->sellt]->arrange) {
+ m = c->mon;
if(ev->value_mask & CWX)
- c->x = sx + ev->x;
+ c->x = m->mx + ev->x;
if(ev->value_mask & CWY)
- c->y = sy + ev->y;
+ c->y = m->my + ev->y;
if(ev->value_mask & CWWidth)
c->w = ev->width;
if(ev->value_mask & CWHeight)
c->h = ev->height;
- if((c->x - sx + c->w) > sw && c->isfloating)
- c->x = sx + (sw / 2 - c->w / 2); /* center in x direction */
- if((c->y - sy + c->h) > sh && c->isfloating)
- c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */
+ if((c->x - m->mx + c->w) > m->mw && c->isfloating)
+ c->x = m->mx + (m->mw / 2 - c->w / 2); /* center in x direction */
+ if((c->y - m->my + c->h) > m->mh && c->isfloating)
+ c->y = m->my + (m->mh / 2 - c->h / 2); /* center in y direction */
if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
configure(c);
if(ISVISIBLE(c))
}
void
-drawbars() {
+drawbars(void) {
Monitor *m;
for(m = mons; m; m = m->next)
void
enternotify(XEvent *e) {
Client *c;
+ Monitor *m;
XCrossingEvent *ev = &e->xcrossing;
if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
return;
+ if((m = getmon(ev->window)) && m != selmon) {
+ unfocus(selmon->sel);
+ selmon = m;
+ }
if((c = getclient(ev->window)))
focus(c);
else
Monitor *m;
XExposeEvent *ev = &e->xexpose;
- if(ev->count == 0)
- for(m = mons; m; m = m->next)
- if(ev->window == m->barwin) {
- drawbar(m);
- break;
- }
+ if(ev->count == 0 && (m = getmon(ev->window)))
+ drawbar(m);
}
void
#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;
- }
+ Monitor *m;
+
+ if(!(m = getmonn(arg->ui)) || m == selmon)
+ return;
+ unfocus(selmon->sel);
+ selmon = m;
+ focus(NULL);
}
#endif /* XINERAMA */
return color.pixel;
}
+Monitor *
+getmon(Window w) {
+ int x, y;
+ Client *c;
+ Monitor *m;
+
+ if(w == root && getrootpointer(&x, &y))
+ return getmonxy(x, y);
+ for(m = mons; m; m = m->next)
+ if(w == m->barwin)
+ return m;
+ if((c = getclient(w)))
+ return c->mon;
+ return mons;
+}
+
+Monitor *
+getmonn(unsigned int n) {
+ unsigned int i;
+ Monitor *m;
+
+ for(m = mons, i = 0; m && i != n; m = m->next, i++);
+ return m;
+}
+
+Monitor *
+getmonxy(int x, int y) {
+ Monitor *m;
+
+ for(m = mons; m; m = m->next)
+ if(INRECT(x, y, m->wx, m->wy, m->ww, m->wh))
+ return m;
+ return mons;
+}
+
+Bool
+getrootpointer(int *x, int *y) {
+ int di;
+ unsigned int dui;
+ Window dummy;
+ return XQueryPointer(dpy, root, &dummy, &dummy, x, y, &di, &di, &dui);
+}
+
long
getstate(Window w) {
int format, status;
c->mon = selmon;
/* geometry */
- c->x = wa->x;
- c->y = wa->y;
+ c->x = wa->x + selmon->wx;
+ c->y = wa->y + selmon->wy;
c->w = wa->width;
c->h = wa->height;
c->oldbw = wa->border_width;
- if(c->w == sw && c->h == sh) {
- c->x = sx;
- c->y = sy;
+ if(c->w == selmon->mw && c->h == selmon->mh) {
+ c->x = selmon->mx;
+ c->y = selmon->my;
c->bw = 0;
}
else {
- if(c->x + WIDTH(c) > sx + sw)
- c->x = sx + sw - WIDTH(c);
- if(c->y + HEIGHT(c) > sy + sh)
- c->y = sy + sh - HEIGHT(c);
- c->x = MAX(c->x, sx);
+ if(c->x + WIDTH(c) > selmon->mx + selmon->mw)
+ c->x = selmon->mx + selmon->mw - WIDTH(c);
+ if(c->y + HEIGHT(c) > selmon->my + selmon->mh)
+ c->y = selmon->my + selmon->mh - HEIGHT(c);
+ c->x = MAX(c->x, selmon->mx);
/* only fix client y-offset, if the client center might cover the bar */
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->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : selmon->my);
c->bw = borderpx;
}
void
movemouse(const Arg *arg) {
- int x, y, ocx, ocy, di, nx, ny;
- unsigned int dui;
+ int x, y, ocx, ocy, nx, ny;
Client *c;
- Window dummy;
+ Monitor *m;
XEvent ev;
if(!(c = selmon->sel))
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
None, cursor[CurMove], CurrentTime) != GrabSuccess)
return;
- XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui);
+ if(!getrootpointer(&x, &y))
+ return;
do {
XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
switch (ev.type) {
}
while(ev.type != ButtonRelease);
XUngrabPointer(dpy, CurrentTime);
+ if((m = getmonxy(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
+ sendmon(c, m);
+ selmon = m;
+ focus(NULL);
+ }
}
Client *
int ocx, ocy;
int nw, nh;
Client *c;
+ Monitor *m;
XEvent ev;
if(!(c = selmon->sel))
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));
+ if((m = getmonxy(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
+ sendmon(c, m);
+ selmon = m;
+ focus(NULL);
+ }
}
void
}
void
+sendmon(Client *c, Monitor *m) {
+ if(c->mon == m)
+ return;
+ detach(c);
+ detachstack(c);
+ c->mon = m;
+ c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */
+ attach(c);
+ attachstack(c);
+ focus(NULL);
+ arrange();
+}
+
+void
setclientstate(Client *c, long state) {
long data[] = {state, None};
#ifdef XINERAMA
void
tagmon(const Arg *arg) {
- unsigned int i;
- Client *c;
Monitor *m;
- if(!(c = selmon->sel))
+ if(!selmon->sel || !(m = getmonn(arg->ui)))
return;
- for(i = 0, m = mons; m; m = m->next, i++)
- if(i == arg->ui) {
- 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;
- }
+ sendmon(selmon->sel, m);
}
#endif /* XINERAMA */
void
updategeom(void) {
- int i, di, n = 1, x, y;
- unsigned int dui;
+ int i, n = 1;
Client *c;
Monitor *newmons = NULL, *m, *tm;
- Window dummy;
#ifdef XINULATOR
n = 2;
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->mx = m->wx = info[i].x_org;
m->my = m->wy = info[i].y_org;
- m->ww = info[i].width;
+ m->mw = m->ww = info[i].width;
m->mh = m->wh = info[i].height;
}
XFree(info);
}
/* 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;
+ selmon = getmon(root);
}
void
}
void
-updatestatus() {
+updatestatus(void) {
if(!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
strcpy(stext, "dwm-"VERSION);
drawbar(selmon);
Got questions, comments, patches, etc.? Contact Jason Woofenden