Addressed some conflicts between CMDCUSTOMIZE and NODMENU patches as well as between EXRESIZE and MAXIMIZE patches

8 files changed, 52 insertions, 28 deletions

diff --git a/config.def.h b/config.def.h
index ff4e45d..ac4a8e4 100644
--- a/config.def.h
+++ b/config.def.h
@@ -605,7 +605,7 @@ static Key keys[] = {
 	{ MODKEY|ControlMask|ShiftMask, XK_l,          togglehorizontalmax,    {0} },
 	{ MODKEY|ControlMask|ShiftMask, XK_j,          toggleverticalmax,      {0} },
 	{ MODKEY|ControlMask|ShiftMask, XK_k,          toggleverticalmax,      {0} },
-	{ MODKEY|ControlMask,           XK_m,          togglemaximize,         {0} },
+	{ MODKEY|ControlMask,           XK_m,          togglemax,              {0} },
 	#endif // MAXIMIZE_PATCH
 	#if UNFLOATVISIBLE_PATCH
 	{ MODKEY|Mod4Mask,              XK_space,      unfloatvisible,         {0} },
diff --git a/dwm.c b/dwm.c
index 3b8fbb9..2c27ba5 100644
--- a/dwm.c
+++ b/dwm.c
@@ -3800,7 +3800,7 @@ zoom(const Arg *arg)
 int
 main(int argc, char *argv[])
 {
-	#if CMDCUSTOMIZE
+	#if CMDCUSTOMIZE_PATCH
 	for (int i=1;i<argc;i+=1)
 		if (!strcmp("-v", argv[i]))
 			die("dwm-"VERSION);
@@ -3816,6 +3816,19 @@ main(int argc, char *argv[])
 			colors[SchemeSel][1] = argv[++i];
 		else if (!strcmp("-sf", argv[i])) /* selected foreground color */
 			colors[SchemeSel][0] = argv[++i];
+		#if NODMENU_PATCH
+		else if (!strcmp("-df", argv[i])) /* dmenu font */
+			dmenucmd[2] = argv[++i];
+		else if (!strcmp("-dnb", argv[i])) /* dmenu normal background color */
+			dmenucmd[4] = argv[++i];
+		else if (!strcmp("-dnf", argv[i])) /* dmenu normal foreground color */
+			dmenucmd[6] = argv[++i];
+		else if (!strcmp("-dsb", argv[i])) /* dmenu selected background color */
+			dmenucmd[8] = argv[++i];
+		else if (!strcmp("-dsf", argv[i])) /* dmenu selected foreground color */
+			dmenucmd[10] = argv[++i];
+		else die(help());
+		#else
 		else if (!strcmp("-df", argv[i])) /* dmenu font */
 			dmenucmd[4] = argv[++i];
 		else if (!strcmp("-dnb", argv[i])) /* dmenu normal background color */
@@ -3827,12 +3840,13 @@ main(int argc, char *argv[])
 		else if (!strcmp("-dsf", argv[i])) /* dmenu selected foreground color */
 			dmenucmd[12] = argv[++i];
 		else die(help());
+		#endif // NODMENU_PATCH
 	#else
 	if (argc == 2 && !strcmp("-v", argv[1]))
 		die("dwm-"VERSION);
 	else if (argc != 1)
 		die("usage: dwm [-v]");
-	#endif // CMDCUSTOMIZE
+	#endif // CMDCUSTOMIZE_PATCH
 	if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
 		fputs("warning: no locale support\n", stderr);
 	if (!(dpy = XOpenDisplay(NULL)))
diff --git a/patch/exresize.c b/patch/exresize.c
index 31591b0..4d8d4b0 100644
--- a/patch/exresize.c
+++ b/patch/exresize.c
@@ -11,7 +11,8 @@
 #define FORCE_EXPANDALL ~0 // Force expand in all directions
 
 void
-exresize(const Arg *arg) {
+exresize(const Arg *arg)
+{
 	Client *c;
 	int x, y, nx, ny, nw, nh;
 	c = selmon->sel;
@@ -59,7 +60,8 @@ exresize(const Arg *arg) {
 }
 
 void
-explace(const Arg *arg) {
+explace(const Arg *arg)
+{
 	Client *c;
 	int nx, ny;
 
@@ -87,13 +89,13 @@ int
 calculate_expand(unsigned char mask, unsigned char curmask,
 		unsigned char *newmask, unsigned char key,
 		int *reset_value, int new_reset_value,
-		int max_value, int old_value) {
+		int max_value, int old_value)
+{
 	if (IS_SET(key, mask) ||
 			(IS_SET(key, curmask) && (!IS_SET(key, mask) && IS_FORCED(key, mask))) ||
 			(!IS_SET(key, curmask) && (IS_SET(key, mask) && IS_FORCED(key, mask)))) {
 
-		if (IS_SET(key, mask) && (!IS_SET(key,curmask) || IS_FORCED(key,mask)))
-		{
+		if (IS_SET(key, mask) && (!IS_SET(key,curmask) || IS_FORCED(key,mask))) {
 			if (!IS_SET(key, curmask))
 				*reset_value = new_reset_value;
 			*newmask |= key;
@@ -111,13 +113,14 @@ calculate_expand(unsigned char mask, unsigned char curmask,
 }
 
 void
-expand(unsigned char mask) {
+expand(unsigned char mask)
+{
 	XEvent ev;
 	int nx1, ny1, nx2, ny2;
 	unsigned char curmask;
 	unsigned char newmask;
 
-	if(!selmon->sel || selmon->sel->isfixed)
+	if (!selmon->sel || selmon->sel->isfixed)
 		return;
 	XRaiseWindow(dpy, selmon->sel->win);
 	newmask = curmask = selmon->sel->expandmask;
@@ -163,21 +166,24 @@ expand(unsigned char mask) {
 }
 
 void
-togglemaximize(const Arg *arg) {
+togglemaximize(const Arg *arg)
+{
 	if (arg->i > 0) expand(FORCE_EXPANDALL);
 	else if (arg->i < 0) expand(UNEXPAND);
 	else expand(EXPANDALL);
 }
 
 void
-toggleverticalexpand(const Arg *arg) {
+toggleverticalexpand(const Arg *arg)
+{
 	if (arg->i < 0) expand(EXPAND_DOWN);
 	else if (arg->i > 0) expand(EXPAND_UP);
 	else expand(EXPAND_DOWN | EXPAND_UP);
 }
 
 void
-togglehorizontalexpand(const Arg *arg) {
+togglehorizontalexpand(const Arg *arg)
+{
 	if (arg->i < 0) expand(EXPAND_LEFT);
 	else if (arg->i > 0) expand(EXPAND_RIGHT);
 	else expand(EXPAND_LEFT | EXPAND_RIGHT);
diff --git a/patch/include.c b/patch/include.c
index 5166174..9b0fd0d 100644
--- a/patch/include.c
+++ b/patch/include.c
@@ -17,7 +17,7 @@
 #if CFACTS_PATCH
 #include "cfacts.c"
 #endif
-#if CMDCUSTOMIZE
+#if CMDCUSTOMIZE_PATCH
 #include "cmdcustomize.c"
 #endif
 #if COMBO_PATCH
@@ -174,4 +174,4 @@
 #endif
 #if TILE_LAYOUT
 #include "tile.c"
-#endif
\ No newline at end of file
+#endif
diff --git a/patch/include.h b/patch/include.h
index 9c1980f..4ae5675 100644
--- a/patch/include.h
+++ b/patch/include.h
@@ -17,7 +17,7 @@
 #if CFACTS_PATCH
 #include "cfacts.h"
 #endif
-#if CMDCUSTOMIZE
+#if CMDCUSTOMIZE_PATCH
 #include "cmdcustomize.h"
 #endif
 #if COMBO_PATCH
@@ -174,4 +174,4 @@
 #endif
 #if TILE_LAYOUT
 #include "tile.h"
-#endif
\ No newline at end of file
+#endif
diff --git a/patch/maximize.c b/patch/maximize.c
index 6f89538..77775f3 100644
--- a/patch/maximize.c
+++ b/patch/maximize.c
@@ -1,12 +1,13 @@
 void
-maximize(int x, int y, int w, int h) {
+maximize(int x, int y, int w, int h)
+{
 	XEvent ev;
 
-	if(!selmon->sel || selmon->sel->isfixed)
+	if (!selmon->sel || selmon->sel->isfixed)
 		return;
 	XRaiseWindow(dpy, selmon->sel->win);
-	if(!selmon->sel->ismax) {
-		if(!selmon->lt[selmon->sellt]->arrange || selmon->sel->isfloating)
+	if (!selmon->sel->ismax) {
+		if (!selmon->lt[selmon->sellt]->arrange || selmon->sel->isfloating)
 			selmon->sel->wasfloating = True;
 		else {
 			togglefloating(NULL);
@@ -21,25 +22,28 @@ maximize(int x, int y, int w, int h) {
 	}
 	else {
 		resize(selmon->sel, selmon->sel->oldx, selmon->sel->oldy, selmon->sel->oldw, selmon->sel->oldh, True);
-		if(!selmon->sel->wasfloating)
+		if (!selmon->sel->wasfloating)
 			togglefloating(NULL);
 		selmon->sel->ismax = False;
 	}
 	drawbar(selmon);
-	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+	while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
-togglemaximize(const Arg *arg) {
+togglemax(const Arg *arg)
+{
 	maximize(selmon->wx, selmon->wy, selmon->ww - 2 * borderpx, selmon->wh - 2 * borderpx);
 }
 
 void
-toggleverticalmax(const Arg *arg) {
+toggleverticalmax(const Arg *arg)
+{
 	maximize(selmon->sel->x, selmon->wy, selmon->sel->w, selmon->wh - 2 * borderpx);
 }
 
 void
-togglehorizontalmax(const Arg *arg) {
+togglehorizontalmax(const Arg *arg)
+{
 	maximize(selmon->wx, selmon->sel->y, selmon->ww - 2 * borderpx, selmon->sel->h);
 }
\ No newline at end of file
diff --git a/patch/maximize.h b/patch/maximize.h
index a71226a..e06a3ff 100644
--- a/patch/maximize.h
+++ b/patch/maximize.h
@@ -1,4 +1,4 @@
 static void maximize(int x, int y, int w, int h);
-static void togglemaximize(const Arg *arg);
+static void togglemax(const Arg *arg);
 static void toggleverticalmax(const Arg *arg);
 static void togglehorizontalmax(const Arg *arg);
\ No newline at end of file
diff --git a/patches.h b/patches.h
index 4d1d781..a7d58d0 100644
--- a/patches.h
+++ b/patches.h
@@ -101,7 +101,7 @@
 /* This patch allows color attributes to be set through the command line.
  * https://dwm.suckless.org/patches/cmdcustomize/
  */
-#define CMDCUSTOMIZE 0
+#define CMDCUSTOMIZE_PATCH 0
 
 /* This patch tweaks the tagging interface so that you can select multiple tags for tag
  * or view by pressing all the right keys as a combo. For example to view tags 1 and 3,