X-Git-Url: http://wpitchoune.net/gitweb/?p=psensor-pkg-debian.git;a=blobdiff_plain;f=src%2Fcfg.c;h=d94f256aa221a8fdbb5c41b13ba2fad3756c39c8;hp=0f22ccb6ed254b8d8d9cbb8c38ca7af87ec46c7b;hb=bd7036af56a4b61b2b473dccbeac5e26f78b57da;hpb=48da1ac5531838d157762882ee455cec4da05728

diff --git a/src/cfg.c b/src/cfg.c
index 0f22ccb..d94f256 100644
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2014 jeanfi@gmail.com
+ * Copyright (C) 2010-2016 jeanfi@gmail.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -119,6 +119,10 @@ static const char *KEY_PROVIDER_LIBATASMART_ENABLED
 static const char *KEY_PROVIDER_NVCTRL_ENABLED = "provider-nvctrl-enabled";
 static const char *KEY_PROVIDER_UDISKS2_ENABLED = "provider-udisks2-enabled";
 
+static const char *KEY_DEFAULT_HIGH_THRESHOLD_TEMPERATURE
+= "default-high-threshold-temperature";
+static const char *KEY_DEFAULT_SENSOR_ALARM_ENABLED
+= "default-sensor-alarm-enabled";
 
 static GSettings *settings;
 
@@ -170,7 +174,7 @@ static int get_int(const char *k)
 	return g_settings_get_int(settings, k);
 }
 
-char *config_get_notif_script()
+char *config_get_notif_script(void)
 {
 	char *str;
 
@@ -191,7 +195,7 @@ void config_set_notif_script(const char *str)
 		set_string(KEY_NOTIFICATION_SCRIPT, "");
 }
 
-static struct color *get_background_color()
+static struct color *get_background_color(void)
 {
 	char *scolor;
 	struct color *c;
@@ -207,7 +211,7 @@ static struct color *get_background_color()
 	return c;
 }
 
-static struct color *get_foreground_color()
+static struct color *get_foreground_color(void)
 {
 	char *scolor;
 	struct color *c;
@@ -223,7 +227,7 @@ static struct color *get_foreground_color()
 	return c;
 }
 
-static bool is_alpha_channel_enabled()
+static bool is_alpha_channel_enabled(void)
 {
 	return get_bool(KEY_ALPHA_CHANNEL_ENABLED);
 }
@@ -233,17 +237,17 @@ static void set_alpha_channeld_enabled(bool b)
 	set_bool(KEY_ALPHA_CHANNEL_ENABLED, b);
 }
 
-static enum sensorlist_position get_sensorlist_position()
+enum sensorlist_position config_get_sensorlist_position(void)
 {
 	return get_int(KEY_INTERFACE_SENSORLIST_POSITION);
 }
 
-static void set_sensorlist_position(enum sensorlist_position pos)
+void config_set_sensorlist_position(enum sensorlist_position pos)
 {
 	set_int(KEY_INTERFACE_SENSORLIST_POSITION, pos);
 }
 
-static double get_graph_background_alpha()
+static double get_graph_background_alpha(void)
 {
 	return get_double(KEY_GRAPH_BACKGROUND_ALPHA);
 }
@@ -279,7 +283,7 @@ static void set_foreground_color(const struct color *color)
 	free(str);
 }
 
-bool is_slog_enabled()
+bool is_slog_enabled(void)
 {
 	return get_bool(KEY_SLOG_ENABLED);
 }
@@ -311,7 +315,7 @@ void config_set_slog_enabled_changed_cbk(void (*cbk)(void *), void *data)
 	log_fct_exit();
 }
 
-int config_get_slog_interval()
+int config_get_slog_interval(void)
 {
 	return get_int(KEY_SLOG_INTERVAL);
 }
@@ -324,27 +328,27 @@ static void set_slog_interval(int interval)
 	set_int(KEY_SLOG_INTERVAL, interval);
 }
 
-static bool is_window_decoration_enabled()
+bool config_is_window_decoration_enabled(void)
 {
 	return !get_bool(KEY_INTERFACE_WINDOW_DECORATION_DISABLED);
 }
 
-static bool is_window_keep_below_enabled()
+bool config_is_window_keep_below_enabled(void)
 {
 	return get_bool(KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED);
 }
 
