change the name of a few things
This commit is contained in:
parent
a1ab4b4b74
commit
32c2291936
|
@ -27,10 +27,10 @@ spmenu.col_inputfg: #eeeeee
|
||||||
spmenu.col_inputbg: #222222
|
spmenu.col_inputbg: #222222
|
||||||
spmenu.col_numfgcolor: #ffffff
|
spmenu.col_numfgcolor: #ffffff
|
||||||
spmenu.col_numbgcolor: #2d3856
|
spmenu.col_numbgcolor: #2d3856
|
||||||
spmenu.col_normhlfgcolor: #ffffff
|
spmenu.col_hlnormfgcolor: #ffffff
|
||||||
spmenu.col_normhlbgcolor: #000000
|
spmenu.col_hlnormbgcolor: #000000
|
||||||
spmenu.col_selhlfgcolor: #ffffff
|
spmenu.col_hlselfgcolor: #ffffff
|
||||||
spmenu.col_selhlbgcolor: #000000
|
spmenu.col_hlselbgcolor: #000000
|
||||||
spmenu.col_caretfgcolor: #ffffff
|
spmenu.col_caretfgcolor: #ffffff
|
||||||
spmenu.col_bordercolor: #35638A
|
spmenu.col_bordercolor: #35638A
|
||||||
spmenu.col_modefgcolor: #ffffff
|
spmenu.col_modefgcolor: #ffffff
|
||||||
|
@ -70,10 +70,10 @@ spmenu.alpha_larrowfg: 255
|
||||||
spmenu.alpha_larrowbg: 200
|
spmenu.alpha_larrowbg: 200
|
||||||
spmenu.alpha_rarrowfg: 255
|
spmenu.alpha_rarrowfg: 255
|
||||||
spmenu.alpha_rarrowbg: 200
|
spmenu.alpha_rarrowbg: 200
|
||||||
spmenu.alpha_normhlfg: 255
|
spmenu.alpha_hlnormfg: 255
|
||||||
spmenu.alpha_normhlbg: 200
|
spmenu.alpha_hlnormbg: 200
|
||||||
spmenu.alpha_selhlfg: 255
|
spmenu.alpha_hlselfg: 255
|
||||||
spmenu.alpha_selhlbg: 200
|
spmenu.alpha_hlselbg: 200
|
||||||
spmenu.alpha_numfg: 255
|
spmenu.alpha_numfg: 255
|
||||||
spmenu.alpha_numbg: 200
|
spmenu.alpha_numbg: 200
|
||||||
spmenu.alpha_borderbg: 255
|
spmenu.alpha_borderbg: 255
|
||||||
|
|
|
@ -102,10 +102,10 @@ spmenu =
|
||||||
larrowbg = 200;
|
larrowbg = 200;
|
||||||
rarrowfg = 255;
|
rarrowfg = 255;
|
||||||
rarrowbg = 200;
|
rarrowbg = 200;
|
||||||
normhlfg = 255;
|
hlnormfg = 255;
|
||||||
normhlbg = 200;
|
hlnormbg = 200;
|
||||||
selhlfg = 255;
|
hlselfg = 255;
|
||||||
selhlbg = 200;
|
hlselbg = 200;
|
||||||
numfg = 255;
|
numfg = 255;
|
||||||
numbg = 200;
|
numbg = 200;
|
||||||
borderbg = 255;
|
borderbg = 255;
|
||||||
|
|
|
@ -1,21 +1,21 @@
|
||||||
// alpha array
|
// alpha array
|
||||||
static unsigned int alphas[][2] = {
|
static unsigned int alphas[][2] = {
|
||||||
// fg bg
|
// fg bg
|
||||||
[SchemeLArrow] = { opaque, 200 },
|
[SchemeLArrow] = { 255, 200 },
|
||||||
[SchemeRArrow] = { opaque, 200 },
|
[SchemeRArrow] = { 255, 200 },
|
||||||
[SchemeItemNorm] = { opaque, 200 },
|
[SchemeItemNorm] = { 255, 200 },
|
||||||
[SchemeItemSel] = { opaque, 200 },
|
[SchemeItemSel] = { 255, 200 },
|
||||||
[SchemeItemNormPri] = { opaque, 200 },
|
[SchemeItemNormPri] = { 255, 200 },
|
||||||
[SchemeItemSelPri] = { opaque, 200 },
|
[SchemeItemSelPri] = { 255, 200 },
|
||||||
[SchemeMenu] = { opaque, 200 },
|
[SchemeMenu] = { 255, 200 },
|
||||||
[SchemeInput] = { opaque, 200 },
|
[SchemeInput] = { 255, 200 },
|
||||||
[SchemePrompt] = { opaque, 200 },
|
[SchemePrompt] = { 255, 200 },
|
||||||
[SchemeNormHighlight] = { opaque, 200 },
|
[SchemeNormHighlight] = { 255, 200 },
|
||||||
[SchemeSelHighlight] = { opaque, 200 },
|
[SchemeSelHighlight] = { 255, 200 },
|
||||||
[SchemeMode] = { opaque, 200 },
|
[SchemeMode] = { 255, 200 },
|
||||||
[SchemeCaret] = { opaque, 200 },
|
[SchemeCaret] = { 255, 200 },
|
||||||
[SchemeNumber] = { opaque, 200 },
|
[SchemeNumber] = { 255, 200 },
|
||||||
[SchemeBorder] = { opaque, 200 },
|
[SchemeBorder] = { 255, 200 },
|
||||||
};
|
};
|
||||||
|
|
||||||
// colorscheme array
|
// colorscheme array
|
||||||
|
@ -30,8 +30,8 @@ static char *colors[SchemeLast][2] = {
|
||||||
[SchemeInput] = { col_inputfg, col_inputbg, },
|
[SchemeInput] = { col_inputfg, col_inputbg, },
|
||||||
[SchemeMenu] = { NULL, col_menubgcolor },
|
[SchemeMenu] = { NULL, col_menubgcolor },
|
||||||
[SchemePrompt] = { col_promptfg, col_promptbg },
|
[SchemePrompt] = { col_promptfg, col_promptbg },
|
||||||
[SchemeNormHighlight] = { col_normhlfgcolor, col_normhlbgcolor },
|
[SchemeNormHighlight] = { col_hlnormfgcolor, col_hlnormbgcolor },
|
||||||
[SchemeSelHighlight] = { col_selhlfgcolor, col_selhlbgcolor },
|
[SchemeSelHighlight] = { col_hlselfgcolor, col_hlselbgcolor },
|
||||||
[SchemeCaret] = { col_caretfgcolor, NULL },
|
[SchemeCaret] = { col_caretfgcolor, NULL },
|
||||||
[SchemeMode] = { col_modefgcolor, col_modebgcolor },
|
[SchemeMode] = { col_modefgcolor, col_modebgcolor },
|
||||||
[SchemeNumber] = { col_numfgcolor, col_numbgcolor },
|
[SchemeNumber] = { col_numfgcolor, col_numbgcolor },
|
||||||
|
|
|
@ -208,10 +208,10 @@ conf_init(void)
|
||||||
config_setting_lookup_int(conf, "rarrowfg", &alpha_rarrowfg); // spmenu.alpha.rarrowfg
|
config_setting_lookup_int(conf, "rarrowfg", &alpha_rarrowfg); // spmenu.alpha.rarrowfg
|
||||||
config_setting_lookup_int(conf, "rarrowbg", &alpha_rarrowbg); // spmenu.alpha.rarrowbg
|
config_setting_lookup_int(conf, "rarrowbg", &alpha_rarrowbg); // spmenu.alpha.rarrowbg
|
||||||
|
|
||||||
config_setting_lookup_int(conf, "normhlfg", &alpha_normhlfg); // spmenu.alpha.normhlfg
|
config_setting_lookup_int(conf, "hlnormfg", &alpha_hlnormfg); // spmenu.alpha.hlnormfg
|
||||||
config_setting_lookup_int(conf, "normhlbg", &alpha_normhlbg); // spmenu.alpha.normhlbg
|
config_setting_lookup_int(conf, "hlnormbg", &alpha_hlnormbg); // spmenu.alpha.hlnormbg
|
||||||
config_setting_lookup_int(conf, "selhlfg", &alpha_selhlfg); // spmenu.alpha.selhlfg
|
config_setting_lookup_int(conf, "hlselfg", &alpha_hlselfg); // spmenu.alpha.hlselfg
|
||||||
config_setting_lookup_int(conf, "selhlbg", &alpha_selhlbg); // spmenu.alpha.selhlbg
|
config_setting_lookup_int(conf, "hlselbg", &alpha_hlselbg); // spmenu.alpha.hlselbg
|
||||||
|
|
||||||
config_setting_lookup_int(conf, "numfg", &alpha_numfg); // spmenu.alpha.numfg
|
config_setting_lookup_int(conf, "numfg", &alpha_numfg); // spmenu.alpha.numfg
|
||||||
config_setting_lookup_int(conf, "numbg", &alpha_numbg); // spmenu.alpha.numbg
|
config_setting_lookup_int(conf, "numbg", &alpha_numbg); // spmenu.alpha.numbg
|
||||||
|
|
|
@ -21,6 +21,3 @@
|
||||||
#define ALTR Mod3Mask
|
#define ALTR Mod3Mask
|
||||||
#define SUPER Mod4Mask
|
#define SUPER Mod4Mask
|
||||||
#define SUPERR Mod5Mask
|
#define SUPERR Mod5Mask
|
||||||
|
|
||||||
// alpha
|
|
||||||
#define opaque 0xffU
|
|
||||||
|
|
|
@ -29,10 +29,10 @@ init_appearance(void)
|
||||||
alphas[SchemeInput][ColBg] = alpha_inputbg;
|
alphas[SchemeInput][ColBg] = alpha_inputbg;
|
||||||
alphas[SchemePrompt][ColFg] = alpha_promptfg;
|
alphas[SchemePrompt][ColFg] = alpha_promptfg;
|
||||||
alphas[SchemePrompt][ColBg] = alpha_promptbg;
|
alphas[SchemePrompt][ColBg] = alpha_promptbg;
|
||||||
alphas[SchemeNormHighlight][ColFg] = alpha_normhlfg;
|
alphas[SchemeNormHighlight][ColFg] = alpha_hlnormfg;
|
||||||
alphas[SchemeNormHighlight][ColBg] = alpha_normhlbg;
|
alphas[SchemeNormHighlight][ColBg] = alpha_hlnormbg;
|
||||||
alphas[SchemeSelHighlight][ColFg] = alpha_selhlfg;
|
alphas[SchemeSelHighlight][ColFg] = alpha_hlselfg;
|
||||||
alphas[SchemeSelHighlight][ColBg] = alpha_selhlbg;
|
alphas[SchemeSelHighlight][ColBg] = alpha_hlselbg;
|
||||||
alphas[SchemeCaret][ColFg] = alpha_caretfg;
|
alphas[SchemeCaret][ColFg] = alpha_caretfg;
|
||||||
alphas[SchemeCaret][ColBg] = alpha_caretbg;
|
alphas[SchemeCaret][ColBg] = alpha_caretbg;
|
||||||
alphas[SchemeNumber][ColFg] = alpha_numfg;
|
alphas[SchemeNumber][ColFg] = alpha_numfg;
|
||||||
|
|
|
@ -21,10 +21,10 @@ ResourcePref resources[] = {
|
||||||
{ "col_numbgcolor", STRING, &col_numbgcolor },
|
{ "col_numbgcolor", STRING, &col_numbgcolor },
|
||||||
{ "col_modefgcolor", STRING, &col_modefgcolor },
|
{ "col_modefgcolor", STRING, &col_modefgcolor },
|
||||||
{ "col_modebgcolor", STRING, &col_modebgcolor },
|
{ "col_modebgcolor", STRING, &col_modebgcolor },
|
||||||
{ "col_normhlfgcolor", STRING, &col_normhlfgcolor },
|
{ "col_hlnormfgcolor", STRING, &col_hlnormfgcolor },
|
||||||
{ "col_normhlbgcolor", STRING, &col_normhlbgcolor },
|
{ "col_hlnormbgcolor", STRING, &col_hlnormbgcolor },
|
||||||
{ "col_selhlfgcolor", STRING, &col_selhlfgcolor },
|
{ "col_hlselfgcolor", STRING, &col_hlselfgcolor },
|
||||||
{ "col_selhlbgcolor", STRING, &col_selhlbgcolor },
|
{ "col_hlselbgcolor", STRING, &col_hlselbgcolor },
|
||||||
{ "col_bordercolor", STRING, &col_bordercolor },
|
{ "col_bordercolor", STRING, &col_bordercolor },
|
||||||
{ "col_promptfg", STRING, &col_promptfg },
|
{ "col_promptfg", STRING, &col_promptfg },
|
||||||
{ "col_promptbg", STRING, &col_promptbg },
|
{ "col_promptbg", STRING, &col_promptbg },
|
||||||
|
@ -47,10 +47,10 @@ ResourcePref resources[] = {
|
||||||
{ "alpha_larrowbg", INTEGER, &alpha_larrowbg },
|
{ "alpha_larrowbg", INTEGER, &alpha_larrowbg },
|
||||||
{ "alpha_rarrowfg", INTEGER, &alpha_rarrowfg },
|
{ "alpha_rarrowfg", INTEGER, &alpha_rarrowfg },
|
||||||
{ "alpha_rarrowbg", INTEGER, &alpha_rarrowbg },
|
{ "alpha_rarrowbg", INTEGER, &alpha_rarrowbg },
|
||||||
{ "alpha_normhlfg", INTEGER, &alpha_normhlfg },
|
{ "alpha_hlnormfg", INTEGER, &alpha_hlnormfg },
|
||||||
{ "alpha_normhlbg", INTEGER, &alpha_normhlbg },
|
{ "alpha_hlnormbg", INTEGER, &alpha_hlnormbg },
|
||||||
{ "alpha_selhlfg", INTEGER, &alpha_selhlfg },
|
{ "alpha_hlselfg", INTEGER, &alpha_hlselfg },
|
||||||
{ "alpha_selhlbg", INTEGER, &alpha_selhlbg },
|
{ "alpha_hlselbg", INTEGER, &alpha_hlselbg },
|
||||||
{ "alpha_numfg", INTEGER, &alpha_numfg },
|
{ "alpha_numfg", INTEGER, &alpha_numfg },
|
||||||
{ "alpha_numbg", INTEGER, &alpha_numbg },
|
{ "alpha_numbg", INTEGER, &alpha_numbg },
|
||||||
{ "alpha_borderbg", INTEGER, &alpha_borderbg },
|
{ "alpha_borderbg", INTEGER, &alpha_borderbg },
|
||||||
|
@ -169,10 +169,10 @@ ResourcePref cols[] = {
|
||||||
{ "color5", STRING, &col_numbgcolor },
|
{ "color5", STRING, &col_numbgcolor },
|
||||||
{ "color0", STRING, &col_modefgcolor },
|
{ "color0", STRING, &col_modefgcolor },
|
||||||
{ "color7", STRING, &col_modebgcolor },
|
{ "color7", STRING, &col_modebgcolor },
|
||||||
{ "color2", STRING, &col_normhlbgcolor },
|
{ "color2", STRING, &col_hlnormbgcolor },
|
||||||
{ "color3", STRING, &col_selhlbgcolor },
|
{ "color3", STRING, &col_hlselbgcolor },
|
||||||
{ "color0", STRING, &col_normhlfgcolor },
|
{ "color0", STRING, &col_hlnormfgcolor },
|
||||||
{ "color0", STRING, &col_selhlfgcolor },
|
{ "color0", STRING, &col_hlselfgcolor },
|
||||||
{ "color0", STRING, &col_sgrcolor0 },
|
{ "color0", STRING, &col_sgrcolor0 },
|
||||||
{ "color1", STRING, &col_sgrcolor1 },
|
{ "color1", STRING, &col_sgrcolor1 },
|
||||||
{ "color2", STRING, &col_sgrcolor2 },
|
{ "color2", STRING, &col_sgrcolor2 },
|
||||||
|
|
40
options.h
40
options.h
|
@ -127,12 +127,12 @@ static char col_larrowbg[] = "#222222"; /* Left arrow color */
|
||||||
static char col_rarrowbg[] = "#222222"; /* Right arrow color */
|
static char col_rarrowbg[] = "#222222"; /* Right arrow color */
|
||||||
|
|
||||||
/* Normal highlight colors */
|
/* Normal highlight colors */
|
||||||
static char col_normhlfgcolor[] = "#ffffff"; /* Text highlight color for unselected */
|
static char col_hlnormfgcolor[] = "#ffffff"; /* Text highlight color for unselected */
|
||||||
static char col_normhlbgcolor[] = "#000000"; /* Background highlight color for unselected */
|
static char col_hlnormbgcolor[] = "#000000"; /* Background highlight color for unselected */
|
||||||
|
|
||||||
/* Selected highlight colors */
|
/* Selected highlight colors */
|
||||||
static char col_selhlfgcolor[] = "#ffffff"; /* Text highlight color for selected */
|
static char col_hlselfgcolor[] = "#ffffff"; /* Text highlight color for selected */
|
||||||
static char col_selhlbgcolor[] = "#000000"; /* Background highlight color for selected */
|
static char col_hlselbgcolor[] = "#000000"; /* Background highlight color for selected */
|
||||||
|
|
||||||
/* Match count colors */
|
/* Match count colors */
|
||||||
static char col_numfgcolor[] = "#ffffff"; /* Match count text color */
|
static char col_numfgcolor[] = "#ffffff"; /* Match count text color */
|
||||||
|
@ -167,33 +167,33 @@ static char col_sgrcolor14[] = "#00ffff"; /* SGR color #14 */
|
||||||
static char col_sgrcolor15[] = "#ffffff"; /* SGR color #15 */
|
static char col_sgrcolor15[] = "#ffffff"; /* SGR color #15 */
|
||||||
|
|
||||||
/* Alpha options */
|
/* Alpha options */
|
||||||
static int alpha_itemnormfg = opaque; /* Alpha for normal item foreground (0-255) */
|
static int alpha_itemnormfg = 255; /* Alpha for normal item foreground (0-255) */
|
||||||
static int alpha_itemnormbg = 200; /* Alpha for normal item background (0-255) */
|
static int alpha_itemnormbg = 200; /* Alpha for normal item background (0-255) */
|
||||||
static int alpha_itemselfg = opaque; /* Alpha for selected item foreground (0-255) */
|
static int alpha_itemselfg = 255; /* Alpha for selected item foreground (0-255) */
|
||||||
static int alpha_itemselbg = 200; /* Alpha for selected item background (0-255) */
|
static int alpha_itemselbg = 200; /* Alpha for selected item background (0-255) */
|
||||||
static int alpha_itemnormprifg = opaque; /* alpha for normal priority item foreground (0-255) */
|
static int alpha_itemnormprifg = 255; /* alpha for normal priority item foreground (0-255) */
|
||||||
static int alpha_itemnormpribg = 200; /* Alpha for normal priority item background (0-255) */
|
static int alpha_itemnormpribg = 200; /* Alpha for normal priority item background (0-255) */
|
||||||
static int alpha_itemselprifg = opaque; /* Alpha for selected priority item foreground (0-255) */
|
static int alpha_itemselprifg = 255; /* Alpha for selected priority item foreground (0-255) */
|
||||||
static int alpha_itemselpribg = 200; /* Alpha for selected priority item background (0-255) */
|
static int alpha_itemselpribg = 200; /* Alpha for selected priority item background (0-255) */
|
||||||
static int alpha_inputfg = opaque; /* Alpha for input foreground (0-255) */
|
static int alpha_inputfg = 255; /* Alpha for input foreground (0-255) */
|
||||||
static int alpha_inputbg = 200; /* Alpha for input background (0-255) */
|
static int alpha_inputbg = 200; /* Alpha for input background (0-255) */
|
||||||
static int alpha_menubg = 200; /* Alpha for menu background (0-255) */
|
static int alpha_menubg = 200; /* Alpha for menu background (0-255) */
|
||||||
static int alpha_promptfg = opaque; /* Alpha for prompt foreground (0-255) */
|
static int alpha_promptfg = 255; /* Alpha for prompt foreground (0-255) */
|
||||||
static int alpha_promptbg = 200; /* Alpha for prompt background (0-255) */
|
static int alpha_promptbg = 200; /* Alpha for prompt background (0-255) */
|
||||||
static int alpha_larrowfg = opaque; /* Alpha for left arrow foreground (0-255) */
|
static int alpha_larrowfg = 255; /* Alpha for left arrow foreground (0-255) */
|
||||||
static int alpha_larrowbg = 200; /* Alpha for left arrow background (0-255) */
|
static int alpha_larrowbg = 200; /* Alpha for left arrow background (0-255) */
|
||||||
static int alpha_rarrowfg = opaque; /* Alpha for right arrow foreground (0-255) */
|
static int alpha_rarrowfg = 255; /* Alpha for right arrow foreground (0-255) */
|
||||||
static int alpha_rarrowbg = 200; /* Alpha for right arrow background (0-255) */
|
static int alpha_rarrowbg = 200; /* Alpha for right arrow background (0-255) */
|
||||||
static int alpha_normhlfg = opaque; /* Alpha for normal highlight foreground (0-255) */
|
static int alpha_hlnormfg = 255; /* Alpha for normal highlight foreground (0-255) */
|
||||||
static int alpha_normhlbg = 200; /* Alpha for normal highlight background (0-255) */
|
static int alpha_hlnormbg = 200; /* Alpha for normal highlight background (0-255) */
|
||||||
static int alpha_selhlfg = opaque; /* Alpha for selected highlight foreground (0-255) */
|
static int alpha_hlselfg = 255; /* Alpha for selected highlight foreground (0-255) */
|
||||||
static int alpha_selhlbg = 200; /* Alpha for selected highlight background (0-255) */
|
static int alpha_hlselbg = 200; /* Alpha for selected highlight background (0-255) */
|
||||||
static int alpha_numfg = opaque; /* Alpha for match count foreground (0-255) */
|
static int alpha_numfg = 255; /* Alpha for match count foreground (0-255) */
|
||||||
static int alpha_numbg = 200; /* Alpha for the match count background (0-255) */
|
static int alpha_numbg = 200; /* Alpha for the match count background (0-255) */
|
||||||
static int alpha_borderbg = opaque; /* Alpha for the border (0-255) */
|
static int alpha_borderbg = 255; /* Alpha for the border (0-255) */
|
||||||
static int alpha_caretfg = opaque; /* Alpha for the caret foreground (0-255) */
|
static int alpha_caretfg = 255; /* Alpha for the caret foreground (0-255) */
|
||||||
static int alpha_caretbg = 200; /* Alpha for the caret background (0-255) */
|
static int alpha_caretbg = 200; /* Alpha for the caret background (0-255) */
|
||||||
static int alpha_modefg = opaque; /* Alpha for the mode indicator foreground (0-255) */
|
static int alpha_modefg = 255; /* Alpha for the mode indicator foreground (0-255) */
|
||||||
static int alpha_modebg = 200; /* Alpha for the mode indicator background (0-255) */
|
static int alpha_modebg = 200; /* Alpha for the mode indicator background (0-255) */
|
||||||
|
|
||||||
/* Pango options */
|
/* Pango options */
|
||||||
|
|
Loading…
Reference in a new issue