add basic theme.conf file support

This commit is contained in:
speedie 2023-05-01 17:07:35 +02:00
parent 58778a0613
commit 316fcd0a76
14 changed files with 519 additions and 24 deletions

Binary file not shown.

BIN
code.pdf

Binary file not shown.

View file

@ -304,11 +304,19 @@ You may use long, descriptive arguments or the shorter arguments.
: Set config file to load to file : Set config file to load to file
`-lcfg, --load-config` `-lcfg, --load-config`
: Load spmenu configuration (~/.config/spmenu/spmenu.conf, ~/.spmenurc or ~/.config/spmenu/spmenurc) : Load spmenu configuration (~/.spmenu.conf or ~/.config/spmenu/spmenu.conf)
`-ncfg, --no-load-config` `-ncfg, --no-load-config`
: Don't load spmenu configuration (~/.config/spmenu/spmenu.conf, ~/.spmenurc : Don't load spmenu configuration (~/.spmenu.conf or ~/.config/spmenu/spmenu.conf)
or ~/.config/spmenu/spmenurc)
`-tm, --theme theme`
: Load theme 'theme' on runtime.
`-ltm, --load-theme`
: Load theme
`-nltm, --no-load-theme`
: Don't load theme
`-v, --version` `-v, --version`
: Print spmenu version to stdout : Print spmenu version to stdout

View file

@ -187,9 +187,10 @@ spmenu = {
maxcache = 512; // Max image width/height to cache (px) maxcache = 512; // Max image width/height to cache (px)
} ); } );
/* .Xresources/Xrdb options */ /* File options */
xrdb = ( { xresources = 1; // Load .Xresources on startup (0/1) file = ( { xresources = 1; // Load .Xresources on startup (0/1)
global = 1; // Read global .Xresources colors, programs like Pywal use this. (*.color0, *.color1, etc.) (0/1) global = 1; // Read global .Xresources colors, programs like Pywal use this. (*.color0, *.color1, etc.) (0/1)
theme = 1; // Load theme (~/.theme.conf or ~/.config/spmenu/theme.conf) on runtime
} ); } );
/* Input options */ /* Input options */

View file

