Fix "implicit declaration" warning by including unistd.h.

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

diff --git a/src/taskbar/task.c b/src/taskbar/task.c
index 0bf7349169803da84239f175e93093112fd6dada..6309f2734a9f02329e4f2809cc611d8788f2c6fb 100644 (file)
--- a/src/taskbar/task.c
+++ b/src/taskbar/task.c
@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
+#include <unistd.h>
 
 #include "window.h"
 #include "task.h"
@@ -43,10 +44,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 +65,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 +76,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;
@@ -99,6 +101,12 @@ void remove_task (Task *tsk)
        Window win = tsk->win;
        int desktop = tsk->desktop;
 
+       if (g_tooltip.task == tsk) {
+               tooltip_hide();
+               alarm(0);
+               g_tooltip.task = 0;
+       }
+
        // free title and icon just for the first task
        // even with task_on_all_desktop and with task_on_all_panel
        //printf("remove_task %s %d\n", tsk->title, tsk->desktop);
@@ -150,6 +158,12 @@ void get_title(Task *tsk)
 
        if (!panel->g_task.text && !g_tooltip.enabled) return;
 
+       if (g_tooltip.task == tsk) {
+               tooltip_hide();
+               alarm(0);
+               g_tooltip.task = 0;
+       }
+
        name = server_get_property (tsk->win, server.atom._NET_WM_VISIBLE_NAME, server.atom.UTF8_STRING, 0);
        if (!name || !strlen(name)) {
                name = server_get_property (tsk->win, server.atom._NET_WM_NAME, server.atom.UTF8_STRING, 0);
@@ -180,6 +194,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);
@@ -190,9 +208,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;
@@ -201,20 +217,18 @@ 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
-               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
@@ -229,7 +243,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);
@@ -239,7 +252,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);
@@ -260,6 +276,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);
 }