X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=17d5218cda906940f555b37f02043546dfd48353;hp=5c27113940ba3244b29f0e72c5fb52295702ae63;hb=1724f7fa43f9b2a3a3479c365e685ba23327ce2c;hpb=9cde6570cce2a0924ab7b7358b09b4cbf644b7b8 diff --git a/dwm.c b/dwm.c index 5c27113..17d5218 100644 --- a/dwm.c +++ b/dwm.c @@ -11,9 +11,9 @@ * in O(1) time. * * Each child of the root window is called a client, except windows which have - * set the override_redirect flag. Clients are organized in a global - * linked client list, the focus history is remembered through a global - * stack list. Each client contains a bit array to indicate the tags of a + * set the override_redirect flag. Clients are organized in a linked client + * list on each monitor, the focus history is remembered through a stack list + * on each monitor. Each client contains a bit array to indicate the tags of a * client. * * Keys and tagging rules are organized as arrays and defined in config.h. @@ -66,7 +66,7 @@ typedef union { int i; unsigned int ui; float f; - void *v; + const void *v; } Arg; typedef struct { @@ -136,6 +136,7 @@ struct Monitor { Client *stack; Monitor *next; Window barwin; + const Layout *lt[2]; }; typedef struct { @@ -148,7 +149,7 @@ typedef struct { /* 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); @@ -164,6 +165,7 @@ static void destroynotify(XEvent *e); static void detach(Client *c); static void detachstack(Client *c); static void die(const char *errstr, ...); +static Monitor *dirtomon(int dir); static void drawbar(Monitor *m); static void drawbars(void); static void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]); @@ -172,14 +174,14 @@ static void enternotify(XEvent *e); 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 unsigned long getcolor(const char *colstr); -static Bool getrootpointer(int *x, int *y); +static Bool getrootptr(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); @@ -190,10 +192,10 @@ static void maprequest(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 Monitor *ptrtomon(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); @@ -207,6 +209,7 @@ static void showhide(Client *c); 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); @@ -231,15 +234,11 @@ 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 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; @@ -263,9 +262,9 @@ static Bool running = True; static Cursor cursor[CurLast]; static Display *dpy; static DC dc; -static Layout *lt[] = { NULL, NULL }; static Monitor *mons = NULL, *selmon = NULL; static Window root; + /* configuration, allows nested code to access above variables */ #include "config.h" @@ -276,7 +275,7 @@ struct NumTags { char limitexceeded[sizeof(unsigned int) * 8 < LENGTH(tags) ? -1 void applyrules(Client *c) { unsigned int i; - Rule *r; + const Rule *r; XClassHint ch = { 0 }; /* rule matching */ @@ -286,7 +285,8 @@ applyrules(Client *c) { r = &rules[i]; if((!r->title || strstr(c->name, r->title)) && (!r->class || (ch.res_class && strstr(ch.res_class, r->class))) - && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) { + && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) + { c->isfloating = r->isfloating; c->tags |= r->tags; } @@ -300,36 +300,44 @@ applyrules(Client *c) { } 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 > m->mx + m->mw) - *x = m->mw - WIDTH(c); - if(*y > m->my + m->mh) - *y = 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(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) @@ -337,28 +345,22 @@ applysizehints(Client *c, int *x, int *y, int *w, int *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); } @@ -374,8 +376,8 @@ arrange(void) { showhide(m->stack); focus(NULL); for(m = mons; m; m = m->next) { - if(lt[m->sellt]->arrange) - lt[m->sellt]->arrange(m); + if(m->lt[m->sellt]->arrange) + m->lt[m->sellt]->arrange(m); restack(m); } } @@ -428,7 +430,6 @@ buttonpress(XEvent *e) { 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)) @@ -439,7 +440,6 @@ void 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); @@ -456,7 +456,7 @@ cleanup(void) { Monitor *m; view(&a); - lt[selmon->sellt] = &foo; + selmon->lt[selmon->sellt] = &foo; for(m = mons; m; m = m->next) while(m->stack) unmanage(m->stack); @@ -547,7 +547,7 @@ configurerequest(XEvent *e) { if((c = wintoclient(ev->window))) { if(ev->value_mask & CWBorderWidth) c->bw = ev->border_width; - else if(c->isfloating || !lt[selmon->sellt]->arrange) { + else if(c->isfloating || !selmon->lt[selmon->sellt]->arrange) { m = c->mon; if(ev->value_mask & CWX) c->x = m->mx + ev->x; @@ -622,6 +622,23 @@ die(const char *errstr, ...) { exit(EXIT_FAILURE); } +Monitor * +dirtomon(int dir) { + Monitor *m = NULL; + + if(dir > 0) { + if(!(m = selmon->next)) + m = mons; + } + else { + if(selmon == mons) + for(m = mons; m->next; m = m->next); + else + for(m = mons; m->next != selmon; m = m->next); + } + return m; +} + void drawbar(Monitor *m) { int x; @@ -634,18 +651,12 @@ drawbar(Monitor *m) { if(c->isurgent) urg |= c->tags; } - dc.x = 0; -#ifdef XINERAMA if(mons->next) { /* more than a single monitor */ - 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); + 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]); @@ -657,7 +668,7 @@ drawbar(Monitor *m) { } if(blw > 0) { dc.w = blw; - drawtext(lt[m->sellt]->symbol, dc.norm, False); + drawtext(m->lt[m->sellt]->symbol, dc.norm, False); x = dc.x + dc.w; } else @@ -671,9 +682,8 @@ drawbar(Monitor *m) { } drawtext(stext, dc.norm, False); } - else { + else dc.x = m->ww; - } if((dc.w = dc.x - x) > bh) { dc.x = x; if(m->sel) { @@ -803,18 +813,17 @@ focusin(XEvent *e) { /* there are some broken focus acquiring clients */ XSetInputFocus(dpy, selmon->sel->win, RevertToPointerRoot, CurrentTime); } -#ifdef XINERAMA void focusmon(const Arg *arg) { - Monitor *m; + Monitor *m = NULL; - if(!(m = idxtomon(arg->ui)) || m == selmon) + if(!mons->next) return; + m = dirtomon(arg->i); unfocus(selmon->sel); selmon = m; focus(NULL); } -#endif /* XINERAMA */ void focusstack(const Arg *arg) { @@ -853,10 +862,11 @@ getcolor(const char *colstr) { } Bool -getrootpointer(int *x, int *y) { +getrootptr(int *x, int *y) { int di; unsigned int dui; Window dummy; + return XQueryPointer(dpy, root, &dummy, &dummy, x, y, &di, &di, &dui); } @@ -894,7 +904,8 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) { strncpy(text, (char *)name.value, size - 1); else { if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success - && n > 0 && *list) { + && n > 0 && *list) + { strncpy(text, *list, size - 1); XFreeStringList(list); } @@ -919,7 +930,8 @@ grabbuttons(Client *c, Bool focused) { buttons[i].mask | modifiers[j], c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None); - } else + } + else XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None); } @@ -928,7 +940,7 @@ grabbuttons(Client *c, Bool focused) { void grabkeys(void) { updatenumlockmask(); - { /* grab keys */ + { unsigned int i, j; unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask }; KeyCode code; @@ -943,15 +955,6 @@ grabkeys(void) { } } -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; @@ -1047,7 +1050,6 @@ manage(Window w, XWindowAttributes *wa) { die("fatal: could not malloc() %u bytes\n", sizeof(Client)); *c = cz; c->win = w; - if(XGetTransientForHint(dpy, w, &trans)) t = wintoclient(trans); if(t) { @@ -1058,7 +1060,6 @@ manage(Window w, XWindowAttributes *wa) { c->mon = selmon; applyrules(c); } - /* geometry */ c->x = wa->x + c->mon->wx; c->y = wa->y + c->mon->wy; @@ -1081,7 +1082,6 @@ manage(Window w, XWindowAttributes *wa) { && (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]); @@ -1129,7 +1129,7 @@ monocle(Monitor *m) { 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 @@ -1147,7 +1147,7 @@ movemouse(const Arg *arg) { if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, None, cursor[CurMove], CurrentTime) != GrabSuccess) return; - if(!getrootpointer(&x, &y)) + if(!getrootptr(&x, &y)) return; do { XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev); @@ -1170,18 +1170,18 @@ movemouse(const Arg *arg) { 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 + if(!c->isfloating && selmon->lt[selmon->sellt]->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap)) togglefloating(NULL); } - if(!lt[selmon->sellt]->arrange || c->isfloating) - resize(c, nx, ny, c->w, c->h); + if(!selmon->lt[selmon->sellt]->arrange || c->isfloating) + resize(c, nx, ny, c->w, c->h, True); break; } } while(ev.type != ButtonRelease); XUngrabPointer(dpy, CurrentTime); - if((m = pointertomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) { + if((m = ptrtomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) { sendmon(c, m); selmon = m; focus(NULL); @@ -1195,13 +1195,13 @@ nexttiled(Client *c) { } Monitor * -pointertomon(int x, int y) { +ptrtomon(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; + return selmon; } void @@ -1244,10 +1244,10 @@ quit(const Arg *arg) { } 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; @@ -1287,15 +1287,14 @@ resizemouse(const Arg *arg) { 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 + if(!c->isfloating && selmon->lt[selmon->sellt]->arrange && (abs(nw - c->w) > snap || abs(nh - c->h) > snap)) togglefloating(NULL); } - if(!lt[selmon->sellt]->arrange || c->isfloating) - resize(c, c->x, c->y, nw, nh); + if(!selmon->lt[selmon->sellt]->arrange || c->isfloating) + resize(c, c->x, c->y, nw, nh, True); break; } } @@ -1303,7 +1302,7 @@ resizemouse(const Arg *arg) { 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 = pointertomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) { + if((m = ptrtomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) { sendmon(c, m); selmon = m; focus(NULL); @@ -1319,9 +1318,9 @@ restack(Monitor *m) { drawbars(); if(!m->sel) return; - if(m->sel->isfloating || !lt[m->sellt]->arrange) + if(m->sel->isfloating || !m->lt[m->sellt]->arrange) XRaiseWindow(dpy, m->sel->win); - if(lt[m->sellt]->arrange) { + if(m->lt[m->sellt]->arrange) { wc.stack_mode = Below; wc.sibling = m->barwin; for(c = m->stack; c; c = c->snext) @@ -1340,10 +1339,9 @@ run(void) { /* main event loop */ XSync(dpy, False); - while(running && !XNextEvent(dpy, &ev)) { + while(running && !XNextEvent(dpy, &ev)) if(handler[ev.type]) (handler[ev.type])(&ev); /* call handler */ - } } void @@ -1376,6 +1374,7 @@ void sendmon(Client *c, Monitor *m) { if(c->mon == m) return; + unfocus(c); detach(c); detachstack(c); c->mon = m; @@ -1388,7 +1387,7 @@ sendmon(Client *c, Monitor *m) { void setclientstate(Client *c, long state) { - long data[] = {state, None}; + long data[] = { state, None }; XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32, PropModeReplace, (unsigned char *)data, 2); @@ -1396,10 +1395,10 @@ setclientstate(Client *c, long state) { void setlayout(const Arg *arg) { - if(!arg || !arg->v || arg->v != lt[selmon->sellt]) + if(!arg || !arg->v || arg->v != selmon->lt[selmon->sellt]) selmon->sellt ^= 1; if(arg && arg->v) - lt[selmon->sellt] = (Layout *)arg->v; + selmon->lt[selmon->sellt] = (Layout *)arg->v; if(selmon->sel) arrange(); else @@ -1411,7 +1410,7 @@ void setmfact(const Arg *arg) { float f; - if(!arg || !lt[selmon->sellt]->arrange) + if(!arg || !selmon->lt[selmon->sellt]->arrange) return; f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0; if(f < 0.1 || f > 0.9) @@ -1433,22 +1432,17 @@ setup(void) { 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); @@ -1461,7 +1455,6 @@ setup(void) { 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); @@ -1469,11 +1462,9 @@ setup(void) { } 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 @@ -1481,7 +1472,6 @@ setup(void) { |PropertyChangeMask; XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa); XSelectInput(dpy, root, wa.event_mask); - grabkeys(); } @@ -1491,8 +1481,8 @@ showhide(Client *c) { return; 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); + if(!c->mon->lt[c->mon->sellt]->arrange || c->isfloating) + resize(c, c->x, c->y, c->w, c->h, False); showhide(c->snext); } else { /* hide clients bottom up */ @@ -1529,16 +1519,12 @@ tag(const Arg *arg) { } } -#ifdef XINERAMA void tagmon(const Arg *arg) { - Monitor *m; - - if(!selmon->sel || !(m = idxtomon(arg->ui))) + if(!selmon->sel || !mons->next) return; - sendmon(selmon->sel, m); + sendmon(selmon->sel, dirtomon(arg->i)); } -#endif /* XINERAMA */ int textnw(const char *text, unsigned int len) { @@ -1560,15 +1546,12 @@ tile(Monitor *m) { 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; @@ -1576,10 +1559,9 @@ tile(Monitor *m) { 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); } @@ -1599,7 +1581,8 @@ togglefloating(const Arg *arg) { 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(); } @@ -1609,7 +1592,6 @@ toggletag(const Arg *arg) { if(!selmon->sel) return; - mask = selmon->sel->tags ^ (arg->ui & TAGMASK); if(mask) { selmon->sel->tags = mask; @@ -1674,10 +1656,8 @@ updatebars(void) { 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]); @@ -1712,11 +1692,11 @@ updategeom(void) { #endif /* XINERAMA */ /* allocate monitor(s) for the new geometry setup */ for(i = 0; i < n; i++) { - m = (Monitor *)malloc(sizeof(Monitor)); + if(!(m = (Monitor *)malloc(sizeof(Monitor)))) + die("fatal: could not malloc() %u bytes\n", sizeof(Monitor)); m->next = newmons; newmons = m; } - /* initialise monitor(s) */ #ifdef XINERAMA if(XineramaIsActive(dpy)) { @@ -1734,12 +1714,11 @@ updategeom(void) { /* default monitor setup */ { m->screen_number = 0; - m->wx = 0; + m->mx = m->wx = 0; m->my = m->wy = 0; - m->ww = sw; + m->mw = m->ww = sw; m->mh = m->wh = sh; } - /* bar geometry setup */ for(m = newmons; m; m = m->next) { m->sel = m->stack = m->clients = NULL; @@ -1747,11 +1726,12 @@ updategeom(void) { 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; + m->lt[0] = &layouts[0]; + m->lt[1] = &layouts[1 % LENGTH(layouts)]; updatebarpos(m); } - /* reassign left over clients of disappeared monitors */ for(tm = mons; tm; tm = tm->next) while(tm->clients) { @@ -1762,10 +1742,9 @@ updategeom(void) { attach(c); attachstack(c); } - /* select focused monitor */ cleanupmons(); - mons = newmons; + selmon = mons = newmons; selmon = wintomon(root); } @@ -1858,7 +1837,6 @@ updatewmhints(Client *c) { } else c->isurgent = (wmh->flags & XUrgencyHint) ? True : False; - XFree(wmh); } } @@ -1891,14 +1869,14 @@ wintomon(Window w) { Client *c; Monitor *m; - if(w == root && getrootpointer(&x, &y)) - return pointertomon(x, y); + if(w == root && getrootptr(&x, &y)) + return ptrtomon(x, y); for(m = mons; m; m = m->next) if(w == m->barwin) return m; if((c = wintoclient(w))) return c->mon; - return mons; + return selmon; } /* There's no way to check accesses to destroyed windows, thus those cases are @@ -1938,7 +1916,9 @@ void zoom(const Arg *arg) { Client *c = selmon->sel; - if(!lt[selmon->sellt]->arrange || lt[selmon->sellt]->arrange == monocle || (selmon->sel && selmon->sel->isfloating)) + if(!selmon->lt[selmon->sellt]->arrange + || selmon->lt[selmon->sellt]->arrange == monocle + || (selmon->sel && selmon->sel->isfloating)) return; if(c == nexttiled(selmon->clients)) if(!c || !(c = nexttiled(c->next))) @@ -1955,19 +1935,15 @@ main(int argc, char *argv[]) { 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; }