-static void set_window_decoration_enabled(bool enabled)
+void config_set_window_decoration_enabled(bool enabled)
 {
 	set_bool(KEY_INTERFACE_WINDOW_DECORATION_DISABLED, !enabled);
 }
 
-static void set_window_keep_below_enabled(bool enabled)
+void config_set_window_keep_below_enabled(bool enabled)
 {
 	set_bool(KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED, enabled);
 }
 
-bool config_is_smooth_curves_enabled()
+bool config_is_smooth_curves_enabled(void)
 {
 	return get_bool(KEY_GRAPH_SMOOTH_CURVES_ENABLED);
 }
@@ -354,8 +358,17 @@ void config_set_smooth_curves_enabled(bool b)
 	set_bool(KEY_GRAPH_SMOOTH_CURVES_ENABLED, b);
 }
 
+double config_get_default_high_threshold_temperature(void)
+{
+	return get_double(KEY_DEFAULT_HIGH_THRESHOLD_TEMPERATURE);
+}
+
+static bool config_get_default_sensor_alarm_enabled(void)
+{
+	return get_bool(KEY_DEFAULT_SENSOR_ALARM_ENABLED);
+}
 
-static void init()
+static void init(void)
 {
 	log_fct_enter();
 
@@ -365,7 +378,7 @@ static void init()
 	log_fct_exit();
 }
 
-void config_cleanup()
+void config_cleanup(void)
 {
 	config_sync();
 
@@ -393,7 +406,7 @@ void config_cleanup()
 	slog_enabled_cbk = NULL;
 }
 
-struct config *config_load()
+struct config *config_load(void)
 {
 	struct config *c;
 
@@ -405,9 +418,6 @@ struct config *config_load()
 	c->graph_fgcolor = get_foreground_color();
 	c->graph_bg_alpha = get_graph_background_alpha();
 	c->alpha_channel_enabled = is_alpha_channel_enabled();
-	c->sensorlist_position = get_sensorlist_position();
-	c->window_decoration_enabled = is_window_decoration_enabled();
-	c->window_keep_below_enabled = is_window_keep_below_enabled();
 	c->slog_enabled = is_slog_enabled();
 	c->slog_interval = config_get_slog_interval();
 
@@ -425,13 +435,6 @@ struct config *config_load()
 	if (c->graph_monitoring_duration < 1)
 		c->graph_monitoring_duration = 10;
 
-	c->menu_bar_disabled = get_bool(KEY_INTERFACE_MENU_BAR_DISABLED);
-
-	c->unity_launcher_count_disabled
-		= get_bool(KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED);
-
-	c->hide_on_startup = get_bool(KEY_INTERFACE_HIDE_ON_STARTUP);
-
 	c->window_restore_enabled
 		= get_bool(KEY_INTERFACE_WINDOW_RESTORE_ENABLED);
 
@@ -447,8 +450,6 @@ struct config *config_load()
 		c->window_h = 200;
 	}
 
-	c->temperature_unit = get_int(KEY_INTERFACE_TEMPERATURE_UNIT);
-
 	c->sensor_values_max_length = compute_values_max_length(c);
 
 	return c;
@@ -460,9 +461,6 @@ void config_save(const struct config *c)
 	set_background_color(c->graph_bgcolor);
 	set_foreground_color(c->graph_fgcolor);
 	set_graph_background_alpha(c->graph_bg_alpha);
-	set_sensorlist_position(c->sensorlist_position);
-	set_window_decoration_enabled(c->window_decoration_enabled);
-	set_window_keep_below_enabled(c->window_keep_below_enabled);
 	set_slog_enabled(c->slog_enabled);
 	set_slog_interval(c->slog_interval);
 
@@ -472,11 +470,6 @@ void config_save(const struct config *c)
 
 	set_int(KEY_SENSOR_UPDATE_INTERVAL, c->sensor_update_interval);
 
-	set_bool(KEY_INTERFACE_MENU_BAR_DISABLED, c->menu_bar_disabled);
-
-	set_bool(KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED,
-		 c->unity_launcher_count_disabled);
-
 	set_bool(KEY_INTERFACE_HIDE_ON_STARTUP, c->hide_on_startup);
 
 	set_bool(KEY_INTERFACE_WINDOW_RESTORE_ENABLED,
@@ -488,11 +481,9 @@ void config_save(const struct config *c)
 	set_int(KEY_INTERFACE_WINDOW_H, c->window_h);
 
 	set_int(KEY_INTERFACE_WINDOW_DIVIDER_POS, c->window_divider_pos);
-
-	set_int(KEY_INTERFACE_TEMPERATURE_UNIT, c->temperature_unit);
 }
 