@ -14,6 +14,10 @@ readargs(int argc, char *argv[])
loadconfig = 1; loadconfig = 1;
} else if (!strcmp(argv[j], "-ncfg") || (!strcmp(argv[j], "--no-load-config"))) { } else if (!strcmp(argv[j], "-ncfg") || (!strcmp(argv[j], "--no-load-config"))) {
loadconfig = 0; loadconfig = 0;
} else if (!strcmp(argv[j], "-ltm") || (!strcmp(argv[j], "--load-theme"))) {
loadtheme = 1;
} else if (!strcmp(argv[j], "-nltm") || (!strcmp(argv[j], "--no-load-theme"))) {
loadtheme = 0;
#if USECONFIG #if USECONFIG
} else if (!strcmp(argv[j], "-cf") || (!strcmp(argv[j], "--config-file"))) { // specify a config file } else if (!strcmp(argv[j], "-cf") || (!strcmp(argv[j], "--config-file"))) { // specify a config file
if (argv[j+1]) { if (argv[j+1]) {
@ -22,6 +26,13 @@ readargs(int argc, char *argv[])
} else { } else {
die("This argument requires a second argument.\n"); die("This argument requires a second argument.\n");
} }
} else if (!strcmp(argv[j], "-tm") || (!strcmp(argv[j], "--theme"))) { // specify a theme
if (argv[j+1]) {
ctheme = 1;
argtheme = argv[++j];
} else {
die("This argument requires a second argument.\n");
}
#endif #endif
} }
} }
@ -188,6 +199,10 @@ readargs(int argc, char *argv[])
|| !strcmp(argv[i], "-ncfg") || !strcmp(argv[i], "-ncfg")
|| !strcmp(argv[i], "--load-config") || !strcmp(argv[i], "--load-config")
|| !strcmp(argv[i], "--no-load-config") || !strcmp(argv[i], "--no-load-config")
|| !strcmp(argv[i], "-ltm")
|| !strcmp(argv[i], "-nltm")
|| !strcmp(argv[i], "--load-theme")
|| !strcmp(argv[i], "--no-load-theme")
|| !strcmp(argv[i], "-gbc") || !strcmp(argv[i], "-gbc")
|| !strcmp(argv[i], "-ngbc") || !strcmp(argv[i], "-ngbc")
|| !strcmp(argv[i], "--global-colors") || !strcmp(argv[i], "--global-colors")
@ -196,6 +211,9 @@ readargs(int argc, char *argv[])
|| !strcmp(argv[i], "-cf") || !strcmp(argv[i], "-cf")
|| !strcmp(argv[i], "--config-file") || !strcmp(argv[i], "--config-file")
|| (argconf && !strcmp(argv[i], argconf)) || (argconf && !strcmp(argv[i], argconf))
|| !strcmp(argv[i], "-tm")
|| !strcmp(argv[i], "--theme")
|| (argtheme && !strcmp(argv[i], argtheme))
#endif #endif
)) ))
continue; continue;
@ -387,6 +405,10 @@ readargs(int argc, char *argv[])
|| !strcmp(argv[i], "-ncfg") || !strcmp(argv[i], "-ncfg")
|| !strcmp(argv[i], "--load-config") || !strcmp(argv[i], "--load-config")
|| !strcmp(argv[i], "--no-load-config") || !strcmp(argv[i], "--no-load-config")
|| !strcmp(argv[i], "-ltm")
|| !strcmp(argv[i], "-nltm")
|| !strcmp(argv[i], "--load-theme")
|| !strcmp(argv[i], "--no-load-theme")
|| !strcmp(argv[i], "-gbc") || !strcmp(argv[i], "-gbc")
|| !strcmp(argv[i], "-ngbc") || !strcmp(argv[i], "-ngbc")
|| !strcmp(argv[i], "--global-colors") || !strcmp(argv[i], "--global-colors")
@ -395,6 +417,9 @@ readargs(int argc, char *argv[])
|| !strcmp(argv[i], "-cf") || !strcmp(argv[i], "-cf")
|| !strcmp(argv[i], "--config-file") || !strcmp(argv[i], "--config-file")
|| (argconf && !strcmp(argv[i], argconf)) || (argconf && !strcmp(argv[i], argconf))
|| !strcmp(argv[i], "-tm")
|| !strcmp(argv[i], "--theme")
|| (argtheme && !strcmp(argv[i], argtheme))
#endif #endif
)) ))
continue; continue;
@ -523,8 +548,11 @@ usage(void)
fputs("spmenu -wm, --managed, --x11-client Spawn spmenu as a window manager controlled client/window. Useful for testing\n" fputs("spmenu -wm, --managed, --x11-client Spawn spmenu as a window manager controlled client/window. Useful for testing\n"
"spmenu -nwm, --unmanaged Don't spawn spmenu as a window manager controlled client/window. Useful for testing\n" "spmenu -nwm, --unmanaged Don't spawn spmenu as a window manager controlled client/window. Useful for testing\n"
"spmenu -cf, --config-file <file> Set config file to load to <file>\n" "spmenu -cf, --config-file <file> Set config file to load to <file>\n"
"spmenu -lcfg, --load-config Load spmenu configuration (~/.config/spmenu/spmenu.conf, ~/.spmenu or ~/.config/spmenu/spmenurc)\n" "spmenu -lcfg, --load-config Load spmenu configuration (~/.spmenu.conf or ~/.config/spmenu/spmenu.conf)\n"
"spmenu -ncfg, --no-load-config Don't load spmenu configuration (~/.config/spmenu/spmenu.conf, ~/.spmenu or ~/.config/spmenu/spmenurc)\n" "spmenu -ncfg, --no-load-config Don't load spmenu configuration (~/.spmenu.conf or ~/.config/spmenu/spmenu.conf)\n"
"spmenu -tm, --theme <theme> Load theme <theme>\n"
"spmenu -ltm, --load-theme Load theme\n"
"spmenu -nltm, --no-load-theme Don't load theme\n"
"spmenu -v, --version Print spmenu version to stdout\n" "spmenu -v, --version Print spmenu version to stdout\n"
"\n", stdout); "\n", stdout);

View file

