TnSb/wofi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The color and style config options now have the same semantics as the command line options

Browse Source
This commit is contained in:
Scoopta 2020-01-12 22:20:37 -08:00
parent db8bf96411
commit e7be007842
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.c
View File

@ -488,10 +488,13 @@ int main(int argc, char** argv) {
} }
free(config_path); free(config_path);
if(style_str == NULL) {
style_str = map_get(config, "style");
}
//Check if --style was specified //Check if --style was specified
if(style_str == NULL) { if(style_str == NULL) {
style_str = map_get(config, "stylesheet"); style_str = map_get(config, "stylesheet");
style_str = style_str == NULL ? map_get(config, "style") : style_str;
if(style_str == NULL) { if(style_str == NULL) {
const char* style_f = "/style.css"; const char* style_f = "/style.css";
stylesheet = utils_concat(2, CONFIG_LOCATION, style_f); stylesheet = utils_concat(2, CONFIG_LOCATION, style_f);
@ -506,10 +509,13 @@ int main(int argc, char** argv) {
stylesheet = strdup(style_str); stylesheet = strdup(style_str);
} }
if(color_str == NULL) {
color_str = map_get(config, "color");
}
//Check if --color was specified //Check if --color was specified
if(color_str == NULL) { if(color_str == NULL) {
color_str = map_get(config, "colors"); color_str = map_get(config, "colors");
color_str = color_str == NULL ? map_get(config, "color") : color_str;
if(color_str == NULL) { if(color_str == NULL) {
color_path = strdup(COLORS_LOCATION); color_path = strdup(COLORS_LOCATION);
} else { } else {