quitprompt: added branch and patch

config.def.h

@@ -41,7 +41,6 @@ static const Layout layouts[] = {
 	{ "[]=",      tile },    /* first entry is default */
 	{ "><>",      NULL },    /* no layout function means floating behavior */
 	{ "[M]",      monocle },
-	{ NULL,       NULL },
 };
 
 /* key definitions */
@@ -77,8 +76,6 @@ static Key keys[] = {
 	{ MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
 	{ MODKEY,                       XK_f,      setlayout,      {.v = &layouts[1]} },
 	{ MODKEY,                       XK_m,      setlayout,      {.v = &layouts[2]} },
-	{ MODKEY|ControlMask,		XK_comma,  cyclelayout,    {.i = -1 } },
-	{ MODKEY|ControlMask,           XK_period, cyclelayout,    {.i = +1 } },
 	{ MODKEY,                       XK_space,  setlayout,      {0} },
 	{ MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
 	{ MODKEY,                       XK_0,      view,           {.ui = ~0 } },
@@ -96,7 +93,7 @@ static 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 */

dwm-cyclelayouts-20180524-6.2.diff

@@ -1,93 +0,0 @@
-From a09e766a4342f580582082a92b2de65f33208eb4 Mon Sep 17 00:00:00 2001
-From: Christopher Drelich <cd@cdrakka.com>
-Date: Thu, 24 May 2018 00:56:56 -0400
-Subject: [PATCH] Function to cycle through available layouts.
-
-MOD-CTRL-, and MOD-CTRL-.
-cycle backwards and forwards through available layouts.
-Probably only useful if you have a lot of additional layouts.
-The NULL, NULL layout should always be the last layout in your list,
-in order to guarantee consistent behavior.
----
- config.def.h |  3 +++
- dwm.1        |  6 ++++++
- dwm.c        | 18 ++++++++++++++++++
- 3 files changed, 27 insertions(+)
-
-diff --git a/config.def.h b/config.def.h
-index a9ac303..153b880 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -41,6 +41,7 @@ static const Layout layouts[] = {
- 	{ "[]=",      tile },    /* first entry is default */
- 	{ "><>",      NULL },    /* no layout function means floating behavior */
- 	{ "[M]",      monocle },
-+	{ NULL,       NULL },
- };
- 
- /* key definitions */
-@@ -76,6 +77,8 @@ static Key keys[] = {
- 	{ MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
- 	{ MODKEY,                       XK_f,      setlayout,      {.v = &layouts[1]} },
- 	{ MODKEY,                       XK_m,      setlayout,      {.v = &layouts[2]} },
-+	{ MODKEY|ControlMask,		XK_comma,  cyclelayout,    {.i = -1 } },
-+	{ MODKEY|ControlMask,           XK_period, cyclelayout,    {.i = +1 } },
- 	{ MODKEY,                       XK_space,  setlayout,      {0} },
- 	{ MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
- 	{ MODKEY,                       XK_0,      view,           {.ui = ~0 } },
-diff --git a/dwm.1 b/dwm.1
-index 13b3729..165891b 100644
---- a/dwm.1
-+++ b/dwm.1
-@@ -92,6 +92,12 @@ Sets monocle layout.
- .B Mod1\-space
- Toggles between current and previous layout.
- .TP
-+.B Mod1\-Control\-,
-+Cycles backwards in layout list.
-+.TP
-+.B Mod1\-Control\-.
-+Cycles forwards in layout list.
-+.TP
- .B Mod1\-j
- Focus next window.
- .TP
-diff --git a/dwm.c b/dwm.c
-index bb95e26..db73000 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -157,6 +157,7 @@ static void configure(Client *c);
- static void configurenotify(XEvent *e);
- static void configurerequest(XEvent *e);
- static Monitor *createmon(void);
-+static void cyclelayout(const Arg *arg);
- static void destroynotify(XEvent *e);
- static void detach(Client *c);
- static void detachstack(Client *c);
-@@ -645,6 +646,23 @@ createmon(void)
- }
- 
- void
-+cyclelayout(const Arg *arg) {
-+	Layout *l;
-+	for(l = (Layout *)layouts; l != selmon->lt[selmon->sellt]; l++);
-+	if(arg->i > 0) {
-+		if(l->symbol && (l + 1)->symbol)
-+			setlayout(&((Arg) { .v = (l + 1) }));
-+		else
-+			setlayout(&((Arg) { .v = layouts }));
-+	} else {
-+		if(l != layouts && (l - 1)->symbol)
-+			setlayout(&((Arg) { .v = (l - 1) }));
-+		else
-+			setlayout(&((Arg) { .v = &layouts[LENGTH(layouts) - 2] }));
-+	}
-+}
-+
-+void
- destroynotify(XEvent *e)
- {
- 	Client *c;
--- 
-2.7.4
-

dwm-quitprompt-20220718-6613d9f.diff

@@ -0,0 +1,92 @@
+From eb558048819ed916b272765e64e1ea795a85740e Mon Sep 17 00:00:00 2001
+From: Lerrrtaste <lerrrtaste@protonmail.com>
+Date: Mon, 18 Jul 2022 12:22:39 +0200
+Subject: [PATCH] This Patch replaces the default quit behavior with an dmenu
+ prompt. Possible selections are (Quit DWM?) "yes", "no" and "restart". The
+ additional confirmation can save your work from accidentally hitting the quit
+ key by requiring two additional keystrokes (y/yes and RET). Additionally it
+ allows for restarting / reloading dwm without ending the xsession and closing
+ all open x windows. To abort press ESC or n/no and RET.
+
+---
+ config.def.h |  2 +-
+ dwm.c        | 30 ++++++++++++++++++++++++++++++
+ 2 files changed, 31 insertions(+), 1 deletion(-)
+
+diff --git a/config.def.h b/config.def.h
+index a2ac963..9e3b394 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -94,7 +94,7 @@ static 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 7c0f978..3761ba4 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -188,6 +188,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);
+@@ -262,6 +263,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;
+@@ -1258,6 +1260,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)
+ {
+@@ -2155,5 +2182,8 @@ main(int argc, char *argv[])
+ 	run();
+ 	cleanup();
+ 	XCloseDisplay(dpy);
++	if (restart == 1) {
++		execlp("dwm", "dwm", NULL);
++	}
+ 	return EXIT_SUCCESS;
+ }
+-- 
+2.36.0
+

dwm.1

@@ -92,12 +92,6 @@ Sets monocle layout.
 .B Mod1\-space
 Toggles between current and previous layout.
 .TP
-.B Mod1\-Control\-,
-Cycles backwards in layout list.
-.TP
-.B Mod1\-Control\-.
-Cycles forwards in layout list.
-.TP
 .B Mod1\-j
 Focus next window.
 .TP

dwm.c

@@ -157,7 +157,6 @@ static void configure(Client *c);
 static void configurenotify(XEvent *e);
 static void configurerequest(XEvent *e);
 static Monitor *createmon(void);
-static void cyclelayout(const Arg *arg);
 static void destroynotify(XEvent *e);
 static void detach(Client *c);
 static void detachstack(Client *c);
@@ -188,6 +187,7 @@ static Client *nexttiled(Client *c);
 static void pop(Client *);
 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);
@@ -262,6 +262,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;
@@ -645,23 +646,6 @@ createmon(void)
 	return m;
 }
 
-void
-cyclelayout(const Arg *arg) {
-	Layout *l;
-	for(l = (Layout *)layouts; l != selmon->lt[selmon->sellt]; l++);
-	if(arg->i > 0) {
-		if(l->symbol && (l + 1)->symbol)
-			setlayout(&((Arg) { .v = (l + 1) }));
-		else
-			setlayout(&((Arg) { .v = layouts }));
-	} else {
-		if(l != layouts && (l - 1)->symbol)
-			setlayout(&((Arg) { .v = (l - 1) }));
-		else
-			setlayout(&((Arg) { .v = &layouts[LENGTH(layouts) - 2] }));
-	}
-}
-
 void
 destroynotify(XEvent *e)
 {
@@ -1269,6 +1253,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)
 {
@@ -2163,5 +2172,8 @@ main(int argc, char *argv[])
 	run();
 	cleanup();
 	XCloseDisplay(dpy);
+	if (restart == 1) {
+		execlp("dwm", "dwm", NULL);
+	}
 	return EXIT_SUCCESS;
 }