*fix* better internal urgent task handling

*fix* urgent task blinks on all desktops for omnipresent windows
*fix* better active window handling on desktop changes
*fix* better active window handling if switching omnipresent property

diff --git a/src/panel.c b/src/panel.c
index 3064a201f0057024e4b5839511def7dc3b6e8a40..6da20c53e04e79d021a8e03710af1917f384cd46 100644 (file)
--- a/src/panel.c
+++ b/src/panel.c
@@ -52,7 +52,6 @@ int panel_refresh;
 
 Task *task_active;
 Task *task_drag;
-GSList *urgent_list;
 int  max_tick_urgent;
 
 // panel's initial config
@@ -239,11 +238,6 @@ void cleanup_panel()
 
        task_active = 0;
        task_drag = 0;
-       while (urgent_list) {
-               Task_urgent* t = urgent_list->data;
-               urgent_list = g_slist_remove(urgent_list, urgent_list->data);
-               free(t);
-       }
 
        cleanup_taskbar();
 

diff --git a/src/panel.h b/src/panel.h
index 646d79671b156ea0eb3a76c5aa2cde860bebc51d..73d7f50adce9838ad15659df4f169b4b9cb36620 100644 (file)
--- a/src/panel.h
+++ b/src/panel.h
@@ -50,7 +50,6 @@ extern int panel_refresh;
 
 extern Task *task_active;
 extern Task *task_drag;
-extern GSList *urgent_list;
 extern int  max_tick_urgent;
 
 extern Imlib_Image default_icon;

diff --git a/src/taskbar/task.c b/src/taskbar/task.c
index a569a99e4ec47f3a8555ec58c3cb5d6d15ab33b5..81d4edad3361944e12eb665af57969b2bba567d6 100644 (file)
--- a/src/taskbar/task.c
+++ b/src/taskbar/task.c
@@ -29,12 +29,14 @@
 
 #include "window.h"
 #include "task.h"
+#include "taskbar.h"
 #include "server.h"
 #include "panel.h"
 #include "tooltip.h"
 #include "timer.h"
 
 static const struct timeout* urgent_timeout = 0;
+static GSList* urgent_list = 0;
 
 const char* task_get_tooltip(void* obj)
 {
@@ -145,7 +147,7 @@ void remove_task (Task *tsk)
                                                task_active = 0;
                                        if (tsk2 == task_drag)
                                                task_drag = 0;
-                                       if (is_urgent(tsk2))
+                                       if (g_slist_find(urgent_list, tsk2))
                                                del_urgent(tsk2);
 
                                        XFreePixmap (server.dsp, tsk2->area.pix.pmap);
@@ -441,7 +443,7 @@ void active_task()
                if (XGetTransientForHint(server.dsp, w1, &w2) != 0)
                        if (w2) tsk2 = task_get_task(w2);
        }
-       if ( is_urgent(tsk2) ) {
+       if ( g_slist_find(urgent_list, tsk2) ) {
                del_urgent(tsk2);
        }
        // put active state on all task (multi_desktop)
@@ -465,11 +467,11 @@ void blink_urgent()
 {
        GSList* urgent_task = urgent_list;
        while (urgent_task) {
-               Task_urgent* t = urgent_task->data;
-               if ( t->tick < max_tick_urgent) {
-                       t->tsk->area.is_active = !t->tsk->area.is_active;
-                       t->tsk->area.redraw = 1;
-                       t->tick++;
+               Task* t = urgent_task->data;
+               if ( t->urgent_tick < max_tick_urgent) {
+                       t->area.is_active = !t->area.is_active;
+                       t->area.redraw = 1;
+                       t->urgent_tick++;
                }
                urgent_task = urgent_task->next;
        }
@@ -486,24 +488,20 @@ void add_urgent(Task *tsk)
        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) {
-               Task_urgent* t = urgent_task->data;
-               if (t->tsk == tsk) {
-                       t->tick = 0;
-                       return;
-               }
-               urgent_task = urgent_task->next;
+       // reset counter to 0, remove tasks which are already in the list
+       GSList* urgent_add = task_get_tasks(tsk->win);
+       GSList* it = urgent_add;
+       Task* tsk2;
+       while (it) {
+               tsk2 = it->data;
+               tsk2->urgent_tick = 0;
+               it = it->next;
+               if (g_slist_find(urgent_list, tsk2))
+                       urgent_add = g_slist_remove(urgent_add, tsk2);
        }
 
        // 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);
+       urgent_list = g_slist_concat(urgent_add, urgent_list);
 
        if (urgent_timeout == 0)
                urgent_timeout = add_timeout(10, 1000, blink_urgent);
@@ -511,33 +509,18 @@ void add_urgent(Task *tsk)
 
 
 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) {
-                               stop_timeout(urgent_timeout);
-                               urgent_timeout = 0;
-                       }
-                       return;
-               }
-               urgent_task = urgent_task->next;
-       }
-}
-
-int is_urgent(Task *tsk)
 {
        if (!tsk)
-               return 0;
-       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;
+       
+       GSList* urgent_del = task_get_tasks(tsk->win);
+       GSList* it = urgent_del;
+       while(it) {
+               urgent_list = g_slist_remove(urgent_list, it->data);
+               it = it->next;
+       }
+       if (!urgent_list) {
+               stop_timeout(urgent_timeout);
+               urgent_timeout = 0;
        }
-       return 0;
 }

