#include "cfg.h"
-static const char *KEY_SENSORS
-= "/apps/psensor/sensors";
+static const char *KEY_SENSORS = "/apps/psensor/sensors";
+
+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_ENABLED = "enabled";
+static const char *ATT_SENSOR_NAME = "name";
static const char *KEY_SENSOR_UPDATE_INTERVAL
= "/apps/psensor/sensor/update_interval";
c = str_to_color(scolor);
free(scolor);
- if (c == NULL)
+ if (!c)
return color_new(0xffff, 0xffff, 0xffff);
return c;
c = str_to_color(scolor);
free(scolor);
- if (c == NULL)
+ if (!c)
return color_new(0x0000, 0x0000, 0x0000);
return c;
}
-static int 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 get_sensorlist_position()
+static enum sensorlist_position get_sensorlist_position()
{
return gconf_client_get_int(client,
KEY_INTERFACE_SENSORLIST_POSITION, NULL);
}
-static void 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);
gconf_client_set_float(client, KEY_GRAPH_BACKGROUND_ALPHA, alpha, NULL);
}
-static void set_background_color(struct color *color)
+static void set_background_color(const struct color *color)
{
char *scolor;
free(scolor);
}
-static void set_foreground_color(struct color *color)
+static void set_foreground_color(const struct color *color)
{
- char *scolor;
+ char *str;
- scolor = color_to_str(color);
- 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 *get_sensor_att_key(const char *sid, const char *att)
return key;
}
-struct color *config_get_sensor_color(const char *sid,
- const struct color *default_color)
+struct color *
+config_get_sensor_color(const char *sid, const struct color *dft)
{
char *key, *scolor;
struct color *color;
- key = get_sensor_att_key(sid, "color");
+ key = get_sensor_att_key(sid, ATT_SENSOR_COLOR);
scolor = gconf_client_get_string(client, key, NULL);
color = str_to_color(scolor);
if (!scolor || !color) {
- color = color_new(default_color->red,
- default_color->green, default_color->blue);
-
+ color = color_new(dft->red, dft->green, dft->blue);
scolor = color_to_str(color);
-
gconf_client_set_string(client, key, scolor, NULL);
}
{
char *key, *scolor;
- key = get_sensor_att_key(sid, "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 *sid, int def)
+int config_get_sensor_alarm_high_threshold(const char *sid)
{
int res;
char *key;
- key = get_sensor_att_key(sid, "alarmlimit");
+ key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD);
res = gconf_client_get_int(client, key, NULL);
free(key);
- return res ? res : def;
+ return res;
}
-void config_set_sensor_alarm_limit(char *sid, int alarm_limit)
+void
+config_set_sensor_alarm_high_threshold(const char *sid, int threshold)
{
char *key;
- key = get_sensor_att_key(sid, "alarmlimit");
- gconf_client_set_int(client, key, alarm_limit, 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_enabled(char *sid)
+int config_get_sensor_alarm_low_threshold(const char *sid)
{
- gboolean res;
+ int res;
char *key;
- key = get_sensor_att_key(sid, "alarmenabled");
- res = gconf_client_get_bool(client, key, NULL);
+ key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_LOW_THRESHOLD);
+ res = gconf_client_get_int(client, key, NULL);
free(key);
- return res == TRUE;
+ return res;
}
-void config_set_sensor_alarm_enabled(char *sid, int enabled)
+void
+config_set_sensor_alarm_low_threshold(const char *sid, int threshold)
{
- char *escaped_name, *key;
-
- escaped_name = gconf_escape_key(sid, -1);
- /* /apps/psensor/sensors/[sid]/alarmenabled */
- key = malloc(22 + 2 * strlen(escaped_name) + 1 + 12 + 1);
-
- sprintf(key, "/apps/psensor/sensors/%s/alarmenabled", escaped_name);
-
- gconf_client_set_bool(client, key, enabled, NULL);
+ char *key;
- free(escaped_name);
+ key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_LOW_THRESHOLD);
+ gconf_client_set_int(client, key, threshold, NULL);
free(key);
}
-int config_is_sensor_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/[sid]/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_ALARM_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_alarm_enabled(const char *sid, int enabled)
{
- char *escaped_name, *key;
-
- escaped_name = gconf_escape_key(sid, -1);
- /* /apps/psensor/sensors/[sid]/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_ALARM_ENABLED);
gconf_client_set_bool(client, key, enabled, NULL);
-
- free(escaped_name);
free(key);
}
-char *config_get_sensor_name(char *sid)
+int config_is_sensor_enabled(const char *sid)
{
- char *res, *escaped_name, *key;
+ gboolean b;
+ char *key;
- escaped_name = gconf_escape_key(sid, -1);
- /* /apps/psensor/sensors/[sid]/name */
- key = malloc(22 + 2 * strlen(escaped_name) + 1 + 4 + 1);
+ key = get_sensor_att_key(sid, ATT_SENSOR_ENABLED);
+ b = gconf_client_get_bool(client, key, NULL);
+ free(key);
- sprintf(key, "/apps/psensor/sensors/%s/name", escaped_name);
+ return b == TRUE;
+}
- res = gconf_client_get_string(client, key, NULL);
+void config_set_sensor_enabled(const char *sid, int enabled)
+{
+ char *key;
- free(escaped_name);
+ key = get_sensor_att_key(sid, ATT_SENSOR_ENABLED);
+ gconf_client_set_bool(client, key, enabled, NULL);
free(key);
-
- return res;
}
-void config_set_sensor_name(char *sid, const char *name)
+char *config_get_sensor_name(const char *sid)
{
- char *escaped_name, *key;
+ char *name, *key;
+
+ key = get_sensor_att_key(sid, ATT_SENSOR_NAME);
+ name = gconf_client_get_string(client, key, NULL);
+ free(key);
- escaped_name = gconf_escape_key(sid, -1);
- /* /apps/psensor/sensors/[sid]/name */
- key = malloc(22 + 2 * strlen(escaped_name) + 1 + 4 + 1);
+ return name;
+}
- sprintf(key, "/apps/psensor/sensors/%s/name", escaped_name);
+void config_set_sensor_name(const char *sid, const char *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);
}
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,
projects / psensor.git / blobdiff