implemented dynamic layout symbol stuff

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 5ea74cb..1cb07d3 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -121,6 +121,7 @@ typedef struct {
 } Layout;
 
 struct Monitor {
 } Layout;
 
 struct Monitor {

+       const char *ltsymbol;

        float mfact;
        int num;
        int by;               /* bar geometry */
        float mfact;
        int num;
        int by;               /* bar geometry */


@@ -218,7 +219,7 @@ static void togglefloating(const Arg *arg);
 static void toggletag(const Arg *arg);
 static void toggleview(const Arg *arg);
 static void unfocus(Client *c);
 static void toggletag(const Arg *arg);
 static void toggleview(const Arg *arg);
 static void unfocus(Client *c);

-static void unmanage(Client *c, Bool isdestroyed);
+static void unmanage(Client *c, Bool destroyed);

 static void unmapnotify(XEvent *e);
 static void updategeom(void);
 static void updatebarpos(Monitor *m);
 static void unmapnotify(XEvent *e);
 static void updategeom(void);
 static void updatebarpos(Monitor *m);


@@ -238,7 +239,7 @@ static void zoom(const Arg *arg);
 
 /* variables */
 static const char broken[] = "broken";
 
 /* variables */
 static const char broken[] = "broken";

-static char stext[256], ntext[8];
+static char stext[256];

 static int screen;
 static int sw, sh;           /* X display screen geometry width, height */
 static int bh, blw = 0;      /* bar geometry */
 static int screen;
 static int sw, sh;           /* X display screen geometry width, height */
 static int bh, blw = 0;      /* bar geometry */


@@ -384,6 +385,7 @@ arrange(void) {
                showhide(m->stack);
        focus(NULL);
        for(m = mons; m; m = m->next) {
                showhide(m->stack);
        focus(NULL);
        for(m = mons; m; m = m->next) {

+               m->ltsymbol = m->lt[m->sellt]->symbol;

                if(m->lt[m->sellt]->arrange)
                        m->lt[m->sellt]->arrange(m);
                restack(m);
                if(m->lt[m->sellt]->arrange)
                        m->lt[m->sellt]->arrange(m);
                restack(m);


@@ -649,13 +651,11 @@ dirtomon(int dir) {
 void
 drawbar(Monitor *m) {
        int x;
 void
 drawbar(Monitor *m) {
        int x;

-       unsigned int i, n = 0, occ = 0, urg = 0;
+       unsigned int i, occ = 0, urg = 0;

        unsigned long *col;
        Client *c;
 
        for(c = m->clients; c; c = c->next) {
        unsigned long *col;
        Client *c;
 
        for(c = m->clients; c; c = c->next) {

-               if(ISVISIBLE(c))
-                       n++;

                occ |= c->tags;
                if(c->isurgent)
                        urg |= c->tags;
                occ |= c->tags;
                if(c->isurgent)
                        urg |= c->tags;


@@ -669,15 +669,10 @@ drawbar(Monitor *m) {
                           occ & 1 << i, urg & 1 << i, col);
                dc.x += dc.w;
        }
                           occ & 1 << i, urg & 1 << i, col);
                dc.x += dc.w;
        }

-       if(blw > 0) {
-               dc.w = blw;
-               drawtext(m->lt[m->sellt]->symbol, dc.norm, False);
-               dc.x += dc.w;
-       }
-       snprintf(ntext, sizeof ntext, "%u", n);
-       dc.w = TEXTW(ntext);
-       drawtext(ntext, dc.norm, False);
-       x = (dc.x += dc.w);
+       dc.w = blw = TEXTW(m->ltsymbol);
+       drawtext(m->ltsymbol, dc.norm, False);
+       dc.x += dc.w;
+       x = dc.x;

        if(m == selmon) { /* status is only drawn on selected monitor */
                dc.w = TEXTW(stext);
                dc.x = m->ww - dc.w;
        if(m == selmon) { /* status is only drawn on selected monitor */
                dc.w = TEXTW(stext);
                dc.x = m->ww - dc.w;


@@ -1039,9 +1034,15 @@ killclient(const Arg *arg) {
                ev.xclient.data.l[1] = CurrentTime;
                XSendEvent(dpy, selmon->sel->win, False, NoEventMask, &ev);
        }
                ev.xclient.data.l[1] = CurrentTime;
                XSendEvent(dpy, selmon->sel->win, False, NoEventMask, &ev);
        }

-       else
+       else {
+               XGrabServer(dpy);
+               XSetErrorHandler(xerrordummy);
+               XSetCloseDownMode(dpy, DestroyAll);

                XKillClient(dpy, selmon->sel->win);
                XKillClient(dpy, selmon->sel->win);

-       XSync(dpy, False);
+               XSync(dpy, False);
+               XSetErrorHandler(xerror);
+               XUngrabServer(dpy);
+       }

 }
 
 void
 }
 
 void


@@ -1131,8 +1132,17 @@ maprequest(XEvent *e) {
 
 void
 monocle(Monitor *m) {
 
 void
 monocle(Monitor *m) {

+       static char ntext[8];
+       unsigned int n = 0;

        Client *c;
 
        Client *c;
 

+       for(c = m->clients; c; c = c->next)
+               if(ISVISIBLE(c))
+                       n++;
+       if(n > 0) { /* override layout symbol */
+               snprintf(ntext, sizeof ntext, "[%d]", n);
+               m->ltsymbol = ntext;
+       }

        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, False);
 }
        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, False);
 }


@@ -1425,8 +1435,6 @@ setmfact(const Arg *arg) {
 
 void
 setup(void) {
 
 void
 setup(void) {

-       unsigned int i;
-       int w;

        XSetWindowAttributes wa;
 
        /* clean up any zombies immediately */
        XSetWindowAttributes wa;
 
        /* clean up any zombies immediately */


@@ -1463,10 +1471,6 @@ setup(void) {
        if(!dc.font.set)
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);
        /* init bars */
        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);
-               blw = MAX(blw, w);
-       }

        updatebars();
        updatestatus();
        /* EWMH support per view */
        updatebars();
        updatestatus();
        /* EWMH support per view */


@@ -1627,13 +1631,13 @@ unfocus(Client *c) {
 }
 
 void
 }
 
 void

-unmanage(Client *c, Bool isdestroyed) {
+unmanage(Client *c, Bool destroyed) {

        XWindowChanges wc;
 
        /* The server grab construct avoids race conditions. */
        detach(c);
        detachstack(c);
        XWindowChanges wc;
 
        /* The server grab construct avoids race conditions. */
        detach(c);
        detachstack(c);

-       if(!isdestroyed) {
+       if(!destroyed) {

                wc.border_width = c->oldbw;
                XGrabServer(dpy);
                XSetErrorHandler(xerrordummy);
                wc.border_width = c->oldbw;
                XGrabServer(dpy);
                XSetErrorHandler(xerrordummy);


@@ -1646,6 +1650,7 @@ unmanage(Client *c, Bool isdestroyed) {
        }
        free(c);
        focus(NULL);
        }
        free(c);
        focus(NULL);

+       arrange();

 }
 
 void
 }
 
 void


@@ -1745,6 +1750,7 @@ updategeom(void) {
                m->topbar = topbar;
                m->lt[0] = &layouts[0];
                m->lt[1] = &layouts[1 % LENGTH(layouts)];
                m->topbar = topbar;
                m->lt[0] = &layouts[0];
                m->lt[1] = &layouts[1 % LENGTH(layouts)];

+               m->ltsymbol = layouts[0].symbol;

                updatebarpos(m);
        }
        /* reassign left over clients of disappeared monitors */
                updatebarpos(m);
        }
        /* reassign left over clients of disappeared monitors */