*fix* issue 282

[chaz/tint2] / src / config.c

diff --git a/src/config.c b/src/config.c
index cc8cb5587ee50c50efe202954c0d72c3f840f08d..f215b395cafe8905ec6ebc920a1412004a0083bd 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -41,6 +41,7 @@
 #include "task.h"
 #include "taskbar.h"
 #include "systraybar.h"
+#include "launcher.h"
 #include "clock.h"
 #include "config.h"
 #include "window.h"
@@ -57,9 +58,7 @@ 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;
 
 
@@ -77,43 +76,6 @@ void cleanup_config()
 }
 
 
-void init_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);
-printf("*** init_config()\n");
-
-       // 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));
-
-       // 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 extract_values (const char *value, char **value1, char **value2, char **value3)
 {
        char *b=0, *c=0;
@@ -194,9 +156,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)
@@ -205,6 +165,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)
@@ -213,6 +176,7 @@ int config_get_monitor(char* monitor)
                        }
                }
        }
+       // monitor == "all" or monitor not found or xrandr can't identify monitors
        return -1;
 }
 
@@ -316,14 +280,14 @@ void add_entry (char *key, char *value)
        else if (strcmp (key, "panel_dock") == 0)
                panel_dock = atoi (value);
        else if (strcmp (key, "urgent_nb_of_blink") == 0)
-               max_tick_urgent = (atoi (value) * 2) + 1;
+               max_tick_urgent = atoi (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 */
@@ -537,12 +501,13 @@ void add_entry (char *key, char *value)
        // 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 && snapshot_path == 0) {
-               if (old_config_file)
+               if (old_config_file) {
+                       // if tint2rc is an old config file, systray_padding enabled the systray bar.
                        systray_enabled = 1;
+               }
                extract_values(value, &value1, &value2, &value3);
                systray.area.paddingxlr = systray.area.paddingx = atoi (value1);
                if (value2) systray.area.paddingy = atoi (value2);
@@ -573,6 +538,33 @@ void add_entry (char *key, char *value)
                systray.brightness = atoi(value3);
        }
 
+       /* Launcher */
+       else if (strcmp (key, "launcher") == 0) {
+               launcher_enabled = atoi(value);
+       }
+       else if (strcmp (key, "launcher_padding") == 0) {
+               extract_values(value, &value1, &value2, &value3);
+               panel_config.launcher.area.paddingxlr = panel_config.launcher.area.paddingx = atoi (value1);
+               if (value2) panel_config.launcher.area.paddingy = atoi (value2);
+               if (value3) panel_config.launcher.area.paddingx = atoi (value3);
+       }
+       else if (strcmp (key, "launcher_background_id") == 0) {
+               int id = atoi (value);
+               id = (id < backgrounds->len && id >= 0) ? id : 0;
+               panel_config.launcher.area.bg = &g_array_index(backgrounds, Background, id);
+       }
+       else if (strcmp(key, "launcher_icon_size") == 0) {
+               launcher_max_icon_size = atoi(value);
+       }
+       else if (strcmp(key, "launcher_item_app") == 0) {
+               char *app = strdup(value);
+               panel_config.launcher.list_apps = g_slist_append(panel_config.launcher.list_apps, app);
+       }
+       else if (strcmp(key, "launcher_icon_theme") == 0) {
+               char *app = strdup(value);
+               panel_config.launcher.icon_theme_names = g_slist_append(panel_config.launcher.icon_theme_names, app);
+       }
+
        /* Tooltip */
        else if (strcmp (key, "tooltip") == 0)
                g_tooltip.enabled = atoi(value);
@@ -629,8 +621,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);
@@ -705,9 +702,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;
 }