diff --git a/src/taskbar/task.h b/src/taskbar/task.h
index 6bb9ef3c22e25501b8f86fc15bcbb33d415da3ea..e67a04513b542f44d07e367b00a8920d55b6f4cf 100644 (file)
--- a/src/taskbar/task.h
+++ b/src/taskbar/task.h
@@ -51,16 +51,10 @@ typedef struct {
        unsigned int icon_width;
        unsigned int icon_height;
        char *title;
+       int urgent_tick;
 } Task;
 
 
-typedef struct {
-       Task* tsk;
-       int tick;
-} Task_urgent;
-
-
-
 Task *add_task (Window win);
 void remove_task (Task *tsk);
 
@@ -75,7 +69,6 @@ Task *prev_task (Task *tsk);
 
 void add_urgent(Task *tsk);
 void del_urgent(Task *tsk);
-int is_urgent(Task *tsk);
 
 #endif
 

diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c
index e1756441692fd974f3202c941ba3295d9cb27255..f7197c13cda0f2597c089c99a053bf5b8eefc1ed 100644 (file)
--- a/src/taskbar/taskbar.c
+++ b/src/taskbar/taskbar.c
@@ -169,6 +169,25 @@ Task *task_get_task (Window win)
 }
 
 
+GSList* task_get_tasks(Window win)
+{
+       GSList* l = 0;
+       GSList* it;
+       Task* tsk;
+       int i, j;
+       for (i=0; i<nb_panel; ++i) {
+               for (j=0; j<panel1[i].nb_desktop; ++j) {
+                       for (it=panel1[i].taskbar[j].area.list; it; it=it->next) {
+                               tsk = it->data;
+                               if (win == tsk->win)
+                                       l = g_slist_prepend(l, tsk);
+                       }
+               }
+       }
+       return l;
+}
+
+
 void task_refresh_tasklist ()
 {
        Window *win, active_win;
@@ -180,11 +199,7 @@ void task_refresh_tasklist ()
        if (!win) return;
 
        // Remove any old and set active win
-       active_win = window_get_active ();
-       if (task_active) {
-               task_active->area.is_active = 0;
-               task_active = 0;
-       }
+       active_task();
 
        for (i=0 ; i < nb_panel ; i++) {
                for (j=0 ; j < panel1[i].nb_desktop ; j++) {
@@ -193,11 +208,6 @@ void task_refresh_tasklist ()
                                tsk = l0->data;
                                l0 = l0->next;
 
-                               if (tsk->win == active_win) {
-                                       tsk->area.is_active = 1;
-                                       task_active = tsk;
-                               }
-
                                for (k = 0; k < num_results; k++) {
                                        if (tsk->win == win[k]) break;
                                }

diff --git a/src/taskbar/taskbar.h b/src/taskbar/taskbar.h
index 0901ed5a945967ee751b4182a49ffa2dce8eb4ba..9e954b3ce97ad1c174747208a7b8ee080729b40c 100644 (file)
--- a/src/taskbar/taskbar.h
+++ b/src/taskbar/taskbar.h
@@ -29,6 +29,7 @@ void init_taskbar();
 void cleanup_taskbar();
 
 Task *task_get_task (Window win);
+GSList* task_get_tasks(Window win);
 void task_refresh_tasklist ();
 
 void resize_taskbar(void *obj);

diff --git a/src/tint.c b/src/tint.c
index fc471def24f2a9bfcefa87a8b5a9e8d551da914a..bb7586d6f4f72f69dc1a3ad3feb887688221f143 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -400,6 +400,7 @@ void event_property_notify (XEvent *e)
                                panel1[i].area.resize = 1;
                        }
                        task_refresh_tasklist();
+                       active_task();
                        panel_refresh = 1;
                }
                // Change desktop
@@ -559,16 +560,12 @@ void event_property_notify (XEvent *e)
                // Window desktop changed
                else if (at == server.atom._NET_WM_DESKTOP) {
                        int desktop = window_get_desktop (win);
-                       int active = tsk->area.is_active;
                        //printf("  Window desktop changed %d, %d\n", tsk->desktop, desktop);
                        // bug in windowmaker : send unecessary 'desktop changed' when focus changed
                        if (desktop != tsk->desktop) {
                                remove_task (tsk);
                                tsk = add_task (win);
-                               if (tsk && active) {
-                                       tsk->area.is_active = 1;
-                                       task_active = tsk;
-                               }
+                               active_task();
                                panel_refresh = 1;
                        }
                }
@@ -630,9 +627,13 @@ void event_configure_notify (Window win)
                remove_task (tsk);
                add_task (win);
                if (win == window_get_active ()) {
-                       Task *tsk = task_get_task (win);
-                       tsk->area.is_active = 1;
-                       task_active = tsk;
+                       GSList* task_list = task_get_tasks(win);
+                       while (task_list) {
+                               Task *tsk = task_list->data;
+                               tsk->area.is_active = 1;
+                               task_active = tsk;
+                               task_list = task_list->next;
+                       }
                }
                panel_refresh = 1;
        }