*fix* issue 213

[chaz/tint2] / src / config.c

diff --git a/src/config.c b/src/config.c
index 7ccb08396467e6a7f35576f4d7b96d59f093c61e..deb08ce5fa30d15049bcd587803d8a66ca790bb9 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -58,8 +58,6 @@ char *snapshot_path = 0;
 // --------------------------------------------------
 // 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;
@@ -99,6 +97,7 @@ void init_config()
        // window manager's menu default value == false
        wm_menu = 0;
        max_tick_urgent = 7;
+       panel_config.g_taskbar.bg = panel_config.g_taskbar.bg_active = 0;
 
        // flush pango cache if possible
        //pango_xft_shutdown_display(server.dsp, server.screen);
@@ -226,11 +225,6 @@ void add_entry (char *key, char *value)
                        panel_config.monitor = atoi (value);
                        if (panel_config.monitor > 0) panel_config.monitor -= 1;
                }
-               if (panel_config.monitor > (server.nb_monitor-1)) {
-                       // server.nb_monitor minimum value is 1 (see get_monitors())
-                       fprintf(stderr, "warning : monitor not found. tint2 default to all monitors.\n");
-                       panel_config.monitor = 0;
-               }
        }
        else if (strcmp (key, "panel_size") == 0) {
                extract_values(value, &value1, &value2, &value3);
@@ -300,8 +294,6 @@ void add_entry (char *key, char *value)
                panel_dock = atoi (value);
        else if (strcmp (key, "urgent_nb_of_blink") == 0)
                max_tick_urgent = (atoi (value) * 2) + 1;
-       else if (strcmp (key, "real_transparency") == 0)
-               real_transparency = atoi(value);
        else if (strcmp (key, "panel_layer") == 0) {
                if (strcmp(value, "bottom") == 0)
                        panel_layer = BOTTOM_LAYER;
@@ -367,6 +359,13 @@ void add_entry (char *key, char *value)
                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) {
@@ -607,86 +606,6 @@ void add_entry (char *key, char *value)
        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);