Added layout menu popup which presents available layouts after right-clicking the...

[dwm] / dwm.c

diff --git a/dwm.c b/dwm.c
index 6c81540..a94b759 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -178,6 +178,7 @@ static void grabkeys(void);
 static void incnmaster(const Arg *arg);
 static void keypress(XEvent *e);
 static void killclient(const Arg *arg);
 static void incnmaster(const Arg *arg);
 static void keypress(XEvent *e);
 static void killclient(const Arg *arg);

+static void layoutmenu(const Arg *arg);

 static void manage(Window w, XWindowAttributes *wa);
 static void mappingnotify(XEvent *e);
 static void maprequest(XEvent *e);
 static void manage(Window w, XWindowAttributes *wa);
 static void mappingnotify(XEvent *e);
 static void maprequest(XEvent *e);


@@ -352,7 +353,9 @@ applyrules(Client *c)
                XFree(ch.res_class);
        if (ch.res_name)
                XFree(ch.res_name);
                XFree(ch.res_class);
        if (ch.res_name)
                XFree(ch.res_name);

-       c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];
+       if(c->tags & TAGMASK)                    c->tags = c->tags & TAGMASK;
+       else if(c->mon->tagset[c->mon->seltags]) c->tags = c->mon->tagset[c->mon->seltags];
+       else                                     c->tags = 1;

 }
 
 int
 }
 
 int


@@ -680,7 +683,7 @@ createmon(void)
        Monitor *m;
 
        m = ecalloc(1, sizeof(Monitor));
        Monitor *m;
 
        m = ecalloc(1, sizeof(Monitor));

-       m->tagset[0] = m->tagset[1] = 1;
+       m->tagset[0] = m->tagset[1] = startontag ? 1 : 0;

        m->mfact = mfact;
        m->nmaster = nmaster;
        m->showbar = showbar;
        m->mfact = mfact;
        m->nmaster = nmaster;
        m->showbar = showbar;


@@ -1066,6 +1069,24 @@ killclient(const Arg *arg)
        }
 }
 
        }
 }
 

+void
+layoutmenu(const Arg *arg) {
+       FILE *p;
+       char c[3], *s;
+       int i;
+
+       if (!(p = popen(layoutmenu_cmd, "r")))
+                return;
+       s = fgets(c, sizeof(c), p);
+       pclose(p);
+
+       if (!s || *s == '\0' || c[0] == '\0')
+                return;
+
+       i = atoi(c);
+       setlayout(&((Arg) { .v = &layouts[i] }));
+}
+

 void
 manage(Window w, XWindowAttributes *wa)
 {
 void
 manage(Window w, XWindowAttributes *wa)
 {


@@ -1464,7 +1485,7 @@ sendmon(Client *c, Monitor *m)
        detach(c);
        detachstack(c);
        c->mon = m;
        detach(c);
        detachstack(c);
        c->mon = m;

-       c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */
+       c->tags = (m->tagset[m->seltags] ? m->tagset[m->seltags] : 1);

        attach(c);
        attachstack(c);
        focus(NULL);
        attach(c);
        attachstack(c);
        focus(NULL);


@@ -1784,11 +1805,9 @@ toggleview(const Arg *arg)
 {
        unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
 
 {
        unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
 

-       if (newtagset) {
-               selmon->tagset[selmon->seltags] = newtagset;
-               focus(NULL);
-               arrange(selmon);
-       }
+       selmon->tagset[selmon->seltags] = newtagset;
+       focus(NULL);
+       arrange(selmon);

 }
 
 void
 }
 
 void


@@ -2082,7 +2101,7 @@ updatewmhints(Client *c)
 void
 view(const Arg *arg)
 {
 void
 view(const Arg *arg)
 {

-       if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
+       if(arg->ui && (arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])

                return;
        selmon->seltags ^= 1; /* toggle sel tagset */
        if (arg->ui & TAGMASK)
                return;
        selmon->seltags ^= 1; /* toggle sel tagset */
        if (arg->ui & TAGMASK)