X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fcfg.c;h=6fd812ae8addbb8798840c025b18641a0cecb803;hb=cc35e177d57bc4ee2cc57ae25f130dfc168aa61d;hp=1bd5fac7bf472f3ecd50ef516d64e57f4691846c;hpb=e1f8d2cbf6c09da9cbcb0bdf04d495b3d3666178;p=psensor.git diff --git a/src/cfg.c b/src/cfg.c index 1bd5fac..6fd812a 100644 --- a/src/cfg.c +++ b/src/cfg.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2012 jeanfi@gmail.com + * Copyright (C) 2010-2013 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 @@ -21,18 +21,18 @@ #include #include -#include - #include "cfg.h" +#include "log.h" static const char *KEY_SENSORS = "/apps/psensor/sensors"; static const char *ATT_SENSOR_ALARM_ENABLED = "alarm/enabled"; -static const char *ATT_SENSOR_ALARM_HIGH_THRESOLD = "alarm/high_thresold"; -static const char *ATT_SENSOR_ALARM_LOW_THRESOLD = "alarm/low_thresold"; +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_ENABLED = "enabled"; static const char *ATT_SENSOR_NAME = "name"; +static const char *ATT_SENSOR_APPINDICATOR_DISABLED = "appindicator/disabled"; static const char *KEY_SENSOR_UPDATE_INTERVAL = "/apps/psensor/sensor/update_interval"; @@ -90,6 +90,9 @@ static const char *KEY_INTERFACE_WINDOW_DIVIDER_POS static const char *KEY_INTERFACE_TEMPERATURE_UNIT = "/apps/psensor/interface/temperature_unit"; +static const char *KEY_SLOG_ENABLED = "/apps/psensor/slog/enabled"; +static const char *KEY_SLOG_INTERVAL = "/apps/psensor/slog/interval"; + static GConfClient *client; static char *get_string(const char *key, const char *default_value) @@ -117,7 +120,7 @@ static struct color *get_background_color() c = str_to_color(scolor); free(scolor); - if (c == NULL) + if (!c) return color_new(0xffff, 0xffff, 0xffff); return c; @@ -134,19 +137,15 @@ static struct color *get_foreground_color() c = str_to_color(scolor); free(scolor); - if (c == NULL) + if (!c) return color_new(0x0000, 0x0000, 0x0000); return c; } -static unsigned int is_alpha_channel_enabled() +static bool is_alpha_channel_enabled() { - gboolean b; - - b = gconf_client_get_bool(client, KEY_ALPHA_CHANNEL_ENABLED, NULL); - - return b == TRUE; + return gconf_client_get_bool(client, KEY_ALPHA_CHANNEL_ENABLED, NULL); } static enum sensorlist_position get_sensorlist_position() @@ -261,12 +260,12 @@ void config_set_sensor_color(const char *sid, const struct color *color) free(key); } -int config_get_sensor_alarm_high_thresold(const char *sid) +int config_get_sensor_alarm_high_threshold(const char *sid) { int res; char *key; - key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_HIGH_THRESOLD); + key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD); res = gconf_client_get_int(client, key, NULL); free(key); @@ -274,21 +273,21 @@ int config_get_sensor_alarm_high_thresold(const char *sid) } void -config_set_sensor_alarm_high_thresold(const char *sid, int thresold) +config_set_sensor_alarm_high_threshold(const char *sid, int threshold) { char *key; - key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_HIGH_THRESOLD); - gconf_client_set_int(client, key, thresold, NULL); + key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD); + gconf_client_set_int(client, key, threshold, NULL); free(key); } -int config_get_sensor_alarm_low_thresold(const char *sid) +int config_get_sensor_alarm_low_threshold(const char *sid) { int res; char *key; - key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_LOW_THRESOLD); + key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_LOW_THRESHOLD); res = gconf_client_get_int(client, key, NULL); free(key); @@ -296,16 +295,16 @@ int config_get_sensor_alarm_low_thresold(const char *sid) } void -config_set_sensor_alarm_low_thresold(const char *sid, int thresold) +config_set_sensor_alarm_low_threshold(const char *sid, int threshold) { char *key; - key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_LOW_THRESOLD); - gconf_client_set_int(client, key, thresold, NULL); + key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_LOW_THRESHOLD); + gconf_client_set_int(client, key, threshold, NULL); free(key); } -int config_get_sensor_alarm_enabled(const char *sid) +bool config_get_sensor_alarm_enabled(const char *sid) { gboolean b; char *key; @@ -314,10 +313,10 @@ int config_get_sensor_alarm_enabled(const char *sid) b = gconf_client_get_bool(client, key, NULL); free(key); - return b == TRUE; + return b; } -void config_set_sensor_alarm_enabled(const char *sid, int enabled) +void config_set_sensor_alarm_enabled(const char *sid, bool enabled) { char *key; @@ -326,7 +325,7 @@ void config_set_sensor_alarm_enabled(const char *sid, int enabled) free(key); } -int config_is_sensor_enabled(const char *sid) +bool config_is_sensor_enabled(const char *sid) { gboolean b; char *key; @@ -335,10 +334,10 @@ int config_is_sensor_enabled(const char *sid) b = gconf_client_get_bool(client, key, NULL); free(key); - return b == TRUE; + return b; } -void config_set_sensor_enabled(const char *sid, int enabled) +void config_set_sensor_enabled(const char *sid, bool enabled) { char *key; @@ -367,50 +366,99 @@ void config_set_sensor_name(const char *sid, const char *name) free(key); } -static int is_window_decoration_enabled() +bool config_is_appindicator_enabled(const char *sid) { + char *key; gboolean b; - b = gconf_client_get_bool(client, - KEY_INTERFACE_WINDOW_DECORATION_DISABLED, - NULL); + key = get_sensor_att_key(sid, ATT_SENSOR_APPINDICATOR_DISABLED); + b = gconf_client_get_bool(client, key, NULL); + free(key); - return b == FALSE; + return !b; } -static int is_window_keep_below_enabled() +void config_set_appindicator_enabled(const char *sid, bool enabled) { - gboolean b; + char *key; + + key = get_sensor_att_key(sid, ATT_SENSOR_APPINDICATOR_DISABLED); + gconf_client_set_bool(client, key, !enabled, NULL); + free(key); +} - b = gconf_client_get_bool(client, - KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED, - NULL); +bool is_slog_enabled() +{ + return gconf_client_get_bool(client, KEY_SLOG_ENABLED, NULL); +} - return b == TRUE; +static void set_slog_enabled(bool enabled) +{ + gconf_client_set_bool(client, KEY_SLOG_ENABLED, enabled, NULL); } -static void set_window_decoration_enabled(int enabled) + +void config_slog_enabled_notify_add(GConfClientNotifyFunc cbk, void *data) { - 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); + log_debug("config_slog_enabled_notify_add"); + gconf_client_add_dir(client, + KEY_SLOG_ENABLED, + GCONF_CLIENT_PRELOAD_NONE, + NULL); + gconf_client_notify_add(client, + KEY_SLOG_ENABLED, + cbk, + data, + NULL, + NULL); } -static void set_window_keep_below_enabled(int enabled) +int config_get_slog_interval() { - if (enabled) - gconf_client_set_bool(client, - KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED, - TRUE, NULL); + int res; + + res = gconf_client_get_int(client, KEY_SLOG_INTERVAL, NULL); + + if (res <= 0) + return 300; else - gconf_client_set_bool(client, - KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED, - FALSE, NULL); + return res; +} + +static void set_slog_interval(int interval) +{ + if (interval <= 0) + interval = 300; + + gconf_client_set_int(client, KEY_SLOG_INTERVAL, interval, NULL); +} + +static bool is_window_decoration_enabled() +{ + return !gconf_client_get_bool(client, + KEY_INTERFACE_WINDOW_DECORATION_DISABLED, + NULL); +} + +static bool is_window_keep_below_enabled() +{ + return gconf_client_get_bool(client, + KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED, + NULL); +} + +static void set_window_decoration_enabled(bool enabled) +{ + gconf_client_set_bool + (client, + KEY_INTERFACE_WINDOW_DECORATION_DISABLED, !enabled, NULL); +} + +static void set_window_keep_below_enabled(bool enabled) +{ + gconf_client_set_bool(client, + KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED, + enabled, NULL); } /* @@ -445,6 +493,8 @@ struct config *config_load() 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 = gconf_client_get_int(client, KEY_SENSOR_UPDATE_INTERVAL, NULL); @@ -525,6 +575,8 @@ void config_save(const struct config *c) 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); gconf_client_set_int(client, KEY_GRAPH_UPDATE_INTERVAL, @@ -555,22 +607,10 @@ void config_save(const struct config *c) 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_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,