X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Ftaskbar%2Ftask.c;h=98c943aa0ddcdc6f13f606dcaea4f364acc8c2c1;hb=cbb9b4d7de7e4a439dd586a8c8d4cd5f4e4622ba;hp=cbd1b0765495241c4d125ae95ce1802cbed73e81;hpb=b28c78295621a815c9021090fe9d086465930151;p=chaz%2Ftint2 diff --git a/src/taskbar/task.c b/src/taskbar/task.c index cbd1b07..98c943a 100644 --- a/src/taskbar/task.c +++ b/src/taskbar/task.c @@ -25,13 +25,24 @@ #include #include #include +#include #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) +{ + Task* t = obj; + return t->title; +} Task *add_task (Window win) @@ -43,10 +54,13 @@ Task *add_task (Window win) Task new_tsk; new_tsk.win = win; - new_tsk.area.panel = &panel1[0]; new_tsk.desktop = window_get_desktop (win); - if (nb_panel > 1) monitor = window_get_monitor (win); + if (nb_panel > 1) { + monitor = window_get_monitor (win); + if (monitor >= nb_panel) monitor = 0; + } else monitor = 0; + new_tsk.area.panel = &panel1[monitor]; // allocate only one title and one icon // even with task_on_all_desktop and with task_on_all_panel @@ -61,12 +75,7 @@ Task *add_task (Window win) Taskbar *tskbar; Task *new_tsk2=0; int i, j; -// for (i = 0; i < nb_panel; i++) { -// if (nb_panel > 1 && panel1[i].monitor != monitor) continue; -// for (j = 0; j < panel1[i].nb_desktop; j++) { -// if ((new_tsk.desktop != ALLDESKTOP && new_tsk.desktop != j) -// || (panel_mode == MULTI_DESKTOP && new_tsk.desktop == ALLDESKTOP && server.desktop != j)) -// continue; + // 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; @@ -78,7 +87,12 @@ Task *add_task (Window win) 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; new_tsk2->icon = new_tsk.icon; new_tsk2->icon_active = new_tsk.icon_active; new_tsk2->icon_width = new_tsk.icon_width; @@ -88,6 +102,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; } @@ -132,6 +148,8 @@ void remove_task (Task *tsk) 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.pmap); XFreePixmap (server.dsp, tsk2->area.pix_active.pmap); @@ -203,12 +221,11 @@ void get_icon (Task *tsk) tmp_data = get_best_icon (data, get_icon_count (data, i), i, &w, &h, panel->g_task.icon_size1); #ifdef __x86_64__ - DATA32 *icon_data = malloc (w * h * sizeof (DATA32)); + DATA32 icon_data[w * h]; int length = w * h; for (i = 0; i < length; ++i) icon_data[i] = tmp_data[i]; - img = imlib_create_image_using_data (w, h, icon_data); - free(icon_data); + img = imlib_create_image_using_copied_data (w, h, icon_data); #else img = imlib_create_image_using_data (w, h, (DATA32*)tmp_data); #endif @@ -296,8 +313,13 @@ void draw_task_icon (Task *tsk, int text_width, int active) imlib_context_set_image (tsk->icon_active); pmap = &tsk->area.pix_active.pmap; } - imlib_context_set_drawable (*pmap); - imlib_render_image_on_drawable (pos_x, panel->g_task.icon_posy); + if (real_transparency) { + render_image(*pmap, pos_x, panel->g_task.icon_posy, imlib_image_get_width(), imlib_image_get_height() ); + } + else { + imlib_context_set_drawable (*pmap); + imlib_render_image_on_drawable (pos_x, panel->g_task.icon_posy); + } } @@ -351,3 +373,160 @@ 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; + 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; + tsk1->area.is_active = 0; + } + } + } + task_active = 0; + } + + Window w1 = window_get_active (); + //printf("Change active task %ld\n", w1); + + tsk2 = task_get_task(w1); + if (!tsk2) { + 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) { + tsk1->area.is_active = 1; + } + } + } + } + task_active = tsk2; + } +} + + +void blink_urgent() +{ + GSList* urgent_task = urgent_list; + while (urgent_task) { + 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; + } + 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; + + // 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 + urgent_list = g_slist_concat(urgent_add, urgent_list); + + if (urgent_timeout == 0) + urgent_timeout = add_timeout(10, 1000, blink_urgent); +} + + +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; + } + if (!urgent_list) { + stop_timeout(urgent_timeout); + urgent_timeout = 0; + } +}