#include "cfg.h"
-#define KEY_SENSOR_UPDATE_INTERVAL "/apps/psensor/sensor/update_interval"
+static const char *KEY_SENSORS = "/apps/psensor/sensors";
-#define KEY_GRAPH_UPDATE_INTERVAL "/apps/psensor/graph/update_interval"
-#define KEY_GRAPH_MONITORING_DURATION "/apps/psensor/graph/monitoring_duration"
+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_COLOR = "color";
+static const char *ATT_SENSOR_ENABLED = "enabled";
+static const char *ATT_SENSOR_NAME = "name";
-#define KEY_GRAPH_BACKGROUND_COLOR "/apps/psensor/graph/background_color"
-#define DEFAULT_GRAPH_BACKGROUND_COLOR "#e8f4e8f4a8f5"
+static const char *KEY_SENSOR_UPDATE_INTERVAL
+= "/apps/psensor/sensor/update_interval";
-#define KEY_GRAPH_BACKGROUND_ALPHA "/apps/psensor/graph/background_alpha"
-#define DEFAULT_GRAPH_BACKGROUND_ALPHA "1.0"
+static const char *KEY_GRAPH_UPDATE_INTERVAL
+= "/apps/psensor/graph/update_interval";
-#define KEY_GRAPH_FOREGROUND_COLOR "/apps/psensor/graph/foreground_color"
-#define DEFAULT_GRAPH_FOREGROUND_COLOR "#000000000000"
+static const char *KEY_GRAPH_MONITORING_DURATION
+= "/apps/psensor/graph/monitoring_duration";
-#define KEY_ALPHA_CHANNEL_ENABLED "/apps/psensor/graph/alpha_channel_enabled"
-#define DEFAULT_ALPHA_CHANNEL_ENABLED 0
+static const char *KEY_GRAPH_BACKGROUND_COLOR
+= "/apps/psensor/graph/background_color";
-#define KEY_INTERFACE_SENSORLIST_POSITION \
-"/apps/psensor/interface/sensorlist_position"
+static const char *DEFAULT_GRAPH_BACKGROUND_COLOR = "#e8f4e8f4a8f5";
-#define KEY_INTERFACE_WINDOW_DECORATION_DISABLED \
-"/apps/psensor/interface/window_decoration_disabled"
+static const char *KEY_GRAPH_BACKGROUND_ALPHA
+= "/apps/psensor/graph/background_alpha";
-#define KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED \
-"/apps/psensor/interface/window_keep_below_enabled"
+static const char *KEY_GRAPH_FOREGROUND_COLOR
+= "/apps/psensor/graph/foreground_color";
+static const char *DEFAULT_GRAPH_FOREGROUND_COLOR = "#000000000000";
-#define KEY_INTERFACE_MENU_BAR_DISABLED \
-"/apps/psensor/interface/menu_bar_disabled"
+static const char *KEY_ALPHA_CHANNEL_ENABLED
+= "/apps/psensor/graph/alpha_channel_enabled";
-#define KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED \
-"/apps/psensor/interface/unity_launcher_count_disabled"
+static const char *KEY_INTERFACE_SENSORLIST_POSITION
+= "/apps/psensor/interface/sensorlist_position";
-#define KEY_INTERFACE_HIDE_ON_STARTUP \
-"/apps/psensor/interface/hide_on_startup"
+static const char *KEY_INTERFACE_WINDOW_DECORATION_DISABLED
+= "/apps/psensor/interface/window_decoration_disabled";
-#define KEY_INTERFACE_WINDOW_RESTORE_ENABLED \
-"/apps/psensor/interface/window_restore_enabled"
+static const char *KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED
+= "/apps/psensor/interface/window_keep_below_enabled";
-#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 const char *KEY_INTERFACE_MENU_BAR_DISABLED
+= "/apps/psensor/interface/menu_bar_disabled";
-#define KEY_INTERFACE_WINDOW_DIVIDER_POS \
-"/apps/psensor/interface/window_divider_pos"
+static const char *KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED
+= "/apps/psensor/interface/unity_launcher_count_disabled";
-#define KEY_INTERFACE_TEMPERATURE_UNIT \
-"/apps/psensor/interface/temperature_unit"
+static const char *KEY_INTERFACE_HIDE_ON_STARTUP
+= "/apps/psensor/interface/hide_on_startup";
+
+static const char *KEY_INTERFACE_WINDOW_RESTORE_ENABLED
+= "/apps/psensor/interface/window_restore_enabled";
+
+static const char *KEY_INTERFACE_WINDOW_X = "/apps/psensor/interface/window_x";
+static const char *KEY_INTERFACE_WINDOW_Y = "/apps/psensor/interface/window_y";
+static const char *KEY_INTERFACE_WINDOW_W = "/apps/psensor/interface/window_w";
+static const char *KEY_INTERFACE_WINDOW_H = "/apps/psensor/interface/window_h";
+
+static const char *KEY_INTERFACE_WINDOW_DIVIDER_POS
+= "/apps/psensor/interface/window_divider_pos";
+
+static const char *KEY_INTERFACE_TEMPERATURE_UNIT
+= "/apps/psensor/interface/temperature_unit";
static GConfClient *client;
-static char *get_string(char *key, char *default_value)
+static char *get_string(const char *key, const char *default_value)
{
- char *value = gconf_client_get_string(client,
- key,
- NULL);
+ char *value;
+
+ value = gconf_client_get_string(client, key, NULL);
if (!value) {
value = strdup(default_value);
-
gconf_client_set_string(client, key, default_value, NULL);
}
return value;
}
-static struct color *config_get_background_color()
+static struct color *get_background_color()
{
+ char *scolor;
+ struct color *c;
- char *scolor = get_string(KEY_GRAPH_BACKGROUND_COLOR,
- DEFAULT_GRAPH_BACKGROUND_COLOR);
-
- struct color *c = string_to_color(scolor);
+ scolor = get_string(KEY_GRAPH_BACKGROUND_COLOR,
+ DEFAULT_GRAPH_BACKGROUND_COLOR);
+ c = str_to_color(scolor);
free(scolor);
if (c == NULL)
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,
+ DEFAULT_GRAPH_FOREGROUND_COLOR);
+ c = str_to_color(scolor);
free(scolor);
if (c == NULL)
return c;
}
-static int config_is_alpha_channel_enabled()
+static unsigned int is_alpha_channel_enabled()
{
- gboolean b = gconf_client_get_bool(client,
- KEY_ALPHA_CHANNEL_ENABLED,
- NULL);
+ gboolean b;
+
+ b = gconf_client_get_bool(client, KEY_ALPHA_CHANNEL_ENABLED, NULL);
return b == TRUE;
}
-static int config_get_sensorlist_position()
+static enum sensorlist_position get_sensorlist_position()
{
return gconf_client_get_int(client,
KEY_INTERFACE_SENSORLIST_POSITION, NULL);
}
-static void config_set_sensorlist_position(int pos)
+static void set_sensorlist_position(enum sensorlist_position pos)
{
gconf_client_set_int(client,
KEY_INTERFACE_SENSORLIST_POSITION, pos, NULL);
}
-static double config_get_graph_background_alpha()
+static double get_graph_background_alpha()
{
- double a = gconf_client_get_float(client,
- KEY_GRAPH_BACKGROUND_ALPHA,
- NULL);
+ double a;
+
+ a = gconf_client_get_float(client, KEY_GRAPH_BACKGROUND_ALPHA, NULL);
if (a == 0)
gconf_client_set_float(client,
KEY_GRAPH_BACKGROUND_ALPHA, 1.0, NULL);
return a;
}
-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);
}
-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);
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);
+ gconf_client_set_string(client, KEY_GRAPH_FOREGROUND_COLOR, str, NULL);
- free(scolor);
+ free(str);
}
-static char *config_get_sensor_key(char *sensor_name)
+static char *get_sensor_att_key(const char *sid, const char *att)
{
- 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);
+ char *esc_sid, *key;
+
+ esc_sid = gconf_escape_key(sid, -1);
+ /* [KEY_SENSORS]/[esc_sid]/[att] */
+ key = malloc(strlen(KEY_SENSORS)
+ + 1 + 2 * strlen(esc_sid)
+ + 1 + strlen(att) + 1);
- sprintf(key, "/apps/psensor/sensors/%s/color", escaped_name);
+ sprintf(key, "%s/%s/%s", KEY_SENSORS, esc_sid, att);
- free(escaped_name);
+ free(esc_sid);
return key;
}
-struct color *config_get_sensor_color(char *sensor_name,
- struct color *default_color)
+struct color *
+config_get_sensor_color(const char *sid, const struct color *dft)
{
- char *key = config_get_sensor_key(sensor_name);
+ char *key, *scolor;
+ struct color *color;
- char *scolor = gconf_client_get_string(client,
- key,
- NULL);
+ key = get_sensor_att_key(sid, ATT_SENSOR_COLOR);
- struct color *color = NULL;
+ scolor = gconf_client_get_string(client, key, NULL);
+
+ color = NULL;
if (scolor)
- color = string_to_color(scolor);
+ color = str_to_color(scolor);
if (!scolor || !color) {
- color = color_new(default_color->red,
- default_color->green, default_color->blue);
-
- scolor = color_to_string(color);
-
+ color = color_new(dft->red, dft->green, dft->blue);
+ scolor = color_to_str(color);
gconf_client_set_string(client, key, scolor, NULL);
}
return color;
}
-void config_set_sensor_color(char *sensor_name, struct color *color)
+void config_set_sensor_color(const char *sid, const struct color *color)
{
char *key, *scolor;
- key = config_get_sensor_key(sensor_name);
- scolor = color_to_string(color);
+ key = get_sensor_att_key(sid, ATT_SENSOR_COLOR);
+ scolor = color_to_str(color);
gconf_client_set_string(client, key, scolor, NULL);
free(key);
}
-int config_get_sensor_alarm_limit(char *sensor_name, int def)
+int config_get_sensor_alarm_high_thresold(const char *sid)
{
int res;
- char *escaped_name, *key;
-
- escaped_name = gconf_escape_key(sensor_name, -1);
- /* /apps/psensor/sensors/[sensor_name]/alarmlimit */
- key = malloc(22 + 2 * strlen(escaped_name) + 1 + 10 + 1);
-
- sprintf(key, "/apps/psensor/sensors/%s/alarmlimit", escaped_name);
+ char *key;
+ key = get_sensor_att_key(sid, "alarmlimit");
res = gconf_client_get_int(client, key, NULL);
-
- free(escaped_name);
free(key);
- return res ? res : def;
+ return res;
}
-void config_set_sensor_alarm_limit(char *sensor_name, int alarm_limit)
+void
+config_set_sensor_alarm_high_thresold(const char *sid, int thresold)
{
- char *escaped_name, *key;
-
- escaped_name = gconf_escape_key(sensor_name, -1);
- /* /apps/psensor/sensors/[sensor_name]/alarmlimit */
- key = malloc(22 + 2 * strlen(escaped_name) + 1 + 10 + 1);
-
- sprintf(key, "/apps/psensor/sensors/%s/alarmlimit", escaped_name);
+ char *key;
- gconf_client_set_int(client, key, alarm_limit, NULL);
-
- free(escaped_name);
+ key = get_sensor_att_key(sid, "alarmlimit");
+ gconf_client_set_int(client, key, thresold, NULL);
free(key);
}
-int config_get_sensor_alarm_enabled(char *sid)
+int config_get_sensor_alarm_enabled(const char *sid)
{
- gboolean res;
- char *escaped_name, *key;
-
- escaped_name = gconf_escape_key(sid, -1);
- /* /apps/psensor/sensors/[sensor_name]/alarmenabled */
- key = malloc(22 + 2 * strlen(escaped_name) + 1 + 12 + 1);
-
- sprintf(key, "/apps/psensor/sensors/%s/alarmenabled", escaped_name);
-
- res = gconf_client_get_bool(client, key, NULL);
+ gboolean b;
+ char *key;
- free(escaped_name);
+ key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_ENABLED);
+ b = gconf_client_get_bool(client, key, NULL);
free(key);
- return res == TRUE;
+ return b == TRUE;
}
-void config_set_sensor_alarm_enabled(char *sid, int enabled)
+void config_set_sensor_alarm_enabled(const char *sid, int enabled)
{
- char *escaped_name, *key;
-
- escaped_name = gconf_escape_key(sid, -1);
- /* /apps/psensor/sensors/[sensor_name]/alarmenabled */
- key = malloc(22 + 2 * strlen(escaped_name) + 1 + 12 + 1);
-
- sprintf(key, "/apps/psensor/sensors/%s/alarmenabled", escaped_name);
+ char *key;
+ key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_ENABLED);
gconf_client_set_bool(client, key, enabled, NULL);
-
- free(escaped_name);
free(key);
}
-int config_is_sensor_enabled(char *sid)
+int config_is_sensor_enabled(const char *sid)
{
- gboolean res;
- char *escaped_name, *key;
-
- escaped_name = gconf_escape_key(sid, -1);
- /* /apps/psensor/sensors/[sensor_name]/enabled */
- key = malloc(22 + 2 * strlen(escaped_name) + 1 + 7 + 1);
- sprintf(key, "/apps/psensor/sensors/%s/enabled", escaped_name);
+ gboolean b;
+ char *key;
- res = gconf_client_get_bool(client, key, NULL);
+ key = get_sensor_att_key(sid, ATT_SENSOR_ENABLED);
+ b = gconf_client_get_bool(client, key, NULL);
free(key);
- free(escaped_name);
-
- return res == TRUE;
+ return b == TRUE;
}
-void config_set_sensor_enabled(char *sid, int enabled)
+void config_set_sensor_enabled(const char *sid, int enabled)
{
- char *escaped_name, *key;
-
- escaped_name = gconf_escape_key(sid, -1);
- /* /apps/psensor/sensors/[sensor_name]/enabled */
- key = malloc(22 + 2 * strlen(escaped_name) + 1 + 7 + 1);
-
- sprintf(key, "/apps/psensor/sensors/%s/enabled", escaped_name);
+ char *key;
+ key = get_sensor_att_key(sid, ATT_SENSOR_ENABLED);
gconf_client_set_bool(client, key, enabled, NULL);
-
- free(escaped_name);
free(key);
}
-char *config_get_sensor_name(char *sid)
+char *config_get_sensor_name(const char *sid)
{
- char *res, *escaped_name, *key;
-
- escaped_name = gconf_escape_key(sid, -1);
- /* /apps/psensor/sensors/[sensor_name]/name */
- key = malloc(22 + 2 * strlen(escaped_name) + 1 + 4 + 1);
-
- sprintf(key, "/apps/psensor/sensors/%s/name", escaped_name);
+ char *name, *key;
- res = gconf_client_get_string(client, key, NULL);
-
- free(escaped_name);
+ key = get_sensor_att_key(sid, ATT_SENSOR_NAME);
+ name = gconf_client_get_string(client, key, NULL);
free(key);
- return res;
+ return name;
}
-void config_set_sensor_name(char *sid, const char *name)
+void config_set_sensor_name(const char *sid, const char *name)
{
- char *escaped_name, *key;
-
- escaped_name = gconf_escape_key(sid, -1);
- /* /apps/psensor/sensors/[sensor_name]/name */
- key = malloc(22 + 2 * strlen(escaped_name) + 1 + 4 + 1);
-
- sprintf(key, "/apps/psensor/sensors/%s/name", escaped_name);
+ char *key;
+ key = get_sensor_att_key(sid, ATT_SENSOR_NAME);
gconf_client_set_string(client, key, name, NULL);
-
- free(escaped_name);
free(key);
}
-static int config_is_window_decoration_enabled()
+static int is_window_decoration_enabled()
{
gboolean b;
return b == FALSE;
}
-static int config_is_window_keep_below_enabled()
+static int is_window_keep_below_enabled()
{
gboolean b;
return b == TRUE;
}
-static void config_set_window_decoration_enabled(int enabled)
+static void set_window_decoration_enabled(int enabled)
{
if (enabled)
gconf_client_set_bool
KEY_INTERFACE_WINDOW_DECORATION_DISABLED, TRUE, NULL);
}
-static void config_set_window_keep_below_enabled(int enabled)
+static void set_window_keep_below_enabled(int enabled)
{
if (enabled)
gconf_client_set_bool(client,
c = malloc(sizeof(struct config));
- 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();
+ 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->sensor_update_interval
= gconf_client_get_int(client, KEY_SENSOR_UPDATE_INTERVAL, NULL);
return c;
}
-void config_save(struct config *c)
+void config_save(const 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);
+ 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);
gconf_client_set_int(client,
KEY_GRAPH_UPDATE_INTERVAL,
KEY_INTERFACE_TEMPERATURE_UNIT,
c->temperature_unit,
NULL);
-
}
projects / psensor.git / blobdiff