*add* multiple tasks can be urgent now

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

diff --git a/src/taskbar/task.c b/src/taskbar/task.c
index c4c2b883e40b1e41d16672da03a73860e4eec0d0..07db3723068ad0ee6f9d25ea4335fc0f3da8e61c 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
@@ -97,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);
@@ -148,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);
@@ -201,12 +217,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
@@ -349,3 +364,101 @@ void draw_task (void *obj, cairo_t *c, int active)
 }
 
 
+void active_task()
+{
+       GSList *l0;
+       int i, j;
+       Task *tsk1, *tsk2;
+
+       if (task_active) {
+               for (i=0 ; i < nb_panel ; i++) {
+                       for (j=0 ; j < panel1[i].nb_desktop ; j++) {
+                               for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
+                                       tsk1 = l0->data;
+                                       tsk1->area.is_active = 0;
+                               }
+                       }
+               }
+               task_active = 0;
+       }
+
+       Window w1 = window_get_active ();
+       //printf("Change active task %ld\n", w1);
+
+       tsk2 = task_get_task(w1);
+       if (!tsk2) {
+               Window w2;
+               if (XGetTransientForHint(server.dsp, w1, &w2) != 0)
+                       if (w2) tsk2 = task_get_task(w2);
+       }
+       if ( is_urgent(tsk2) ) {
+               del_urgent(tsk2);
+       }
+       // put active state on all task (multi_desktop)
+       if (tsk2) {
+               for (i=0 ; i < nb_panel ; i++) {
+                       for (j=0 ; j < panel1[i].nb_desktop ; j++) {
+                               for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
+                                       tsk1 = l0->data;
+                                       if (tsk1->win == tsk2->win) {
+                                               tsk1->area.is_active = 1;
+                                       }
+                               }
+                       }
+               }
+               task_active = tsk2;
+       }
+}
+
+
+void add_urgent(Task *tsk)
+{
+       // first check if task is already in the list and reset the counter
+       GSList* urgent_task = urgent_list;
+       while (urgent_task) {
+               Task_urgent* t = urgent_task->data;
+               if (t->tsk == tsk) {
+                       t->tick = 0;
+                       return;
+               }
+               urgent_task = urgent_task->next;
+       }
+
+       // not yet in the list, so we have to add it
+       Task_urgent* t = malloc(sizeof(Task_urgent));
+       if (!t)
+               return;
+       t->tsk = tsk;
+       t->tick = 0;
+       urgent_list = g_slist_prepend(urgent_list, t);
+       time_precision = 1;
+}
+
+
+void del_urgent(Task *tsk)
+{
+       GSList* urgent_task = urgent_list;
+       while (urgent_task) {
+               Task_urgent* t = urgent_task->data;
+               if (t->tsk == tsk) {
+                       urgent_list = g_slist_remove(urgent_list, t);
+                       free(t);
+                       if (!urgent_list)
+                               init_precision();
+                       return;
+               }
+               urgent_task = urgent_task->next;
+       }
+}
+
+int is_urgent(Task *tsk)
+{
+       GSList* urgent_task = urgent_list;
+       while (urgent_task) {
+               Task_urgent* t = urgent_task->data;
+               if (t->tsk == tsk)
+                       return 1;
+               urgent_task = urgent_task->next;
+       }
+       return 0;
+}