strut_policy=minimum possible even if autohide disabled

[chaz/tint2] / src / config.c

diff --git a/src/config.c b/src/config.c
index 60c14f31716e7c3d3f786f82bcb9f5fada61ced7..1175660b4d45e74c13717a2f90ca50c825cdf1d8 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -52,58 +52,26 @@
 #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;
-// detect if it's an old config file
-// ==1
+// detect if it's an old config file (==1)
 static int old_config_file;
 
 
-void init_config()
+void default_config()
 {
-       if (backgrounds)
-               g_array_free(backgrounds, 1);
-       backgrounds = g_array_new(0, 0, sizeof(Background));
-
-       // append full transparency background
-       Background transparent_bg;
-       memset(&transparent_bg, 0, sizeof(Background));
-       g_array_append_val(backgrounds, transparent_bg);
-
-       // tint2 could reload config, so we cleanup objects
-       cleanup_systray();
-#ifdef ENABLE_BATTERY
-       cleanup_battery();
-#endif
-       cleanup_clock();
-       cleanup_tooltip();
-
-       // panel's default value
-       if (panel_config.g_task.font_desc) {
-               pango_font_description_free(panel_config.g_task.font_desc);
-       }
-       memset(&panel_config, 0, sizeof(Panel));
-       systray.alpha = 100;
-       systray.sort = 3;
+       config_path = 0;
+       snapshot_path = 0;
        old_config_file = 1;
-
-       // window manager's menu default value == false
-       wm_menu = 0;
-       max_tick_urgent = 7;
-
-       // flush pango cache if possible
-       //pango_xft_shutdown_display(server.dsp, server.screen);
-       //PangoFontMap *font_map = pango_xft_get_font_map(server.dsp, server.screen);
-       //pango_fc_font_map_shutdown(font_map);
 }
 
-
 void cleanup_config()
 {
+       if (config_path) g_free(config_path);
+       if (snapshot_path) g_free(snapshot_path);
 }
 
 
@@ -187,9 +155,7 @@ int get_task_status(char* status)
 
 int config_get_monitor(char* monitor)
 {
-       if (strcmp(monitor, "all") == 0)
-               return -1;
-       else {
+       if (strcmp(monitor, "all") != 0) {
                char* endptr;
                int ret_int = strtol(monitor, &endptr, 10);
                if (*endptr == 0)
@@ -198,6 +164,9 @@ int config_get_monitor(char* monitor)
                        // monitor specified by name, not by index
                        int i, j;
                        for (i=0; i<server.nb_monitor; ++i) {
+                               if (server.monitor[i].names == 0) 
+                                       // xrandr can't identify monitors
+                                       continue;
                                j = 0;
                                while (server.monitor[i].names[j] != 0) {
                                        if (strcmp(monitor, server.monitor[i].names[j++]) == 0)
@@ -206,6 +175,7 @@ int config_get_monitor(char* monitor)
                        }
                }
        }
+       // monitor == "all" or monitor not found or xrandr can't identify monitors
        return -1;
 }
 
@@ -313,10 +283,10 @@ void add_entry (char *key, char *value)
        else if (strcmp (key, "panel_layer") == 0) {
                if (strcmp(value, "bottom") == 0)
                        panel_layer = BOTTOM_LAYER;
-               else if (strcmp(value, "normal") == 0)
-                       panel_layer = NORMAL_LAYER;
                else if (strcmp(value, "top") == 0)
                        panel_layer = TOP_LAYER;
+               else
+                       panel_layer = NORMAL_LAYER;
        }
 
        /* Battery */
@@ -622,8 +592,13 @@ void add_entry (char *key, char *value)
                else
                        panel_strut_policy = STRUT_MINIMUM;
        }
-       else if (strcmp(key, "autohide_height") == 0)
+       else if (strcmp(key, "autohide_height") == 0) {
                panel_autohide_height = atoi(value);
+               if (panel_autohide_height == 0) {
+                       // autohide need height > 0
+                       panel_autohide_height = 1;
+               }
+       }
 
        else
                fprintf(stderr, "tint2 : invalid option \"%s\",\n  upgrade tint2 or correct your config file\n", key);
@@ -698,9 +673,6 @@ int config_read_file (const char *path)
        }
        fclose (fp);
 
-       if (old_task_icon_size) {
-               panel_config.g_task.area.paddingy = ((int)panel_config.area.height - (2 * panel_config.area.paddingy) - old_task_icon_size) / 2;
-       }
        return 1;
 }