From 1da78b826a139d24abff8efb490d234968c03096 Mon Sep 17 00:00:00 2001 From: Aaron Taylor Date: Thu, 2 Feb 2023 17:18:24 -0800 Subject: [PATCH] Added a prompt when exiting dwm, allowing the user to exit/reload/cancel. --- README | 3 +++ config.def.h | 2 +- config.h | 2 +- dwm.c | 30 ++++++++++++++++++++++++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/README b/README index c6357e7..546265a 100644 --- a/README +++ b/README @@ -2,6 +2,9 @@ This git repository contains my personal branch of dwm-6.4. The changes made to stock dwm add the following abilities. + - Prompt the user before exiting/restarting dwm. + + - Assign text names to tags at runtime. diff --git a/config.def.h b/config.def.h index 9835e4d..7680b82 100644 --- a/config.def.h +++ b/config.def.h @@ -97,7 +97,7 @@ static const Key keys[] = { TAGKEYS( XK_7, 6) TAGKEYS( XK_8, 7) TAGKEYS( XK_9, 8) - { MODKEY|ShiftMask, XK_q, quit, {0} }, + { MODKEY|ShiftMask, XK_q, quitprompt, {0} }, }; /* button definitions */ diff --git a/config.h b/config.h index 9835e4d..7680b82 100644 --- a/config.h +++ b/config.h @@ -97,7 +97,7 @@ static const Key keys[] = { TAGKEYS( XK_7, 6) TAGKEYS( XK_8, 7) TAGKEYS( XK_9, 8) - { MODKEY|ShiftMask, XK_q, quit, {0} }, + { MODKEY|ShiftMask, XK_q, quitprompt, {0} }, }; /* button definitions */ diff --git a/dwm.c b/dwm.c index 21393d8..0b91b0d 100644 --- a/dwm.c +++ b/dwm.c @@ -190,6 +190,7 @@ 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); @@ -271,6 +272,7 @@ static void (*handler[LASTEvent]) (XEvent *) = { }; static Atom wmatom[WMLast], netatom[NetLast]; static int running = 1; +static int restart = 1; static Cur *cursor[CurLast]; static Clr **scheme; static Display *dpy; @@ -1347,6 +1349,31 @@ quit(const Arg *arg) 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) { @@ -2236,5 +2263,8 @@ main(int argc, char *argv[]) run(); cleanup(); XCloseDisplay(dpy); + if (restart == 1) { + execlp("dwm", "dwm", NULL); + } return EXIT_SUCCESS; } -- 2.20.1