From 29e5ab38b59e04eda8a23b700bbbad1bdce4a466 Mon Sep 17 00:00:00 2001 From: ivan-boikov Date: Sun, 18 Aug 2024 14:03:22 +0200 Subject: xrdb: fix merge --- patches/dwm-xrdb-6.4.diff | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/patches/dwm-xrdb-6.4.diff b/patches/dwm-xrdb-6.4.diff index 7852afb..bc02c44 100644 --- a/patches/dwm-xrdb-6.4.diff +++ b/patches/dwm-xrdb-6.4.diff @@ -40,15 +40,10 @@ index 061ad66..686b947 100644 }; /* tagging */ -@@ -56,7 +57,7 @@ static const Layout layouts[] = { - #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } - - /* commands */ --static const char *dmenucmd[] = { "dmenu_run", "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; -+static const char *dmenucmd[] = { "dmenu_run", "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbordercolor, "-sf", selfgcolor, NULL }; +@@ -57,2 +58,2 @@ /* commands */ +-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; ++static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbordercolor, "-sf", selfgcolor, NULL }; static const char *termcmd[] = { "st", NULL }; - - static const Key keys[] = { @@ -84,6 +85,7 @@ static const Key keys[] = { { MODKEY, XK_period, focusmon, {.i = +1 } }, { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, -- cgit v1.2.3