@ -1,4 +1,5 @@
#include <libconfig.h> #include <libconfig.h>
#include "../theme/theme.c"
void void
conf_init(void) conf_init(void)
@ -376,14 +377,15 @@ conf_init(void)
} }
// load options spmenu.xrdb // load options spmenu.xrdb
config_setting_t *xrdb_setting = config_lookup(&cfg, "spmenu.xrdb"); config_setting_t *file_setting = config_lookup(&cfg, "spmenu.file");
if (xrdb_setting != NULL) { if (file_setting != NULL) {
for (unsigned int i = 0; i < config_setting_length(xrdb_setting); ++i) { for (unsigned int i = 0; i < config_setting_length(file_setting); ++i) {
config_setting_t *conf = config_setting_get_elem(xrdb_setting, i); config_setting_t *conf = config_setting_get_elem(file_setting, i);
// look up // look up
config_setting_lookup_int(conf, "global", &globalcolors); // spmenu.xrdb.global config_setting_lookup_int(conf, "theme", &loadtheme); // spmenu.file.theme
config_setting_lookup_int(conf, "xresources", &xresources); // spmenu.xrdb.xresources config_setting_lookup_int(conf, "global", &globalcolors); // spmenu.file.global
config_setting_lookup_int(conf, "xresources", &xresources); // spmenu.file.xresources
} }
} }
@ -605,5 +607,6 @@ conf_init(void)
// we're done here // we're done here
config_destroy(&cfg); config_destroy(&cfg);
if (loadtheme) theme_load();
return; return;
} }

View file

@ -1 +1,3 @@
#include "../theme/theme.h"
static void conf_init(void); static void conf_init(void);

427
libs/theme/theme.c Normal file
View file

