cleanup
This commit is contained in:
parent
43bcdd2912
commit
1098239b63
|
|
@ -1 +1,3 @@
|
||||||
dwm-final
|
dwm-final
|
||||||
|
dwm-dev-1.0.0_1.x86_64.xbps
|
||||||
|
pkg/usr
|
||||||
|
|
|
||||||
8
build.sh
8
build.sh
|
|
@ -10,7 +10,7 @@ cd dwm-final || exit 1
|
||||||
make clean install DESTDIR="../pkg" PREFIX="/usr"
|
make clean install DESTDIR="../pkg" PREFIX="/usr"
|
||||||
cd - || exit 1
|
cd - || exit 1
|
||||||
|
|
||||||
xbps-create -A x86_64 \
|
# xbps-create -A x86_64 \
|
||||||
-n "dwm-dev-1.0.0_1" \
|
# -n "dwm-dev-1.0.0_1" \
|
||||||
-s "Test build of dwm" \
|
# -s "Test build of dwm" \
|
||||||
pkg
|
# pkg
|
||||||
|
|
|
||||||
140
config.h
140
config.h
|
|
@ -37,58 +37,112 @@ static int floatindicatortype = INDICATOR_TOP_LEFT_SQUARE;
|
||||||
static const char font[] = "FiraCode Nerd Font Mono:pixelsize=14";
|
static const char font[] = "FiraCode Nerd Font Mono:pixelsize=14";
|
||||||
static const char dmenufont[] = "FiraCode Nerd Font Mono:pixelsize=14";
|
static const char dmenufont[] = "FiraCode Nerd Font Mono:pixelsize=14";
|
||||||
|
|
||||||
static const char nocolor[] = "#FF0000";
|
#define NOCOLOR "#FF0000"
|
||||||
static const char color0[] = "#15161E";
|
#define COLOR0 "#15161E"
|
||||||
static const char color1[] = "#f7768e";
|
#define COLOR1 "#f7768e"
|
||||||
static const char color2[] = "#9ece6a";
|
#define COLOR2 "#9ece6a"
|
||||||
static const char color3[] = "#e0af68";
|
#define COLOR3 "#e0af68"
|
||||||
static const char color4[] = "#7aa2f7";
|
#define COLOR4 "#7aa2f7"
|
||||||
static const char color5[] = "#bb9af7";
|
#define COLOR5 "#bb9af7"
|
||||||
static const char color6[] = "#7dcfff";
|
#define COLOR6 "#7dcfff"
|
||||||
static const char color7[] = "#a9b1d6";
|
#define COLOR7 "#a9b1d6"
|
||||||
static const char color8[] = "#414868";
|
#define COLOR8 "#414868"
|
||||||
static const char color9[] = "#f7768e";
|
#define COLOR9 "#f7768e"
|
||||||
static const char color10[] = "#9ece6a";
|
#define COLOR10 "#9ece6a"
|
||||||
static const char color11[] = "#e0af68";
|
#define COLOR11 "#e0af68"
|
||||||
static const char color12[] = "#7aa2f7";
|
#define COLOR12 "#7aa2f7"
|
||||||
static const char color13[] = "#bb9af7";
|
#define COLOR13 "#bb9af7"
|
||||||
static const char color14[] = "#7dcfff";
|
#define COLOR14 "#7dcfff"
|
||||||
static const char color15[] = "#c0caf5";
|
#define COLOR15 "#c0caf5"
|
||||||
static const char bordernorm[] = "#383c4a";
|
|
||||||
static const char bordersel[] = "#7aa2f7";
|
|
||||||
|
|
||||||
static const unsigned int baralpha = 0xCC;
|
#define BORDERNORM "#383c4a"
|
||||||
|
#define BORDERSEL COLOR4
|
||||||
|
|
||||||
|
static char normfgcolor[] = COLOR15;
|
||||||
|
static char normbgcolor[] = COLOR0;
|
||||||
|
static char normbordercolor[] = BORDERNORM;
|
||||||
|
static char normfloatcolor[] = BORDERNORM;
|
||||||
|
|
||||||
|
static char selfgcolor[] = COLOR15;
|
||||||
|
static char selbgcolor[] = COLOR4;
|
||||||
|
static char selbordercolor[] = BORDERSEL;
|
||||||
|
static char selfloatcolor[] = BORDERSEL;
|
||||||
|
|
||||||
|
static char titlenormfgcolor[] = COLOR7;
|
||||||
|
static char titlenormbgcolor[] = COLOR0;
|
||||||
|
static char titlenormbordercolor[] = NOCOLOR;
|
||||||
|
static char titlenormfloatcolor[] = NOCOLOR;
|
||||||
|
|
||||||
|
static char titleselfgcolor[] = COLOR7;
|
||||||
|
static char titleselbgcolor[] = COLOR0;
|
||||||
|
static char titleselbordercolor[] = NOCOLOR;
|
||||||
|
static char titleselfloatcolor[] = NOCOLOR;
|
||||||
|
|
||||||
|
static char tagsnormfgcolor[] = COLOR7;
|
||||||
|
static char tagsnormbgcolor[] = COLOR0;
|
||||||
|
static char tagsnormbordercolor[] = NOCOLOR;
|
||||||
|
static char tagsnormfloatcolor[] = NOCOLOR;
|
||||||
|
|
||||||
|
static char tagsselfgcolor[] = COLOR0;
|
||||||
|
static char tagsselbgcolor[] = COLOR4;
|
||||||
|
static char tagsselbordercolor[] = NOCOLOR;
|
||||||
|
static char tagsselfloatcolor[] = NOCOLOR;
|
||||||
|
|
||||||
|
static char hidnormfgcolor[] = NOCOLOR;
|
||||||
|
static char hidselfgcolor[] = NOCOLOR;
|
||||||
|
static char hidnormbgcolor[] = NOCOLOR;
|
||||||
|
static char hidselbgcolor[] = NOCOLOR;
|
||||||
|
|
||||||
|
static char urgfgcolor[] = COLOR0;
|
||||||
|
static char urgbgcolor[] = COLOR1;
|
||||||
|
static char urgbordercolor[] = COLOR1;
|
||||||
|
static char urgfloatcolor[] = COLOR1;
|
||||||
|
|
||||||
|
static char scratchselfgcolor[] = COLOR15;
|
||||||
|
static char scratchselbgcolor[] = COLOR4;
|
||||||
|
static char scratchselbordercolor[] = BORDERSEL;
|
||||||
|
static char scratchselfloatcolor[] = BORDERSEL;
|
||||||
|
|
||||||
|
static char scratchnormfgcolor[] = COLOR15;
|
||||||
|
static char scratchnormbgcolor[] = COLOR0;
|
||||||
|
static char scratchnormbordercolor[] = BORDERNORM;
|
||||||
|
static char scratchnormfloatcolor[] = BORDERNORM;
|
||||||
|
|
||||||
|
|
||||||
|
static const unsigned int baralpha = 0xcc;
|
||||||
static const unsigned int borderalpha = OPAQUE;
|
static const unsigned int borderalpha = OPAQUE;
|
||||||
static const unsigned int alphas[][3] = {
|
static const unsigned int alphas[][3] = {
|
||||||
/* fg bg border */
|
/* fg bg border */
|
||||||
[SchemeNorm] = { OPAQUE, baralpha, borderalpha },
|
[SchemeNorm] = { OPAQUE, baralpha, borderalpha },
|
||||||
[SchemeSel] = { OPAQUE, baralpha, borderalpha },
|
[SchemeSel] = { OPAQUE, baralpha, borderalpha },
|
||||||
[SchemeTitleNorm] = { OPAQUE, baralpha, borderalpha },
|
[SchemeTitleNorm] = { OPAQUE, baralpha, borderalpha },
|
||||||
[SchemeTitleSel] = { OPAQUE, baralpha, borderalpha },
|
[SchemeTitleSel] = { OPAQUE, baralpha, borderalpha },
|
||||||
[SchemeTagsNorm] = { OPAQUE, baralpha, borderalpha },
|
[SchemeTagsNorm] = { OPAQUE, baralpha, borderalpha },
|
||||||
[SchemeTagsSel] = { OPAQUE, OPAQUE, borderalpha },
|
[SchemeTagsSel] = { OPAQUE, OPAQUE, borderalpha },
|
||||||
// [SchemeHidNorm] = { OPAQUE, OPAQUE, OPAQUE },
|
[SchemeHidNorm] = { OPAQUE, baralpha, borderalpha },
|
||||||
// [SchemeHidSel] = { OPAQUE, OPAQUE, OPAQUE },
|
[SchemeHidSel] = { OPAQUE, baralpha, borderalpha },
|
||||||
[SchemeUrg] = { OPAQUE, baralpha, borderalpha },
|
[SchemeUrg] = { OPAQUE, OPAQUE, borderalpha },
|
||||||
[SchemeScratchSel] = { OPAQUE, baralpha, borderalpha },
|
[SchemeScratchSel] = { OPAQUE, baralpha, borderalpha },
|
||||||
[SchemeScratchNorm] = { OPAQUE, baralpha, borderalpha },
|
[SchemeScratchNorm] = { OPAQUE, baralpha, borderalpha },
|
||||||
};
|
};
|
||||||
|
|
||||||
static char *colors[][ColCount] = {
|
static char *colors[][ColCount] = {
|
||||||
/* fg bg border float */
|
/* fg bg border float */
|
||||||
[SchemeNorm] = { color15, color0, bordernorm, bordernorm },
|
[SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor, normfloatcolor },
|
||||||
[SchemeSel] = { color15, color4, bordersel, bordersel },
|
[SchemeSel] = { selfgcolor, selbgcolor, selbordercolor, selfloatcolor },
|
||||||
[SchemeTitleNorm] = { color7, color0, nocolor, nocolor },
|
[SchemeTitleNorm] = { titlenormfgcolor, titlenormbgcolor, titlenormbordercolor, titlenormfloatcolor },
|
||||||
[SchemeTitleSel] = { color7, color0, nocolor, nocolor },
|
[SchemeTitleSel] = { titleselfgcolor, titleselbgcolor, titleselbordercolor, titleselfloatcolor },
|
||||||
[SchemeTagsNorm] = { color7, color0, nocolor, nocolor },
|
[SchemeTagsNorm] = { tagsnormfgcolor, tagsnormbgcolor, tagsnormbordercolor, tagsnormfloatcolor },
|
||||||
[SchemeTagsSel] = { color0, color4, nocolor, nocolor },
|
[SchemeTagsSel] = { tagsselfgcolor, tagsselbgcolor, tagsselbordercolor, tagsselfloatcolor },
|
||||||
// [SchemeHidNorm] = { nocolor, nocolor, nocolor, nocolor },
|
[SchemeHidNorm] = { hidnormfgcolor, hidnormbgcolor, NOCOLOR, NOCOLOR },
|
||||||
// [SchemeHidSel] = { nocolor, nocolor, nocolor, nocolor },
|
[SchemeHidSel] = { hidselfgcolor, hidselbgcolor, NOCOLOR, NOCOLOR },
|
||||||
[SchemeUrg] = { color0, color9, color9, color9 },
|
[SchemeUrg] = { urgfgcolor, urgbgcolor, urgbordercolor, urgfloatcolor },
|
||||||
[SchemeScratchSel] = { color15, color4, bordersel, bordersel },
|
[SchemeScratchSel] = { scratchselfgcolor, scratchselbgcolor, scratchselbordercolor, scratchselfloatcolor },
|
||||||
[SchemeScratchNorm] = { color15, color0, bordernorm, bordernorm }program,
|
[SchemeScratchNorm] = { scratchnormfgcolor, scratchnormbgcolor, scratchnormbordercolor, scratchnormfloatcolor },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#define AUTOSHELL(command) "sh", "-c", command, NULL
|
#define AUTOSHELL(command) "sh", "-c", command, NULL
|
||||||
static const char *const autostart[] = {
|
static const char *const autostart[] = {
|
||||||
AUTOSHELL("exec runsvdir $SVDIR"),
|
AUTOSHELL("exec runsvdir $SVDIR"),
|
||||||
|
|
@ -133,7 +187,7 @@ static char *tagicons[][NUMTAGS] =
|
||||||
{
|
{
|
||||||
[DEFAULT_TAGS] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" },
|
[DEFAULT_TAGS] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" },
|
||||||
[ALTERNATIVE_TAGS] = { "A", "B", "C", "D", "E", "F", "G", "H", "I" },
|
[ALTERNATIVE_TAGS] = { "A", "B", "C", "D", "E", "F", "G", "H", "I" },
|
||||||
[ALT_TAGS_DECORATION] = { "<1>", "<2>", "<3>", "<4>", "<5>", "<6>", "<7>", "<8>", "<9>" },
|
[ALT_TAGS_DECORATION] = { "[1]", "[2]", "[3]", "[4]", "[5]", "[6]", "[7]", "[8]", "[9]" },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue