fixed segfault

[chaz/tint2] / src / config.c

diff --git a/src/config.c b/src/config.c
index f1b4655b50ae53a197435b020a1fd5b4c59e9b83..931dc388d82bc40f6db99bd684f13f87944e70da 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -48,6 +48,9 @@
 #include "battery.h"
 #endif
 
+// global path
+char *config_path = 0;
+char *thumbnail_path = 0;
 
 // --------------------------------------------------
 // backward compatibility
@@ -81,6 +84,8 @@ void init_config()
    list_back = g_slist_append(0, calloc(1, sizeof(Area)));
 
        panel_config = calloc(1, sizeof(Panel));
+       systray.sort = 1;
+
        // window manager's menu default value == false
        wm_menu = 0;
        max_tick_urgent = 7;
@@ -228,6 +233,10 @@ void get_action (char *event, int *action)
       *action = TOGGLE_ICONIFY;
    else if (strcmp (event, "maximize_restore") == 0)
       *action = MAXIMIZE_RESTORE;
+   else if (strcmp (event, "desktop_left") == 0)
+      *action = DESKTOP_LEFT;
+   else if (strcmp (event, "desktop_right") == 0)
+      *action = DESKTOP_RIGHT;
 }
 
 
@@ -339,7 +348,7 @@ void add_entry (char *key, char *value)
                        panel_config->battery.area.on_screen = 1;
 #else
                if(atoi(value) == 1)
-                       printf("tint2 is build without battery support\n");
+                       fprintf(stderr, "tint2 is build without battery support\n");
 #endif
    }
    else if (strcmp (key, "battery_low_status") == 0) {
@@ -468,6 +477,13 @@ void add_entry (char *key, char *value)
       memcpy(&panel_config->g_taskbar.pix.back, &a->pix.back, sizeof(Color));
       memcpy(&panel_config->g_taskbar.pix.border, &a->pix.border, sizeof(Border));
    }
+   else if (strcmp (key, "taskbar_active_background_id") == 0) {
+      int id = atoi (value);
+      Area *a = g_slist_nth_data(list_back, id);
+      memcpy(&panel_config->g_taskbar.pix_active.back, &a->pix.back, sizeof(Color));
+      memcpy(&panel_config->g_taskbar.pix_active.border, &a->pix.border, sizeof(Border));
+               panel_config->g_taskbar.use_active = 1;
+   }
 
    /* Task */
    else if (strcmp (key, "task_text") == 0)
@@ -511,6 +527,18 @@ void add_entry (char *key, char *value)
       if (value2) panel_config->g_task.font_active.alpha = (atoi (value2) / 100.0);
       else panel_config->g_task.font_active.alpha = 0.1;
    }
+   else if (strcmp (key, "task_icon_hsb") == 0) {
+      extract_values(value, &value1, &value2, &value3);
+               panel_config->g_task.hue = atoi(value1);
+               panel_config->g_task.saturation = atoi(value2);
+               panel_config->g_task.brightness = atoi(value3);
+   }
+   else if (strcmp (key, "task_active_icon_hsb") == 0) {
+      extract_values(value, &value1, &value2, &value3);
+               panel_config->g_task.hue_active = atoi(value1);
+               panel_config->g_task.saturation_active = atoi(value2);
+               panel_config->g_task.brightness_active = atoi(value3);
+   }
    else if (strcmp (key, "task_background_id") == 0) {
       int id = atoi (value);
       Area *a = g_slist_nth_data(list_back, id);
@@ -538,6 +566,12 @@ void add_entry (char *key, char *value)
       memcpy(&systray.area.pix.back, &a->pix.back, sizeof(Color));
       memcpy(&systray.area.pix.border, &a->pix.border, sizeof(Border));
    }
+       else if (strcmp(key, "systray_sort") == 0) {
+               if (strcmp(value, "desc") == 0)
+                       systray.sort = -1;
+               else
+                       systray.sort = 1;
+       }
 
    /* Mouse actions */
    else if (strcmp (key, "mouse_middle") == 0)
@@ -723,6 +757,7 @@ deb:
    path1 = g_build_filename (g_get_user_config_dir(), "tint2", "tint2rc", NULL);
    if (g_file_test (path1, G_FILE_TEST_EXISTS)) {
                i = config_read_file (path1);
+               config_path = strdup(path1);
                g_free(path1);
           return i;
        }
@@ -765,6 +800,7 @@ deb:
                g_free(path2);
 
                i = config_read_file (path1);
+               config_path = strdup(path1);
                g_free(path1);
                return i;
        }