@ -0,0 +1,427 @@
void
theme_load(void)
{
char *xdg_conf;
char *theme = NULL;
char *home = NULL;
const char *dest;
// don't load configuration
if (!loadconfig) return;
// get path for configuration file
if (!ctheme || !argtheme) {
if (!(xdg_conf = getenv("XDG_CONFIG_HOME"))) {
// ~/.config/spmenu/theme.conf
home = getenv("HOME");
// malloc
if (!(theme = malloc(snprintf(NULL, 0, "%s/%s", home, ".config/spmenu/theme.conf") + 1))) {
die("spmenu: failed to malloc theme");
}
sprintf(theme, "%s/%s", home, ".config/spmenu/theme.conf");
} else {
// malloc
if (!(theme = malloc(snprintf(NULL, 0, "%s/%s", xdg_conf, "spmenu/theme.conf") + 1))) {
die("spmenu: failed to malloc theme");
}
// XDG_CONFIG_HOME is set, so let's use that instead
sprintf(theme, "%s/%s", xdg_conf, "spmenu/theme.conf");
}
} else { // custom config path
if (!(theme = malloc(snprintf(NULL, 0, "%s", argtheme) + 1))) {
die("spmenu: failed to malloc theme");
}
sprintf(theme, "%s", argtheme);
}
// don't bother trying to load if it doesn't exist.
if (access(theme, F_OK) != 0) {
return;
}
// init config
config_t cfg;
config_init(&cfg);
// attempt to read theme
if (!config_read_file(&cfg, theme)) {
fprintf(stdout, "spmenu: Invalid theme.\n"); // invalid configuration, but let's try to read it anyway
}
// load options theme.window
config_setting_t *window_setting = config_lookup(&cfg, "theme.window");
if (window_setting != NULL) {
// look up window entries
for (unsigned int i = 0; i < config_setting_length(window_setting); ++i) {
config_setting_t *conf = config_setting_get_elem(window_setting, i);
config_setting_lookup_int(conf, "position", &menuposition); // theme.window.menuposition
config_setting_lookup_int(conf, "paddingv", &menupaddingv); // theme.window.paddingv
config_setting_lookup_int(conf, "paddingh", &menupaddingh); // theme.window.paddingh
config_setting_lookup_int(conf, "padding-vertical", &menupaddingv); // theme.window.padding-vertical
config_setting_lookup_int(conf, "padding-horizontal", &menupaddingh); // theme.window.padding-horizontal
config_setting_lookup_int(conf, "margin-vertical", &menumarginv); // theme.window.margin-vertical
config_setting_lookup_int(conf, "margin-horizontal", &menumarginh); // theme.window.margin-horizontal
config_setting_lookup_int(conf, "x", &xpos); // theme.window.x
config_setting_lookup_int(conf, "y", &xpos); // theme.window.y
config_setting_lookup_int(conf, "width", &menuwidth); // theme.window.width
config_setting_lookup_int(conf, "border", &borderwidth); // theme.window.border
config_setting_lookup_int(conf, "alpha", &alpha); // theme.window.alpha
}
}
// load options theme.powerline
config_setting_t *pwl_setting = config_lookup(&cfg, "theme.powerline");
if (pwl_setting != NULL) {
for (unsigned int i = 0; i < config_setting_length(pwl_setting); ++i) {
config_setting_t *conf = config_setting_get_elem(pwl_setting, i);
// look up
config_setting_lookup_int(conf, "promptstyle", &promptpwlstyle); // theme.powerline.promptstyle
config_setting_lookup_int(conf, "matchcountstyle", &matchcountpwlstyle); // theme.powerline.matchcountstyle
config_setting_lookup_int(conf, "modestyle", &modepwlstyle); // theme.powerline.modestyle
config_setting_lookup_int(conf, "capsstyle", &capspwlstyle); // theme.powerline.capsstyle
config_setting_lookup_int(conf, "prompt", &powerlineprompt); // theme.powerline.prompt
config_setting_lookup_int(conf, "matchcount", &powerlinecount); // theme.powerline.matchcount
config_setting_lookup_int(conf, "mode", &powerlinemode); // theme.powerline.mode
config_setting_lookup_int(conf, "caps", &powerlinecaps); // theme.powerline.caps
}
}
// load options theme.center
config_setting_t *center_setting = config_lookup(&cfg, "theme.center");
if (center_setting != NULL) {
for (unsigned int i = 0; i < config_setting_length(center_setting); ++i) {
config_setting_t *conf = config_setting_get_elem(center_setting, i);
config_setting_lookup_int(conf, "width", &minwidth); // theme.center.width
}
}
// load options theme.text
config_setting_t *text_setting = config_lookup(&cfg, "theme.text");
if (text_setting != NULL) {
for (unsigned int i = 0; i < config_setting_length(text_setting); ++i) {
config_setting_t *conf = config_setting_get_elem(text_setting, i);
// look up
if (config_setting_lookup_string(conf, "font", &dest)) // theme.text.font
strcpy(font, strdup(dest));
config_setting_lookup_int(conf, "padding", &textpadding); // theme.text.padding
config_setting_lookup_int(conf, "normitempadding", &normitempadding); // theme.text.normitempadding
config_setting_lookup_int(conf, "selitempadding", &selitempadding); // theme.text.selitempadding
config_setting_lookup_int(conf, "priitempadding", &priitempadding); // theme.text.priitempadding
if (config_setting_lookup_string(conf, "leftarrow", &dest)) // theme.text.leftarrow
leftarrow = strdup(dest);
if (config_setting_lookup_string(conf, "rightarrow", &dest)) // theme.text.rightarrow
rightarrow = strdup(dest);
if (config_setting_lookup_string(conf, "password", &dest))
password = strdup(dest);
if (config_setting_lookup_string(conf, "prompt", &dest))
prompt = strdup(dest);
if (config_setting_lookup_string(conf, "capslockon", &dest))
capslockontext = strdup(dest);
if (config_setting_lookup_string(conf, "capslockoff", &dest))
capslockofftext = strdup(dest);
if (config_setting_lookup_string(conf, "input", &dest))
input = strdup(dest);
}
}
// load options theme.alpha
config_setting_t *alpha_setting = config_lookup(&cfg, "theme.alpha");
if (alpha_setting != NULL) {
for (unsigned int i = 0; i < config_setting_length(alpha_setting); ++i) {
config_setting_t *conf = config_setting_get_elem(alpha_setting, i);
// look up
config_setting_lookup_int(conf, "itemnormfg", &alpha_itemnormfg); // theme.alpha.itemnormfg
config_setting_lookup_int(conf, "itemnormbg", &alpha_itemnormbg); // theme.alpha.itemnormbg
config_setting_lookup_int(conf, "itemselfg", &alpha_itemselfg); // theme.alpha.itemselfg
config_setting_lookup_int(conf, "itemselbg", &alpha_itemselbg); // theme.alpha.itemselbg
config_setting_lookup_int(conf, "itemnormprifg", &alpha_itemnormprifg); // theme.alpha.itemnormprifg
config_setting_lookup_int(conf, "itemnormpribg", &alpha_itemnormpribg); // theme.alpha.itemnormpribg
config_setting_lookup_int(conf, "itemselprifg", &alpha_itemselprifg); // theme.alpha.itemselprifg
config_setting_lookup_int(conf, "itemselpribg", &alpha_itemselpribg); // theme.alpha.itemselpribg
config_setting_lookup_int(conf, "inputfg", &alpha_inputfg); // theme.alpha.inputfg
config_setting_lookup_int(conf, "inputbg", &alpha_inputbg); // theme.alpha.inputbg
config_setting_lookup_int(conf, "menu", &alpha_menu); // theme.alpha.menu
config_setting_lookup_int(conf, "promptfg", &alpha_promptfg); // theme.alpha.promptfg
config_setting_lookup_int(conf, "promptbg", &alpha_promptbg); // theme.alpha.promptbg
config_setting_lookup_int(conf, "larrowfg", &alpha_larrowfg); // theme.alpha.larrowfg
config_setting_lookup_int(conf, "larrowbg", &alpha_larrowbg); // theme.alpha.larrowbg
config_setting_lookup_int(conf, "rarrowfg", &alpha_rarrowfg); // theme.alpha.rarrowfg
config_setting_lookup_int(conf, "rarrowbg", &alpha_rarrowbg); // theme.alpha.rarrowbg
config_setting_lookup_int(conf, "hlnormfg", &alpha_hlnormfg); // theme.alpha.hlnormfg
config_setting_lookup_int(conf, "hlnormbg", &alpha_hlnormbg); // theme.alpha.hlnormbg
config_setting_lookup_int(conf, "hlselfg", &alpha_hlselfg); // theme.alpha.hlselfg
config_setting_lookup_int(conf, "hlselbg", &alpha_hlselbg); // theme.alpha.hlselbg
config_setting_lookup_int(conf, "numfg", &alpha_numfg); // theme.alpha.numfg
config_setting_lookup_int(conf, "numbg", &alpha_numbg); // theme.alpha.numbg
config_setting_lookup_int(conf, "border", &alpha_border); // theme.alpha.border
config_setting_lookup_int(conf, "caretfg", &alpha_caretfg); // theme.alpha.caretfg
config_setting_lookup_int(conf, "caretbg", &alpha_caretbg); // theme.alpha.caretbg
config_setting_lookup_int(conf, "modefg", &alpha_modefg); // theme.alpha.modefg
config_setting_lookup_int(conf, "modebg", &alpha_modebg); // theme.alpha.modebg
config_setting_lookup_int(conf, "capsfg", &alpha_capsfg); // theme.alpha.capsfg
config_setting_lookup_int(conf, "capsbg", &alpha_capsbg); // theme.alpha.capsbg
}
}
// load options theme.color
config_setting_t *color_setting = config_lookup(&cfg, "theme.color");
if (color_setting != NULL) {
for (unsigned int i = 0; i < config_setting_length(color_setting); ++i) {
config_setting_t *conf = config_setting_get_elem(color_setting, i);
// items
if (config_setting_lookup_string(conf, "itemnormfg", &dest))
strcpy(colors[SchemeItemNorm][ColFg], strdup(dest));
if (config_setting_lookup_string(conf, "itemnormbg", &dest))
strcpy(colors[SchemeItemNorm][ColBg], strdup(dest));
if (config_setting_lookup_string(conf, "itemselfg", &dest))
strcpy(colors[SchemeItemSel][ColFg], strdup(dest));
if (config_setting_lookup_string(conf, "itemselbg", &dest))
strcpy(colors[SchemeItemSel][ColBg], strdup(dest));
// items with priority
if (config_setting_lookup_string(conf, "itemnormprifg", &dest))
strcpy(colors[SchemeItemNormPri][ColFg], strdup(dest));
if (config_setting_lookup_string(conf, "itemnormpribg", &dest))
strcpy(colors[SchemeItemNormPri][ColBg], strdup(dest));
if (config_setting_lookup_string(conf, "itemselprifg", &dest))
strcpy(colors[SchemeItemSelPri][ColFg], strdup(dest));
if (config_setting_lookup_string(conf, "itemselpribg", &dest))
strcpy(colors[SchemeItemSelPri][ColBg], strdup(dest));
// input
if (config_setting_lookup_string(conf, "inputfg", &dest))
strcpy(colors[SchemeInput][ColFg], strdup(dest));
if (config_setting_lookup_string(conf, "inputbg", &dest))
strcpy(colors[SchemeInput][ColBg], strdup(dest));
// menu
if (config_setting_lookup_string(conf, "menu", &dest))
strcpy(colors[SchemeMenu][ColBg], strdup(dest));
// prompt
if (config_setting_lookup_string(conf, "promptfg", &dest))
strcpy(colors[SchemePrompt][ColFg], strdup(dest));
if (config_setting_lookup_string(conf, "promptbg", &dest))
strcpy(colors[SchemePrompt][ColBg], strdup(dest));
// arrows
if (config_setting_lookup_string(conf, "larrowfg", &dest))
strcpy(colors[SchemeLArrow][ColFg], strdup(dest));
if (config_setting_lookup_string(conf, "larrowbg", &dest))
strcpy(colors[SchemeLArrow][ColBg], strdup(dest));
if (config_setting_lookup_string(conf, "rarrowfg", &dest))
strcpy(colors[SchemeRArrow][ColFg], strdup(dest));
if (config_setting_lookup_string(conf, "rarrowbg", &dest))
strcpy(colors[SchemeRArrow][ColBg], strdup(dest));
// highlight
if (config_setting_lookup_string(conf, "hlnormfg", &dest))
strcpy(colors[SchemeNormHighlight][ColFg], strdup(dest));
if (config_setting_lookup_string(conf, "hlnormbg", &dest))
strcpy(colors[SchemeNormHighlight][ColBg], strdup(dest));
if (config_setting_lookup_string(conf, "hlselfg", &dest))
strcpy(colors[SchemeSelHighlight][ColFg], strdup(dest));
if (config_setting_lookup_string(conf, "hlselbg", &dest))
strcpy(colors[SchemeSelHighlight][ColBg], strdup(dest));
// number
if (config_setting_lookup_string(conf, "numfg", &dest))
strcpy(colors[SchemeNumber][ColFg], strdup(dest));
if (config_setting_lookup_string(conf, "numbg", &dest))
strcpy(colors[SchemeNumber][ColBg], strdup(dest));
// mode
if (config_setting_lookup_string(conf, "modefg", &dest))
strcpy(colors[SchemeMode][ColFg], strdup(dest));
if (config_setting_lookup_string(conf, "modebg", &dest))
strcpy(colors[SchemeMode][ColBg], strdup(dest));
// caps
if (config_setting_lookup_string(conf, "capsfg", &dest))
strcpy(colors[SchemeCaps][ColFg], strdup(dest));
if (config_setting_lookup_string(conf, "capsbg", &dest))
strcpy(colors[SchemeCaps][ColBg], strdup(dest));
// border
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, "sgr0", &dest))
strcpy(textcolors[0], strdup(dest));
if (config_setting_lookup_string(conf, "sgr1", &dest))
strcpy(textcolors[1], strdup(dest));
if (config_setting_lookup_string(conf, "sgr2", &dest))
strcpy(textcolors[2], strdup(dest));
if (config_setting_lookup_string(conf, "sgr3", &dest))
strcpy(textcolors[3], strdup(dest));
if (config_setting_lookup_string(conf, "sgr4", &dest))
strcpy(textcolors[4], strdup(dest));
if (config_setting_lookup_string(conf, "sgr5", &dest))
strcpy(textcolors[5], strdup(dest));
if (config_setting_lookup_string(conf, "sgr6", &dest))
strcpy(textcolors[6], strdup(dest));
if (config_setting_lookup_string(conf, "sgr7", &dest))
strcpy(textcolors[7], strdup(dest));
if (config_setting_lookup_string(conf, "sgr8", &dest))
strcpy(textcolors[8], strdup(dest));
if (config_setting_lookup_string(conf, "sgr9", &dest))
strcpy(textcolors[9], strdup(dest));
if (config_setting_lookup_string(conf, "sgr10", &dest))
strcpy(textcolors[10], strdup(dest));
if (config_setting_lookup_string(conf, "sgr11", &dest))
strcpy(textcolors[11], strdup(dest));
if (config_setting_lookup_string(conf, "sgr12", &dest))
strcpy(textcolors[12], strdup(dest));
if (config_setting_lookup_string(conf, "sgr13", &dest))
strcpy(textcolors[13], strdup(dest));
if (config_setting_lookup_string(conf, "sgr14", &dest))
strcpy(textcolors[14], strdup(dest));
if (config_setting_lookup_string(conf, "sgr15", &dest))
strcpy(textcolors[15], strdup(dest));
// coloritems int
config_setting_lookup_int(conf, "coloritems", &coloritems);
config_setting_lookup_int(conf, "sgr", &sgr);
}
}
// load options theme.image
config_setting_t *img_setting = config_lookup(&cfg, "theme.image");
if (img_setting != NULL) {
for (unsigned int i = 0; i < config_setting_length(img_setting); ++i) {
config_setting_t *conf = config_setting_get_elem(img_setting, i);
// look up
config_setting_lookup_int(conf, "width", &imagewidth); // theme.image.width
config_setting_lookup_int(conf, "height", &imageheight); // theme.image.height
config_setting_lookup_int(conf, "gaps", &imageheight); // theme.image.gaps
config_setting_lookup_int(conf, "position", &imageposition); // theme.image.position
}
}
// load options theme.mode
config_setting_t *mode_setting = config_lookup(&cfg, "theme.mode");
if (mode_setting != NULL) {
for (unsigned int i = 0; i < config_setting_length(mode_setting); ++i) {
config_setting_t *conf = config_setting_get_elem(mode_setting, i);
config_setting_lookup_string(conf, "normal_text", &dest); // theme.mode.normal_text
normtext = strdup(dest);
config_setting_lookup_string(conf, "insert_text", &dest); // theme.mode.insert_text
instext = strdup(dest);
}
}
// load options theme.line
config_setting_t *line_setting = config_lookup(&cfg, "theme.line");
if (line_setting != NULL) {
for (unsigned int i = 0; i < config_setting_length(line_setting); ++i) {
config_setting_t *conf = config_setting_get_elem(line_setting, i);
// look up
config_setting_lookup_int(conf, "height", &lineheight); // theme.line.height
config_setting_lookup_int(conf, "indentitems", &indentitems); // theme.line.indentitems
}
}
// load options theme.hide
config_setting_t *hide_setting = config_lookup(&cfg, "theme.hide");
if (hide_setting != NULL) {
for (unsigned int i = 0; i < config_setting_length(hide_setting); ++i) {
config_setting_t *conf = config_setting_get_elem(hide_setting, i);
// look up
config_setting_lookup_int(conf, "input", &hideinput); // theme.hide.input
config_setting_lookup_int(conf, "larrow", &hidelarrow); // theme.hide.larrow
config_setting_lookup_int(conf, "rarrow", &hiderarrow); // theme.hide.rarrow
config_setting_lookup_int(conf, "prompt", &hideprompt); // theme.hide.prompt
config_setting_lookup_int(conf, "items", &hideitem); // theme.hide.items
config_setting_lookup_int(conf, "powerline", &hidepowerline); // theme.hide.powerline
config_setting_lookup_int(conf, "caret", &hidecaret); // theme.hide.caret
config_setting_lookup_int(conf, "highlight", &hidehighlight); // theme.hide.highlight
config_setting_lookup_int(conf, "matchcount", &hidematchcount); // theme.hide.matchcount
config_setting_lookup_int(conf, "mode", &hidemode); // theme.hide.mode
config_setting_lookup_int(conf, "caps", &hidecaps); // theme.hide.caps
config_setting_lookup_int(conf, "hideimage", &hideimage); // theme.hide.image
}
}
// load options theme.pango
config_setting_t *pango_setting = config_lookup(&cfg, "theme.pango");
if (pango_setting != NULL) {
for (unsigned int i = 0; i < config_setting_length(pango_setting); ++i) {
config_setting_t *conf = config_setting_get_elem(pango_setting, i);
// look up
config_setting_lookup_int(conf, "item", &pango_item); // theme.pango.input
config_setting_lookup_int(conf, "highlight", &pango_highlight); // theme.pango.highlight
config_setting_lookup_int(conf, "prompt", &pango_prompt); // theme.pango.rarrow
config_setting_lookup_int(conf, "input", &pango_input); // theme.pango.input
config_setting_lookup_int(conf, "leftarrow", &pango_leftarrow); // theme.pango.leftarrow
config_setting_lookup_int(conf, "rightarrow", &pango_rightarrow); // theme.pango.rightarrow
config_setting_lookup_int(conf, "numbers", &pango_numbers); // theme.pango.numbers
config_setting_lookup_int(conf, "mode", &pango_mode); // theme.pango.mode
config_setting_lookup_int(conf, "caps", &pango_caps); // theme.pango.caps
config_setting_lookup_int(conf, "password", &pango_password); // theme.pango.mode
}
}
// we're done here
config_destroy(&cfg);
return;
}

