-//#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
int screen_number;
float mfact;
int by, btx; /* bar geometry */
- int mx, my, mw, mh; /* screen size */
+ int mx, my, mw, mh; /* screen size */
int wx, wy, ww, wh; /* window area */
unsigned int seltags;
unsigned int sellt;
/* function declarations */
static void applyrules(Client *c);
-static Bool applysizehints(Client *c, int *x, int *y, int *w, int *h);
+static Bool applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact);
static void arrange(void);
static void attach(Client *c);
static void attachstack(Client *c);
static void expose(XEvent *e);
static void focus(Client *c);
static void focusin(XEvent *e);
+static void focusmon(const Arg *arg);
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 grabkeys(void);
+static Monitor *idxtomon(unsigned int n);
static void initfont(const char *fontstr);
static Bool isprotodel(Client *c);
static void keypress(XEvent *e);
static void monocle(Monitor *m);
static void movemouse(const Arg *arg);
static Client *nexttiled(Client *c);
+static Monitor *pointertomon(int x, int y);
static void propertynotify(XEvent *e);
static void quit(const Arg *arg);
-static void resize(Client *c, int x, int y, int w, int h);
+static void resize(Client *c, int x, int y, int w, int h, Bool interact);
static void resizemouse(const Arg *arg);
static void restack(Monitor *m);
static void run(void);
static void sigchld(int signal);
static void spawn(const Arg *arg);
static void tag(const Arg *arg);
+static void tagmon(const Arg *arg);
static int textnw(const char *text, unsigned int len);
static void tile(Monitor *);
static void togglebar(const Arg *arg);
static void updatetitle(Client *c);
static void updatewmhints(Client *c);
static void view(const Arg *arg);
+static Client *wintoclient(Window w);
+static Monitor *wintomon(Window w);
static int xerror(Display *dpy, XErrorEvent *ee);
static int xerrordummy(Display *dpy, XErrorEvent *ee);
static int xerrorstart(Display *dpy, XErrorEvent *ee);
static void zoom(const Arg *arg);
-#ifdef XINERAMA
-static void focusmon(const Arg *arg);
-static void tagmon(const Arg *arg);
-#endif /* XINERAMA */
/* variables */
static char stext[256];
static int screen;
-static int sx, sy, sw, sh; /* X display screen geometry x, y, width, height */
+static int sw, sh; /* X display screen geometry x, y, width, height */
static int bh, blw = 0; /* bar geometry */
static int (*xerrorxlib)(Display *, XErrorEvent *);
static unsigned int numlockmask = 0;
}
Bool
-applysizehints(Client *c, int *x, int *y, int *w, int *h) {
+applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact) {
Bool baseismin;
+ Monitor *m = c->mon;
/* 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(interact) {
+ if(*x > sw)
+ *x = sw - WIDTH(c);
+ if(*y > sh)
+ *y = sh - HEIGHT(c);
+ if(*x + *w + 2 * c->bw < 0)
+ *x = 0;
+ if(*y + *h + 2 * c->bw < 0)
+ *y = 0;
+ }
+ else {
+ if(*x > m->mx + m->mw)
+ *x = m->mx + m->mw - WIDTH(c);
+ if(*y > m->my + m->mh)
+ *y = m->my + m->mh - HEIGHT(c);
+ if(*x + *w + 2 * c->bw < m->mx)
+ *x = m->mx;
+ if(*y + *h + 2 * c->bw < m->my)
+ *y = m->my;
+ }
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)
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);
}
click = ClkRootWin;
/* focus monitor if necessary */
- if((m = getmon(ev->window)) && m != selmon) {
+ if((m = wintomon(ev->window)) && m != selmon) {
unfocus(selmon->sel);
selmon = m;
focus(NULL);
else
click = ClkWinTitle;
}
- else if((c = getclient(ev->window))) {
+ else if((c = wintoclient(ev->window))) {
focus(c);
click = ClkClientWin;
}
-
for(i = 0; i < LENGTH(buttons); i++)
if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
&& CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
checkotherwm(void) {
otherwm = False;
xerrorxlib = XSetErrorHandler(xerrorstart);
-
/* this causes an error if some other window manager is running */
XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
XSync(dpy, False);
view(&a);
lt[selmon->sellt] = &foo;
-
- /* TODO: consider simplifying cleanup code of the stack, perhaps do that in cleanmons() ? */
for(m = mons; m; m = m->next)
while(m->stack)
unmanage(m->stack);
XConfigureRequestEvent *ev = &e->xconfigurerequest;
XWindowChanges wc;
- if((c = getclient(ev->window))) {
+ if((c = wintoclient(ev->window))) {
if(ev->value_mask & CWBorderWidth)
c->bw = ev->border_width;
else if(c->isfloating || !lt[selmon->sellt]->arrange) {
Client *c;
XDestroyWindowEvent *ev = &e->xdestroywindow;
- if((c = getclient(ev->window)))
+ if((c = wintoclient(ev->window)))
unmanage(c);
}
void
detachstack(Client *c) {
- Client **tc;
+ Client **tc, *t;
for(tc = &c->mon->stack; *tc && *tc != c; tc = &(*tc)->snext);
*tc = c->snext;
+
+ if(c == c->mon->sel) {
+ for(t = c->mon->stack; t && !ISVISIBLE(t); t = t->snext);
+ c->mon->sel = t;
+ }
}
void
if(c->isurgent)
urg |= c->tags;
}
-
dc.x = 0;
-#ifdef XINERAMA
- {
- char buf[2];
- buf[0] = m->screen_number + '0';
- buf[1] = '\0';
- dc.w = TEXTW(buf);
- drawtext(buf, selmon == m ? dc.sel : dc.norm, True);
+ if(mons->next) { /* more than a single monitor */
+ dc.w = TEXTW(monsyms[m->screen_number]);
+ drawtext(monsyms[m->screen_number], selmon == m ? dc.sel : dc.norm, False);
dc.x += dc.w;
}
-#endif /* XINERAMA */
m->btx = dc.x;
for(i = 0; i < LENGTH(tags); i++) {
dc.w = TEXTW(tags[i]);
}
drawtext(stext, dc.norm, False);
}
- else {
+ else
dc.x = m->ww;
- }
if((dc.w = dc.x - x) > bh) {
dc.x = x;
if(m->sel) {
if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
return;
- if((m = getmon(ev->window)) && m != selmon) {
+ if((m = wintomon(ev->window)) && m != selmon) {
unfocus(selmon->sel);
selmon = m;
}
- if((c = getclient(ev->window)))
+ if((c = wintoclient(ev->window)))
focus(c);
else
focus(NULL);
Monitor *m;
XExposeEvent *ev = &e->xexpose;
- if(ev->count == 0 && (m = getmon(ev->window)))
+ if(ev->count == 0 && (m = wintomon(ev->window)))
drawbar(m);
}
XSetInputFocus(dpy, selmon->sel->win, RevertToPointerRoot, CurrentTime);
}
-#ifdef XINERAMA
void
focusmon(const Arg *arg) {
Monitor *m;
- if(!(m = getmonn(arg->ui)) || m == selmon)
+ if(!(m = idxtomon(arg->ui)) || m == selmon)
return;
unfocus(selmon->sel);
selmon = m;
focus(NULL);
}
-#endif /* XINERAMA */
void
focusstack(const Arg *arg) {
}
}
-Client *
-getclient(Window w) {
- Client *c;
- Monitor *m;
-
- for(m = mons; m; m = m->next)
- for(c = m->clients; c; c = c->next)
- if(c->win == w)
- return c;
- return NULL;
-}
-
unsigned long
getcolor(const char *colstr) {
Colormap cmap = DefaultColormap(dpy, screen);
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);
}
void
grabkeys(void) {
updatenumlockmask();
- { /* grab keys */
+ {
unsigned int i, j;
unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
KeyCode code;
}
}
+Monitor *
+idxtomon(unsigned int n) {
+ unsigned int i;
+ Monitor *m;
+
+ for(m = mons, i = 0; m && i != n; m = m->next, i++);
+ return m;
+}
+
void
initfont(const char *fontstr) {
char *def, **missing;
die("fatal: could not malloc() %u bytes\n", sizeof(Client));
*c = cz;
c->win = w;
- c->mon = selmon;
-
+ if(XGetTransientForHint(dpy, w, &trans))
+ t = wintoclient(trans);
+ if(t) {
+ c->mon = t->mon;
+ c->tags = t->tags;
+ }
+ else {
+ c->mon = selmon;
+ applyrules(c);
+ }
/* geometry */
- c->x = wa->x + selmon->wx;
- c->y = wa->y + selmon->wy;
+ c->x = wa->x + c->mon->wx;
+ c->y = wa->y + c->mon->wy;
c->w = wa->width;
c->h = wa->height;
c->oldbw = wa->border_width;
- if(c->w == selmon->mw && c->h == selmon->mh) {
- c->x = selmon->mx;
- c->y = selmon->my;
+ if(c->w == c->mon->mw && c->h == c->mon->mh) {
+ c->x = c->mon->mx;
+ c->y = c->mon->my;
c->bw = 0;
}
else {
- 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);
+ if(c->x + WIDTH(c) > c->mon->mx + c->mon->mw)
+ c->x = c->mon->mx + c->mon->mw - WIDTH(c);
+ if(c->y + HEIGHT(c) > c->mon->my + c->mon->mh)
+ c->y = c->mon->my + c->mon->mh - HEIGHT(c);
+ c->x = MAX(c->x, c->mon->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 : selmon->my);
+ && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my);
c->bw = borderpx;
}
-
wc.border_width = c->bw;
XConfigureWindow(dpy, w, CWBorderWidth, &wc);
XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
grabbuttons(c, False);
updatetitle(c);
- if(XGetTransientForHint(dpy, w, &trans))
- t = getclient(trans);
- if(t)
- c->tags = t->tags;
- else
- applyrules(c);
if(!c->isfloating)
c->isfloating = trans != None || c->isfixed;
if(c->isfloating)
return;
if(wa.override_redirect)
return;
- if(!getclient(ev->window))
+ if(!wintoclient(ev->window))
manage(ev->window, &wa);
}
Client *c;
for(c = nexttiled(m->clients); c; c = nexttiled(c->next))
- resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw);
+ resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, False);
}
void
togglefloating(NULL);
}
if(!lt[selmon->sellt]->arrange || c->isfloating)
- resize(c, nx, ny, c->w, c->h);
+ resize(c, nx, ny, c->w, c->h, True);
break;
}
}
while(ev.type != ButtonRelease);
XUngrabPointer(dpy, CurrentTime);
- if((m = getmonxy(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
+ if((m = pointertomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
sendmon(c, m);
selmon = m;
focus(NULL);
return c;
}
+Monitor *
+pointertomon(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 selmon;
+}
+
void
propertynotify(XEvent *e) {
Client *c;
updatestatus();
else if(ev->state == PropertyDelete)
return; /* ignore */
- else if((c = getclient(ev->window))) {
+ else if((c = wintoclient(ev->window))) {
switch (ev->atom) {
default: break;
case XA_WM_TRANSIENT_FOR:
XGetTransientForHint(dpy, c->win, &trans);
- if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
+ if(!c->isfloating && (c->isfloating = (wintoclient(trans) != NULL)))
arrange();
break;
case XA_WM_NORMAL_HINTS:
}
void
-resize(Client *c, int x, int y, int w, int h) {
+resize(Client *c, int x, int y, int w, int h, Bool interact) {
XWindowChanges wc;
- if(applysizehints(c, &x, &y, &w, &h)) {
+ if(applysizehints(c, &x, &y, &w, &h, interact)) {
c->x = wc.x = x;
c->y = wc.y = y;
c->w = wc.width = w;
case MotionNotify:
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 >= selmon->wx && nw <= selmon->wx + selmon->ww
&& nh >= selmon->wy && nh <= selmon->wy + selmon->wh) {
if(!c->isfloating && lt[selmon->sellt]->arrange
togglefloating(NULL);
}
if(!lt[selmon->sellt]->arrange || c->isfloating)
- resize(c, c->x, c->y, nw, nh);
+ resize(c, c->x, c->y, nw, nh, True);
break;
}
}
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) {
+ if((m = pointertomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
sendmon(c, m);
selmon = m;
focus(NULL);
sendmon(Client *c, Monitor *m) {
if(c->mon == m)
return;
+ unfocus(c);
detach(c);
detachstack(c);
c->mon = m;
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);
initfont(font);
- sx = 0;
- sy = 0;
sw = DisplayWidth(dpy, screen);
sh = DisplayHeight(dpy, screen);
bh = dc.h = dc.font.height + 2;
lt[0] = &layouts[0];
lt[1] = &layouts[1 % LENGTH(layouts)];
updategeom();
-
/* init atoms */
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
-
/* init cursors */
cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
-
/* init appearance */
dc.norm[ColBorder] = getcolor(normbordercolor);
dc.norm[ColBG] = getcolor(normbgcolor);
XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
if(!dc.font.set)
XSetFont(dpy, dc.gc, dc.font.xfont->fid);
-
/* init bars */
for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
w = TEXTW(layouts[i].symbol);
}
updatebars();
updatestatus();
-
/* EWMH support per view */
XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
PropModeReplace, (unsigned char *) netatom, NetLast);
-
/* select for events */
wa.cursor = cursor[CurNormal];
wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask
|PropertyChangeMask;
XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
XSelectInput(dpy, root, wa.event_mask);
-
grabkeys();
}
if(ISVISIBLE(c)) { /* show clients top down */
XMoveWindow(dpy, c->win, c->x, c->y);
if(!lt[c->mon->sellt]->arrange || c->isfloating)
- resize(c, c->x, c->y, c->w, c->h);
+ resize(c, c->x, c->y, c->w, c->h, False);
showhide(c->snext);
}
else { /* hide clients bottom up */
}
}
-#ifdef XINERAMA
void
tagmon(const Arg *arg) {
Monitor *m;
- if(!selmon->sel || !(m = getmonn(arg->ui)))
+ if(!selmon->sel || !(m = idxtomon(arg->ui)))
return;
sendmon(selmon->sel, m);
}
-#endif /* XINERAMA */
int
textnw(const char *text, unsigned int len) {
for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
if(n == 0)
return;
-
/* master */
c = nexttiled(m->clients);
mw = m->mfact * m->ww;
- resize(c, m->wx, m->wy, (n == 1 ? m->ww : mw) - 2 * c->bw, m->wh - 2 * c->bw);
-
+ resize(c, m->wx, m->wy, (n == 1 ? m->ww : mw) - 2 * c->bw, m->wh - 2 * c->bw, False);
if(--n == 0)
return;
-
/* tile stack */
x = (m->wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : m->wx + mw;
y = m->wy;
h = m->wh / n;
if(h < bh)
h = m->wh;
-
for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
- ? m->wy + m->wh - y - 2 * c->bw : h - 2 * c->bw));
+ ? m->wy + m->wh - y - 2 * c->bw : h - 2 * c->bw), False);
if(h != m->wh)
y = c->y + HEIGHT(c);
}
return;
selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
if(selmon->sel->isfloating)
- resize(selmon->sel, selmon->sel->x, selmon->sel->y, selmon->sel->w, selmon->sel->h);
+ resize(selmon->sel, selmon->sel->x, selmon->sel->y,
+ selmon->sel->w, selmon->sel->h, False);
arrange();
}
if(!selmon->sel)
return;
-
mask = selmon->sel->tags ^ (arg->ui & TAGMASK);
if(mask) {
selmon->sel->tags = mask;
XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
detach(c);
detachstack(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);
XSync(dpy, False);
XSetErrorHandler(xerror);
XUngrabServer(dpy);
+ focus(NULL);
arrange();
}
Client *c;
XUnmapEvent *ev = &e->xunmap;
- if((c = getclient(ev->window)))
+ if((c = wintoclient(ev->window)))
unmanage(c);
}
wa.override_redirect = True;
wa.background_pixmap = ParentRelative;
wa.event_mask = ButtonPressMask|ExposureMask;
-
for(m = mons; m; m = m->next) {
m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
-
CopyFromParent, DefaultVisual(dpy, screen),
CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
XDefineCursor(dpy, m->barwin, cursor[CurNormal]);
Client *c;
Monitor *newmons = NULL, *m, *tm;
-#ifdef XINULATOR
- n = 2;
-#elif defined(XINERAMA)
+#ifdef XINERAMA
XineramaScreenInfo *info = NULL;
if(XineramaIsActive(dpy))
info = XineramaQueryScreens(dpy, &n);
-#endif
+#endif /* XINERAMA */
/* allocate monitor(s) for the new geometry setup */
for(i = 0; i < n; i++) {
m = (Monitor *)malloc(sizeof(Monitor));
m->next = newmons;
newmons = m;
}
-
/* initialise monitor(s) */
-#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)
+#ifdef XINERAMA
if(XineramaIsActive(dpy)) {
for(i = 0, m = newmons; m; m = m->next, i++) {
m->screen_number = info[i].screen_number;
XFree(info);
}
else
-#endif
+#endif /* XINERAMA */
/* default monitor setup */
{
m->screen_number = 0;
- m->wx = sx;
- m->my = m->wy = sy;
- m->ww = sw;
+ m->mx = m->wx = 0;
+ m->my = m->wy = 0;
+ m->mw = m->ww = sw;
m->mh = m->wh = sh;
}
-
/* bar geometry setup */
for(m = newmons; m; m = m->next) {
- /* TODO: consider removing the following values from config.h */
- m->clients = NULL;
- m->sel = NULL;
- m->stack = NULL;
+ m->sel = m->stack = m->clients = NULL;
m->seltags = 0;
m->sellt = 0;
m->tagset[0] = m->tagset[1] = 1;
m->mfact = mfact;
- m->showbar = showbar;
- m->topbar = topbar;
+ m->showbar = SHOWBAR;
+ m->topbar = TOPBAR;
updatebarpos(m);
}
-
/* reassign left over clients of disappeared monitors */
for(tm = mons; tm; tm = tm->next)
while(tm->clients) {
attach(c);
attachstack(c);
}
-
/* select focused monitor */
cleanupmons();
- mons = newmons;
- selmon = getmon(root);
+ selmon = mons = newmons;
+ selmon = wintomon(root);
}
void
}
else
c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
-
XFree(wmh);
}
}
arrange();
}
+Client *
+wintoclient(Window w) {
+ Client *c;
+ Monitor *m;
+
+ for(m = mons; m; m = m->next)
+ for(c = m->clients; c; c = c->next)
+ if(c->win == w)
+ return c;
+ return NULL;
+}
+
+Monitor *
+wintomon(Window w) {
+ int x, y;
+ Client *c;
+ Monitor *m;
+
+ if(w == root && getrootpointer(&x, &y))
+ return pointertomon(x, y);
+ for(m = mons; m; m = m->next)
+ if(w == m->barwin)
+ return m;
+ if((c = wintoclient(w)))
+ return c->mon;
+ return selmon;
+}
+
/* There's no way to check accesses to destroyed windows, thus those cases are
* ignored (especially on UnmapNotify's). Other types of errors call Xlibs
* default error handler, which may call exit. */
zoom(const Arg *arg) {
Client *c = selmon->sel;
- if(!lt[selmon->sellt]->arrange || lt[selmon->sellt]->arrange == monocle || (selmon->sel && selmon->sel->isfloating))
+ if(!lt[selmon->sellt]->arrange
+ || lt[selmon->sellt]->arrange == monocle
+ || (selmon->sel && selmon->sel->isfloating))
return;
if(c == nexttiled(selmon->clients))
if(!c || !(c = nexttiled(c->next)))
die("dwm-"VERSION", © 2006-2009 dwm engineers, see LICENSE for details\n");
else if(argc != 1)
die("usage: dwm [-v]\n");
-
if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
fputs("warning: no locale support\n", stderr);
-
if(!(dpy = XOpenDisplay(NULL)))
die("dwm: cannot open display\n");
-
checkotherwm();
setup();
scan();
run();
cleanup();
-
XCloseDisplay(dpy);
return 0;
}
Got questions, comments, patches, etc.? Contact Jason Woofenden