no that's definately better

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 9e049c6..d448f5b 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -136,6 +136,7 @@ struct Monitor {
        Client *stack;
        Monitor *next;
        Window barwin;
+       Layout *lt[2];
 };
 
 typedef struct {
@@ -176,7 +177,7 @@ 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);
@@ -191,7 +192,7 @@ 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, Bool interact);
@@ -261,7 +262,6 @@ 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;
 
@@ -376,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);
        }
 }
@@ -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;
@@ -668,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
@@ -862,7 +862,7 @@ getcolor(const char *colstr) {
 }
 
 Bool
-getrootpointer(int *x, int *y) {
+getrootptr(int *x, int *y) {
        int di;
        unsigned int dui;
        Window dummy;
@@ -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)
+                       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,7 +1195,7 @@ nexttiled(Client *c) {
 }
 
 Monitor *
-pointertomon(int x, int y) {
+ptrtomon(int x, int y) {
        Monitor *m;
 
        for(m = mons; m; m = m->next)
@@ -1289,11 +1289,11 @@ resizemouse(const Arg *arg) {
                        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)
+                       if(!selmon->lt[selmon->sellt]->arrange || c->isfloating)
                                resize(c, c->x, c->y, nw, nh, True);
                        break;
                }
@@ -1302,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);
@@ -1318,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)
@@ -1339,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
@@ -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,8 +1432,6 @@ 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);
@@ -1484,7 +1481,7 @@ 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)
+               if(!c->mon->lt[c->mon->sellt]->arrange || c->isfloating)
                        resize(c, c->x, c->y, c->w, c->h, False);
                showhide(c->snext);
        }
@@ -1695,7 +1692,8 @@ 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;
        }
@@ -1730,6 +1728,8 @@ updategeom(void) {
                m->mfact = mfact;
                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 */
@@ -1869,8 +1869,8 @@ 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;
@@ -1916,8 +1916,8 @@ void
 zoom(const Arg *arg) {
        Client *c = selmon->sel;
 
-       if(!lt[selmon->sellt]->arrange
-       || lt[selmon->sellt]->arrange == monocle
+       if(!selmon->lt[selmon->sellt]->arrange
+       || selmon->lt[selmon->sellt]->arrange == monocle
        || (selmon->sel && selmon->sel->isfloating))
                return;
        if(c == nexttiled(selmon->clients))