#endif
// global path
-char *config_path = 0;
-char *snapshot_path = 0;
+char *config_path;
+char *snapshot_path;
// --------------------------------------------------
// backward compatibility
static int old_task_icon_size;
-static int bg_task;
-static int bg_task_active;
// detect if it's an old config file
// ==1
static int old_config_file;
+void default_config()
+{
+ config_path = 0;
+ snapshot_path = 0;
+ old_config_file = 1;
+}
+
+void cleanup_config()
+{
+ if (config_path) g_free(config_path);
+ if (snapshot_path) g_free(snapshot_path);
+}
+
+
void init_config()
{
if (backgrounds)
Background transparent_bg;
memset(&transparent_bg, 0, sizeof(Background));
g_array_append_val(backgrounds, transparent_bg);
+printf("*** init_config()\n");
// tint2 could reload config, so we cleanup objects
cleanup_systray();
pango_font_description_free(panel_config.g_task.font_desc);
}
memset(&panel_config, 0, sizeof(Panel));
- int i;
- for (i=0; i<TASK_STATE_COUNT; ++i)
- panel_config.g_task.alpha[i] = 100;
- systray.alpha = 100;
- systray.sort = 3;
- old_config_file = 1;
// window manager's menu default value == false
wm_menu = 0;
}
-void cleanup_config()
-{
-}
-
-
void extract_values (const char *value, char **value1, char **value2, char **value3)
{
char *b=0, *c=0;
}
+int config_get_monitor(char* monitor)
+{
+ if (strcmp(monitor, "all") == 0)
+ return -1;
+ else {
+ char* endptr;
+ int ret_int = strtol(monitor, &endptr, 10);
+ if (*endptr == 0)
+ return ret_int-1;
+ else {
+ // monitor specified by name, not by index
+ int i, j;
+ for (i=0; i<server.nb_monitor; ++i) {
+ j = 0;
+ while (server.monitor[i].names[j] != 0) {
+ if (strcmp(monitor, server.monitor[i].names[j++]) == 0)
+ return i;
+ }
+ }
+ }
+ }
+ return -1;
+}
+
void add_entry (char *key, char *value)
{
char *value1=0, *value2=0, *value3=0;
/* Panel */
else if (strcmp (key, "panel_monitor") == 0) {
- if (strcmp (value, "all") == 0) panel_config.monitor = -1;
- else {
- panel_config.monitor = atoi (value);
- if (panel_config.monitor > 0) panel_config.monitor -= 1;
- }
+ panel_config.monitor = config_get_monitor(value);
}
else if (strcmp (key, "panel_size") == 0) {
extract_values(value, &value1, &value2, &value3);
panel_config.battery.area.bg = &g_array_index(backgrounds, Background, id);
#endif
}
+ else if (strcmp (key, "battery_hide") == 0) {
+#ifdef ENABLE_BATTERY
+ percentage_hide = atoi (value);
+ if (percentage_hide == 0)
+ percentage_hide = 101;
+#endif
+ }
/* Clock */
else if (strcmp (key, "time1_format") == 0) {
}
/* Systray */
- else if (strcmp (key, "systray") == 0) {
+ // systray disabled in snapshot mode
+ else if (strcmp (key, "systray") == 0 && snapshot_path == 0) {
systray_enabled = atoi(value);
// systray is latest option added. files without 'systray' are old.
old_config_file = 0;
}
- else if (strcmp (key, "systray_padding") == 0) {
+ else if (strcmp (key, "systray_padding") == 0 && snapshot_path == 0) {
if (old_config_file)
systray_enabled = 1;
extract_values(value, &value1, &value2, &value3);
else if (strcmp(key, "strut_policy") == 0) {
if (strcmp(value, "follow_size") == 0)
panel_strut_policy = STRUT_FOLLOW_SIZE;
+ else if (strcmp(value, "none") == 0)
+ panel_strut_policy = STRUT_NONE;
else
panel_strut_policy = STRUT_MINIMUM;
}
else if (strcmp(key, "autohide_height") == 0)
panel_autohide_height = atoi(value);
-
- // QUESTION: Do we still need backwards compatibility???
- /* Read tint-0.6 config for backward compatibility */
- else if (strcmp (key, "panel_mode") == 0) {
- if (strcmp (value, "single_desktop") == 0) panel_mode = SINGLE_DESKTOP;
- else panel_mode = MULTI_DESKTOP;
- }
- else if (strcmp (key, "panel_rounded") == 0) {
- Background bg;
- bg.border.rounded = atoi(value);
- g_array_append_val(backgrounds, bg);
- }
- else if (strcmp (key, "panel_border_width") == 0) {
- g_array_index(backgrounds, Background, backgrounds->len-1).border.width = atoi(value);
- }
- else if (strcmp (key, "panel_background_color") == 0) {
- Background* bg = &g_array_index(backgrounds, Background, backgrounds->len-1);
- extract_values(value, &value1, &value2, &value3);
- get_color (value1, bg->back.color);
- if (value2) bg->back.alpha = (atoi (value2) / 100.0);
- else bg->back.alpha = 0.5;
- }
- else if (strcmp (key, "panel_border_color") == 0) {
- Background* bg = &g_array_index(backgrounds, Background, backgrounds->len-1);
- extract_values(value, &value1, &value2, &value3);
- get_color (value1, bg->border.color);
- if (value2) bg->border.alpha = (atoi (value2) / 100.0);
- else bg->border.alpha = 0.5;
- }
- else if (strcmp (key, "task_text_centered") == 0)
- panel_config.g_task.centered = atoi (value);
- else if (strcmp (key, "task_margin") == 0) {
- panel_config.g_taskbar.area.paddingxlr = 0;
- panel_config.g_taskbar.area.paddingx = atoi (value);
- }
- else if (strcmp (key, "task_icon_size") == 0)
- old_task_icon_size = atoi (value);
- else if (strcmp (key, "task_rounded") == 0) {
- Background bg;
- bg.border.rounded = atoi(value);
- g_array_append_val(backgrounds, bg);
- g_array_append_val(backgrounds, bg);
- bg_task = backgrounds->len-2;
- bg_task_active = backgrounds->len-1;
- }
- else if (strcmp (key, "task_background_color") == 0) {
- Background* bg = &g_array_index(backgrounds, Background, bg_task);
- extract_values(value, &value1, &value2, &value3);
- get_color (value1, bg->back.color);
- if (value2) bg->back.alpha = (atoi (value2) / 100.0);
- else bg->back.alpha = 0.5;
- }
- else if (strcmp (key, "task_active_background_color") == 0) {
- Background* bg = &g_array_index(backgrounds, Background, bg_task_active);
- extract_values(value, &value1, &value2, &value3);
- get_color (value1, bg->back.color);
- if (value2) bg->back.alpha = (atoi (value2) / 100.0);
- else bg->back.alpha = 0.5;
- }
- else if (strcmp (key, "task_border_width") == 0) {
- Background* bg = &g_array_index(backgrounds, Background, bg_task);
- bg->border.width = atoi (value);
- bg = &g_array_index(backgrounds, Background, bg_task_active);
- bg->border.width = atoi (value);
- }
- else if (strcmp (key, "task_border_color") == 0) {
- Background* bg = &g_array_index(backgrounds, Background, bg_task);
- extract_values(value, &value1, &value2, &value3);
- get_color (value1, bg->border.color);
- if (value2) bg->border.alpha = (atoi (value2) / 100.0);
- else bg->border.alpha = 0.5;
- }
- else if (strcmp (key, "task_active_border_color") == 0) {
- Background* bg = &g_array_index(backgrounds, Background, bg_task_active);
- extract_values(value, &value1, &value2, &value3);
- get_color (value1, bg->border.color);
- if (value2) bg->border.alpha = (atoi (value2) / 100.0);
- else bg->border.alpha = 0.5;
- }
-
else
- fprintf(stderr, "tint2 : invalid option \"%s\", correct your config file\n", key);
+ fprintf(stderr, "tint2 : invalid option \"%s\",\n upgrade tint2 or correct your config file\n", key);
if (value1) free (value1);
if (value2) free (value2);
projects / chaz / tint2 / blobdiff