make default_{shade_,outline_,}color lua settings

src/conky.cc

@@ -363,8 +363,6 @@ int get_stippled_borders(void)
 static conky::simple_config_setting<bool> draw_shades("draw_shades", true, false);
 static conky::simple_config_setting<bool> draw_outline("draw_outline", false, false);
 
-long default_fg_color, default_bg_color, default_out_color;
-
 #ifdef OWN_WINDOW
 /* fixed size/pos is set if wm/user changes them */
 static int fixed_size = 0, fixed_pos = 0;
@@ -1477,13 +1475,6 @@ int draw_each_line_inner(char *s, int special_index, int last_special_applied)
 							&& h > font_h) {
 						cur_y_add = h;
 					}
-					/* if (draw_mode == BG) {
-						set_foreground_color(default_bg_color);
-					} else if (draw_mode == OUTLINE) {
-						set_foreground_color(default_out_color);
-					} else {
-						set_foreground_color(default_fg_color);
-					} */
 					if (show_graph_range.get(*state)) {
 						int tmp_x = cur_x;
 						int tmp_y = cur_y;
@@ -1769,7 +1760,7 @@ static void draw_stuff(void)
 		if (draw_shades.get(*state) && !draw_outline.get(*state)) {
 			text_start_x++;
 			text_start_y++;
-			set_foreground_color(default_bg_color);
+			set_foreground_color(default_shade_color.get(*state));
 			draw_mode = BG;
 			draw_text();
 			text_start_x--;
@@ -1787,7 +1778,7 @@ static void draw_stuff(void)
 					}
 					text_start_x += i;
 					text_start_y += j;
-					set_foreground_color(default_out_color);
+					set_foreground_color(default_outline_color.get(*state));
 					draw_mode = OUTLINE;
 					draw_text();
 					text_start_x -= i;
@@ -1796,7 +1787,7 @@ static void draw_stuff(void)
 			}
 		}
 
-		set_foreground_color(default_fg_color);
+		set_foreground_color(default_color.get(*state));
 	}
 #endif /* BUILD_X11 */
 	draw_mode = FG;
@@ -2328,9 +2319,6 @@ static void main_loop(void)
 #endif /* HAVE_SYS_INOTIFY_H */
 }
 
-#ifdef BUILD_X11
-static void load_config_file_x11(const char *);
-#endif /* BUILD_X11 */
 void initialisation(int argc, char** argv);
 
 	/* reload the config file */
@@ -2450,14 +2438,11 @@ static bool string_to_bool(const char *s)
 	return false;
 }
 
-#ifdef BUILD_X11
 // XXX
+#if 0 && BUILD_X11
 static void __attribute__((unused)) set_default_configurations_for_x(void)
 {
-	default_fg_color = WhitePixel(display, screen);
+	current_text_color = default_color;
-	default_bg_color = BlackPixel(display, screen);
-	default_out_color = BlackPixel(display, screen);
-	current_text_color = default_fg_color;
 }
 #endif /* BUILD_X11 */
 
@@ -3246,10 +3231,6 @@ char load_config_file(const char *f)
 #endif /* BUILD_X11 */
 #endif /* BUILD_LUA */
 
-		CONF("default_color"){}
-		CONF3("default_shade_color", "default_shadecolor"){}
-		CONF3("default_outline_color", "default_outlinecolor") {}
-
 		else {
 			NORM_ERR("%s: %d: no such configuration: '%s'", f, line, name);
 		}
@@ -3283,72 +3264,6 @@ char load_config_file(const char *f)
 	return TRUE;
 }
 
