*fix* panel_monitor = n works again, after I've broken it with revision 308

*add* convenience storage for tasks in a hash map (Window is mapped to a GPtrArray of Task*)
*fix* bugfix in resize_taskbar when task.area.width/height changes

diff --git a/src/config.c b/src/config.c
index 7ccb08396467e6a7f35576f4d7b96d59f093c61e..f4e91a8b9da78694f1a929c0cf08d6e7f0fa5c60 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -226,11 +226,6 @@ void add_entry (char *key, char *value)
                        panel_config.monitor = atoi (value);
                        if (panel_config.monitor > 0) panel_config.monitor -= 1;
                }
-               if (panel_config.monitor > (server.nb_monitor-1)) {
-                       // server.nb_monitor minimum value is 1 (see get_monitors())
-                       fprintf(stderr, "warning : monitor not found. tint2 default to all monitors.\n");
-                       panel_config.monitor = 0;
-               }
        }
        else if (strcmp (key, "panel_size") == 0) {
                extract_values(value, &value1, &value2, &value3);

diff --git a/src/panel.c b/src/panel.c
index 9d803d95489b002f33df430ea14858ae23313887..3250806806398a38f1b9f2ae485f15b7a6ec6c01 100644 (file)
--- a/src/panel.c
+++ b/src/panel.c
@@ -81,6 +81,12 @@ void init_panel()
        int i, old_nb_panel;
        Panel *new_panel, *p;
 
+       if (panel_config.monitor > (server.nb_monitor-1)) {
+               // server.nb_monitor minimum value is 1 (see get_monitors())
+               fprintf(stderr, "warning : monitor not found. tint2 default to all monitors.\n");
+               panel_config.monitor = 0;
+       }
+
        init_tooltip();
        init_systray();
        init_clock();

diff --git a/src/taskbar/task.c b/src/taskbar/task.c
index 62c84832b3c7c8409a28dadd60cb7c473944e76f..26f8bea759020be1383522c55ac81fa17811b24b 100644 (file)
--- a/src/taskbar/task.c
+++ b/src/taskbar/task.c
@@ -51,15 +51,15 @@ Task *add_task (Window win)
        if (window_is_hidden(win)) return 0;
 
        int monitor;
-
-       Task new_tsk;
-       new_tsk.win = win;
-       new_tsk.desktop = window_get_desktop (win);
        if (nb_panel > 1) {
                monitor = window_get_monitor (win);
                if (monitor >= nb_panel) monitor = 0;
        }
        else monitor = 0;
+
+       Task new_tsk;
+       new_tsk.win = win;
+       new_tsk.desktop = window_get_desktop (win);
        new_tsk.area.panel = &panel1[monitor];
        new_tsk.current_state = window_is_iconified(win) ? TASK_ICONIFIED : TASK_NORMAL;
 
@@ -75,41 +75,45 @@ Task *add_task (Window win)
        //printf("task %s : desktop %d, monitor %d\n", new_tsk->title, desktop, monitor);
        XSelectInput (server.dsp, new_tsk.win, PropertyChangeMask|StructureNotifyMask);
 
+       GPtrArray* task_group = g_ptr_array_new();
        Taskbar *tskbar;
        Task *new_tsk2=0;
-       int i, j;
-       // QUESTION: Do we need to iterate over nb_panel (we know the monitor, why not taking panel1[monitor]???
-       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));
-                       memcpy(&new_tsk2->area, &panel1[i].g_task.area, sizeof(Area));
-                       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->area._get_tooltip_text = task_get_tooltip;
-                       for (k=0; k<TASK_STATE_COUNT; ++k) {
-                               new_tsk2->icon[k] = new_tsk.icon[k];
-                               new_tsk2->state_pix[k] = 0;
-                       }
-                       new_tsk2->icon_width = new_tsk.icon_width;
-                       new_tsk2->icon_height = new_tsk.icon_height;
-                       set_task_state(new_tsk2, new_tsk.current_state);
-                       tskbar->area.list = g_slist_append(tskbar->area.list, new_tsk2);
-                       tskbar->area.resize = 1;
-                       //printf("add_task panel %d, desktop %d, task %s\n", i, j, new_tsk2->title);
+       int j;
+       for (j=0 ; j < panel1[monitor].nb_desktop ; j++) {
+               if (new_tsk.desktop != ALLDESKTOP && new_tsk.desktop != j) continue;
+
+               tskbar = &panel1[monitor].taskbar[j];
+               new_tsk2 = malloc(sizeof(Task));
+               memcpy(&new_tsk2->area, &panel1[monitor].g_task.area, sizeof(Area));
+               new_tsk2->area.parent = tskbar;
+               new_tsk2->win = new_tsk.win;
+               new_tsk2->desktop = new_tsk.desktop;
+               new_tsk2->current_state = -1;  // to update the current state later in set_task_state...
+               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->area._get_tooltip_text = task_get_tooltip;
+               for (k=0; k<TASK_STATE_COUNT; ++k) {
+                       new_tsk2->icon[k] = new_tsk.icon[k];
+                       new_tsk2->state_pix[k] = 0;
+               }
+               new_tsk2->icon_width = new_tsk.icon_width;
+               new_tsk2->icon_height = new_tsk.icon_height;
+               tskbar->area.list = g_slist_append(tskbar->area.list, new_tsk2);
+               tskbar->area.resize = 1;
+               g_ptr_array_add(task_group, new_tsk2);
+               //printf("add_task panel %d, desktop %d, task %s\n", i, j, new_tsk2->title);
        }