-const char *get_psensor_user_dir()
+const char *get_psensor_user_dir(void)
 {
 	const char *home;
 
@@ -521,7 +512,7 @@ const char *get_psensor_user_dir()
 	return user_dir;
 }
 
-static const char *get_sensor_config_path()
+static const char *get_sensor_config_path(void)
 {
 	const char *dir;
 
@@ -535,7 +526,7 @@ static const char *get_sensor_config_path()
 	return sensor_config_path;
 }
 
-static GKeyFile *get_sensor_key_file()
+static GKeyFile *get_sensor_key_file(void)
 {
 	int ret;
 	GError *err;
@@ -553,16 +544,18 @@ static GKeyFile *get_sensor_key_file()
 						| G_KEY_FILE_KEEP_TRANSLATIONS,
 						&err);
 
-		if (!ret)
+		if (!ret) {
 			log_warn(_("Failed to load configuration file %s: %s"),
 				 path,
 				 err->message);
+			g_error_free(err);
+		}
 	}
 
 	return key_file;
 }
 
-static void save_sensor_key_file()
+static void save_sensor_key_file(void)
 {
 	GKeyFile *kfile;
 	const char *path;
@@ -584,7 +577,7 @@ static void save_sensor_key_file()
 	log_fct_exit();
 }
 
-void config_sync()
+void config_sync(void)
 {
 	log_fct_enter();
 	if (settings)
@@ -609,12 +602,50 @@ static char *sensor_get_str(const char *sid, const char *att)
 	return g_key_file_get_string(kfile, sid, att, NULL);
 }
 
-static bool sensor_get_bool(const char *sid, const char *att)
+static bool sensor_get_double(const char *sid, const char *att, double *d)
+{
+	GKeyFile *kfile;
+	GError *err;
+	double v;
+
+	kfile = get_sensor_key_file();
+
+	err = NULL;
+	v = g_key_file_get_double(kfile, sid, att, &err);
+
+	if (err) {
+		log_err(err->message);
+
+		g_error_free(err);
+
+		return false;
+	}
+
+	*d = v;
+	return true;
+}
+
+static bool sensor_get_bool(const char *sid, const char *att, bool dft)
 {
 	GKeyFile *kfile;
+	GError *err;
+	bool ret;
 
 	kfile = get_sensor_key_file();
-	return g_key_file_get_boolean(kfile, sid, att, NULL);
+
+	err = NULL;
+	ret = g_key_file_get_boolean(kfile, sid, att, &err);
+
+	if (err) {
+		if (err->code == G_KEY_FILE_ERROR_KEY_NOT_FOUND)
+			ret = dft;
+		else
+			log_err(err->message);
+
+		g_error_free(err);
+	}
+
+	return ret;
 }
 
 static void sensor_set_bool(const char *sid, const char *att, bool enabled)
@@ -653,43 +684,85 @@ void config_set_sensor_name(const char *sid, const char *name)
 	sensor_set_str(sid, ATT_SENSOR_NAME, name);
 }
 
