X-Git-Url: http://wpitchoune.net/gitweb/?p=psensor-pkg-debian.git;a=blobdiff_plain;f=src%2Fcfg.c;h=0f22ccb6ed254b8d8d9cbb8c38ca7af87ec46c7b;hp=606ecc46dc9fdd38e1bdd8b56ea01d83865528ed;hb=4e6ce51e7afeb7924573c40796910cd003850949;hpb=f055e7507526592d3a74c652f5f053701614c9c0 diff --git a/src/cfg.c b/src/cfg.c index 606ecc4..0f22ccb 100644 --- a/src/cfg.c +++ b/src/cfg.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2012 jeanfi@gmail.com + * Copyright (C) 2010-2014 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 @@ -16,541 +16,830 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301 USA */ + +#include #include #include #include #include +#include +#include + +#include +#include +#define _(str) gettext(str) + +#include +#include +#include +#include + +/* Properties of each sensor */ +static const char *ATT_SENSOR_ALARM_ENABLED = "alarm_enabled"; +static const char *ATT_SENSOR_ALARM_HIGH_THRESHOLD = "alarm_high_threshold"; +static const char *ATT_SENSOR_ALARM_LOW_THRESHOLD = "alarm_low_threshold"; +static const char *ATT_SENSOR_COLOR = "color"; +static const char *ATT_SENSOR_GRAPH_ENABLED = "graph_enabled"; +static const char *ATT_SENSOR_NAME = "name"; +static const char *ATT_SENSOR_APPINDICATOR_MENU_DISABLED += "appindicator_menu_disabled"; +static const char *ATT_SENSOR_APPINDICATOR_LABEL_ENABLED += "appindicator_label_enabled"; +static const char *ATT_SENSOR_POSITION = "position"; +static const char *ATT_SENSOR_HIDE = "hide"; + +/* Update interval of the measures of the sensors */ +static const char *KEY_SENSOR_UPDATE_INTERVAL += "sensor-update-interval"; + +/* Graph settings */ +static const char *KEY_GRAPH_UPDATE_INTERVAL = "graph-update-interval"; +static const char *KEY_GRAPH_MONITORING_DURATION = "graph-monitoring-duration"; +static const char *KEY_GRAPH_BACKGROUND_COLOR = "graph-background-color"; +static const char *DEFAULT_GRAPH_BACKGROUND_COLOR = "#e8f4e8f4a8f5"; +static const char *KEY_GRAPH_BACKGROUND_ALPHA = "graph-background-alpha"; +static const char *KEY_GRAPH_FOREGROUND_COLOR += "graph-foreground-color"; +static const char *KEY_GRAPH_SMOOTH_CURVES_ENABLED += "graph-smooth-curves-enabled"; + +static const char *DEFAULT_GRAPH_FOREGROUND_COLOR = "#000000000000"; + +static const char *KEY_ALPHA_CHANNEL_ENABLED = "graph-alpha-channel-enabled"; + +/* Inteface settings */ +static const char *KEY_INTERFACE_SENSORLIST_POSITION += "interface-sensorlist-position"; + +static const char *KEY_INTERFACE_WINDOW_DECORATION_DISABLED += "interface-window-decoration-disabled"; + +static const char *KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED += "interface-window-keep-below-enabled"; + +static const char *KEY_INTERFACE_MENU_BAR_DISABLED += "interface-menu-bar-disabled"; + +static const char *KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED += "interface-unity-launcher-count-disabled"; + +static const char *KEY_INTERFACE_HIDE_ON_STARTUP += "interface-hide-on-startup"; + +static const char *KEY_INTERFACE_WINDOW_RESTORE_ENABLED += "interface-window-restore-enabled"; + +static const char *KEY_INTERFACE_WINDOW_X = "interface-window-x"; +static const char *KEY_INTERFACE_WINDOW_Y = "interface-window-y"; +static const char *KEY_INTERFACE_WINDOW_W = "interface-window-w"; +static const char *KEY_INTERFACE_WINDOW_H = "interface-window-h"; -#include +static const char *KEY_INTERFACE_WINDOW_DIVIDER_POS += "interface-window-divider-pos"; -#include "cfg.h" +static const char *KEY_INTERFACE_TEMPERATURE_UNIT += "interface-temperature-unit"; -#define KEY_SENSOR_UPDATE_INTERVAL "/apps/psensor/sensor/update_interval" +/* Sensor logging settings */ +static const char *KEY_SLOG_ENABLED = "slog-enabled"; +static const char *KEY_SLOG_INTERVAL = "slog-interval"; -#define KEY_GRAPH_UPDATE_INTERVAL "/apps/psensor/graph/update_interval" -#define KEY_GRAPH_MONITORING_DURATION "/apps/psensor/graph/monitoring_duration" +/* Path to the script called when a notification is raised */ +static const char *KEY_NOTIFICATION_SCRIPT = "notif-script"; -#define KEY_GRAPH_BACKGROUND_COLOR "/apps/psensor/graph/background_color" -#define DEFAULT_GRAPH_BACKGROUND_COLOR "#e8f4e8f4a8f5" +/* Provider settings */ +static const char *KEY_PROVIDER_LMSENSORS_ENABLED += "provider-lmsensors-enabled"; +static const char *KEY_PROVIDER_ATIADLSDK_ENABLED += "provider-atiadlsdk-enabled"; +static const char *KEY_PROVIDER_GTOP2_ENABLED = "provider-gtop2-enabled"; +static const char *KEY_PROVIDER_HDDTEMP_ENABLED = "provider-hddtemp-enabled"; +static const char *KEY_PROVIDER_LIBATASMART_ENABLED += "provider-libatasmart-enabled"; +static const char *KEY_PROVIDER_NVCTRL_ENABLED = "provider-nvctrl-enabled"; +static const char *KEY_PROVIDER_UDISKS2_ENABLED = "provider-udisks2-enabled"; -#define KEY_GRAPH_BACKGROUND_ALPHA "/apps/psensor/graph/background_alpha" -#define DEFAULT_GRAPH_BACKGROUND_ALPHA "1.0" -#define KEY_GRAPH_FOREGROUND_COLOR "/apps/psensor/graph/foreground_color" -#define DEFAULT_GRAPH_FOREGROUND_COLOR "#000000000000" +static GSettings *settings; -#define KEY_ALPHA_CHANNEL_ENABLED "/apps/psensor/graph/alpha_channel_enabled" -#define DEFAULT_ALPHA_CHANNEL_ENABLED 0 +static char *user_dir; -#define KEY_INTERFACE_SENSORLIST_POSITION \ -"/apps/psensor/interface/sensorlist_position" +static GKeyFile *key_file; -#define KEY_INTERFACE_WINDOW_DECORATION_DISABLED \ -"/apps/psensor/interface/window_decoration_disabled" +static char *sensor_config_path; -#define KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED \ -"/apps/psensor/interface/window_keep_below_enabled" +static void (*slog_enabled_cbk)(void *); -#define KEY_INTERFACE_MENU_BAR_DISABLED \ -"/apps/psensor/interface/menu_bar_disabled" +static char *get_string(const char *key) +{ + return g_settings_get_string(settings, key); +} -#define KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED \ -"/apps/psensor/interface/unity_launcher_count_disabled" +static void set_string(const char *key, const char *str) +{ + g_settings_set_string(settings, key, str); +} -#define KEY_INTERFACE_HIDE_ON_STARTUP \ -"/apps/psensor/interface/hide_on_startup" +static void set_bool(const char *k, bool b) +{ + g_settings_set_boolean(settings, k, b); +} -#define KEY_INTERFACE_WINDOW_RESTORE_ENABLED \ -"/apps/psensor/interface/window_restore_enabled" +static bool get_bool(const char *k) +{ + return g_settings_get_boolean(settings, k); +} -#define KEY_INTERFACE_WINDOW_X "/apps/psensor/interface/window_x" -#define KEY_INTERFACE_WINDOW_Y "/apps/psensor/interface/window_y" -#define KEY_INTERFACE_WINDOW_W "/apps/psensor/interface/window_w" -#define KEY_INTERFACE_WINDOW_H "/apps/psensor/interface/window_h" +static void set_int(const char *k, int i) +{ + g_settings_set_int(settings, k, i); +} -#define KEY_INTERFACE_WINDOW_DIVIDER_POS \ -"/apps/psensor/interface/window_divider_pos" +static double get_double(const char *k) +{ + return g_settings_get_double(settings, k); +} -GConfClient *client; +static void set_double(const char *k, double d) +{ + g_settings_set_double(settings, k, d); +} -static char *get_string(char *key, char *default_value) +static int get_int(const char *k) { - char *value = gconf_client_get_string(client, - key, - NULL); + return g_settings_get_int(settings, k); +} - if (!value) { - value = strdup(default_value); +char *config_get_notif_script() +{ + char *str; - gconf_client_set_string(client, key, default_value, NULL); + str = get_string(KEY_NOTIFICATION_SCRIPT); + if (str && !strlen(str)) { + free(str); + str = NULL; } - return value; + return str; } -static struct color *config_get_background_color() +void config_set_notif_script(const char *str) { + if (str && strlen(str) > 0) + set_string(KEY_NOTIFICATION_SCRIPT, str); + else + set_string(KEY_NOTIFICATION_SCRIPT, ""); +} - char *scolor = get_string(KEY_GRAPH_BACKGROUND_COLOR, - DEFAULT_GRAPH_BACKGROUND_COLOR); +static struct color *get_background_color() +{ + char *scolor; + struct color *c; - struct color *c = string_to_color(scolor); + scolor = get_string(KEY_GRAPH_BACKGROUND_COLOR); + c = str_to_color(scolor); free(scolor); - if (c == NULL) - return color_new(0xffff, 0xffff, 0xffff); + if (!c) + return color_new(1, 1, 1); return c; } -static struct color *config_get_foreground_color() +static struct color *get_foreground_color() { - char *scolor = get_string(KEY_GRAPH_FOREGROUND_COLOR, - DEFAULT_GRAPH_FOREGROUND_COLOR); + char *scolor; + struct color *c; - struct color *c = string_to_color(scolor); + scolor = get_string(KEY_GRAPH_FOREGROUND_COLOR); + c = str_to_color(scolor); free(scolor); - if (c == NULL) - return color_new(0x0000, 0x0000, 0x0000); + if (!c) + return color_new(0, 0, 0); return c; } -static int config_is_alpha_channel_enabled() +static bool is_alpha_channel_enabled() { - gboolean b = gconf_client_get_bool(client, - KEY_ALPHA_CHANNEL_ENABLED, - NULL); - - return b == TRUE; + return get_bool(KEY_ALPHA_CHANNEL_ENABLED); } -static int config_get_sensorlist_position() +static void set_alpha_channeld_enabled(bool b) { - return gconf_client_get_int(client, - KEY_INTERFACE_SENSORLIST_POSITION, NULL); + set_bool(KEY_ALPHA_CHANNEL_ENABLED, b); } -static void config_set_sensorlist_position(int pos) +static enum sensorlist_position get_sensorlist_position() { - gconf_client_set_int(client, - KEY_INTERFACE_SENSORLIST_POSITION, pos, NULL); + return get_int(KEY_INTERFACE_SENSORLIST_POSITION); } -static double config_get_graph_background_alpha() +static void set_sensorlist_position(enum sensorlist_position pos) { - double a = gconf_client_get_float(client, - KEY_GRAPH_BACKGROUND_ALPHA, - NULL); + set_int(KEY_INTERFACE_SENSORLIST_POSITION, pos); +} - if (a == 0) - gconf_client_set_float(client, - KEY_GRAPH_BACKGROUND_ALPHA, 1.0, NULL); - return a; +static double get_graph_background_alpha() +{ + return get_double(KEY_GRAPH_BACKGROUND_ALPHA); } -static void config_set_graph_background_alpha(double alpha) +static void set_graph_background_alpha(double alpha) { - gconf_client_set_float(client, KEY_GRAPH_BACKGROUND_ALPHA, alpha, NULL); + set_double(KEY_GRAPH_BACKGROUND_ALPHA, alpha); } -static void config_set_background_color(struct color *color) +static void set_background_color(const struct color *color) { - char *scolor = color_to_string(color); + char *scolor; + scolor = color_to_str(color); if (!scolor) scolor = strdup(DEFAULT_GRAPH_BACKGROUND_COLOR); - gconf_client_set_string(client, - KEY_GRAPH_BACKGROUND_COLOR, scolor, NULL); + set_string(KEY_GRAPH_BACKGROUND_COLOR, scolor); free(scolor); } -static void config_set_foreground_color(struct color *color) +static void set_foreground_color(const struct color *color) { - char *scolor = color_to_string(color); + char *str; - if (!scolor) - scolor = strdup(DEFAULT_GRAPH_FOREGROUND_COLOR); + str = color_to_str(color); + if (!str) + str = strdup(DEFAULT_GRAPH_FOREGROUND_COLOR); - gconf_client_set_string(client, - KEY_GRAPH_FOREGROUND_COLOR, scolor, NULL); + set_string(KEY_GRAPH_FOREGROUND_COLOR, str); - free(scolor); + free(str); +} + +bool is_slog_enabled() +{ + return get_bool(KEY_SLOG_ENABLED); +} + +static void set_slog_enabled(bool enabled) +{ + set_bool(KEY_SLOG_ENABLED, enabled); } -static char *config_get_sensor_key(char *sensor_name) +static void slog_enabled_changed_cbk(GSettings *settings, + gchar *key, + gpointer data) { - char *escaped_name = gconf_escape_key(sensor_name, -1); - /* /apps/psensor/sensors/[sensor_name]/color */ - char *key = malloc(22 + 2 * strlen(escaped_name) + 6 + 1); + if (slog_enabled_cbk) + slog_enabled_cbk(data); +} + +void config_set_slog_enabled_changed_cbk(void (*cbk)(void *), void *data) +{ + log_fct_enter(); - sprintf(key, "/apps/psensor/sensors/%s/color", escaped_name); + slog_enabled_cbk = cbk; - free(escaped_name); + g_signal_connect_after(settings, + "changed::slog-enabled", + G_CALLBACK(slog_enabled_changed_cbk), + data); - return key; + log_fct_exit(); } -struct color *config_get_sensor_color(char *sensor_name, - struct color *default_color) +int config_get_slog_interval() { - char *key = config_get_sensor_key(sensor_name); + return get_int(KEY_SLOG_INTERVAL); +} - char *scolor = gconf_client_get_string(client, - key, - NULL); +static void set_slog_interval(int interval) +{ + if (interval <= 0) + interval = 300; - struct color *color = NULL; + set_int(KEY_SLOG_INTERVAL, interval); +} - if (scolor) - color = string_to_color(scolor); +static bool is_window_decoration_enabled() +{ + return !get_bool(KEY_INTERFACE_WINDOW_DECORATION_DISABLED); +} - if (!scolor || !color) { - color = color_new(default_color->red, - default_color->green, default_color->blue); +static bool is_window_keep_below_enabled() +{ + return get_bool(KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED); +} - scolor = color_to_string(color); +static void set_window_decoration_enabled(bool enabled) +{ + set_bool(KEY_INTERFACE_WINDOW_DECORATION_DISABLED, !enabled); +} - gconf_client_set_string(client, key, scolor, NULL); +static void set_window_keep_below_enabled(bool enabled) +{ + set_bool(KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED, enabled); +} + +bool config_is_smooth_curves_enabled() +{ + return get_bool(KEY_GRAPH_SMOOTH_CURVES_ENABLED); +} + +void config_set_smooth_curves_enabled(bool b) +{ + set_bool(KEY_GRAPH_SMOOTH_CURVES_ENABLED, b); +} + + +static void init() +{ + log_fct_enter(); + + if (!settings) + settings = g_settings_new("psensor"); + + log_fct_exit(); +} + +void config_cleanup() +{ + config_sync(); + + if (settings) { + g_settings_sync(); + g_object_unref(settings); + settings = NULL; } - free(scolor); - free(key); + if (user_dir) { + free(user_dir); + user_dir = NULL; + } - return color; + if (key_file) { + g_key_file_free(key_file); + key_file = NULL; + } + + if (sensor_config_path) { + free(sensor_config_path); + sensor_config_path = NULL; + } + + slog_enabled_cbk = NULL; } -void config_set_sensor_color(char *sensor_name, struct color *color) +struct config *config_load() { - char *key = config_get_sensor_key(sensor_name); + struct config *c; - char *scolor = color_to_string(color); + init(); - gconf_client_set_string(client, key, scolor, NULL); + c = malloc(sizeof(struct config)); - free(scolor); + c->graph_bgcolor = get_background_color(); + 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(); + + c->sensor_update_interval + = get_int(KEY_SENSOR_UPDATE_INTERVAL); + if (c->sensor_update_interval < 1) + c->sensor_update_interval = 1; + + c->graph_update_interval = get_int(KEY_GRAPH_UPDATE_INTERVAL); + if (c->graph_update_interval < 1) + c->graph_update_interval = 1; + + c->graph_monitoring_duration = get_int(KEY_GRAPH_MONITORING_DURATION); + + 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); + + c->window_x = get_int(KEY_INTERFACE_WINDOW_X); + c->window_y = get_int(KEY_INTERFACE_WINDOW_Y); + c->window_w = get_int(KEY_INTERFACE_WINDOW_W); + c->window_h = get_int(KEY_INTERFACE_WINDOW_H); + + c->window_divider_pos = get_int(KEY_INTERFACE_WINDOW_DIVIDER_POS); + + if (!c->window_restore_enabled || !c->window_w || !c->window_h) { + c->window_w = 800; + 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; +} + +void config_save(const struct config *c) +{ + set_alpha_channeld_enabled(c->alpha_channel_enabled); + 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); + + set_int(KEY_GRAPH_UPDATE_INTERVAL, c->graph_update_interval); + + set_int(KEY_GRAPH_MONITORING_DURATION, c->graph_monitoring_duration); + + 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, + c->window_restore_enabled); + + set_int(KEY_INTERFACE_WINDOW_X, c->window_x); + set_int(KEY_INTERFACE_WINDOW_Y, c->window_y); + set_int(KEY_INTERFACE_WINDOW_W, c->window_w); + 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); } -int config_get_sensor_alarm_limit(char *sensor_name, int def) +const char *get_psensor_user_dir() { - int res; - char *escaped_name = gconf_escape_key(sensor_name, -1); - /* /apps/psensor/sensors/[sensor_name]/alarmlimit */ - char *key = malloc(22 + 2 * strlen(escaped_name) + 1 + 10 + 1); + const char *home; + + log_fct_enter(); - sprintf(key, "/apps/psensor/sensors/%s/alarmlimit", escaped_name); + if (!user_dir) { + home = getenv("HOME"); - res = gconf_client_get_int(client, key, NULL); + if (!home) + return NULL; - free(escaped_name); + user_dir = path_append(home, ".psensor"); - return res ? res : def; + if (mkdir(user_dir, 0700) == -1 && errno != EEXIST) { + log_err(_("Failed to create the directory %s: %s"), + user_dir, + strerror(errno)); + + free(user_dir); + user_dir = NULL; + } + } + + log_fct_exit(); + + return user_dir; } -void config_set_sensor_alarm_limit(char *sensor_name, int alarm_limit) +static const char *get_sensor_config_path() { - char *escaped_name = gconf_escape_key(sensor_name, -1); - /* /apps/psensor/sensors/[sensor_name]/alarmlimit */ - char *key = malloc(22 + 2 * strlen(escaped_name) + 1 + 10 + 1); + const char *dir; + + if (!sensor_config_path) { + dir = get_psensor_user_dir(); - sprintf(key, "/apps/psensor/sensors/%s/alarmlimit", escaped_name); + if (dir) + sensor_config_path = path_append(dir, "psensor.cfg"); + } + + return sensor_config_path; +} - gconf_client_set_int(client, key, alarm_limit, NULL); +static GKeyFile *get_sensor_key_file() +{ + int ret; + GError *err; + const char *path; + + if (!key_file) { + path = get_sensor_config_path(); + + key_file = g_key_file_new(); + + err = NULL; + ret = g_key_file_load_from_file(key_file, + path, + G_KEY_FILE_KEEP_COMMENTS + | G_KEY_FILE_KEEP_TRANSLATIONS, + &err); + + if (!ret) + log_warn(_("Failed to load configuration file %s: %s"), + path, + err->message); + } - free(escaped_name); + return key_file; } -int config_get_sensor_alarm_enabled(char *sid) +static void save_sensor_key_file() { - gboolean res; - char *escaped_name = gconf_escape_key(sid, -1); - /* /apps/psensor/sensors/[sensor_name]/alarmenabled */ - char *key = malloc(22 + 2 * strlen(escaped_name) + 1 + 12 + 1); + GKeyFile *kfile; + const char *path; + char *data; + + log_fct_enter(); + + kfile = get_sensor_key_file(); + + data = g_key_file_to_data(kfile, NULL, NULL); - sprintf(key, "/apps/psensor/sensors/%s/alarmenabled", escaped_name); + path = get_sensor_config_path(); - res = gconf_client_get_bool(client, key, NULL); + if (!g_file_set_contents(path, data, -1, NULL)) + log_err(_("Failed to save configuration file %s."), path); - free(escaped_name); + free(data); - return res == TRUE; + log_fct_exit(); } -void config_set_sensor_alarm_enabled(char *sid, int enabled) +void config_sync() { - char *escaped_name = gconf_escape_key(sid, -1); - /* /apps/psensor/sensors/[sensor_name]/alarmenabled */ - char *key = malloc(22 + 2 * strlen(escaped_name) + 1 + 12 + 1); + log_fct_enter(); + if (settings) + g_settings_sync(); + save_sensor_key_file(); + log_fct_exit(); +} - sprintf(key, "/apps/psensor/sensors/%s/alarmenabled", escaped_name); +static void sensor_set_str(const char *sid, const char *att, const char *str) +{ + GKeyFile *kfile; - gconf_client_set_bool(client, key, enabled, NULL); + kfile = get_sensor_key_file(); + g_key_file_set_string(kfile, sid, att, str); +} - free(escaped_name); +static char *sensor_get_str(const char *sid, const char *att) +{ + GKeyFile *kfile; + + kfile = get_sensor_key_file(); + return g_key_file_get_string(kfile, sid, att, NULL); } -int config_is_sensor_enabled(char *sid) +static bool sensor_get_bool(const char *sid, const char *att) { - gboolean res; - char *escaped_name = gconf_escape_key(sid, -1); - /* /apps/psensor/sensors/[sensor_name]/enabled */ - char *key = malloc(22 + 2 * strlen(escaped_name) + 1 + 7 + 1); + GKeyFile *kfile; + + kfile = get_sensor_key_file(); + return g_key_file_get_boolean(kfile, sid, att, NULL); +} - sprintf(key, "/apps/psensor/sensors/%s/enabled", escaped_name); +static void sensor_set_bool(const char *sid, const char *att, bool enabled) +{ + GKeyFile *kfile; - res = gconf_client_get_bool(client, key, NULL); + kfile = get_sensor_key_file(); - free(escaped_name); + g_key_file_set_boolean(kfile, sid, att, enabled); +} - return res == TRUE; +static int sensor_get_int(const char *sid, const char *att) +{ + GKeyFile *kfile; + kfile = get_sensor_key_file(); + return g_key_file_get_integer(kfile, sid, att, NULL); } -void config_set_sensor_enabled(char *sid, int enabled) +static void sensor_set_int(const char *sid, const char *att, int i) { - char *escaped_name = gconf_escape_key(sid, -1); - /* /apps/psensor/sensors/[sensor_name]/enabled */ - char *key = malloc(22 + 2 * strlen(escaped_name) + 1 + 7 + 1); + GKeyFile *kfile; - sprintf(key, "/apps/psensor/sensors/%s/enabled", escaped_name); + kfile = get_sensor_key_file(); - gconf_client_set_bool(client, key, enabled, NULL); + g_key_file_set_integer(kfile, sid, att, i); +} - free(escaped_name); +char *config_get_sensor_name(const char *sid) +{ + return sensor_get_str(sid, ATT_SENSOR_NAME); } -char *config_get_sensor_name(char *sid) +void config_set_sensor_name(const char *sid, const char *name) { - char *res; - char *escaped_name = gconf_escape_key(sid, -1); - /* /apps/psensor/sensors/[sensor_name]/name */ - char *key = malloc(22 + 2 * strlen(escaped_name) + 1 + 4 + 1); + sensor_set_str(sid, ATT_SENSOR_NAME, name); +} - sprintf(key, "/apps/psensor/sensors/%s/name", escaped_name); +void config_set_sensor_color(const char *sid, const struct color *color) +{ + char *scolor; - res = gconf_client_get_string(client, key, NULL); + scolor = color_to_str(color); - free(escaped_name); + sensor_set_str(sid, ATT_SENSOR_COLOR, scolor); - return res; + free(scolor); } -void config_set_sensor_name(char *sid, const char *name) +struct color * +config_get_sensor_color(const char *sid, const struct color *dft) { - char *escaped_name = gconf_escape_key(sid, -1); - /* /apps/psensor/sensors/[sensor_name]/name */ - char *key = malloc(22 + 2 * strlen(escaped_name) + 1 + 4 + 1); + char *scolor; + struct color *color; - sprintf(key, "/apps/psensor/sensors/%s/name", escaped_name); + scolor = sensor_get_str(sid, ATT_SENSOR_COLOR); - gconf_client_set_string(client, key, name, NULL); + if (scolor) + color = str_to_color(scolor); + else + color = NULL; + + if (!color) { + color = color_new(dft->red, dft->green, dft->blue); + config_set_sensor_color(sid, color); + } - free(escaped_name); + free(scolor); + + return color; } -static int config_is_window_decoration_enabled() +bool config_is_sensor_graph_enabled(const char *sid) { - gboolean b; + return sensor_get_bool(sid, ATT_SENSOR_GRAPH_ENABLED); +} - b = gconf_client_get_bool(client, - KEY_INTERFACE_WINDOW_DECORATION_DISABLED, - NULL); +void config_set_sensor_graph_enabled(const char *sid, bool enabled) +{ + sensor_set_bool(sid, ATT_SENSOR_GRAPH_ENABLED, enabled); +} - return b == FALSE; +int config_get_sensor_alarm_high_threshold(const char *sid) +{ + return sensor_get_int(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD); } -static int config_is_window_keep_below_enabled() +void config_set_sensor_alarm_high_threshold(const char *sid, int threshold) { - gboolean b; + sensor_set_int(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD, threshold); +} - b = gconf_client_get_bool(client, - KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED, - NULL); +int config_get_sensor_alarm_low_threshold(const char *sid) +{ + return sensor_get_int(sid, ATT_SENSOR_ALARM_LOW_THRESHOLD); +} - return b == TRUE; +void config_set_sensor_alarm_low_threshold(const char *sid, int threshold) +{ + sensor_set_int(sid, ATT_SENSOR_ALARM_LOW_THRESHOLD, threshold); } -static void config_set_window_decoration_enabled(int enabled) +bool config_is_appindicator_enabled(const char *sid) { - if (enabled) - gconf_client_set_bool - (client, - KEY_INTERFACE_WINDOW_DECORATION_DISABLED, FALSE, NULL); - else - gconf_client_set_bool - (client, - KEY_INTERFACE_WINDOW_DECORATION_DISABLED, TRUE, NULL); + return !sensor_get_bool(sid, ATT_SENSOR_APPINDICATOR_MENU_DISABLED); } -static void config_set_window_keep_below_enabled(int enabled) +void config_set_appindicator_enabled(const char *sid, bool enabled) { - if (enabled) - gconf_client_set_bool(client, - KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED, - TRUE, NULL); - else - gconf_client_set_bool(client, - KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED, - FALSE, NULL); + return sensor_set_bool(sid, + ATT_SENSOR_APPINDICATOR_MENU_DISABLED, + !enabled); } -void config_init() +int config_get_sensor_position(const char *sid) { - client = gconf_client_get_default(); + return sensor_get_int(sid, ATT_SENSOR_POSITION); } -void config_cleanup() +void config_set_sensor_position(const char *sid, int pos) { - if (client) { - g_object_unref(client); - client = NULL; - } + return sensor_set_int(sid, ATT_SENSOR_POSITION, pos); } -struct config *config_load() +bool config_get_sensor_alarm_enabled(const char *sid) { - struct config *c; + return sensor_get_bool(sid, ATT_SENSOR_ALARM_ENABLED); +} - c = malloc(sizeof(struct config)); +void config_set_sensor_alarm_enabled(const char *sid, bool enabled) +{ + sensor_set_bool(sid, ATT_SENSOR_ALARM_ENABLED, enabled); +} - c->graph_bgcolor = config_get_background_color(); - c->graph_fgcolor = config_get_foreground_color(); - c->graph_bg_alpha = config_get_graph_background_alpha(); - c->alpha_channel_enabled = config_is_alpha_channel_enabled(); - c->sensorlist_position = config_get_sensorlist_position(); - c->window_decoration_enabled = config_is_window_decoration_enabled(); - c->window_keep_below_enabled = config_is_window_keep_below_enabled(); +bool config_is_sensor_enabled(const char *sid) +{ + return !sensor_get_bool(sid, ATT_SENSOR_HIDE); +} - c->sensor_update_interval - = gconf_client_get_int(client, KEY_SENSOR_UPDATE_INTERVAL, NULL); - if (c->sensor_update_interval < 1) - c->sensor_update_interval = 1; +void config_set_sensor_enabled(const char *sid, bool enabled) +{ + sensor_set_bool(sid, ATT_SENSOR_HIDE, !enabled); +} - c->graph_update_interval - = gconf_client_get_int(client, KEY_GRAPH_UPDATE_INTERVAL, NULL); - if (c->graph_update_interval < 1) - c->graph_update_interval = 1; +bool config_is_appindicator_label_enabled(const char *sid) +{ + return sensor_get_bool(sid, ATT_SENSOR_APPINDICATOR_LABEL_ENABLED); +} - c->graph_monitoring_duration - = gconf_client_get_int(client, KEY_GRAPH_MONITORING_DURATION, NULL); +void config_set_appindicator_label_enabled(const char *sid, bool enabled) +{ + sensor_set_bool(sid, ATT_SENSOR_APPINDICATOR_LABEL_ENABLED, enabled); +} - if (c->graph_monitoring_duration < 1) - c->graph_monitoring_duration = 10; +GSettings *config_get_GSettings() +{ + return settings; +} - c->sensor_values_max_length - = - (c->graph_monitoring_duration * 60) / c->sensor_update_interval; - if (c->sensor_values_max_length < 3) - c->sensor_values_max_length = 3; +bool config_is_lmsensor_enabled() +{ + return get_bool(KEY_PROVIDER_LMSENSORS_ENABLED); +} - c->menu_bar_disabled - = gconf_client_get_bool(client, - KEY_INTERFACE_MENU_BAR_DISABLED, - NULL); +bool config_is_gtop2_enabled() +{ + return get_bool(KEY_PROVIDER_GTOP2_ENABLED); +} - c->unity_launcher_count_disabled - = gconf_client_get_bool - (client, - KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED, - NULL); +bool config_is_udisks2_enabled() +{ + return get_bool(KEY_PROVIDER_UDISKS2_ENABLED); +} - c->hide_on_startup - = gconf_client_get_bool(client, - KEY_INTERFACE_HIDE_ON_STARTUP, - NULL); +bool config_is_hddtemp_enabled() +{ + return get_bool(KEY_PROVIDER_HDDTEMP_ENABLED); +} - c->window_restore_enabled - = gconf_client_get_bool(client, - KEY_INTERFACE_WINDOW_RESTORE_ENABLED, - NULL); - - c->window_x = gconf_client_get_int(client, - KEY_INTERFACE_WINDOW_X, - NULL); - c->window_y = gconf_client_get_int(client, - KEY_INTERFACE_WINDOW_Y, - NULL); - c->window_w = gconf_client_get_int(client, - KEY_INTERFACE_WINDOW_W, - NULL); - c->window_h = gconf_client_get_int(client, - KEY_INTERFACE_WINDOW_H, - NULL); - c->window_divider_pos - = gconf_client_get_int(client, - KEY_INTERFACE_WINDOW_DIVIDER_POS, - NULL); +bool config_is_libatasmart_enabled() +{ + return get_bool(KEY_PROVIDER_LIBATASMART_ENABLED); +} - if (!c->window_restore_enabled || !c->window_w || !c->window_h) { - c->window_w = 800; - c->window_h = 200; - } +bool config_is_nvctrl_enabled() +{ + return get_bool(KEY_PROVIDER_NVCTRL_ENABLED); +} - return c; +bool config_is_atiadlsdk_enabled() +{ + return get_bool(KEY_PROVIDER_ATIADLSDK_ENABLED); } -void config_save(struct config *c) -{ - config_set_background_color(c->graph_bgcolor); - config_set_foreground_color(c->graph_fgcolor); - config_set_graph_background_alpha(c->graph_bg_alpha); - config_set_sensorlist_position(c->sensorlist_position); - config_set_window_decoration_enabled(c->window_decoration_enabled); - config_set_window_keep_below_enabled(c->window_keep_below_enabled); - - gconf_client_set_int(client, - KEY_GRAPH_UPDATE_INTERVAL, - c->graph_update_interval, NULL); - - gconf_client_set_int(client, - KEY_GRAPH_MONITORING_DURATION, - c->graph_monitoring_duration, NULL); - - gconf_client_set_int(client, - KEY_SENSOR_UPDATE_INTERVAL, - c->sensor_update_interval, NULL); - - gconf_client_set_bool(client, - KEY_INTERFACE_MENU_BAR_DISABLED, - c->menu_bar_disabled, NULL); - - gconf_client_set_bool(client, - KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED, - c->unity_launcher_count_disabled, NULL); - - gconf_client_set_bool(client, - KEY_INTERFACE_HIDE_ON_STARTUP, - c->hide_on_startup, NULL); - - gconf_client_set_bool(client, - KEY_INTERFACE_WINDOW_RESTORE_ENABLED, - c->window_restore_enabled, - NULL); - - gconf_client_set_int(client, - KEY_INTERFACE_WINDOW_X, - c->window_x, - NULL); - gconf_client_set_int(client, - KEY_INTERFACE_WINDOW_Y, - c->window_y, - NULL); - gconf_client_set_int(client, - KEY_INTERFACE_WINDOW_W, - c->window_w, - NULL); - gconf_client_set_int(client, - KEY_INTERFACE_WINDOW_H, - c->window_h, - NULL); - - gconf_client_set_int(client, - KEY_INTERFACE_WINDOW_DIVIDER_POS, - c->window_divider_pos, - NULL); +void config_set_lmsensor_enable(bool b) +{ + set_bool(KEY_PROVIDER_LMSENSORS_ENABLED, b); +} + +void config_set_nvctrl_enable(bool b) +{ + set_bool(KEY_PROVIDER_NVCTRL_ENABLED, b); +} + +void config_set_atiadlsdk_enable(bool b) +{ + set_bool(KEY_PROVIDER_ATIADLSDK_ENABLED, b); +} + +void config_set_gtop2_enable(bool b) +{ + set_bool(KEY_PROVIDER_GTOP2_ENABLED, b); +} + +void config_set_hddtemp_enable(bool b) +{ + set_bool(KEY_PROVIDER_HDDTEMP_ENABLED, b); +} + +void config_set_libatasmart_enable(bool b) +{ + set_bool(KEY_PROVIDER_LIBATASMART_ENABLED, b); +} + +void config_set_udisks2_enable(bool b) +{ + set_bool(KEY_PROVIDER_UDISKS2_ENABLED, b); }