+       Window* key = malloc(sizeof(Window));
+       *key = new_tsk.win;
+       g_hash_table_insert(win_to_task_table, key, task_group);
+       set_task_state(new_tsk2, new_tsk.current_state);
+
        if (window_is_urgent(win))
                add_urgent(new_tsk2);
+
        return new_tsk2;
 }
 
@@ -119,7 +123,6 @@ void remove_task (Task *tsk)
        if (!tsk) return;
 
        Window win = tsk->win;
-       int desktop = tsk->desktop;
 
        // free title and icon just for the first task
        // even with task_on_all_desktop and with task_on_all_panel
@@ -136,35 +139,21 @@ void remove_task (Task *tsk)
                }
        }
 
-       int i, j;
+       int i;
        Task *tsk2;
        Taskbar *tskbar;
-       for (i=0 ; i < nb_panel ; i++) {
-               for (j=0 ; j < panel1[i].nb_desktop ; j++) {
-                       if (desktop != ALLDESKTOP && desktop != j) continue;
-
-                       GSList *l0;
-                       tskbar = &panel1[i].taskbar[j];
-                       for (l0 = tskbar->area.list; l0 ; ) {
-                               tsk2 = l0->data;
-                               l0 = l0->next;
-                               if (win == tsk2->win) {
-                                       tskbar->area.list = g_slist_remove(tskbar->area.list, tsk2);
-                                       tskbar->area.resize = 1;
-
-                                       if (tsk2 == task_active)
-                                               task_active = 0;
-                                       if (tsk2 == task_drag)
-                                               task_drag = 0;
-                                       if (g_slist_find(urgent_list, tsk2))
-                                               del_urgent(tsk2);
-
-                                       XFreePixmap (server.dsp, tsk2->area.pix);
-                                       free(tsk2);
-                               }
-                       }
-               }
+       GPtrArray* task_group = g_hash_table_lookup(win_to_task_table, &win);
+       for (i=0; i<task_group->len; ++i) {
+               tsk2 = g_ptr_array_index(task_group, i);
+               tskbar = tsk2->area.parent;
+               tskbar->area.list = g_slist_remove(tskbar->area.list, tsk2);
+               tskbar->area.resize = 1;
+               if (tsk2 == task_active) task_active = 0;
+               if (tsk2 == task_drag) task_drag = 0;
+               if (g_slist_find(urgent_list, tsk2)) del_urgent(tsk2);
+               free(tsk2);
        }
+       g_hash_table_remove(win_to_task_table, &win);
 }
 
 
