*fix* use copied data for task icons on 64bit

[chaz/tint2] / src / taskbar / task.c

diff --git a/src/taskbar/task.c b/src/taskbar/task.c
index 383d99e7b2b13a3faf1bf41acaa9de3ca05d198f..25c383ea1e372c129785a0f7f9b6a67a4c73d3ed 100644 (file)
--- a/src/taskbar/task.c
+++ b/src/taskbar/task.c
@@ -43,10 +43,13 @@ Task *add_task (Window win)
 
        Task new_tsk;
        new_tsk.win = win;
-       new_tsk.area.panel = &panel1[0];
        new_tsk.desktop = window_get_desktop (win);
-       if (nb_panel > 1) monitor = window_get_monitor (win);
+       if (nb_panel > 1) {
+               monitor = window_get_monitor (win);
+               if (monitor >= nb_panel) monitor = 0;
+       }
        else monitor = 0;
+       new_tsk.area.panel = &panel1[monitor];
 
        // allocate only one title and one icon
        // even with task_on_all_desktop and with task_on_all_panel
@@ -61,16 +64,10 @@ Task *add_task (Window win)
        Taskbar *tskbar;
        Task *new_tsk2=0;
        int i, j;
-       for (i = 0; i < nb_panel; i++) {
-               if (nb_panel > 1 && panel1[i].monitor != monitor) continue;
-               for (j = 0; j < panel1[i].nb_desktop; j++) {
-                       if ((new_tsk.desktop != ALLDESKTOP && new_tsk.desktop != j)
-                       || (panel_mode == MULTI_DESKTOP && new_tsk.desktop == ALLDESKTOP && server.desktop != j))
-                               continue;
-//     for (i=0 ; i < nb_panel ; i++) {
-//             for (j=0 ; j < panel1[i].nb_desktop ; j++) {
-//                     if (new_tsk.desktop != ALLDESKTOP && new_tsk.desktop != j) continue;
-//                     if (nb_panel > 1 && panel1[i].monitor != monitor) continue;
+       for (i=0 ; i < nb_panel ; i++) {
+               for (j=0 ; j < panel1[i].nb_desktop ; j++) {
+                       if (new_tsk.desktop != ALLDESKTOP && new_tsk.desktop != j) continue;
+                       if (nb_panel > 1 && panel1[i].monitor != monitor) continue;
 
                        tskbar = &panel1[i].taskbar[j];
                        new_tsk2 = malloc(sizeof(Task));
@@ -78,6 +75,10 @@ Task *add_task (Window win)
                        new_tsk2->area.parent = tskbar;
                        new_tsk2->win = new_tsk.win;
                        new_tsk2->desktop = new_tsk.desktop;
+                       if (new_tsk2->desktop == ALLDESKTOP && server.desktop != j) {
+                               // hide ALLDESKTOP task on non-current desktop
+                               new_tsk2->area.on_screen = 0;
+                       }
                        new_tsk2->title = new_tsk.title;
                        new_tsk2->icon = new_tsk.icon;
                        new_tsk2->icon_active = new_tsk.icon_active;
@@ -203,12 +204,11 @@ void get_icon (Task *tsk)
                tmp_data = get_best_icon (data, get_icon_count (data, i), i, &w, &h, panel->g_task.icon_size1);
 
 #ifdef __x86_64__
-               DATA32 *icon_data = malloc (w * h * sizeof (DATA32));
+               DATA32 icon_data[w * h];
                int length = w * h;
                for (i = 0; i < length; ++i)
                        icon_data[i] =  tmp_data[i];
-               img = imlib_create_image_using_data (w, h, icon_data);
-               free(icon_data);
+               img = imlib_create_image_using_copied_data (w, h, icon_data);
 #else
                img = imlib_create_image_using_data (w, h, (DATA32*)tmp_data);
 #endif