-void config_set_sensor_color(const char *sid, const struct color *color)
-{
-	char *scolor;
-
-	scolor = color_to_str(color);
+void config_set_sensor_color(const char *sid, const GdkRGBA *color)
+{
+	gchar *str;
+
+	str = gdk_rgba_to_string(color);
+
+	sensor_set_str(sid, ATT_SENSOR_COLOR, str);
+
+	g_free(str);
+}
+
+static const char *next_default_color(void)
+{
+	/* copied from the default colors of the gtk color color
+	 * chooser.
+	 */
+	const char *default_colors[27] = {
+		"#ef2929",  /* Scarlet Red */
+		"#fcaf3e",  /* Orange */
+		"#fce94f",  /* Butter */
+		"#8ae234",  /* Chameleon */
+		"#729fcf",  /* Sky Blue */
+		"#ad7fa8",  /* Plum */
+		"#e9b96e",  /* Chocolate */
+		"#888a85",  /* Aluminum 1 */
+		"#eeeeec",  /* Aluminum 2 */
+		"#cc0000",
+		"#f57900",
+		"#edd400",
+		"#73d216",
+		"#3465a4",
+		"#75507b",
+		"#c17d11",
+		"#555753",
+		"#d3d7cf",
+		"#a40000",
+		"#ce5c00",
+		"#c4a000",
+		"#4e9a06",
+		"#204a87",
+		"#5c3566",
+		"#8f5902",
+		"#2e3436",
+		"#babdb6"
+	};
+	static int next_idx;
+	const char *c;
+
+	c = default_colors[next_idx % 27];
+
+	next_idx++;
 
-	sensor_set_str(sid, ATT_SENSOR_COLOR, scolor);
-
-	free(scolor);
+	return c;
 }
 
-struct color *
-config_get_sensor_color(const char *sid, const struct color *dft)
+GdkRGBA *config_get_sensor_color(const char *sid)
 {
-	char *scolor;
-	struct color *color;
-
-	scolor = sensor_get_str(sid, ATT_SENSOR_COLOR);
+	GdkRGBA rgba;
+	char *str;
+	gboolean ret;
 
-	if (scolor)
-		color = str_to_color(scolor);
-	else
-		color = NULL;
+	str = sensor_get_str(sid, ATT_SENSOR_COLOR);
 
-	if (!color) {
-		color = color_new(dft->red, dft->green, dft->blue);
-		config_set_sensor_color(sid, color);
+	if (str) {
+		ret = gdk_rgba_parse(&rgba, str);
+		free(str);
 	}
 
-	free(scolor);
+	if (!str || !ret) {
+		gdk_rgba_parse(&rgba, next_default_color());
+		config_set_sensor_color(sid, &rgba);
+	}
 
-	return color;
+	return gdk_rgba_copy(&rgba);
 }
 
 bool config_is_sensor_graph_enabled(const char *sid)
 {
-	return sensor_get_bool(sid, ATT_SENSOR_GRAPH_ENABLED);
+	return sensor_get_bool(sid, ATT_SENSOR_GRAPH_ENABLED, false);
 }
 
 void config_set_sensor_graph_enabled(const char *sid, bool enabled)
@@ -697,9 +770,9 @@ void config_set_sensor_graph_enabled(const char *sid, bool enabled)
 	sensor_set_bool(sid, ATT_SENSOR_GRAPH_ENABLED, enabled);
 }
 
-int config_get_sensor_alarm_high_threshold(const char *sid)
+bool config_get_sensor_alarm_high_threshold(const char *sid, double *v)
 {
-	return sensor_get_int(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD);
+	return sensor_get_double(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD, v);
 }
 
 void config_set_sensor_alarm_high_threshold(const char *sid, int threshold)
@@ -707,9 +780,9 @@ void config_set_sensor_alarm_high_threshold(const char *sid, int threshold)
 	sensor_set_int(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD, threshold);
 }
 
-int config_get_sensor_alarm_low_threshold(const char *sid)
+bool config_get_sensor_alarm_low_threshold(const char *sid, double *v)
 {
-	return sensor_get_int(sid, ATT_SENSOR_ALARM_LOW_THRESHOLD);
+	return sensor_get_double(sid, ATT_SENSOR_ALARM_LOW_THRESHOLD, v);
 }
 
 void config_set_sensor_alarm_low_threshold(const char *sid, int threshold)
@@ -719,14 +792,16 @@ void config_set_sensor_alarm_low_threshold(const char *sid, int threshold)
 
 bool config_is_appindicator_enabled(const char *sid)
 {
-	return !sensor_get_bool(sid, ATT_SENSOR_APPINDICATOR_MENU_DISABLED);
+	return !sensor_get_bool(sid,
+				ATT_SENSOR_APPINDICATOR_MENU_DISABLED,
+				false);
 }
 
 void config_set_appindicator_enabled(const char *sid, bool enabled)
 {
-	return sensor_set_bool(sid,
-			       ATT_SENSOR_APPINDICATOR_MENU_DISABLED,
-			       !enabled);
+	sensor_set_bool(sid,
+			ATT_SENSOR_APPINDICATOR_MENU_DISABLED,
+			!enabled);
 }
 
 int config_get_sensor_position(const char *sid)
