- Task *new_tsk;
- int desktop, monitor, all_desktop;
-
- if (!win) return;
- if (window_is_hidden (win) || win == window.main_win) return;
-
- desktop = window_get_desktop (win);
- if (desktop == 0xFFFFFFFF) {
- desktop = 0;
- all_desktop = 1;
- }
- else
- all_desktop = 0;
-
- if (panel.mode == MULTI_MONITOR) monitor = window_get_monitor (win);
- else monitor = 0;
-
-deb:
- new_tsk = malloc(sizeof(Task));
- new_tsk->win = win;
- new_tsk->all_desktop = all_desktop;
- new_tsk->title = 0;
- new_tsk->icon_data = 0;
-
- get_icon(new_tsk);
- get_title(new_tsk);
- memcpy(&new_tsk->area, &g_task.area, sizeof(Area));
-
- //printf("task %s : desktop %d, monitor %d\n", new_tsk->title, desktop, monitor);
- XSelectInput (server.dsp, new_tsk->win, PropertyChangeMask|StructureNotifyMask);
-
- Taskbar *tskbar = &panel.taskbar[index(desktop, monitor)];
- new_tsk->area.parent = tskbar;
- tskbar->area.list = g_slist_append(tskbar->area.list, new_tsk);
-
- if (resize_tasks (tskbar))
- set_redraw (&tskbar->area);
-
- if (all_desktop) {
- desktop++;
- if (desktop < server.nb_desktop)
- goto deb;
- }
+ if (!win) return 0;
+ if (window_is_hidden(win)) return 0;
+
+ int monitor;
+ 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;
+
+ // allocate only one title and one icon
+ // even with task_on_all_desktop and with task_on_all_panel
+ new_tsk.title = 0;
+ int k;
+ for (k=0; k<TASK_STATE_COUNT; ++k) {
+ new_tsk.icon[k] = 0;
+ new_tsk.state_pix[k] = 0;
+ }
+ get_title(&new_tsk);
+ get_icon(&new_tsk);
+
+ //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 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;