@@ -194,10 +183,20 @@ void get_title(Task *tsk)
        strcat(title, name);
        if (name) XFree (name);
 
-       set_task_redraw(tsk);
        if (tsk->title)
                free(tsk->title);
+
        tsk->title = title;
+       GPtrArray* task_group = task_get_tasks(tsk->win);
+       if (task_group) {
+               int i;
+               for (i=0; i<task_group->len; ++i) {
+                       Task* tsk2 = g_ptr_array_index(task_group, i);
+                       tsk2->title = tsk->title;
+                       set_task_redraw(tsk2);
+               }
+       }
+       set_task_redraw(tsk);
 }
 
 
@@ -218,7 +217,6 @@ void get_icon (Task *tsk)
                        tsk->icon[k] = 0;
                }
        }
-       set_task_redraw(tsk);
 
        data = server_get_property (tsk->win, server.atom._NET_WM_ICON, XA_CARDINAL, &i);
        if (data) {
@@ -291,6 +289,20 @@ void get_icon (Task *tsk)
                XFree(hints);
        if (data)
                XFree (data);
+
+       GPtrArray* task_group = task_get_tasks(tsk->win);
+       if (task_group) {
+               for (i=0; i<task_group->len; ++i) {
+                       Task* tsk2 = g_ptr_array_index(task_group, i);
+                       tsk2->icon_width = tsk->icon_width;
+                       tsk2->icon_height = tsk->icon_height;
+                       int k;
+                       for (k=0; k<TASK_STATE_COUNT; ++k)
+                               tsk2->icon[k] = tsk->icon[k];
+                       set_task_redraw(tsk2);
+               }
+       }
+       set_task_redraw(tsk);
 }
 
 
@@ -373,115 +385,95 @@ void draw_task (void *obj, cairo_t *c)
 
 Task *next_task(Task *tsk)
 {
+       if (tsk == 0)
+               return 0;
+
        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;
-                               }
-                       }
+       Taskbar* tskbar = tsk->area.parent;
+
+       for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
+               tsk1 = l0->data;
+               if (tsk1 == tsk) {
+                       if (l0->next == 0) l0 = tskbar->area.list;
+                       else l0 = l0->next;
+                       return l0->data;
                }
        }
 
-       return NULL;
+       return 0;
 }
 
 Task *prev_task(Task *tsk)
 {
+       if (tsk == 0)
+               return 0;
+
        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;
+       Taskbar* tskbar = tsk->area.parent;
+
+       tsk2 = 0;
+       for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
+               tsk1 = l0->data;
+               if (tsk1 == tsk) {
+                       if (l0 == tskbar->area.list) {
+                               l0 = g_slist_last ( l0 );
+                               tsk2 = l0->data;
                        }
+                       return tsk2;
                }
+               tsk2 = tsk1;
        }
 
-       return NULL;
+       return 0;
 }
 
 
 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;
-                                       if (tsk1->win == task_active->win)
-                                               set_task_state(tsk1, window_is_iconified(tsk1->win) ? TASK_ICONIFIED : TASK_NORMAL);
-                               }
-                       }
-               }
+               set_task_state(task_active, window_is_iconified(task_active->win) ? TASK_ICONIFIED : TASK_NORMAL);
                task_active = 0;
        }
 
-       Window w1 = window_get_active ();
+       Window w1 = window_get_active();
        //printf("Change active task %ld\n", w1);
 
