order of panel items : position of each object is update by layering engine (area)

[chaz/tint2] / src / config.c

diff --git a/src/config.c b/src/config.c
index 61178d11918237301720c7f0843579103923f80f..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"
@@ -155,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)
@@ -166,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)
@@ -174,6 +176,7 @@ int config_get_monitor(char* monitor)
                        }
                }
        }
+       // monitor == "all" or monitor not found or xrandr can't identify monitors
        return -1;
 }
 
@@ -277,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 */
@@ -498,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);
@@ -534,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);