fixed some segfault and memleak

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

diff --git a/src/taskbar/task.c b/src/taskbar/task.c
index b45c184c792923ec7788564ae7958a140d7ae1e1..383d99e7b2b13a3faf1bf41acaa9de3ca05d198f 100644 (file)
--- a/src/taskbar/task.c
+++ b/src/taskbar/task.c
@@ -61,10 +61,16 @@ Task *add_task (Window win)
        Taskbar *tskbar;
        Task *new_tsk2=0;
        int i, j;
-       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++) {
+               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;
 
                        tskbar = &panel1[i].taskbar[j];
                        new_tsk2 = malloc(sizeof(Task));
@@ -174,6 +180,10 @@ void get_icon (Task *tsk)
 {
        Panel *panel = tsk->area.panel;
        if (!panel->g_task.icon) return;
+       int i;
+       Imlib_Image img = NULL;
+       XWMHints *hints = 0;
+       long *data = 0;
 
        if (tsk->icon) {
                imlib_context_set_image(tsk->icon);
@@ -184,9 +194,7 @@ void get_icon (Task *tsk)
        }
        tsk->area.redraw = 1;
 
-       int i;
-       Imlib_Image img = NULL;
-       long *data = server_get_property (tsk->win, server.atom._NET_WM_ICON, XA_CARDINAL, &i);
+       data = server_get_property (tsk->win, server.atom._NET_WM_ICON, XA_CARDINAL, &i);
        if (data) {
                // get ARGB icon
                int w, h;
@@ -204,11 +212,10 @@ void get_icon (Task *tsk)
 #else
                img = imlib_create_image_using_data (w, h, (DATA32*)tmp_data);
 #endif
-               XFree (data);
        }
        else {
                // get Pixmap icon
-               XWMHints *hints = XGetWMHints(server.dsp, tsk->win);
+               hints = XGetWMHints(server.dsp, tsk->win);
                if (hints) {
                        if (hints->flags & IconPixmapHint && hints->icon_pixmap != 0) {
                                // get width, height and depth for the pixmap
@@ -223,7 +230,6 @@ void get_icon (Task *tsk)
                                img = imlib_create_image_from_drawable(hints->icon_mask, 0, 0, w, h, 0);
                        }
                }
-               XFree(hints);
        }
        if (img == NULL) {
                imlib_context_set_image(default_icon);
@@ -233,7 +239,10 @@ void get_icon (Task *tsk)
        // transform icons
        imlib_context_set_image(img);
        imlib_image_set_has_alpha(1);
-       tsk->icon = imlib_create_cropped_scaled_image(0, 0, imlib_image_get_width(), imlib_image_get_height(), panel->g_task.icon_size1, panel->g_task.icon_size1);
+       int w, h;
+       w = imlib_image_get_width();
+       h = imlib_image_get_height();
+       tsk->icon = imlib_create_cropped_scaled_image(0, 0, w, h, panel->g_task.icon_size1, panel->g_task.icon_size1);
        imlib_free_image();
 
        imlib_context_set_image(tsk->icon);
@@ -254,6 +263,11 @@ void get_icon (Task *tsk)
                adjust_asb(data32, tsk->icon_width, tsk->icon_height, panel->g_task.alpha_active, (float)panel->g_task.saturation_active/100, (float)panel->g_task.brightness_active/100);
                imlib_image_put_back_data(data32);
        }
+
+       if (hints)
+               XFree(hints);
+       if (data)
+               XFree (data);
 }