-       tsk2 = task_get_task(w1);
-       if (!tsk2) {
+       if (w1) {
                Window w2;
                if (XGetTransientForHint(server.dsp, w1, &w2) != 0)
-                       if (w2) tsk2 = task_get_task(w2);
-       }
-
-       if ( g_slist_find(urgent_list, 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)
-                                               set_task_state(tsk1, TASK_ACTIVE);
-                               }
-                       }
-               }
-               task_active = tsk2;
+                       if (w2) w1 = w2;
+               set_task_state((task_active = task_get_task(w1)), TASK_ACTIVE);
        }
 }
 
 
 void set_task_state(Task *tsk, int state)
 {
+       if (tsk == 0 || state < 0 || state >= TASK_STATE_COUNT)
+               return;
+
        if (tsk->current_state != state) {
-               tsk->current_state = state;
-               tsk->area.bg = panel1[0].g_task.background[state];
-               tsk->area.pix = tsk->state_pix[state];
-               if (tsk->state_pix[state] == 0)
-                       tsk->area.redraw = 1;
+               GPtrArray* task_group = task_get_tasks(tsk->win);
+               int i;
+               for (i=0; i<task_group->len; ++i) {
+                       Task* tsk1 = g_ptr_array_index(task_group, i);
+                       tsk1->current_state = state;
+                       tsk1->area.bg = panel1[0].g_task.background[state];
+                       tsk1->area.pix = tsk1->state_pix[state];
+                       if (tsk1->state_pix[state] == 0)
+                               tsk1->area.redraw = 1;
+                       if (state == TASK_ACTIVE && g_slist_find(urgent_list, tsk1))
+                               del_urgent(tsk1);
+               }
                panel_refresh = 1;
        }
 }
 
 
-void set_task_redraw(Task* tsk) {
+void set_task_redraw(Task* tsk)
+{
        int k;
        for (k=0; k<TASK_STATE_COUNT; ++k) {
                if (tsk->state_pix[k]) XFreePixmap(server.dsp, tsk->state_pix[k]);
@@ -518,20 +510,13 @@ void add_urgent(Task *tsk)
        if ( task_active && task_active->win == tsk->win )
                return;
 
-       // 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);
-       }
+       tsk = task_get_task(tsk->win);  // always add the first tsk for a task group (omnipresent windows)
+       tsk->urgent_tick = 0;
+       if (g_slist_find(urgent_list, tsk))
+               return;
 
        // not yet in the list, so we have to add it
-       urgent_list = g_slist_concat(urgent_add, urgent_list);
+       urgent_list = g_slist_prepend(urgent_list, tsk);
 
        if (urgent_timeout == 0)
                urgent_timeout = add_timeout(10, 1000, blink_urgent, 0);
@@ -540,17 +525,8 @@ void add_urgent(Task *tsk)
 
 void del_urgent(Task *tsk)
 {
-       if (!tsk)
-               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;
-       }
-       g_slist_free(urgent_del);
-       if (!urgent_list) {
+       urgent_list = g_slist_remove(urgent_list, tsk);
+       if (urgent_list == 0) {
                stop_timeout(urgent_timeout);
                urgent_timeout = 0;
        }

diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c
index 5c2edae1ad8eff8be3b6381fb1eb426a2597a7d6..ffc115a3d65b3ad6bce908c2301d06f10cf5b45b 100644 (file)
--- a/src/taskbar/taskbar.c
+++ b/src/taskbar/taskbar.c
@@ -33,12 +33,20 @@
 #include "panel.h"
 
 
+GHashTable* win_to_task_table = 0;
+
+guint win_hash(gconstpointer key) { return (guint)*((Window*)key); }
+gboolean win_compare(gconstpointer a, gconstpointer b) { return (*((Window*)a) == *((Window*)b)); }
+
 
 void init_taskbar()
 {
        Panel *panel;
        int i, j;
 
+       if (win_to_task_table == 0)
+               win_to_task_table = g_hash_table_new_full(win_hash, win_compare, free, g_ptr_array_unref);
+
        for (i=0 ; i < nb_panel ; i++) {
                panel = &panel1[i];
 
@@ -138,110 +146,73 @@ void init_taskbar()
        }
 }
 
-
+void taskbar_remove_task(gpointer key, gpointer value, gpointer user_data) {remove_task(task_get_task(*(Window*)key)); }
 void cleanup_taskbar()
 {
        Panel *panel;
        Taskbar *tskbar;
        int i, j;
-       GSList *l0;
-       Task *tsk;
 
+       if (win_to_task_table) g_hash_table_foreach(win_to_task_table, taskbar_remove_task, 0);
        for (i=0 ; i < nb_panel ; i++) {
                panel = &panel1[i];
-
                for (j=0 ; j < panel->nb_desktop ; j++) {
                        tskbar = &panel->taskbar[j];
-                       l0 = tskbar->area.list;
-                       while (l0) {
-                               tsk = l0->data;
-                               l0 = l0->next;
-                               // careful : remove_task change l0->next
-                               remove_task (tsk);
-                       }
                        free_area (&tskbar->area);
-
                        // remove taskbar from the panel
                        panel->area.list = g_slist_remove(panel->area.list, tskbar);
                }
-       }
-
-       for (i=0 ; i < nb_panel ; i++) {
-               panel = &panel1[i];
                if (panel->taskbar) {
                        free(panel->taskbar);
                        panel->taskbar = 0;
                }
        }
+
+       if (win_to_task_table) {
+               g_hash_table_destroy(win_to_task_table);
+               win_to_task_table = 0;
+       }
 }
 
 
 Task *task_get_task (Window win)
 {
-       Task *tsk;
-       GSList *l0;
-       int i, j;
-
-       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) {
-                               tsk = l0->data;
-                               if (win == tsk->win)
-                                       return tsk;
-                       }
-               }
-       }
-       return 0;
+       GPtrArray* task_group = task_get_tasks(win);
+       if (task_group)
+               return g_ptr_array_index(task_group, 0);
+       else
+               return 0;
 }
 
 