1
libs/theme/theme.h Normal file
View file

@ -0,0 +1 @@
static void theme_load(void);

View file

@ -9,7 +9,8 @@ static char *class = "spmenu"; /* Class for spmenu */
static int fast = 0; /* Grab keyboard first */ static int fast = 0; /* Grab keyboard first */
static int xresources = 1; /* Enable .Xresources support */ static int xresources = 1; /* Enable .Xresources support */
static int globalcolors = 1; /* Recognize global colors (such as colors generated by Pywal) */ static int globalcolors = 1; /* Recognize global colors (such as colors generated by Pywal) */
static int loadconfig = 1; /* Load configuration (~/.spmenurc or ~/.config/spmenu/spmenurc and ~/.config/spmenu/spmenu.conf) on runtime */ static int loadconfig = 1; /* Load configuration (~/.spmenu.conf or ~/.config/spmenu/spmenu.conf) on runtime */
static int loadtheme = 1; /* Load theme (~/.theme.conf or ~/.config/spmenu/theme.conf) on runtime */
static int mon = -1; /* Monitor to run spmenu on */ static int mon = -1; /* Monitor to run spmenu on */
/* Window options */ /* Window options */

View file

@ -327,12 +327,21 @@ Useful for testing
Set config file to load to file Set config file to load to file
.TP .TP
\f[V]-lcfg, --load-config\f[R] \f[V]-lcfg, --load-config\f[R]
Load spmenu configuration (\[ti]/.config/spmenu/spmenu.conf, Load spmenu configuration (\[ti]/.spmenu.conf or
\[ti]/.spmenurc or \[ti]/.config/spmenu/spmenurc) \[ti]/.config/spmenu/spmenu.conf)
.TP .TP
\f[V]-ncfg, --no-load-config\f[R] \f[V]-ncfg, --no-load-config\f[R]
Don\[cq]t load spmenu configuration (\[ti]/.config/spmenu/spmenu.conf, Don\[cq]t load spmenu configuration (\[ti]/.spmenu.conf or
\[ti]/.spmenurc or \[ti]/.config/spmenu/spmenurc) \[ti]/.config/spmenu/spmenu.conf)
.TP
\f[V]-tm, --theme theme\f[R]
Load theme `theme' on runtime.
.TP
\f[V]-ltm, --load-theme\f[R]
Load theme
.TP
\f[V]-nltm, --no-load-theme\f[R]
Don\[cq]t load theme
.TP .TP
\f[V]-v, --version\f[R] \f[V]-v, --version\f[R]
Print spmenu version to stdout Print spmenu version to stdout

View file

@ -163,9 +163,12 @@ static int imageh = 0;
static int imageg = 0; static int imageg = 0;
#endif #endif
// config file
#if USECONFIG #if USECONFIG
static int cconf = 0; // custom config path static int cconf = 0; // use custom config path?
static char *argconf = NULL; static int ctheme = 0; // use custom theme path?
static char *argconf = NULL; // arg config path
static char *argtheme = NULL; // arg theme path
#endif #endif
// set an integer to 1 if we have rtl enabled, this saves a lot of lines and duplicate code // set an integer to 1 if we have rtl enabled, this saves a lot of lines and duplicate code

View file

@ -559,13 +559,25 @@ Set config file to load to file
</dd> </dd>
<dt><code>-lcfg, --load-config</code></dt> <dt><code>-lcfg, --load-config</code></dt>
<dd> <dd>
Load spmenu configuration (~/.config/spmenu/spmenu.conf, ~/.spmenurc or Load spmenu configuration (~/.spmenu.conf or
~/.config/spmenu/spmenurc) ~/.config/spmenu/spmenu.conf)
</dd> </dd>
<dt><code>-ncfg, --no-load-config</code></dt> <dt><code>-ncfg, --no-load-config</code></dt>
<dd> <dd>
Dont load spmenu configuration (~/.config/spmenu/spmenu.conf, Dont load spmenu configuration (~/.spmenu.conf or
~/.spmenurc or ~/.config/spmenu/spmenurc) ~/.config/spmenu/spmenu.conf)
</dd>
<dt><code>-tm, --theme theme</code></dt>
<dd>
Load theme theme on runtime.
</dd>
<dt><code>-ltm, --load-theme</code></dt>
<dd>
Load theme
</dd>
<dt><code>-nltm, --no-load-theme</code></dt>
<dd>
Dont load theme
</dd> </dd>
<dt><code>-v, --version</code></dt> <dt><code>-v, --version</code></dt>
<dd> <dd>

Binary file not shown.