@@ -736,12 +811,12 @@ int config_get_sensor_position(const char *sid)
 
 void config_set_sensor_position(const char *sid, int pos)
 {
-	return sensor_set_int(sid, ATT_SENSOR_POSITION, pos);
+	sensor_set_int(sid, ATT_SENSOR_POSITION, pos);
 }
 
 bool config_get_sensor_alarm_enabled(const char *sid)
 {
-	return sensor_get_bool(sid, ATT_SENSOR_ALARM_ENABLED);
+	return sensor_get_bool(sid, ATT_SENSOR_ALARM_ENABLED, false);
 }
 
 void config_set_sensor_alarm_enabled(const char *sid, bool enabled)
@@ -751,7 +826,9 @@ void config_set_sensor_alarm_enabled(const char *sid, bool enabled)
 
 bool config_is_sensor_enabled(const char *sid)
 {
-	return !sensor_get_bool(sid, ATT_SENSOR_HIDE);
+	return !sensor_get_bool(sid,
+				ATT_SENSOR_HIDE,
+				config_get_default_sensor_alarm_enabled());
 }
 
 void config_set_sensor_enabled(const char *sid, bool enabled)
@@ -761,7 +838,9 @@ void config_set_sensor_enabled(const char *sid, bool enabled)
 
 bool config_is_appindicator_label_enabled(const char *sid)
 {
-	return sensor_get_bool(sid, ATT_SENSOR_APPINDICATOR_LABEL_ENABLED);
+	return sensor_get_bool(sid,
+			       ATT_SENSOR_APPINDICATOR_LABEL_ENABLED,
+			       false);
 }
 
 void config_set_appindicator_label_enabled(const char *sid, bool enabled)
@@ -769,42 +848,42 @@ void config_set_appindicator_label_enabled(const char *sid, bool enabled)
 	sensor_set_bool(sid, ATT_SENSOR_APPINDICATOR_LABEL_ENABLED, enabled);
 }
 
-GSettings *config_get_GSettings()
+GSettings *config_get_GSettings(void)
 {
 	return settings;
 }
 
-bool config_is_lmsensor_enabled()
+bool config_is_lmsensor_enabled(void)
 {
 	return get_bool(KEY_PROVIDER_LMSENSORS_ENABLED);
 }
 
-bool config_is_gtop2_enabled()
+bool config_is_gtop2_enabled(void)
 {
 	return get_bool(KEY_PROVIDER_GTOP2_ENABLED);
 }
 
-bool config_is_udisks2_enabled()
+bool config_is_udisks2_enabled(void)
 {
 	return get_bool(KEY_PROVIDER_UDISKS2_ENABLED);
 }
 
-bool config_is_hddtemp_enabled()
+bool config_is_hddtemp_enabled(void)
 {
 	return get_bool(KEY_PROVIDER_HDDTEMP_ENABLED);
 }
 
-bool config_is_libatasmart_enabled()
+bool config_is_libatasmart_enabled(void)
 {
 	return get_bool(KEY_PROVIDER_LIBATASMART_ENABLED);
 }
 
-bool config_is_nvctrl_enabled()
+bool config_is_nvctrl_enabled(void)
 {
 	return get_bool(KEY_PROVIDER_NVCTRL_ENABLED);
 }
 
-bool config_is_atiadlsdk_enabled()
+bool config_is_atiadlsdk_enabled(void)
 {
 	return get_bool(KEY_PROVIDER_ATIADLSDK_ENABLED);
 }
@@ -843,3 +922,33 @@ void config_set_udisks2_enable(bool b)
 {
 	set_bool(KEY_PROVIDER_UDISKS2_ENABLED, b);
 }
+
+enum temperature_unit config_get_temperature_unit(void)
+{
+	return get_int(KEY_INTERFACE_TEMPERATURE_UNIT);
+}
+
+void config_set_temperature_unit(enum temperature_unit u)
+{
+	set_int(KEY_INTERFACE_TEMPERATURE_UNIT, u);
+}
+
+bool config_is_menu_bar_enabled(void)
+{
+	return !get_bool(KEY_INTERFACE_MENU_BAR_DISABLED);
+}
+
+void config_set_menu_bar_enabled(bool enabled)
+{
+	set_bool(KEY_INTERFACE_MENU_BAR_DISABLED, !enabled);
+}
+
+bool config_is_count_visible(void)
+{
+	return !get_bool(KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED);
+}
+
+void config_set_count_visible(bool visible)
+{
+	set_bool(KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED, !visible);
+}