-GSList* task_get_tasks(Window win)
+GPtrArray* 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;
+       return g_hash_table_lookup(win_to_task_table, &win);
 }
 
 
 void task_refresh_tasklist ()
 {
        Window *win;
-       int num_results, i, j, k;
-       GSList *l0;
-       Task *tsk;
+       int num_results, i;
 
        win = server_get_property (server.root_win, server.atom._NET_CLIENT_LIST, XA_WINDOW, &num_results);
        if (!win) return;
 
        // Remove any old and set active win
-       active_task();
-
-       for (i=0 ; i < nb_panel ; i++) {
-               for (j=0 ; j < panel1[i].nb_desktop ; j++) {
-                       l0 = panel1[i].taskbar[j].area.list;
-                       while (l0) {
-                               tsk = l0->data;
-                               l0 = l0->next;
-
-                               for (k = 0; k < num_results; k++) {
-                                       if (tsk->win == win[k]) break;
-                               }
-                               // careful : remove_task change l0->next
-                               if (k == num_results) remove_task (tsk);
-                       }
-               }
+       // remark from Andreas: This seems unneccessary...
+//     active_task();
+
+       GList* win_list = g_hash_table_get_keys(win_to_task_table);
+       GList* it;
+       for (it=win_list; it; it=it->next) {
+               for (i = 0; i < num_results; i++)
+                       if (*((Window*)it->data) == win[i])
+                               break;
+               if (i == num_results)
+                       taskbar_remove_task(it->data, 0, 0);
        }
+       g_list_free(win_list);
 
        // Add any new
        for (i = 0; i < num_results; i++)
@@ -293,6 +264,7 @@ void resize_taskbar(void *obj)
                        tsk = l->data;
                        if (!tsk->area.on_screen) continue;
                        tsk->area.posx = x;
+                       if (tsk->area.width != pixel_width) set_task_redraw(tsk);
                        tsk->area.width = pixel_width;
                        if (modulo_width) {
                                tsk->area.width++;
@@ -330,6 +302,7 @@ void resize_taskbar(void *obj)
                        tsk = l->data;
                        if (!tsk->area.on_screen) continue;
                        tsk->area.posy = y;
+                       if (tsk->area.height != pixel_height) set_task_redraw(tsk);
                        tsk->area.height = pixel_height;
                        if (modulo_height) {
                                tsk->area.height++;
@@ -340,6 +313,3 @@ void resize_taskbar(void *obj)
                }
        }
 }
-
-
-

diff --git a/src/taskbar/taskbar.h b/src/taskbar/taskbar.h
index 8152a6cb7d2135eb1a2031da0b8f5eb028d8edd6..74ee19aacf87f643af8408ad1ccbed36d08d5a08 100644 (file)
--- a/src/taskbar/taskbar.h
+++ b/src/taskbar/taskbar.h
@@ -10,6 +10,7 @@
 
 #include "task.h"
 
+extern GHashTable* win_to_task_table;
 // tint2 use one taskbar per desktop.
 typedef struct {
        // always start with area
@@ -36,7 +37,7 @@ void init_taskbar();
 void cleanup_taskbar();
 
 Task *task_get_task (Window win);
-GSList* task_get_tasks(Window win);
+GPtrArray* 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 7ea802060026b579f3899d0cae84716e257d4c88..5b042a87e4aef59df8a6d1bd3d30378271ea961a 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -381,7 +381,7 @@ void event_button_release (XEvent *e)
 
 void event_property_notify (XEvent *e)
 {
-       int i, j;
+       int i;
        Task *tsk;
        Window win = e->xproperty.window;
        Atom at = e->xproperty.atom;
@@ -492,21 +492,7 @@ void event_property_notify (XEvent *e)
 
                // Window title changed
                if (at == server.atom._NET_WM_VISIBLE_NAME || at == server.atom._NET_WM_NAME || at == server.atom.WM_NAME) {
-                       Task *tsk2;
-                       GSList *l0;
                        get_title(tsk);
-                       // changed other tsk->title
-                       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) {
-                                               tsk2 = l0->data;
-                                               if (tsk->win == tsk2->win && tsk != tsk2) {
-                                                       tsk2->title = tsk->title;
-                                                       set_task_redraw(tsk2);
-                                               }
-                                       }
-                               }
-                       }
                        panel_refresh = 1;
                }
                // Demand attention
