memorized taskbar pixmap. So we don t redraw taskbar/task when switching desktop.

[chaz/tint2] / src / config.c

diff --git a/src/config.c b/src/config.c
index 8170631cc12941e8570390a4763f5ee8084cfa98..d2b341481e6ca9a6c1fa90772dc9c3f3b82a7bbf 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -375,10 +375,13 @@ void add_entry (char *key, char *value)
        else if (strcmp (key, "time1_format") == 0) {
                if (new_config_file == 0) {
                        clock_enabled = 1;
-                       if (panel_items_order)
-                               panel_items_order = strcat(panel_items_order, "C");
+                       if (panel_items_order) {
+                               char* tmp = g_strconcat(panel_items_order, "C", NULL);
+                               g_free( panel_items_order );
+                               panel_items_order = tmp;
+                       }
                        else 
-                               panel_items_order = strdup("C");
+                               panel_items_order = g_strdup("C");
                }
                if (strlen(value) > 0) {
                        time1_format = strdup (value);
@@ -451,15 +454,15 @@ void add_entry (char *key, char *value)
        else if (strcmp (key, "taskbar_background_id") == 0) {
                int id = atoi (value);
                id = (id < backgrounds->len && id >= 0) ? id : 0;
-               panel_config.g_taskbar.bg = &g_array_index(backgrounds, Background, id);
-               if (panel_config.g_taskbar.bg_active == 0)
-                       panel_config.g_taskbar.bg_active = panel_config.g_taskbar.bg;
-               panel_config.g_taskbar.area.bg = panel_config.g_taskbar.bg;
+               panel_config.g_taskbar.background[TASKBAR_NORMAL] = &g_array_index(backgrounds, Background, id);
+               if (panel_config.g_taskbar.background[TASKBAR_ACTIVE] == 0)
+                       panel_config.g_taskbar.background[TASKBAR_ACTIVE] = panel_config.g_taskbar.background[TASKBAR_NORMAL];
+               //panel_config.g_taskbar.area.bg = panel_config.g_taskbar.bg;
        }
        else if (strcmp (key, "taskbar_active_background_id") == 0) {
                int id = atoi (value);
                id = (id < backgrounds->len && id >= 0) ? id : 0;
-               panel_config.g_taskbar.bg_active = &g_array_index(backgrounds, Background, id);
+               panel_config.g_taskbar.background[TASKBAR_ACTIVE] = &g_array_index(backgrounds, Background, id);
        }
        else if (strcmp (key, "taskbar_name") == 0) {
                taskbarname_enabled = atoi (value);
@@ -468,9 +471,11 @@ void add_entry (char *key, char *value)
        }
        else if (strcmp (key, "taskbar_name_active_background_id") == 0) {
        }
-       else if (strcmp (key, "taskbar_font_color") == 0) {
+       else if (strcmp (key, "taskbar_name_font") == 0) {
+       }
+       else if (strcmp (key, "taskbar_name_font_color") == 0) {
        }
-       else if (strcmp (key, "taskbar_active_font_color") == 0) {
+       else if (strcmp (key, "taskbar_name_active_font_color") == 0) {
        }
 
        /* Task */
@@ -658,10 +663,13 @@ void add_entry (char *key, char *value)
                if (new_config_file == 0) {
                        systray_enabled = atoi(value);
                        if (systray_enabled) {
-                               if (panel_items_order)
-                                       panel_items_order = strcat(panel_items_order, "S");
-                               else 
-                                       panel_items_order = strdup("S");
+                               if (panel_items_order) {
+                                       char* tmp = g_strconcat(panel_items_order, "S", NULL);
+                                       g_free( panel_items_order );
+                                       panel_items_order = tmp;
+                               }
+                               else
+                                       panel_items_order = g_strdup("S");
                        }
                }
        }
@@ -669,10 +677,13 @@ void add_entry (char *key, char *value)
                if (new_config_file == 0) {
                        battery_enabled = atoi(value);
                        if (battery_enabled) {
-                               if (panel_items_order)
-                                       panel_items_order = strcat(panel_items_order, "B");
-                               else 
-                                       panel_items_order = strdup("B");
+                               if (panel_items_order) {
+                                       char* tmp = g_strconcat(panel_items_order, "B", NULL);
+                                       g_free( panel_items_order );
+                                       panel_items_order = tmp;
+                               }
+                               else
+                                       panel_items_order = g_strdup("B");
                        }
                }
        }
@@ -753,11 +764,12 @@ int config_read_file (const char *path)
        if (new_config_file == 0) {
                taskbar_enabled = 1;
                if (panel_items_order) {
-                       char *tmp = strdup("T");
-                       panel_items_order = strcat(tmp, panel_items_order);
+                       char* tmp = g_strconcat( "T", panel_items_order, NULL );
+                       g_free(panel_items_order);
+                       panel_items_order = tmp;
                }
                else 
-                       panel_items_order = strdup("T");
+                       panel_items_order = g_strdup("T");
        }
 
        return 1;