-#ifdef BUILD_X11
-static void load_config_file_x11(const char *f)
-{
-	int line = 0;
-	FILE *fp;
-
-	fp = open_config_file(f);
-	if (!fp) {
-		return;
-	}
-	DBGP("reading contents from config file '%s'", f);
-
-	while (!feof(fp)) {
-		char buff[CONF_BUFF_SIZE], *name, *value;
-		int ret = do_config_step(&line, fp, buff, &name, &value);
-		if (ret == CONF_BREAK) {
-			break;
-		} else if (ret == CONF_CONTINUE) {
-			continue;
-		}
-
-		CONF("default_color") {
-			// XXX X11_initialisation();
-			if (x_initialised == YES) {
-				if (value) {
-					default_fg_color = get_x11_color(value);
-				} else {
-					CONF_ERR;
-				}
-			}
-		}
-		CONF3("default_shade_color", "default_shadecolor") {
-			// XXX X11_initialisation();
-			if (x_initialised == YES) {
-				if (value) {
-					default_bg_color = get_x11_color(value);
-				} else {
-					CONF_ERR;
-				}
-			}
-		}
-		CONF3("default_outline_color", "default_outlinecolor") {
-			// XXX X11_initialisation();
-			if (x_initialised == YES) {
-				if (value) {
-					default_out_color = get_x11_color(value);
-				} else {
-					CONF_ERR;
-				}
-			}
-		}
-#undef CONF
-#undef CONF2
-#undef CONF3
-#undef CONF_ERR
-#undef CONF_ERR2
-#undef CONF_BREAK
-#undef CONF_CONTINUE
-#undef CONF_BUFF_SIZE
-	}
-
-	fclose(fp);
-
-}
-#endif /* BUILD_X11 */
-
 static void print_help(const char *prog_name) {
 	printf("Usage: %s [OPTION]...\n"
 			PACKAGE_NAME" is a system monitor that renders text on desktop or to own transparent\n"
@@ -3617,13 +3532,6 @@ void initialisation(int argc, char **argv) {
 		}
 	}
 
-#ifdef BUILD_X11
-	/* load font */
-	if (out_to_x.get(*state)) {
-		load_config_file_x11(current_config.c_str());
-	}
-#endif /* BUILD_X11 */
-
 	/* generate text and get initial size */
 	extract_variable_text(global_text);
 	free_and_zero(global_text);

src/conky.h

@@ -158,9 +158,6 @@ struct x11_info {
 
 #endif /* BUILD_X11 */
 
-/* defined in conky.c */
-extern long default_fg_color, default_bg_color, default_out_color;
-
 struct conftree {
 	char* string;
 	struct conftree* horz_next;

src/core.cc

@@ -471,7 +471,7 @@ struct text_object *construct_text_object(char *s, const char *arg, long
 	END OBJ(color, 0)
 #ifdef BUILD_X11
 		if (out_to_x.get(*state)) {
-			obj->data.l = arg ? get_x11_color(arg) : default_fg_color;
+			obj->data.l = arg ? get_x11_color(arg) : default_color.get(*state);
 			set_current_text_color(obj->data.l);
 		}
 #endif /* BUILD_X11 */
@@ -1051,12 +1051,12 @@ struct text_object *construct_text_object(char *s, const char *arg, long
 #endif /* __linux__ */
 	END OBJ(shadecolor, 0)
 #ifdef BUILD_X11
-		obj->data.l = arg ? get_x11_color(arg) : default_bg_color;
+		obj->data.l = arg ? get_x11_color(arg) : default_shade_color.get(*state);
 		obj->callbacks.print = &new_bg;
 #endif /* BUILD_X11 */
 	END OBJ(outlinecolor, 0)
 #ifdef BUILD_X11
-		obj->data.l = arg ? get_x11_color(arg) : default_out_color;
+		obj->data.l = arg ? get_x11_color(arg) : default_outline_color.get(*state);
 		obj->callbacks.print = &new_outline;
 #endif /* BUILD_X11 */
 	END OBJ(stippled_hr, 0)

src/x11.cc

@@ -202,6 +202,9 @@ priv::colour_setting					  color[10] = {
 	{ "color8", 0xffffff },
 	{ "color9", 0xffffff }
 };
+priv::colour_setting					  default_color("default_color", 0xffffff);
+priv::colour_setting					  default_shade_color("default_shade_color", 0x000000);
+priv::colour_setting					  default_outline_color("default_outline_color", 0x000000);
 
 #ifdef OWN_WINDOW
 conky::simple_config_setting<bool>        own_window("own_window", false, false);

src/x11.h

@@ -184,6 +184,9 @@ namespace priv {
 extern priv::out_to_x_setting                    out_to_x;
 extern conky::simple_config_setting<std::string> display_name;
 extern priv::colour_setting						 color[10];
+extern priv::colour_setting						 default_color;
+extern priv::colour_setting						 default_shade_color;
+extern priv::colour_setting						 default_outline_color;
 
 #ifdef OWN_WINDOW
 extern conky::simple_config_setting<bool>        own_window;