@@ -521,38 +507,15 @@ void event_property_notify (XEvent *e)
                }
                else if (at == server.atom.WM_STATE) {
                        // Iconic state
-                       int state = tsk->current_state;
+                       int state = (task_active && tsk->win == task_active->win ? TASK_ACTIVE : TASK_NORMAL);
                        if (window_is_iconified(win))
                                state = TASK_ICONIFIED;
-                       GSList* task_list = task_get_tasks(win);
-                       GSList* it = task_list;
-                       while (it) {
-                               Task* t = it->data;
-                               set_task_state(t, state);
-                               it = it->next;
-                       }
-                       g_slist_free(task_list);
+                       set_task_state(tsk, state);
                        panel_refresh = 1;
                }
                // Window icon changed
                else if (at == server.atom._NET_WM_ICON) {
                        get_icon(tsk);
-                       Task *tsk2;
-                       GSList* task_list = task_get_tasks(tsk->win);
-                       GSList *l0 = task_list;
-                       while (l0) {
-                               tsk2 = l0->data;
-                               if (tsk2 !=  tsk) {
-                                       tsk2->icon_width = tsk->icon_width;
-                                       tsk2->icon_height = tsk->icon_height;
-                                       int k=0;
-                                       for ( ; k<TASK_STATE_COUNT; ++k)
-                                               tsk2->icon[k] = tsk->icon[k];
-                                       set_task_redraw(tsk2);
-                               }
-                               l0 = l0->next;
-                       }
-                       g_slist_free(task_list);
                        panel_refresh = 1;
                }
                // Window desktop changed
@@ -626,15 +589,8 @@ void event_configure_notify (Window win)
                remove_task (tsk);
                add_task (win);
                if (win == window_get_active ()) {
-                       GSList* task_list = task_get_tasks(win);
-                       GSList* it = task_list;
-                       while (it) {
-                               Task *tsk = it->data;
-                               set_task_state(tsk, TASK_ACTIVE);
-                               task_active = tsk;
-                               it = task_list->next;
-                       }
-                       g_slist_free(task_list);
+                       set_task_state(tsk, TASK_ACTIVE);
+                       task_active = tsk;
                }
                panel_refresh = 1;
        }