diff --git a/docs/docs.md b/docs/docs.md index abe1807..42f71f7 100644 --- a/docs/docs.md +++ b/docs/docs.md @@ -375,8 +375,11 @@ or ~/.config/spmenu/spmenurc) `-rab, --right-arrow-background color` : Set the right arrow background color -`-cc, --caret-foreground color` -: Set the caret color +`-cfc, --caret-foreground color` +: Set the caret foreground color + +`-cbc, --caret-background color` +: Set the caret background color `-bc, --border-background color` : Set the border color diff --git a/docs/example.Xresources b/docs/example.Xresources index f17f1e5..e04281d 100644 --- a/docs/example.Xresources +++ b/docs/example.Xresources @@ -16,7 +16,7 @@ spmenu.col_itemnormprifg: #bbbbbb spmenu.col_itemnormpribg: #222222 spmenu.col_itemselprifg: #eeeeee spmenu.col_itemselpribg: #35638A -spmenu.col_menubgcolor: #222222 +spmenu.col_menu: #222222 spmenu.col_promptfg: #eeeeee spmenu.col_promptbg: #35526b spmenu.col_larrowfg: #bbbbbb @@ -25,32 +25,33 @@ spmenu.col_larrowbg: #222222 spmenu.col_rarrowbg: #222222 spmenu.col_inputfg: #eeeeee spmenu.col_inputbg: #222222 -spmenu.col_numfgcolor: #ffffff -spmenu.col_numbgcolor: #2d3856 -spmenu.col_hlnormfgcolor: #ffffff -spmenu.col_hlnormbgcolor: #000000 -spmenu.col_hlselfgcolor: #ffffff -spmenu.col_hlselbgcolor: #000000 -spmenu.col_caretfgcolor: #ffffff -spmenu.col_bordercolor: #35638A -spmenu.col_modefgcolor: #ffffff -spmenu.col_modebgcolor: #35638A -spmenu.col_sgrcolor0: #000000 -spmenu.col_sgrcolor1: #7f0000 -spmenu.col_sgrcolor2: #007f00 -spmenu.col_sgrcolor3: #7f7f00 -spmenu.col_sgrcolor4: #00007f -spmenu.col_sgrcolor5: #7f007f -spmenu.col_sgrcolor6: #007f7f -spmenu.col_sgrcolor7: #cccccc -spmenu.col_sgrcolor8: #333333 -spmenu.col_sgrcolor9: #ff0000 -spmenu.col_sgrcolor10: #00ff00 -spmenu.col_sgrcolor11: #ffff00 -spmenu.col_sgrcolor12: #0000ff -spmenu.col_sgrcolor13: #ff00ff -spmenu.col_sgrcolor14: #00ffff -spmenu.col_sgrcolor15: #ffffff +spmenu.col_numfg: #ffffff +spmenu.col_numbg: #2d3856 +spmenu.col_hlnormfg: #ffffff +spmenu.col_hlnormbg: #000000 +spmenu.col_hlselfg: #ffffff +spmenu.col_hlselbg: #000000 +spmenu.col_caretfg: #ffffff +spmenu.col_caretbg: #222222 +spmenu.col_border: #35638A +spmenu.col_modefg: #ffffff +spmenu.col_modebg: #35638A +spmenu.col_sgr0: #000000 +spmenu.col_sgr1: #7f0000 +spmenu.col_sgr2: #007f00 +spmenu.col_sgr3: #7f7f00 +spmenu.col_sgr4: #00007f +spmenu.col_sgr5: #7f007f +spmenu.col_sgr6: #007f7f +spmenu.col_sgr7: #cccccc +spmenu.col_sgr8: #333333 +spmenu.col_sgr9: #ff0000 +spmenu.col_sgr10: #00ff00 +spmenu.col_sgr11: #ffff00 +spmenu.col_sgr12: #0000ff +spmenu.col_sgr13: #ff00ff +spmenu.col_sgr14: #00ffff +spmenu.col_sgr15: #ffffff !! Alpha spmenu.alpha_itemnormfg: 255 @@ -63,7 +64,7 @@ spmenu.alpha_itemselprifg: 255 spmenu.alpha_itemselpribg: 200 spmenu.alpha_inputfg: 255 spmenu.alpha_inputbg: 200 -spmenu.alpha_menubg: 200 +spmenu.alpha_menu: 200 spmenu.alpha_promptfg: 255 spmenu.alpha_promptbg: 200 spmenu.alpha_larrowfg: 255 @@ -76,9 +77,9 @@ spmenu.alpha_hlselfg: 255 spmenu.alpha_hlselbg: 200 spmenu.alpha_numfg: 255 spmenu.alpha_numbg: 200 -spmenu.alpha_borderbg: 255 -spmenu.alpha_caretfg: 255 -spmenu.alpha_caretbg: 200 +spmenu.alpha_border: 255 +spmenu.alpha_caretfgfg: 255 +spmenu.alpha_caretfgbg: 200 spmenu.alpha_modefg: 255 spmenu.alpha_modebg: 200 diff --git a/docs/spmenu.conf b/docs/spmenu.conf index 1e273c9..3a8b140 100644 --- a/docs/spmenu.conf +++ b/docs/spmenu.conf @@ -48,7 +48,7 @@ spmenu = itemselpribg = "#35638A"; inputfg = "#eeeeee"; inputbg = "#222222"; - menubg = "#222222"; + menu = "#222222"; promptfg = "#eeeeee"; promptbg = "#35526b"; larrowfg = "#bbbbbb"; @@ -63,24 +63,25 @@ spmenu = numbg = "#2d3856"; modefg = "#ffffff"; modebg = "#35638A"; - borderbg = "#35638A"; + border = "#35638A"; caretfg = "#ffffff"; - sgrcolor0 = "#000000"; - sgrcolor1 = "#7f0000"; - sgrcolor2 = "#007f00"; - sgrcolor3 = "#7f7f00"; - sgrcolor4 = "#00007f"; - sgrcolor5 = "#7f007f"; - sgrcolor6 = "#007f7f"; - sgrcolor7 = "#cccccc"; - sgrcolor8 = "#333333"; - sgrcolor9 = "#ff0000"; - sgrcolor10 = "#00ff00"; - sgrcolor11 = "#ffff00"; - sgrcolor12 = "#0000ff"; - sgrcolor13 = "#ff00ff"; - sgrcolor14 = "#00ffff"; - sgrcolor15 = "#ffffff"; + caretbg = "#222222"; + sgr0 = "#000000"; + sgr1 = "#7f0000"; + sgr2 = "#007f00"; + sgr3 = "#7f7f00"; + sgr4 = "#00007f"; + sgr5 = "#7f007f"; + sgr6 = "#007f7f"; + sgr7 = "#cccccc"; + sgr8 = "#333333"; + sgr9 = "#ff0000"; + sgr10 = "#00ff00"; + sgr11 = "#ffff00"; + sgr12 = "#0000ff"; + sgr13 = "#ff00ff"; + sgr14 = "#00ffff"; + sgr15 = "#ffffff"; coloritems = 1; } ); @@ -95,7 +96,7 @@ spmenu = itemselpribg = 200; inputfg = 255; inputbg = 200; - menubg = 200; + menu = 200; promptfg = 255; promptbg = 200; larrowfg = 255; @@ -108,7 +109,7 @@ spmenu = hlselbg = 200; numfg = 255; numbg = 200; - borderbg = 255; + border = 255; caretfg = 255; caretbg = 200; modefg = 255; diff --git a/libs/argv.c b/libs/argv.c index cd9d573..c9fe6f6 100644 --- a/libs/argv.c +++ b/libs/argv.c @@ -320,9 +320,9 @@ readargs(int argc, char *argv[]) colors[SchemeSelHighlight][ColFg] = argv[++i]; } else if (!strcmp(argv[i], "-shb") || (!strcmp(argv[i], "--selected-highlight-background"))) { // selected highlight background color colors[SchemeSelHighlight][ColBg] = argv[++i]; - } else if (!strcmp(argv[i], "-nbg") || (!strcmp(argv[i], "--number-background"))) { // numbgcolor + } else if (!strcmp(argv[i], "-nbg") || (!strcmp(argv[i], "--number-background"))) { // numbg colors[SchemeNumber][ColBg] = argv[++i]; - } else if (!strcmp(argv[i], "-nfg") || (!strcmp(argv[i], "--number-foreground"))) { // numfgcolor + } else if (!strcmp(argv[i], "-nfg") || (!strcmp(argv[i], "--number-foreground"))) { // numfg colors[SchemeNumber][ColFg] = argv[++i]; } else if (!strcmp(argv[i], "-mbg") || (!strcmp(argv[i], "--mode-background"))) { // mode colors[SchemeMode][ColBg] = argv[++i]; @@ -338,8 +338,10 @@ readargs(int argc, char *argv[]) colors[SchemeRArrow][ColFg] = argv[++i]; } else if (!strcmp(argv[i], "-bc") || (!strcmp(argv[i], "--border-background"))) { // border colors[SchemeBorder][ColBg] = argv[++i]; - } else if (!strcmp(argv[i], "-cc") || (!strcmp(argv[i], "--caret-foreground"))) { // caret color + } else if (!strcmp(argv[i], "-cc") || (!strcmp(argv[i], "-cfc")) || (!strcmp(argv[i], "--caret-foreground"))) { // caret color colors[SchemeCaret][ColFg] = argv[++i]; + } else if (!strcmp(argv[i], "-cbc") || (!strcmp(argv[i], "--caret-background"))) { // caret color + colors[SchemeCaret][ColBg] = argv[++i]; } // sgr colors @@ -529,7 +531,8 @@ usage(void) "spmenu -raf, --right-arrow-foreground Set the right arrow foreground color\n" "spmenu -lab, --left-arrow-background Set the left arrow background color\n" "spmenu -rab, --right-arrow-background Set the right arrow background color\n" - "spmenu -cc, --caret-foreground Set the caret color\n" + "spmenu -cfc, --caret-foreground Set the caret foreground color\n" + "spmenu -cbc, --caret-background Set the caret background color\n" "spmenu -bc, --border-background Set the border color\n" "\n", stdout); diff --git a/libs/colors.h b/libs/colors.h index 5e27075..2046142 100644 --- a/libs/colors.h +++ b/libs/colors.h @@ -21,40 +21,40 @@ static unsigned int alphas[][2] = { // colorscheme array static char *colors[SchemeLast][2] = { // fg bg - [SchemeLArrow] = { col_larrowfg, col_larrowbg }, - [SchemeRArrow] = { col_rarrowfg, col_rarrowbg }, - [SchemeItemNorm] = { col_itemnormfg, col_itemnormbg }, - [SchemeItemSel] = { col_itemselfg, col_itemselbg }, - [SchemeItemNormPri] = { col_itemnormprifg, col_itemnormpribg }, - [SchemeItemSelPri] = { col_itemselprifg, col_itemselpribg }, - [SchemeInput] = { col_inputfg, col_inputbg, }, - [SchemeMenu] = { NULL, col_menubgcolor }, - [SchemePrompt] = { col_promptfg, col_promptbg }, - [SchemeNormHighlight] = { col_hlnormfgcolor, col_hlnormbgcolor }, - [SchemeSelHighlight] = { col_hlselfgcolor, col_hlselbgcolor }, - [SchemeCaret] = { col_caretfgcolor, NULL }, - [SchemeMode] = { col_modefgcolor, col_modebgcolor }, - [SchemeNumber] = { col_numfgcolor, col_numbgcolor }, - [SchemeBorder] = { NULL, col_bordercolor }, + [SchemeLArrow] = { col_larrowfg, col_larrowbg }, + [SchemeRArrow] = { col_rarrowfg, col_rarrowbg }, + [SchemeItemNorm] = { col_itemnormfg, col_itemnormbg }, + [SchemeItemSel] = { col_itemselfg, col_itemselbg }, + [SchemeItemNormPri] = { col_itemnormprifg, col_itemnormpribg }, + [SchemeItemSelPri] = { col_itemselprifg, col_itemselpribg }, + [SchemeInput] = { col_inputfg, col_inputbg, }, + [SchemeMenu] = { NULL, col_menu }, + [SchemePrompt] = { col_promptfg, col_promptbg }, + [SchemeNormHighlight] = { col_hlnormfg, col_hlnormbg }, + [SchemeSelHighlight] = { col_hlselfg, col_hlselbg }, + [SchemeCaret] = { col_caretfg, col_caretbg }, + [SchemeMode] = { col_modefg, col_modebg }, + [SchemeNumber] = { col_numfg, col_numbg }, + [SchemeBorder] = { NULL, col_border }, }; // sgr color array // to enable 256 color support, append to this. static char *textcolors[] = { - col_sgrcolor0, - col_sgrcolor1, - col_sgrcolor2, - col_sgrcolor3, - col_sgrcolor4, - col_sgrcolor5, - col_sgrcolor6, - col_sgrcolor7, - col_sgrcolor8, - col_sgrcolor9, - col_sgrcolor10, - col_sgrcolor11, - col_sgrcolor12, - col_sgrcolor13, - col_sgrcolor14, - col_sgrcolor15, + col_sgr0, + col_sgr1, + col_sgr2, + col_sgr3, + col_sgr4, + col_sgr5, + col_sgr6, + col_sgr7, + col_sgr8, + col_sgr9, + col_sgr10, + col_sgr11, + col_sgr12, + col_sgr13, + col_sgr14, + col_sgr15, }; diff --git a/libs/conf/config.c b/libs/conf/config.c index cd520ea..760244c 100644 --- a/libs/conf/config.c +++ b/libs/conf/config.c @@ -198,7 +198,7 @@ conf_init(void) config_setting_lookup_int(conf, "inputfg", &alpha_inputfg); // spmenu.alpha.inputfg config_setting_lookup_int(conf, "inputbg", &alpha_inputbg); // spmenu.alpha.inputbg - config_setting_lookup_int(conf, "menubg", &alpha_menubg); // spmenu.alpha.menubg + config_setting_lookup_int(conf, "menu", &alpha_menu); // spmenu.alpha.menu config_setting_lookup_int(conf, "promptfg", &alpha_promptfg); // spmenu.alpha.promptfg config_setting_lookup_int(conf, "promptbg", &alpha_promptbg); // spmenu.alpha.promptbg @@ -216,7 +216,7 @@ conf_init(void) 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, "borderbg", &alpha_borderbg); // spmenu.alpha.borderbg + config_setting_lookup_int(conf, "border", &alpha_border); // spmenu.alpha.border config_setting_lookup_int(conf, "caretfg", &alpha_caretfg); // spmenu.alpha.caretfg config_setting_lookup_int(conf, "caretbg", &alpha_caretbg); // spmenu.alpha.caretbg @@ -270,7 +270,7 @@ conf_init(void) strcpy(colors[SchemeInput][ColBg], strdup(dest)); // menu - if (config_setting_lookup_string(conf, "menubg", &dest)) + if (config_setting_lookup_string(conf, "menu", &dest)) strcpy(colors[SchemeMenu][ColBg], strdup(dest)); // prompt @@ -321,45 +321,48 @@ conf_init(void) strcpy(colors[SchemeMode][ColBg], strdup(dest)); // border - if (config_setting_lookup_string(conf, "borderbg", &dest)) + if (config_setting_lookup_string(conf, "border", &dest)) strcpy(colors[SchemeBorder][ColBg], strdup(dest)); // caret if (config_setting_lookup_string(conf, "caretfg", &dest)) strcpy(colors[SchemeCaret][ColFg], strdup(dest)); + if (config_setting_lookup_string(conf, "caretbg", &dest)) + strcpy(colors[SchemeCaret][ColBg], strdup(dest)); + // sgr colors - if (config_setting_lookup_string(conf, "sgrcolor0", &dest)) + if (config_setting_lookup_string(conf, "sgr0", &dest)) strcpy(textcolors[0], strdup(dest)); - if (config_setting_lookup_string(conf, "sgrcolor1", &dest)) + if (config_setting_lookup_string(conf, "sgr1", &dest)) strcpy(textcolors[1], strdup(dest)); - if (config_setting_lookup_string(conf, "sgrcolor2", &dest)) + if (config_setting_lookup_string(conf, "sgr2", &dest)) strcpy(textcolors[2], strdup(dest)); - if (config_setting_lookup_string(conf, "sgrcolor3", &dest)) + if (config_setting_lookup_string(conf, "sgr3", &dest)) strcpy(textcolors[3], strdup(dest)); - if (config_setting_lookup_string(conf, "sgrcolor4", &dest)) + if (config_setting_lookup_string(conf, "sgr4", &dest)) strcpy(textcolors[4], strdup(dest)); - if (config_setting_lookup_string(conf, "sgrcolor5", &dest)) + if (config_setting_lookup_string(conf, "sgr5", &dest)) strcpy(textcolors[5], strdup(dest)); - if (config_setting_lookup_string(conf, "sgrcolor6", &dest)) + if (config_setting_lookup_string(conf, "sgr6", &dest)) strcpy(textcolors[6], strdup(dest)); - if (config_setting_lookup_string(conf, "sgrcolor7", &dest)) + if (config_setting_lookup_string(conf, "sgr7", &dest)) strcpy(textcolors[7], strdup(dest)); - if (config_setting_lookup_string(conf, "sgrcolor8", &dest)) + if (config_setting_lookup_string(conf, "sgr8", &dest)) strcpy(textcolors[8], strdup(dest)); - if (config_setting_lookup_string(conf, "sgrcolor9", &dest)) + if (config_setting_lookup_string(conf, "sgr9", &dest)) strcpy(textcolors[9], strdup(dest)); - if (config_setting_lookup_string(conf, "sgrcolor10", &dest)) + if (config_setting_lookup_string(conf, "sgr10", &dest)) strcpy(textcolors[10], strdup(dest)); - if (config_setting_lookup_string(conf, "sgrcolor11", &dest)) + if (config_setting_lookup_string(conf, "sgr11", &dest)) strcpy(textcolors[11], strdup(dest)); - if (config_setting_lookup_string(conf, "sgrcolor12", &dest)) + if (config_setting_lookup_string(conf, "sgr12", &dest)) strcpy(textcolors[12], strdup(dest)); - if (config_setting_lookup_string(conf, "sgrcolor13", &dest)) + if (config_setting_lookup_string(conf, "sgr13", &dest)) strcpy(textcolors[13], strdup(dest)); - if (config_setting_lookup_string(conf, "sgrcolor14", &dest)) + if (config_setting_lookup_string(conf, "sgr14", &dest)) strcpy(textcolors[14], strdup(dest)); - if (config_setting_lookup_string(conf, "sgrcolor15", &dest)) + if (config_setting_lookup_string(conf, "sgr15", &dest)) strcpy(textcolors[15], strdup(dest)); // coloritems int diff --git a/libs/schemes.c b/libs/schemes.c index 77b1996..6cf8c50 100644 --- a/libs/schemes.c +++ b/libs/schemes.c @@ -24,7 +24,7 @@ init_appearance(void) alphas[SchemeItemNormPri][ColBg] = alpha_itemnormpribg; alphas[SchemeItemSelPri][ColFg] = alpha_itemselprifg; alphas[SchemeItemSelPri][ColBg] = alpha_itemselpribg; - alphas[SchemeMenu][ColBg] = alpha_menubg; + alphas[SchemeMenu][ColBg] = alpha_menu; alphas[SchemeInput][ColFg] = alpha_inputfg; alphas[SchemeInput][ColBg] = alpha_inputbg; alphas[SchemePrompt][ColFg] = alpha_promptfg; @@ -39,7 +39,7 @@ init_appearance(void) alphas[SchemeNumber][ColBg] = alpha_numbg; alphas[SchemeMode][ColFg] = alpha_modefg; alphas[SchemeMode][ColBg] = alpha_modebg; - alphas[SchemeBorder][ColBg] = alpha_borderbg; + alphas[SchemeBorder][ColBg] = alpha_border; // create color schemes from array for (j = 0; j < SchemeLast; j++) { diff --git a/libs/xresources.h b/libs/xresources.h index ad81ac5..f481b75 100644 --- a/libs/xresources.h +++ b/libs/xresources.h @@ -1,7 +1,8 @@ // This .Xresources array is read and compared to the xrdb. Simply add to the array if you need to. ResourcePref resources[] = { { "font", STRING, &font }, - { "col_caretfgcolor", STRING, &col_caretfgcolor }, + { "col_caretfg", STRING, &col_caretfg }, + { "col_caretbg", STRING, &col_caretbg }, { "col_larrowfg", STRING, &col_larrowfg }, { "col_rarrowfg", STRING, &col_rarrowfg }, { "col_larrowbg", STRING, &col_larrowbg }, @@ -16,16 +17,16 @@ ResourcePref resources[] = { { "col_itemselpribg", STRING, &col_itemselpribg }, { "col_inputbg", STRING, &col_inputbg }, { "col_inputfg", STRING, &col_inputfg }, - { "col_menubgcolor", STRING, &col_menubgcolor }, - { "col_numfgcolor", STRING, &col_numfgcolor }, - { "col_numbgcolor", STRING, &col_numbgcolor }, - { "col_modefgcolor", STRING, &col_modefgcolor }, - { "col_modebgcolor", STRING, &col_modebgcolor }, - { "col_hlnormfgcolor", STRING, &col_hlnormfgcolor }, - { "col_hlnormbgcolor", STRING, &col_hlnormbgcolor }, - { "col_hlselfgcolor", STRING, &col_hlselfgcolor }, - { "col_hlselbgcolor", STRING, &col_hlselbgcolor }, - { "col_bordercolor", STRING, &col_bordercolor }, + { "col_menu", STRING, &col_menu }, + { "col_numfg", STRING, &col_numfg }, + { "col_numbg", STRING, &col_numbg }, + { "col_modefg", STRING, &col_modefg }, + { "col_modebg", STRING, &col_modebg }, + { "col_hlnormfg", STRING, &col_hlnormfg }, + { "col_hlnormbg", STRING, &col_hlnormbg }, + { "col_hlselfg", STRING, &col_hlselfg }, + { "col_hlselbg", STRING, &col_hlselbg }, + { "col_border", STRING, &col_border }, { "col_promptfg", STRING, &col_promptfg }, { "col_promptbg", STRING, &col_promptbg }, @@ -40,7 +41,7 @@ ResourcePref resources[] = { { "alpha_itemselpribg", INTEGER, &alpha_itemselpribg }, { "alpha_inputfg", INTEGER, &alpha_inputfg }, { "alpha_inputbg", INTEGER, &alpha_inputbg }, - { "alpha_menubg", INTEGER, &alpha_menubg }, + { "alpha_menu", INTEGER, &alpha_menu }, { "alpha_promptfg", INTEGER, &alpha_promptfg }, { "alpha_promptbg", INTEGER, &alpha_promptbg }, { "alpha_larrowfg", INTEGER, &alpha_larrowfg }, @@ -53,29 +54,29 @@ ResourcePref resources[] = { { "alpha_hlselbg", INTEGER, &alpha_hlselbg }, { "alpha_numfg", INTEGER, &alpha_numfg }, { "alpha_numbg", INTEGER, &alpha_numbg }, - { "alpha_borderbg", INTEGER, &alpha_borderbg }, + { "alpha_border", INTEGER, &alpha_border }, { "alpha_caretfg", INTEGER, &alpha_caretfg }, { "alpha_caretbg", INTEGER, &alpha_caretbg }, { "alpha_modefg", INTEGER, &alpha_modefg }, { "alpha_modebg", INTEGER, &alpha_modebg }, // SGR sequence colors - { "col_sgrcolor0", STRING, &col_sgrcolor0 }, - { "col_sgrcolor1", STRING, &col_sgrcolor1 }, - { "col_sgrcolor2", STRING, &col_sgrcolor2 }, - { "col_sgrcolor3", STRING, &col_sgrcolor3 }, - { "col_sgrcolor4", STRING, &col_sgrcolor4 }, - { "col_sgrcolor5", STRING, &col_sgrcolor5 }, - { "col_sgrcolor6", STRING, &col_sgrcolor6 }, - { "col_sgrcolor7", STRING, &col_sgrcolor7 }, - { "col_sgrcolor8", STRING, &col_sgrcolor8 }, - { "col_sgrcolor9", STRING, &col_sgrcolor9 }, - { "col_sgrcolor10", STRING, &col_sgrcolor10 }, - { "col_sgrcolor11", STRING, &col_sgrcolor11 }, - { "col_sgrcolor12", STRING, &col_sgrcolor12 }, - { "col_sgrcolor13", STRING, &col_sgrcolor13 }, - { "col_sgrcolor14", STRING, &col_sgrcolor14 }, - { "col_sgrcolor15", STRING, &col_sgrcolor15 }, + { "col_sgr0", STRING, &col_sgr0 }, + { "col_sgr1", STRING, &col_sgr1 }, + { "col_sgr2", STRING, &col_sgr2 }, + { "col_sgr3", STRING, &col_sgr3 }, + { "col_sgr4", STRING, &col_sgr4 }, + { "col_sgr5", STRING, &col_sgr5 }, + { "col_sgr6", STRING, &col_sgr6 }, + { "col_sgr7", STRING, &col_sgr7 }, + { "col_sgr8", STRING, &col_sgr8 }, + { "col_sgr9", STRING, &col_sgr9 }, + { "col_sgr10", STRING, &col_sgr10 }, + { "col_sgr11", STRING, &col_sgr11 }, + { "col_sgr12", STRING, &col_sgr12 }, + { "col_sgr13", STRING, &col_sgr13 }, + { "col_sgr14", STRING, &col_sgr14 }, + { "col_sgr15", STRING, &col_sgr15 }, // General options { "promptpwlstyle", INTEGER, &promptpwlstyle }, @@ -146,7 +147,8 @@ ResourcePref resources[] = { }; ResourcePref cols[] = { - { "color10", STRING, &col_caretfgcolor }, + { "color10", STRING, &col_caretfg }, + { "color0", STRING, &col_caretbg }, { "color4", STRING, &col_larrowfg }, { "color4", STRING, &col_rarrowfg }, { "color10", STRING, &col_itemnormfg }, @@ -154,7 +156,7 @@ ResourcePref cols[] = { { "color10", STRING, &col_inputfg }, { "color0", STRING, &col_itemnormbg }, { "color0", STRING, &col_itemnormpribg }, - { "color0", STRING, &col_menubgcolor }, + { "color0", STRING, &col_menu }, { "color0", STRING, &col_larrowbg }, { "color0", STRING, &col_rarrowbg }, { "color0", STRING, &col_itemselfg }, @@ -164,29 +166,29 @@ ResourcePref cols[] = { { "color0", STRING, &col_promptfg }, { "color6", STRING, &col_itemselbg }, { "color6", STRING, &col_itemselpribg }, - { "color6", STRING, &col_bordercolor }, - { "color0", STRING, &col_numfgcolor }, - { "color5", STRING, &col_numbgcolor }, - { "color0", STRING, &col_modefgcolor }, - { "color7", STRING, &col_modebgcolor }, - { "color2", STRING, &col_hlnormbgcolor }, - { "color3", STRING, &col_hlselbgcolor }, - { "color0", STRING, &col_hlnormfgcolor }, - { "color0", STRING, &col_hlselfgcolor }, - { "color0", STRING, &col_sgrcolor0 }, - { "color1", STRING, &col_sgrcolor1 }, - { "color2", STRING, &col_sgrcolor2 }, - { "color3", STRING, &col_sgrcolor3 }, - { "color4", STRING, &col_sgrcolor4 }, - { "color5", STRING, &col_sgrcolor5 }, - { "color6", STRING, &col_sgrcolor6 }, - { "color7", STRING, &col_sgrcolor7 }, - { "color8", STRING, &col_sgrcolor8 }, - { "color9", STRING, &col_sgrcolor9 }, - { "color10", STRING, &col_sgrcolor10 }, - { "color11", STRING, &col_sgrcolor11 }, - { "color12", STRING, &col_sgrcolor12 }, - { "color13", STRING, &col_sgrcolor13 }, - { "color14", STRING, &col_sgrcolor14 }, - { "color15", STRING, &col_sgrcolor15 }, + { "color6", STRING, &col_border }, + { "color0", STRING, &col_numfg }, + { "color5", STRING, &col_numbg }, + { "color0", STRING, &col_modefg }, + { "color7", STRING, &col_modebg }, + { "color2", STRING, &col_hlnormbg }, + { "color3", STRING, &col_hlselbg }, + { "color0", STRING, &col_hlnormfg }, + { "color0", STRING, &col_hlselfg }, + { "color0", STRING, &col_sgr0 }, + { "color1", STRING, &col_sgr1 }, + { "color2", STRING, &col_sgr2 }, + { "color3", STRING, &col_sgr3 }, + { "color4", STRING, &col_sgr4 }, + { "color5", STRING, &col_sgr5 }, + { "color6", STRING, &col_sgr6 }, + { "color7", STRING, &col_sgr7 }, + { "color8", STRING, &col_sgr8 }, + { "color9", STRING, &col_sgr9 }, + { "color10", STRING, &col_sgr10 }, + { "color11", STRING, &col_sgr11 }, + { "color12", STRING, &col_sgr12 }, + { "color13", STRING, &col_sgr13 }, + { "color14", STRING, &col_sgr14 }, + { "color15", STRING, &col_sgr15 }, }; diff --git a/options.h b/options.h index 3d6b7a7..0425223 100644 --- a/options.h +++ b/options.h @@ -114,7 +114,7 @@ static char col_inputbg[] = "#222222"; /* Input field background co static char col_inputfg[] = "#eeeeee"; /* Input field foreground color */ /* Menu colors */ -static char col_menubgcolor[] = "#222222"; /* Menu background color */ +static char col_menu[] = "#222222"; /* Menu background color */ /* Prompt colors */ static char col_promptfg[] = "#eeeeee"; /* Prompt foreground color */ @@ -127,44 +127,45 @@ static char col_larrowbg[] = "#222222"; /* Left arrow color */ static char col_rarrowbg[] = "#222222"; /* Right arrow color */ /* Normal highlight colors */ -static char col_hlnormfgcolor[] = "#ffffff"; /* Text highlight color for unselected */ -static char col_hlnormbgcolor[] = "#000000"; /* Background highlight color for unselected */ +static char col_hlnormfg[] = "#ffffff"; /* Normal text highlight color */ +static char col_hlnormbg[] = "#000000"; /* Normal background highlight color */ /* Selected highlight colors */ -static char col_hlselfgcolor[] = "#ffffff"; /* Text highlight color for selected */ -static char col_hlselbgcolor[] = "#000000"; /* Background highlight color for selected */ +static char col_hlselfg[] = "#ffffff"; /* Selected text highlight color */ +static char col_hlselbg[] = "#000000"; /* Selected background highlight color */ /* Match count colors */ -static char col_numfgcolor[] = "#ffffff"; /* Match count text color */ -static char col_numbgcolor[] = "#2d3856"; /* Match count background color */ +static char col_numfg[] = "#ffffff"; /* Match count text color */ +static char col_numbg[] = "#2d3856"; /* Match count background color */ /* Border color */ -static char col_bordercolor[] = "#35638A"; /* Border color */ +static char col_border[] = "#35638A"; /* Border color */ /* Caret colors */ -static char col_caretfgcolor[] = "#ffffff"; /* Caret color */ +static char col_caretfg[] = "#ffffff"; /* Foreground caret color */ +static char col_caretbg[] = "#222222"; /* Background caret color */ /* Mode colors */ -static char col_modefgcolor[] = "#ffffff"; /* Mode text color */ -static char col_modebgcolor[] = "#35638A"; /* Mode background color */ +static char col_modefg[] = "#ffffff"; /* Mode text color */ +static char col_modebg[] = "#35638A"; /* Mode background color */ /* SGR colors */ -static char col_sgrcolor0[] = "#000000"; /* SGR color #0 */ -static char col_sgrcolor1[] = "#7f0000"; /* SGR color #1 */ -static char col_sgrcolor2[] = "#007f00"; /* SGR color #2 */ -static char col_sgrcolor3[] = "#7f7f00"; /* SGR color #3 */ -static char col_sgrcolor4[] = "#00007f"; /* SGR color #4 */ -static char col_sgrcolor5[] = "#7f007f"; /* SGR color #5 */ -static char col_sgrcolor6[] = "#007f7f"; /* SGR color #6 */ -static char col_sgrcolor7[] = "#cccccc"; /* SGR color #7 */ -static char col_sgrcolor8[] = "#333333"; /* SGR color #8 */ -static char col_sgrcolor9[] = "#ff0000"; /* SGR color #9 */ -static char col_sgrcolor10[] = "#00ff00"; /* SGR color #10 */ -static char col_sgrcolor11[] = "#ffff00"; /* SGR color #11 */ -static char col_sgrcolor12[] = "#0000ff"; /* SGR color #12 */ -static char col_sgrcolor13[] = "#ff00ff"; /* SGR color #13 */ -static char col_sgrcolor14[] = "#00ffff"; /* SGR color #14 */ -static char col_sgrcolor15[] = "#ffffff"; /* SGR color #15 */ +static char col_sgr0[] = "#000000"; /* SGR color #0 */ +static char col_sgr1[] = "#7f0000"; /* SGR color #1 */ +static char col_sgr2[] = "#007f00"; /* SGR color #2 */ +static char col_sgr3[] = "#7f7f00"; /* SGR color #3 */ +static char col_sgr4[] = "#00007f"; /* SGR color #4 */ +static char col_sgr5[] = "#7f007f"; /* SGR color #5 */ +static char col_sgr6[] = "#007f7f"; /* SGR color #6 */ +static char col_sgr7[] = "#cccccc"; /* SGR color #7 */ +static char col_sgr8[] = "#333333"; /* SGR color #8 */ +static char col_sgr9[] = "#ff0000"; /* SGR color #9 */ +static char col_sgr10[] = "#00ff00"; /* SGR color #10 */ +static char col_sgr11[] = "#ffff00"; /* SGR color #11 */ +static char col_sgr12[] = "#0000ff"; /* SGR color #12 */ +static char col_sgr13[] = "#ff00ff"; /* SGR color #13 */ +static char col_sgr14[] = "#00ffff"; /* SGR color #14 */ +static char col_sgr15[] = "#ffffff"; /* SGR color #15 */ /* Alpha options */ static int alpha_itemnormfg = 255; /* Alpha for normal item foreground (0-255) */ @@ -177,7 +178,7 @@ static int alpha_itemselprifg = 255; /* Alpha for selected priority ite static int alpha_itemselpribg = 200; /* Alpha for selected priority item background (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_menubg = 200; /* Alpha for menu background (0-255) */ +static int alpha_menu = 200; /* Alpha for menu background (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_larrowfg = 255; /* Alpha for left arrow foreground (0-255) */ @@ -190,7 +191,7 @@ static int alpha_hlselfg = 255; /* Alpha for selected highlight fo static int alpha_hlselbg = 200; /* Alpha for selected highlight background (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_borderbg = 255; /* Alpha for the border (0-255) */ +static int alpha_border = 255; /* Alpha for the border (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_modefg = 255; /* Alpha for the mode indicator foreground (0-255) */ diff --git a/spmenu.1 b/spmenu.1 index de5c278..ed5e090 100644 --- a/spmenu.1 +++ b/spmenu.1 @@ -396,8 +396,11 @@ Set the left arrow background color \f[V]-rab, --right-arrow-background color\f[R] Set the right arrow background color .TP -\f[V]-cc, --caret-foreground color\f[R] -Set the caret color +\f[V]-cfc, --caret-foreground color\f[R] +Set the caret foreground color +.TP +\f[V]-cbc, --caret-background color\f[R] +Set the caret background color .TP \f[V]-bc, --border-background color\f[R] Set the border color diff --git a/themes/legacy/Catppuccin b/themes/legacy/Catppuccin index 0b4b594..27fb40f 100644 --- a/themes/legacy/Catppuccin +++ b/themes/legacy/Catppuccin @@ -1,6 +1,6 @@ -! Catppuccin color scheme for spmenu +! Catppuccin scheme for spmenu -! We must disable global colors first, because otherwise we can use Pywal to override. +! We must disable global s first, because otherwise we can use Pywal to override. ! If you want that, then you may set this to 1. spmenu.globalcolors: 0 @@ -12,7 +12,7 @@ spmenu.col_itemnormprifg: #cad3f5 spmenu.col_itemnormpribg: #24273a spmenu.col_itemselprifg: #181926 spmenu.col_itemselpribg: #91d7e3 -spmenu.col_menubgcolor: #24273a +spmenu.col_menu: #24273a spmenu.col_promptfg: #24273a spmenu.col_promptbg: #ED8796 spmenu.col_larrowfg: #EED49F @@ -21,29 +21,29 @@ spmenu.col_larrowbg: #24273a spmenu.col_rarrowbg: #24273a spmenu.col_inputfg: #B8C0E0 spmenu.col_inputbg: #24273a -spmenu.col_numfgcolor: #24273a -spmenu.col_numbgcolor: #A6DA95 -spmenu.col_normhlfgcolor: #8BD5CA -spmenu.col_normhlbgcolor: #494D64 -spmenu.col_selhlfgcolor: #EED49F -spmenu.col_selhlbgcolor: #494D64 -spmenu.col_caretfgcolor: #cad3f5 -spmenu.col_bordercolor: #8AADF4 -spmenu.col_modefgcolor: #24273a -spmenu.col_modebgcolor: #F5BDE6 -spmenu.col_sgrcolor0: #494D64 -spmenu.col_sgrcolor1: #ED8796 -spmenu.col_sgrcolor2: #A6DA95 -spmenu.col_sgrcolor3: #EED49F -spmenu.col_sgrcolor4: #8AADF4 -spmenu.col_sgrcolor5: #F5BDE6 -spmenu.col_sgrcolor6: #8BD5CA -spmenu.col_sgrcolor7: #B8C0E0 -spmenu.col_sgrcolor8: #5B6078 -spmenu.col_sgrcolor9: #ED8796 -spmenu.col_sgrcolor10: #A6DA95 -spmenu.col_sgrcolor11: #EED49F -spmenu.col_sgrcolor12: #8AADF4 -spmenu.col_sgrcolor13: #F5BDE6 -spmenu.col_sgrcolor14: #8BD5CA -spmenu.col_sgrcolor15: #A5ADCB +spmenu.col_numfg: #24273a +spmenu.col_numbg: #A6DA95 +spmenu.col_normhlfg: #8BD5CA +spmenu.col_normhlbg: #494D64 +spmenu.col_selhlfg: #EED49F +spmenu.col_selhlbg: #494D64 +spmenu.col_caretfg: #cad3f5 +spmenu.col_border: #8AADF4 +spmenu.col_modefg: #24273a +spmenu.col_modebg: #F5BDE6 +spmenu.col_sgr0: #494D64 +spmenu.col_sgr1: #ED8796 +spmenu.col_sgr2: #A6DA95 +spmenu.col_sgr3: #EED49F +spmenu.col_sgr4: #8AADF4 +spmenu.col_sgr5: #F5BDE6 +spmenu.col_sgr6: #8BD5CA +spmenu.col_sgr7: #B8C0E0 +spmenu.col_sgr8: #5B6078 +spmenu.col_sgr9: #ED8796 +spmenu.col_sgr10: #A6DA95 +spmenu.col_sgr11: #EED49F +spmenu.col_sgr12: #8AADF4 +spmenu.col_sgr13: #F5BDE6 +spmenu.col_sgr14: #8BD5CA +spmenu.col_sgr15: #A5ADCB diff --git a/themes/legacy/Cyberpunk-Neon b/themes/legacy/Cyberpunk-Neon index c8d239c..249a350 100644 --- a/themes/legacy/Cyberpunk-Neon +++ b/themes/legacy/Cyberpunk-Neon @@ -1,6 +1,6 @@ -! Cyberpunk-Neon color scheme for spmenu +! Cyberpunk-Neon scheme for spmenu -! We must disable global colors first, because otherwise we can use Pywal to override. +! We must disable global s first, because otherwise we can use Pywal to override. ! If you want that, then you may set this to 1. spmenu.globalcolors: 0 @@ -12,7 +12,7 @@ spmenu.col_itemnormprifg: #0abdc6 spmenu.col_itemnormpribg: #000b1e spmenu.col_itemselprifg: #000b1e spmenu.col_itemselpribg: #d300c4 -spmenu.col_menubgcolor: #000b1e +spmenu.col_menu: #000b1e spmenu.col_promptfg: #000b1e spmenu.col_promptbg: #d300c4 spmenu.col_larrowfg: #ff0000 @@ -21,29 +21,29 @@ spmenu.col_larrowbg: #000b1e spmenu.col_rarrowbg: #000b1e spmenu.col_inputfg: #0abdc6 spmenu.col_inputbg: #000b1e -spmenu.col_numfgcolor: #000b1e -spmenu.col_numbgcolor: #00ff00 -spmenu.col_normhlfgcolor: #0abdc6 -spmenu.col_normhlbgcolor: #123e7c -spmenu.col_selhlfgcolor: #d7d7d5 -spmenu.col_selhlbgcolor: #1c61c2 -spmenu.col_caretfgcolor: #0abdc6 -spmenu.col_bordercolor: #711c91 -spmenu.col_modefgcolor: #000b1e -spmenu.col_modebgcolor: #d300c4 -spmenu.col_sgrcolor0: #123e7c -spmenu.col_sgrcolor1: #ff0000 -spmenu.col_sgrcolor2: #d300c4 -spmenu.col_sgrcolor3: #f57800 -spmenu.col_sgrcolor4: #123e7c -spmenu.col_sgrcolor5: #711c91 -spmenu.col_sgrcolor6: #0abdc6 -spmenu.col_sgrcolor7: #d7d7d5 -spmenu.col_sgrcolor8: #1c61c2 -spmenu.col_sgrcolor9: #ff0000 -spmenu.col_sgrcolor10: #d300c4 -spmenu.col_sgrcolor11: #f57800 -spmenu.col_sgrcolor12: #00ff00 -spmenu.col_sgrcolor13: #711c91 -spmenu.col_sgrcolor14: #0abdc6 -spmenu.col_sgrcolor15: #d7d7d5 +spmenu.col_numfg: #000b1e +spmenu.col_numbg: #00ff00 +spmenu.col_normhlfg: #0abdc6 +spmenu.col_normhlbg: #123e7c +spmenu.col_selhlfg: #d7d7d5 +spmenu.col_selhlbg: #1c61c2 +spmenu.col_caretfg: #0abdc6 +spmenu.col_border: #711c91 +spmenu.col_modefg: #000b1e +spmenu.col_modebg: #d300c4 +spmenu.col_sgr0: #123e7c +spmenu.col_sgr1: #ff0000 +spmenu.col_sgr2: #d300c4 +spmenu.col_sgr3: #f57800 +spmenu.col_sgr4: #123e7c +spmenu.col_sgr5: #711c91 +spmenu.col_sgr6: #0abdc6 +spmenu.col_sgr7: #d7d7d5 +spmenu.col_sgr8: #1c61c2 +spmenu.col_sgr9: #ff0000 +spmenu.col_sgr10: #d300c4 +spmenu.col_sgr11: #f57800 +spmenu.col_sgr12: #00ff00 +spmenu.col_sgr13: #711c91 +spmenu.col_sgr14: #0abdc6 +spmenu.col_sgr15: #d7d7d5 diff --git a/themes/legacy/Doom-One b/themes/legacy/Doom-One index f48e73d..0e084ac 100644 --- a/themes/legacy/Doom-One +++ b/themes/legacy/Doom-One @@ -1,6 +1,6 @@ -! Doom-One color scheme for spmenu +! Doom-One scheme for spmenu -! We must disable global colors first, because otherwise we can use Pywal to override. +! We must disable global s first, because otherwise we can use Pywal to override. ! If you want that, then you may set this to 1. spmenu.globalcolors: 0 @@ -12,7 +12,7 @@ spmenu.col_itemnormprifg: #d7d7d7 spmenu.col_itemnormpribg: #5b6268 spmenu.col_itemselprifg: #d7d7d7 spmenu.col_itemselpribg: #da8548 -spmenu.col_menubgcolor: #282c34 +spmenu.col_menu: #282c34 spmenu.col_promptfg: #282c34 spmenu.col_promptbg: #c678dd spmenu.col_larrowfg: #5699af @@ -21,29 +21,29 @@ spmenu.col_larrowbg: #282c34 spmenu.col_rarrowbg: #282c34 spmenu.col_inputfg: #d7d7d7 spmenu.col_inputbg: #282c34 -spmenu.col_numfgcolor: #282c34 -spmenu.col_numbgcolor: #98be65 -spmenu.col_normhlfgcolor: #88C0D0 -spmenu.col_normhlbgcolor: #282c34 -spmenu.col_selhlfgcolor: #ecbe7b -spmenu.col_selhlbgcolor: #282c34 -spmenu.col_caretfgcolor: #d7d7d7 -spmenu.col_bordercolor: #ff6c6b -spmenu.col_modefgcolor: #282c34 -spmenu.col_modebgcolor: #51afef -spmenu.col_sgrcolor0: #1c1f24 -spmenu.col_sgrcolor1: #ff6c6b -spmenu.col_sgrcolor2: #98be65 -spmenu.col_sgrcolor3: #da8548 -spmenu.col_sgrcolor4: #51afef -spmenu.col_sgrcolor5: #c678dd -spmenu.col_sgrcolor6: #5699af -spmenu.col_sgrcolor7: #202328 -spmenu.col_sgrcolor8: #5b6268 -spmenu.col_sgrcolor9: #da8548 -spmenu.col_sgrcolor10: #4db5bd -spmenu.col_sgrcolor11: #ecbe7b -spmenu.col_sgrcolor12: #3071db -spmenu.col_sgrcolor13: #a9a1e1 -spmenu.col_sgrcolor14: #46d9ff -spmenu.col_sgrcolor15: #dfdfdf +spmenu.col_numfg: #282c34 +spmenu.col_numbg: #98be65 +spmenu.col_normhlfg: #88C0D0 +spmenu.col_normhlbg: #282c34 +spmenu.col_selhlfg: #ecbe7b +spmenu.col_selhlbg: #282c34 +spmenu.col_caretfg: #d7d7d7 +spmenu.col_border: #ff6c6b +spmenu.col_modefg: #282c34 +spmenu.col_modebg: #51afef +spmenu.col_sgr0: #1c1f24 +spmenu.col_sgr1: #ff6c6b +spmenu.col_sgr2: #98be65 +spmenu.col_sgr3: #da8548 +spmenu.col_sgr4: #51afef +spmenu.col_sgr5: #c678dd +spmenu.col_sgr6: #5699af +spmenu.col_sgr7: #202328 +spmenu.col_sgr8: #5b6268 +spmenu.col_sgr9: #da8548 +spmenu.col_sgr10: #4db5bd +spmenu.col_sgr11: #ecbe7b +spmenu.col_sgr12: #3071db +spmenu.col_sgr13: #a9a1e1 +spmenu.col_sgr14: #46d9ff +spmenu.col_sgr15: #dfdfdf diff --git a/themes/legacy/Dracula b/themes/legacy/Dracula index 5c22136..8d6ee20 100644 --- a/themes/legacy/Dracula +++ b/themes/legacy/Dracula @@ -1,6 +1,6 @@ -! Dracula color scheme for spmenu +! Dracula scheme for spmenu -! We must disable global colors first, because otherwise we can use Pywal to override. +! We must disable global s first, because otherwise we can use Pywal to override. ! If you want that, then you may set this to 1. spmenu.globalcolors: 0 @@ -12,7 +12,7 @@ spmenu.col_itemnormprifg: #f8f8f2 spmenu.col_itemnormpribg: #282a36 spmenu.col_itemselprifg: #000000 spmenu.col_itemselpribg: #bd93f9 -spmenu.col_menubgcolor: #282a36 +spmenu.col_menu: #282a36 spmenu.col_promptfg: #282a36 spmenu.col_promptbg: #ff5555 spmenu.col_larrowfg: #f1fa8c @@ -21,29 +21,29 @@ spmenu.col_larrowbg: #282a36 spmenu.col_rarrowbg: #282a36 spmenu.col_inputfg: #f8f8f2 spmenu.col_inputbg: #282a36 -spmenu.col_numfgcolor: #282a36 -spmenu.col_numbgcolor: #50fa7b -spmenu.col_normhlfgcolor: #ffffff -spmenu.col_normhlbgcolor: #000000 -spmenu.col_selhlfgcolor: #f1fa8c -spmenu.col_selhlbgcolor: #000000 -spmenu.col_caretfgcolor: #f8f8f2 -spmenu.col_bordercolor: #ff79c6 -spmenu.col_modefgcolor: #282a36 -spmenu.col_modebgcolor: #ff79c6 -spmenu.col_sgrcolor0: #000000 -spmenu.col_sgrcolor1: #ff5555 -spmenu.col_sgrcolor2: #50fa7b -spmenu.col_sgrcolor3: #f1fa8c -spmenu.col_sgrcolor4: #bd93f9 -spmenu.col_sgrcolor5: #ff79c6 -spmenu.col_sgrcolor6: #8be9fd -spmenu.col_sgrcolor7: #bbbbbb -spmenu.col_sgrcolor8: #44475a -spmenu.col_sgrcolor9: #ff5555 -spmenu.col_sgrcolor10: #50fa7b -spmenu.col_sgrcolor11: #f1fa8c -spmenu.col_sgrcolor12: #bd93f9 -spmenu.col_sgrcolor13: #ff79c6 -spmenu.col_sgrcolor14: #8b39fd -spmenu.col_sgrcolor15: #ffffff +spmenu.col_numfg: #282a36 +spmenu.col_numbg: #50fa7b +spmenu.col_normhlfg: #ffffff +spmenu.col_normhlbg: #000000 +spmenu.col_selhlfg: #f1fa8c +spmenu.col_selhlbg: #000000 +spmenu.col_caretfg: #f8f8f2 +spmenu.col_border: #ff79c6 +spmenu.col_modefg: #282a36 +spmenu.col_modebg: #ff79c6 +spmenu.col_sgr0: #000000 +spmenu.col_sgr1: #ff5555 +spmenu.col_sgr2: #50fa7b +spmenu.col_sgr3: #f1fa8c +spmenu.col_sgr4: #bd93f9 +spmenu.col_sgr5: #ff79c6 +spmenu.col_sgr6: #8be9fd +spmenu.col_sgr7: #bbbbbb +spmenu.col_sgr8: #44475a +spmenu.col_sgr9: #ff5555 +spmenu.col_sgr10: #50fa7b +spmenu.col_sgr11: #f1fa8c +spmenu.col_sgr12: #bd93f9 +spmenu.col_sgr13: #ff79c6 +spmenu.col_sgr14: #8b39fd +spmenu.col_sgr15: #ffffff diff --git a/themes/legacy/Gruvbox-Dark b/themes/legacy/Gruvbox-Dark index d48bad0..f02f929 100644 --- a/themes/legacy/Gruvbox-Dark +++ b/themes/legacy/Gruvbox-Dark @@ -1,6 +1,6 @@ -! Gruvbox-Dark color scheme for spmenu +! Gruvbox-Dark scheme for spmenu -! We must disable global colors first, because otherwise we can use Pywal to override. +! We must disable global s first, because otherwise we can use Pywal to override. ! If you want that, then you may set this to 1. spmenu.globalcolors: 0 @@ -12,7 +12,7 @@ spmenu.col_itemnormprifg: #fcf1c7 spmenu.col_itemnormpribg: #504945 spmenu.col_itemselprifg: #fbf1c7 spmenu.col_itemselpribg: #fe8019 -spmenu.col_menubgcolor: #282828 +spmenu.col_menu: #282828 spmenu.col_promptfg: #3c3836 spmenu.col_promptbg: #fb4934 spmenu.col_larrowfg: #98971a @@ -21,29 +21,29 @@ spmenu.col_larrowbg: #282828 spmenu.col_rarrowbg: #282828 spmenu.col_inputfg: #fbf1c7 spmenu.col_inputbg: #282828 -spmenu.col_numfgcolor: #282828 -spmenu.col_numbgcolor: #b16286 -spmenu.col_normhlfgcolor: #458588 -spmenu.col_normhlbgcolor: #282828 -spmenu.col_selhlfgcolor: #fabd2f -spmenu.col_selhlbgcolor: #282828 -spmenu.col_caretfgcolor: #fbf1c7 -spmenu.col_bordercolor: #d79921 -spmenu.col_modefgcolor: #3c3836 -spmenu.col_modebgcolor: #d65d0e -spmenu.col_sgrcolor0: #282828 -spmenu.col_sgrcolor1: #cc241d -spmenu.col_sgrcolor2: #98971a -spmenu.col_sgrcolor3: #d79921 -spmenu.col_sgrcolor4: #458588 -spmenu.col_sgrcolor5: #b16286 -spmenu.col_sgrcolor6: #689d6a -spmenu.col_sgrcolor7: #a89984 -spmenu.col_sgrcolor8: #928374 -spmenu.col_sgrcolor9: #fb4934 -spmenu.col_sgrcolor10: #b8bb26 -spmenu.col_sgrcolor11: #fabd2f -spmenu.col_sgrcolor12: #83a598 -spmenu.col_sgrcolor13: #d3869b -spmenu.col_sgrcolor14: #8ec07c -spmenu.col_sgrcolor15: #ebdbb2 +spmenu.col_numfg: #282828 +spmenu.col_numbg: #b16286 +spmenu.col_normhlfg: #458588 +spmenu.col_normhlbg: #282828 +spmenu.col_selhlfg: #fabd2f +spmenu.col_selhlbg: #282828 +spmenu.col_caretfg: #fbf1c7 +spmenu.col_border: #d79921 +spmenu.col_modefg: #3c3836 +spmenu.col_modebg: #d65d0e +spmenu.col_sgr0: #282828 +spmenu.col_sgr1: #cc241d +spmenu.col_sgr2: #98971a +spmenu.col_sgr3: #d79921 +spmenu.col_sgr4: #458588 +spmenu.col_sgr5: #b16286 +spmenu.col_sgr6: #689d6a +spmenu.col_sgr7: #a89984 +spmenu.col_sgr8: #928374 +spmenu.col_sgr9: #fb4934 +spmenu.col_sgr10: #b8bb26 +spmenu.col_sgr11: #fabd2f +spmenu.col_sgr12: #83a598 +spmenu.col_sgr13: #d3869b +spmenu.col_sgr14: #8ec07c +spmenu.col_sgr15: #ebdbb2 diff --git a/themes/legacy/Nord b/themes/legacy/Nord index ea65cc2..6449895 100644 --- a/themes/legacy/Nord +++ b/themes/legacy/Nord @@ -1,6 +1,6 @@ -! Nord color scheme for spmenu +! Nord scheme for spmenu -! We must disable global colors first, because otherwise we can use Pywal to override. +! We must disable global s first, because otherwise we can use Pywal to override. ! If you want that, then you may set this to 1. spmenu.globalcolors: 0 @@ -12,7 +12,7 @@ spmenu.col_itemnormprifg: #ECEFF4 spmenu.col_itemnormpribg: #3B4252 spmenu.col_itemselprifg: #ECEFF4 spmenu.col_itemselpribg: #D08770 -spmenu.col_menubgcolor: #2E3440 +spmenu.col_menu: #2E3440 spmenu.col_promptfg: #2E3440 spmenu.col_promptbg: #B48EAD spmenu.col_larrowfg: #8FBCBB @@ -21,29 +21,29 @@ spmenu.col_larrowbg: #2E3440 spmenu.col_rarrowbg: #2E3440 spmenu.col_inputfg: #ECEFF4 spmenu.col_inputbg: #2E3440 -spmenu.col_numfgcolor: #2E3440 -spmenu.col_numbgcolor: #A3BE8C -spmenu.col_normhlfgcolor: #88C0D0 -spmenu.col_normhlbgcolor: #2E3440 -spmenu.col_selhlfgcolor: #EBCB8B -spmenu.col_selhlbgcolor: #2E3440 -spmenu.col_caretfgcolor: #D8DEE9 -spmenu.col_bordercolor: #5E81AC -spmenu.col_modefgcolor: #2E3440 -spmenu.col_modebgcolor: #81A1C1 -spmenu.col_sgrcolor0: #3b4252 -spmenu.col_sgrcolor1: #bf616a -spmenu.col_sgrcolor2: #a3be8c -spmenu.col_sgrcolor3: #ebcb8b -spmenu.col_sgrcolor4: #81a1c1 -spmenu.col_sgrcolor5: #b48ead -spmenu.col_sgrcolor6: #88c0d0 -spmenu.col_sgrcolor7: #e5e9f0 -spmenu.col_sgrcolor8: #4c566a -spmenu.col_sgrcolor9: #bf616a -spmenu.col_sgrcolor10: #a3be8c -spmenu.col_sgrcolor11: #ebcb8b -spmenu.col_sgrcolor12: #81a1c1 -spmenu.col_sgrcolor13: #b48ead -spmenu.col_sgrcolor14: #8fbcbb -spmenu.col_sgrcolor15: #eceff4 +spmenu.col_numfg: #2E3440 +spmenu.col_numbg: #A3BE8C +spmenu.col_normhlfg: #88C0D0 +spmenu.col_normhlbg: #2E3440 +spmenu.col_selhlfg: #EBCB8B +spmenu.col_selhlbg: #2E3440 +spmenu.col_caretfg: #D8DEE9 +spmenu.col_border: #5E81AC +spmenu.col_modefg: #2E3440 +spmenu.col_modebg: #81A1C1 +spmenu.col_sgr0: #3b4252 +spmenu.col_sgr1: #bf616a +spmenu.col_sgr2: #a3be8c +spmenu.col_sgr3: #ebcb8b +spmenu.col_sgr4: #81a1c1 +spmenu.col_sgr5: #b48ead +spmenu.col_sgr6: #88c0d0 +spmenu.col_sgr7: #e5e9f0 +spmenu.col_sgr8: #4c566a +spmenu.col_sgr9: #bf616a +spmenu.col_sgr10: #a3be8c +spmenu.col_sgr11: #ebcb8b +spmenu.col_sgr12: #81a1c1 +spmenu.col_sgr13: #b48ead +spmenu.col_sgr14: #8fbcbb +spmenu.col_sgr15: #eceff4 diff --git a/themes/legacy/Solarized-Dark b/themes/legacy/Solarized-Dark index 872ff6b..3d1d61d 100644 --- a/themes/legacy/Solarized-Dark +++ b/themes/legacy/Solarized-Dark @@ -1,6 +1,6 @@ -! Solarized-Dark color scheme for spmenu +! Solarized-Dark scheme for spmenu -! We must disable global colors first, because otherwise we can use Pywal to override. +! We must disable global s first, because otherwise we can use Pywal to override. ! If you want that, then you may set this to 1. spmenu.globalcolors: 0 spmenu.col_itemnormfg: #eee8d5 @@ -11,7 +11,7 @@ spmenu.col_itemnormprifg: #eee8d5 spmenu.col_itemnormpribg: #002b36 spmenu.col_itemselprifg: #eee8d5 spmenu.col_itemselpribg: #586e75 -spmenu.col_menubgcolor: #002b36 +spmenu.col_menu: #002b36 spmenu.col_promptfg: #262626 spmenu.col_promptbg: #b58900 spmenu.col_larrowfg: #2aa198 @@ -20,29 +20,29 @@ spmenu.col_larrowbg: #002b36 spmenu.col_rarrowbg: #002b36 spmenu.col_inputfg: #eee8d5 spmenu.col_inputbg: #002b36 -spmenu.col_numfgcolor: #262626 -spmenu.col_numbgcolor: #cb4b16 -spmenu.col_normhlfgcolor: #268bd2 -spmenu.col_normhlbgcolor: #002b36 -spmenu.col_selhlfgcolor: #ffffd7 -spmenu.col_selhlbgcolor: #262626 -spmenu.col_caretfgcolor: #eee8d5 -spmenu.col_bordercolor: #859900 -spmenu.col_modefgcolor: #262626 -spmenu.col_modebgcolor: #859900 -spmenu.col_sgrcolor0: #073642 -spmenu.col_sgrcolor1: #dc322f -spmenu.col_sgrcolor2: #859900 -spmenu.col_sgrcolor3: #b58900 -spmenu.col_sgrcolor4: #268bd2 -spmenu.col_sgrcolor5: #d33682 -spmenu.col_sgrcolor6: #2aa198 -spmenu.col_sgrcolor7: #eee8d5 -spmenu.col_sgrcolor8: #002b36 -spmenu.col_sgrcolor9: #cb4b16 -spmenu.col_sgrcolor10: #586e75 -spmenu.col_sgrcolor11: #657b83 -spmenu.col_sgrcolor12: #839496 -spmenu.col_sgrcolor13: #6c71c4 -spmenu.col_sgrcolor14: #93a1a1 -spmenu.col_sgrcolor15: #fdf6e3 +spmenu.col_numfg: #262626 +spmenu.col_numbg: #cb4b16 +spmenu.col_normhlfg: #268bd2 +spmenu.col_normhlbg: #002b36 +spmenu.col_selhlfg: #ffffd7 +spmenu.col_selhlbg: #262626 +spmenu.col_caretfg: #eee8d5 +spmenu.col_border: #859900 +spmenu.col_modefg: #262626 +spmenu.col_modebg: #859900 +spmenu.col_sgr0: #073642 +spmenu.col_sgr1: #dc322f +spmenu.col_sgr2: #859900 +spmenu.col_sgr3: #b58900 +spmenu.col_sgr4: #268bd2 +spmenu.col_sgr5: #d33682 +spmenu.col_sgr6: #2aa198 +spmenu.col_sgr7: #eee8d5 +spmenu.col_sgr8: #002b36 +spmenu.col_sgr9: #cb4b16 +spmenu.col_sgr10: #586e75 +spmenu.col_sgr11: #657b83 +spmenu.col_sgr12: #839496 +spmenu.col_sgr13: #6c71c4 +spmenu.col_sgr14: #93a1a1 +spmenu.col_sgr15: #fdf6e3 diff --git a/themes/legacy/Tokyo-Night b/themes/legacy/Tokyo-Night index 15a8ed8..95abd59 100644 --- a/themes/legacy/Tokyo-Night +++ b/themes/legacy/Tokyo-Night @@ -1,6 +1,6 @@ -! Tokyo-Night color scheme for spmenu +! Tokyo-Night scheme for spmenu -! We must disable global colors first, because otherwise we can use Pywal to override. +! We must disable global s first, because otherwise we can use Pywal to override. ! If you want that, then you may set this to 1. spmenu.globalcolors: 0 @@ -12,7 +12,7 @@ spmenu.col_itemnormprifg: #a9b1d6 spmenu.col_itemnormpribg: #444B6A spmenu.col_itemselprifg: #a9b1d6 spmenu.col_itemselpribg: #D08770 -spmenu.col_menubgcolor: #1a1b26 +spmenu.col_menu: #1a1b26 spmenu.col_promptfg: #1a1b26 spmenu.col_promptbg: #ad8ee6 spmenu.col_larrowfg: #7da6ff @@ -21,29 +21,29 @@ spmenu.col_larrowbg: #1a1b26 spmenu.col_rarrowbg: #1a1b26 spmenu.col_inputfg: #a9b1d6 spmenu.col_inputbg: #1a1b26 -spmenu.col_numfgcolor: #1a1b26 -spmenu.col_numbgcolor: #9ece6a -spmenu.col_normhlfgcolor: #7aa2f7 -spmenu.col_normhlbgcolor: #1a1b26 -spmenu.col_selhlfgcolor: #e0af68 -spmenu.col_selhlbgcolor: #1a1b26 -spmenu.col_caretfgcolor: #a9b1d6 -spmenu.col_bordercolor: #7da6ff -spmenu.col_modefgcolor: #1a1b26 -spmenu.col_modebgcolor: #ff7a93 -spmenu.col_sgrcolor0: #32344a -spmenu.col_sgrcolor1: #f7768e -spmenu.col_sgrcolor2: #9ece6a -spmenu.col_sgrcolor3: #e0af68 -spmenu.col_sgrcolor4: #7aa2f7 -spmenu.col_sgrcolor5: #ad8ee6 -spmenu.col_sgrcolor6: #449dab -spmenu.col_sgrcolor7: #787c99 -spmenu.col_sgrcolor8: #444b6a -spmenu.col_sgrcolor9: #ff7a93 -spmenu.col_sgrcolor10: #b9f27c -spmenu.col_sgrcolor11: #ff9e64 -spmenu.col_sgrcolor12: #7da6ff -spmenu.col_sgrcolor13: #bb9af7 -spmenu.col_sgrcolor14: #0db9d7 -spmenu.col_sgrcolor15: #acb0d0 +spmenu.col_numfg: #1a1b26 +spmenu.col_numbg: #9ece6a +spmenu.col_normhlfg: #7aa2f7 +spmenu.col_normhlbg: #1a1b26 +spmenu.col_selhlfg: #e0af68 +spmenu.col_selhlbg: #1a1b26 +spmenu.col_caretfg: #a9b1d6 +spmenu.col_border: #7da6ff +spmenu.col_modefg: #1a1b26 +spmenu.col_modebg: #ff7a93 +spmenu.col_sgr0: #32344a +spmenu.col_sgr1: #f7768e +spmenu.col_sgr2: #9ece6a +spmenu.col_sgr3: #e0af68 +spmenu.col_sgr4: #7aa2f7 +spmenu.col_sgr5: #ad8ee6 +spmenu.col_sgr6: #449dab +spmenu.col_sgr7: #787c99 +spmenu.col_sgr8: #444b6a +spmenu.col_sgr9: #ff7a93 +spmenu.col_sgr10: #b9f27c +spmenu.col_sgr11: #ff9e64 +spmenu.col_sgr12: #7da6ff +spmenu.col_sgr13: #bb9af7 +spmenu.col_sgr14: #0db9d7 +spmenu.col_sgr15: #acb0d0