Added a prompt when exiting dwm, allowing the user to exit/reload/cancel.

[dwm] / dwm.c

diff --git a/dwm.c b/dwm.c
index 6c81540..0b91b0d 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -178,16 +178,19 @@ 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 monocle(Monitor *m);
 static void motionnotify(XEvent *e);
 static void movemouse(const Arg *arg);
 static void manage(Window w, XWindowAttributes *wa);
 static void mappingnotify(XEvent *e);
 static void maprequest(XEvent *e);
 static void monocle(Monitor *m);
 static void motionnotify(XEvent *e);
 static void movemouse(const Arg *arg);

+static void nametag(const Arg *arg);

 static Client *nexttiled(Client *c);
 static void pop(Client *c);
 static void propertynotify(XEvent *e);
 static void quit(const Arg *arg);
 static Client *nexttiled(Client *c);
 static void pop(Client *c);
 static void propertynotify(XEvent *e);
 static void quit(const Arg *arg);

+static void quitprompt(const Arg *arg);

 static Monitor *recttomon(int x, int y, int w, int h);
 static void resize(Client *c, int x, int y, int w, int h, int interact);
 static void resizeclient(Client *c, int x, int y, int w, int h);
 static Monitor *recttomon(int x, int y, int w, int h);
 static void resize(Client *c, int x, int y, int w, int h, int interact);
 static void resizeclient(Client *c, int x, int y, int w, int h);


@@ -269,6 +272,7 @@ static void (*handler[LASTEvent]) (XEvent *) = {
 };
 static Atom wmatom[WMLast], netatom[NetLast];
 static int running = 1;
 };
 static Atom wmatom[WMLast], netatom[NetLast];
 static int running = 1;

+static int restart = 1;

 static Cur *cursor[CurLast];
 static Clr **scheme;
 static Display *dpy;
 static Cur *cursor[CurLast];
 static Clr **scheme;
 static Display *dpy;


@@ -352,7 +356,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 +686,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 +1072,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)
 {


@@ -1240,6 +1264,32 @@ movemouse(const Arg *arg)
        }
 }
 
        }
 }
 

+void
+nametag(const Arg *arg) {
+       char *p, name[MAX_TAGLEN];
+       FILE *f;
+       int i;
+
+       errno = 0; // popen(3p) says on failure it "may" set errno
+       if(!(f = popen("dmenu < /dev/null", "r"))) {
+               fprintf(stderr, "dwm: popen 'dmenu < /dev/null' failed%s%s\n", errno ? ": " : "", errno ? strerror(errno) : "");
+               return;
+       }
+       if (!(p = fgets(name, MAX_TAGLEN, f)) && (i = errno) && ferror(f))
+               fprintf(stderr, "dwm: fgets failed: %s\n", strerror(i));
+       if (pclose(f) < 0)
+               fprintf(stderr, "dwm: pclose failed: %s\n", strerror(errno));
+       if(!p)
+               return;
+       if((p = strchr(name, '\n')))
+               *p = '\0';
+
+       for(i = 0; i < LENGTH(tags); i++)
+               if(selmon->tagset[selmon->seltags] & (1 << i))
+                       strcpy(tags[i], name);
+       drawbars();
+}
+

 Client *
 nexttiled(Client *c)
 {
 Client *
 nexttiled(Client *c)
 {


@@ -1299,6 +1349,31 @@ quit(const Arg *arg)
        running = 0;
 }
 
        running = 0;
 }
 

+void
+quitprompt(const Arg *arg)
+{
+       FILE *pp = popen("echo -e \"no\nrestart\nyes\" | dmenu -i -sb red -p \"Quit DWM?\"", "r");
+       if(pp != NULL) {
+               char buf[1024];
+               if (fgets(buf, sizeof(buf), pp) == NULL) {
+                       fprintf(stderr, "Quitprompt: Error reading pipe!\n");
+                       return;
+               }
+               if (strcmp(buf, "yes\n") == 0) {
+                       pclose(pp);
+                       restart = 0;
+                       quit(NULL);
+               } else if (strcmp(buf, "restart\n") == 0) {
+                       pclose(pp);
+                       restart = 1;
+                       quit(NULL);
+               } else if (strcmp(buf, "no\n") == 0) {
+                       pclose(pp);
+                       return;
+               }
+       }
+}
+

 Monitor *
 recttomon(int x, int y, int w, int h)
 {
 Monitor *
 recttomon(int x, int y, int w, int h)
 {


@@ -1464,7 +1539,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 +1859,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 +2155,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)


@@ -2190,5 +2263,8 @@ main(int argc, char *argv[])
        run();
        cleanup();
        XCloseDisplay(dpy);
        run();
        cleanup();
        XCloseDisplay(dpy);

+       if (restart == 1) {
+               execlp("dwm", "dwm", NULL);
+       }

        return EXIT_SUCCESS;
 }
        return EXIT_SUCCESS;
 }