*add* multiple tasks can be urgent now

[chaz/tint2] / src / tint.c

diff --git a/src/tint.c b/src/tint.c
index 95137dcac9cc07dc1dc148ee648e0282f674a5d8..192fa36d01f139a8c03db3441f3cc58852b91bbb 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -166,6 +166,7 @@ void get_snapshot(const char *path)
 
        imlib_context_set_image(img);
        imlib_save_image(path);
+       imlib_free_image();
 }
 
 
@@ -264,8 +265,10 @@ void window_action (Task *tsk, int action)
                        XIconifyWindow (server.dsp, tsk->win, server.screen);
                        break;
                case TOGGLE_ICONIFY:
-                       if (tsk == task_active) XIconifyWindow (server.dsp, tsk->win, server.screen);
-                       else set_active (tsk->win);
+                       if (task_active && tsk->win == task_active->win)
+                               XIconifyWindow (server.dsp, tsk->win, server.screen);
+                       else
+                               set_active (tsk->win);
                        break;
                case SHADE:
                        window_toggle_shade (tsk->win);
@@ -477,10 +480,20 @@ void event_property_notify (XEvent *e)
        else {
                tsk = task_get_task (win);
                if (!tsk) {
-                       if ( at != server.atom._NET_WM_STATE)
-                               return;
-                       else if ( !(tsk = add_task(win)) )
+                       if (at != server.atom._NET_WM_STATE)
                                return;
+                       else {
+                               // xfce4 sends _NET_WM_STATE after minimized to tray, so we need to check if window is mapped
+                               // if it is mapped and not set as skip_taskbar, we must add it to our task list
+                               XWindowAttributes wa;
+                               XGetWindowAttributes(server.dsp, win, &wa);
+                               if (wa.map_state == IsViewable && !window_is_skip_taskbar(win)) {
+                                       if ( (tsk = add_task(win)) )
+                                               panel_refresh = 1;
+                                       else
+                                               return;
+                               }
+                       }
                }
                //printf("atom root_win = %s, %s\n", XGetAtomName(server.dsp, at), tsk->title);
 
@@ -506,9 +519,7 @@ void event_property_notify (XEvent *e)
                // Demand attention
                else if (at == server.atom._NET_WM_STATE) {
                        if (window_is_urgent (win)) {
-                               task_urgent = tsk;
-                               tick_urgent = 0;
-                               time_precision = 1;
+                               add_urgent(tsk);
                        }
                        if (window_is_skip_taskbar(win)) {
                                remove_task( tsk );
@@ -579,9 +590,7 @@ void event_property_notify (XEvent *e)
                else if (at == server.atom.WM_HINTS) {
                        XWMHints* wmhints = XGetWMHints(server.dsp, win);
                        if (wmhints && wmhints->flags & XUrgencyHint) {
-                               task_urgent = tsk;
-                               tick_urgent = 0;
-                               time_precision = 1;
+                               add_urgent(tsk);
                        }
                        XFree(wmhints);
                }
@@ -661,12 +670,15 @@ void event_timer()
        time_clock.tv_sec -= time_clock.tv_sec % time_precision;
 
        // urgent task
-       if (task_urgent) {
-               if (tick_urgent < max_tick_urgent) {
-                       task_urgent->area.is_active = !task_urgent->area.is_active;
-                       task_urgent->area.redraw = 1;
-                       tick_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++;
                }
+               urgent_task = urgent_task->next;
        }
 
        // update battery