Merge pull request #89 from gx2b/master

Layoutmenu patch

8 files changed, 55 insertions, 3 deletions

diff --git a/README.md b/README.md
index f912ebe..c250f6b 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,8 @@ Refer to [https://dwm.suckless.org/](https://dwm.suckless.org/) for details on t
 
 ### Changelog:
 
+2021-01-02 - Added the Layoutmenu patch
+
 2020-10-26 - Added the \_NET\_CLIENT\_LIST\_STACKING patch
 
 2020-09-29 - Added the on\_empty\_keys patch (ported from InstantOS)
diff --git a/config.def.h b/config.def.h
index 4382560..f471573 100644
--- a/config.def.h
+++ b/config.def.h
@@ -297,6 +297,10 @@ static char *statuscolors[][ColCount] = {
 };
 #endif // BAR_POWERLINE_STATUS_PATCH
 
+#if BAR_LAYOUTMENU_PATCH
+static const char *layoutmenu_cmd = "layoutmenu.sh";
+#endif
+
 #if COOL_AUTOSTART_PATCH
 static const char *const autostart[] = {
 	"st", NULL,
@@ -1134,8 +1138,12 @@ static Button buttons[] = {
 	{ ClkButton,            0,                   Button1,        spawn,          {.v = dmenucmd } },
 	#endif // BAR_STATUSBUTTON_PATCH
 	{ ClkLtSymbol,          0,                   Button1,        setlayout,      {0} },
+    #if BAR_LAYOUTMENU_PATCH
+	{ ClkLtSymbol,          0,                   Button3,        layoutmenu,     {0} },
+    #else
 	{ ClkLtSymbol,          0,                   Button3,        setlayout,      {.v = &layouts[2]} },
-	#if BAR_WINTITLEACTIONS_PATCH
+    #endif // BAR_LAYOUTMENU_PATCH
+    #if BAR_WINTITLEACTIONS_PATCH
 	{ ClkWinTitle,          0,                   Button1,        togglewin,      {0} },
 	{ ClkWinTitle,          0,                   Button3,        showhideclient, {0} },
 	#endif // BAR_WINTITLEACTIONS_PATCH
diff --git a/patch/bar_layoutmenu.c b/patch/bar_layoutmenu.c
new file mode 100644
index 0000000..1b95069
--- /dev/null
+++ b/patch/bar_layoutmenu.c
@@ -0,0 +1,18 @@
+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')
+		 return;
+
+	i = atoi(c);
+	setlayout(&((Arg) { .v = &layouts[i] }));
+}
+
diff --git a/patch/bar_layoutmenu.h b/patch/bar_layoutmenu.h
new file mode 100644
index 0000000..4c23763
--- /dev/null
+++ b/patch/bar_layoutmenu.h
@@ -0,0 +1 @@
+static void layoutmenu(const Arg *arg);
diff --git a/patch/include.c b/patch/include.c
index 27ff539..8e1d590 100644
--- a/patch/include.c
+++ b/patch/include.c
@@ -83,6 +83,9 @@
 #if BAR_WINTITLEACTIONS_PATCH
 #include "bar_wintitleactions.c"
 #endif
+#if BAR_LAYOUTMENU_PATCH
+#include "bar_layoutmenu.c"
+#endif
 
 /* Other patches */
 #if ASPECTRESIZE_PATCH
@@ -328,4 +331,4 @@
 #endif
 #if TILE_LAYOUT
 #include "layout_tile.c"
-#endif
\ No newline at end of file
+#endif
diff --git a/patch/include.h b/patch/include.h
index c13d73b..5ebc442 100644
--- a/patch/include.h
+++ b/patch/include.h
@@ -80,6 +80,9 @@
 #if BAR_WINTITLEACTIONS_PATCH
 #include "bar_wintitleactions.h"
 #endif
+#if BAR_LAYOUTMENU_PATCH
+#include "bar_layoutmenu.h"
+#endif
 
 /* Other patches */
 #if ASPECTRESIZE_PATCH
@@ -318,4 +321,4 @@
 #endif
 #if TILE_LAYOUT
 #include "layout_tile.h"
-#endif
\ No newline at end of file
+#endif
diff --git a/patch/layoutmenu.sh b/patch/layoutmenu.sh
new file mode 100755
index 0000000..0bb0456
--- /dev/null
+++ b/patch/layoutmenu.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+cat <<EOF | xmenu
+[]= Tiled Layout	0
+><> Floating Layout	1
+[M] Monocle Layout	2
+EOF
+
diff --git a/patches.def.h b/patches.def.h
index df6f1c1..12a3670 100644
--- a/patches.def.h
+++ b/patches.def.h
@@ -42,6 +42,15 @@
  */
 #define BAR_FLEXWINTITLE_PATCH 0
 
+/* This patch adds a context menu for layout switching.
+ *   - xmenu needs to be installed.
+ *   - Edit layoutmenu.sh with the installed layouts and with correct indexes.
+ *   - Place layoutmenu.sh in PATH.
+ *   - The text of the menu items is for display only. Name them however you want.
+ * https://dwm.suckless.org/patches/layoutmenu/
+ */
+#define BAR_LAYOUTMENU_PATCH 0
+
 /* Show layout symbol in bar */
 #define BAR_LTSYMBOL_PATCH 1