*fix* forward all clicks tint2 does not handle to the window manager, if wm_menu = 1

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

diff --git a/src/taskbar/task.c b/src/taskbar/task.c
index 94229a2766430c3672aa7a146f36a344bd08caab..a569a99e4ec47f3a8555ec58c3cb5d6d15ab33b5 100644 (file)
--- a/src/taskbar/task.c
+++ b/src/taskbar/task.c
@@ -34,7 +34,14 @@
 #include "tooltip.h"
 #include "timer.h"
 
-static int urgent_timer = 0;
+static const struct timeout* urgent_timeout = 0;
+
+const char* task_get_tooltip(void* obj)
+{
+       Task* t = obj;
+       return t->title;
+}
+
 
 Task *add_task (Window win)
 {
@@ -82,6 +89,7 @@ Task *add_task (Window win)
                                new_tsk2->area.on_screen = 0;
                        }
                        new_tsk2->title = new_tsk.title;
+                       new_tsk2->area._get_tooltip_text = task_get_tooltip;
                        new_tsk2->icon = new_tsk.icon;
                        new_tsk2->icon_active = new_tsk.icon_active;
                        new_tsk2->icon_width = new_tsk.icon_width;
@@ -91,6 +99,8 @@ Task *add_task (Window win)
                        //printf("add_task panel %d, desktop %d, task %s\n", i, j, new_tsk2->title);
                }
        }
+       if (window_is_urgent(win))
+               add_urgent(new_tsk2);
        return new_tsk2;
 }
 
@@ -102,12 +112,6 @@ 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);
@@ -141,6 +145,8 @@ void remove_task (Task *tsk)
                                                task_active = 0;
                                        if (tsk2 == task_drag)
                                                task_drag = 0;
+                                       if (is_urgent(tsk2))
+                                               del_urgent(tsk2);
 
                                        XFreePixmap (server.dsp, tsk2->area.pix.pmap);
                                        XFreePixmap (server.dsp, tsk2->area.pix_active.pmap);
@@ -159,12 +165,6 @@ 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);
@@ -365,6 +365,55 @@ void draw_task (void *obj, cairo_t *c, int active)
 }
 
 
+Task *next_task(Task *tsk)
+{
+       GSList *l0;
+       int i, j;
+       Task *tsk1;
+
+       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 == tsk) {
+                                       if (l0->next == NULL) l0 = panel1[i].taskbar[j].area.list;
+                                       else l0 = l0->next;
+                                       return l0->data;
+                               }
+                       }
+               }
+       }
+
+       return NULL;
+}
+
+Task *prev_task(Task *tsk)
+{
+       GSList *l0;
+       int i, j;
+       Task *tsk1, *tsk2;
+
+       for (i=0 ; i < nb_panel ; i++) {
+               for (j=0 ; j < panel1[i].nb_desktop ; j++) {
+                       tsk2 = NULL;
+                       for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
+                               tsk1 = l0->data;
+                               if (tsk1 == tsk) {
+                                       if (l0 == panel1[i].taskbar[j].area.list) {
+                                               l0 = g_slist_last ( l0 );
+                                               tsk2 = l0->data;
+                                       }
+                                       return tsk2;
+                               }
+                               tsk2 = tsk1;
+                       }
+               }
+       }
+
+       return NULL;
+}
+
+
 void active_task()
 {
        GSList *l0;
@@ -424,11 +473,19 @@ void blink_urgent()
                }
                urgent_task = urgent_task->next;
        }
+       panel_refresh = 1;
 }
 
 
 void add_urgent(Task *tsk)
 {
+       if (!tsk)
+               return;
+
+       // some programs set urgency hint although they are active
+       if ( task_active && task_active->win == tsk->win )
+               return;
+
        // first check if task is already in the list and reset the counter
        GSList* urgent_task = urgent_list;
        while (urgent_task) {
@@ -448,10 +505,8 @@ void add_urgent(Task *tsk)
        t->tick = 0;
        urgent_list = g_slist_prepend(urgent_list, t);
 
-       if (urgent_timer == 0)
-               urgent_timer = install_timer(0, 1000000, 1, 0, blink_urgent);
-       else
-               reset_timer(urgent_timer, 0, 1000000, 1, 0);
+       if (urgent_timeout == 0)
+               urgent_timeout = add_timeout(10, 1000, blink_urgent);
 }
 
 
@@ -463,8 +518,10 @@ void del_urgent(Task *tsk)
                if (t->tsk == tsk) {
                        urgent_list = g_slist_remove(urgent_list, t);
                        free(t);
-                       if (!urgent_list)
-                               reset_timer(urgent_timer, 0, 0, 0, 0);
+                       if (!urgent_list) {
+                               stop_timeout(urgent_timeout);
+                               urgent_timeout = 0;
+                       }
                        return;
                }
                urgent_task = urgent_task->next;
@@ -473,6 +530,8 @@ void del_urgent(Task *tsk)
 
 int is_urgent(Task *tsk)
 {
+       if (!tsk)
+               return 0;
        GSList* urgent_task = urgent_list;
        while (urgent_task) {
                Task_urgent* t = urgent_task->data;