commit 07fdb36cd95b89965c8f72c807a8aea44ddff04d
parent eefa23e2d9a574c195b0aef5249f5389ee6bd80d
Author: wh1tepearl <wh1tepearl@gmail.com>
Date: Wed, 25 Mar 2026 18:02:25 +0000
a bit less sucky config
Diffstat:
2 files changed, 14 insertions(+), 29 deletions(-)
diff --git a/config.def.h b/config.def.h
@@ -10,35 +10,18 @@ static const int topbar = 1; /* 0 means bottom bar */
static const char *fonts[] = { "monospace:size=10" };
static const char dmenufont[] = "monospace:size=10";
-#if !XRDB //when xrdb is turned off
-
-static const char col_gray1[] = "#222222";
-static const char col_gray2[] = "#444444";
-static const char col_gray3[] = "#bbbbbb";
-static const char col_gray4[] = "#eeeeee";
-static const char col_cyan[] = "#005577";
-static const char *colors[][3] = {
- /* fg bg border */
- [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
- [SchemeSel] = { col_gray4, col_cyan, col_cyan },
-};
-
-#else //when xrdb is turned on
-
-static char normbgcolor[] = "#222222";
-static char normbordercolor[] = "#444444";
-static char normfgcolor[] = "#bbbbbb";
-static char selfgcolor[] = "#eeeeee";
-static char selbordercolor[] = "#005577";
-static char selbgcolor[] = "#005577";
-static char *colors[][3] = {
+static MAYBE_CONST char normbgcolor[] = "#222222";
+static MAYBE_CONST char normbordercolor[] = "#444444";
+static MAYBE_CONST char normfgcolor[] = "#bbbbbb";
+static MAYBE_CONST char selfgcolor[] = "#eeeeee";
+static MAYBE_CONST char selbordercolor[] = "#005577";
+static MAYBE_CONST char selbgcolor[] = "#005577";
+static MAYBE_CONST char *colors[][3] = {
/* fg bg border */
[SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor },
[SchemeSel] = { selfgcolor, selbgcolor, selbordercolor },
};
-#endif
-
#if GAPS
static const unsigned int gappx = 5;
#endif
@@ -121,12 +104,7 @@ static const Layout layouts[] = {
/* commands */
static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
-
-#if !XRDB //when xrdb is turned off
-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
-#else //when xrdb is on
static const char *dmenucmd[] = { "dmenu_run", "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbordercolor, "-sf", selfgcolor, NULL };
-#endif
static const char *termcmd[] = { "st", NULL };
diff --git a/vxwm.c b/vxwm.c
@@ -77,6 +77,13 @@ vxwm 2.1 // by solyn (wh1tepearl's child)
}
#endif
+/* This is purely for a bit less sucky config */
+#if !XRDB
+#define MAYBE_CONST const
+#else
+#define MAYBE_CONST
+#endif
+
/* enums */
enum { CurNormal, CurResize, CurMove,
#if BETTER_RESIZE && BR_CHANGE_CURSOR