X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fcfg.c;h=075989a4947fce11cda8d15283349eebe29b974b;hb=0ef6b5963fe07dcdf417058327a35b1655e44498;hp=ff4fca64172558e9c15fb66e6b886b9cfc38ad77;hpb=739055843d76da85aea6b0f68f6be2440b08a905;p=psensor.git diff --git a/src/cfg.c b/src/cfg.c index ff4fca6..075989a 100644 --- a/src/cfg.c +++ b/src/cfg.c @@ -30,6 +30,7 @@ #define _(str) gettext(str) #include +#include #include #include @@ -106,6 +107,18 @@ static const char *KEY_SLOG_INTERVAL = "slog-interval"; /* Path to the script called when a notification is raised */ static const char *KEY_NOTIFICATION_SCRIPT = "notif-script"; +/* 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"; + static GSettings *settings; static char *user_dir; @@ -156,7 +169,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; @@ -177,7 +190,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; @@ -193,7 +206,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; @@ -209,7 +222,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); } @@ -219,7 +232,7 @@ static void set_alpha_channeld_enabled(bool b) set_bool(KEY_ALPHA_CHANNEL_ENABLED, b); } -static enum sensorlist_position get_sensorlist_position() +static enum sensorlist_position get_sensorlist_position(void) { return get_int(KEY_INTERFACE_SENSORLIST_POSITION); } @@ -229,7 +242,7 @@ static void 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); } @@ -265,7 +278,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); } @@ -297,7 +310,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); } @@ -310,12 +323,12 @@ static void set_slog_interval(int interval) set_int(KEY_SLOG_INTERVAL, interval); } -static bool is_window_decoration_enabled() +static bool is_window_decoration_enabled(void) { return !get_bool(KEY_INTERFACE_WINDOW_DECORATION_DISABLED); } -static bool is_window_keep_below_enabled() +static bool is_window_keep_below_enabled(void) { return get_bool(KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED); } @@ -330,7 +343,7 @@ static void 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); } @@ -341,7 +354,7 @@ void config_set_smooth_curves_enabled(bool b) } -static void init() +static void init(void) { log_fct_enter(); @@ -351,7 +364,7 @@ static void init() log_fct_exit(); } -void config_cleanup() +void config_cleanup(void) { config_sync(); @@ -379,7 +392,7 @@ void config_cleanup() slog_enabled_cbk = NULL; } -struct config *config_load() +struct config *config_load(void) { struct config *c; @@ -411,12 +424,6 @@ struct config *config_load() if (c->graph_monitoring_duration < 1) c->graph_monitoring_duration = 10; - 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; - c->menu_bar_disabled = get_bool(KEY_INTERFACE_MENU_BAR_DISABLED); c->unity_launcher_count_disabled @@ -441,6 +448,8 @@ struct config *config_load() c->temperature_unit = get_int(KEY_INTERFACE_TEMPERATURE_UNIT); + c->sensor_values_max_length = compute_values_max_length(c); + return c; } @@ -482,7 +491,7 @@ void config_save(const struct config *c) 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; @@ -511,7 +520,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; @@ -525,7 +534,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; @@ -552,7 +561,7 @@ static GKeyFile *get_sensor_key_file() return key_file; } -static void save_sensor_key_file() +static void save_sensor_key_file(void) { GKeyFile *kfile; const char *path; @@ -574,7 +583,7 @@ static void save_sensor_key_file() log_fct_exit(); } -void config_sync() +void config_sync(void) { log_fct_enter(); if (settings) @@ -643,38 +652,79 @@ 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); - - sensor_set_str(sid, ATT_SENSOR_COLOR, scolor); +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++; - 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) @@ -714,9 +764,9 @@ bool config_is_appindicator_enabled(const char *sid) 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) @@ -726,7 +776,7 @@ 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) @@ -759,7 +809,82 @@ 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(void) +{ + return get_bool(KEY_PROVIDER_LMSENSORS_ENABLED); +} + +bool config_is_gtop2_enabled(void) +{ + return get_bool(KEY_PROVIDER_GTOP2_ENABLED); +} + +bool config_is_udisks2_enabled(void) +{ + return get_bool(KEY_PROVIDER_UDISKS2_ENABLED); +} + +bool config_is_hddtemp_enabled(void) +{ + return get_bool(KEY_PROVIDER_HDDTEMP_ENABLED); +} + +bool config_is_libatasmart_enabled(void) +{ + return get_bool(KEY_PROVIDER_LIBATASMART_ENABLED); +} + +bool config_is_nvctrl_enabled(void) +{ + return get_bool(KEY_PROVIDER_NVCTRL_ENABLED); +} + +bool config_is_atiadlsdk_enabled(void) +{ + return get_bool(KEY_PROVIDER_ATIADLSDK_ENABLED); +} + +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); +} + +int config_get_sensor_unit(void) +{ + return get_int(KEY_INTERFACE_TEMPERATURE_UNIT); +}