X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Ftaskbar%2Ftask.c;h=21b741b0d819522653e66e9313df20cbff62465b;hb=35e206acc0a7b9dca7611fe4a7e17c7acc381ad0;hp=500d7f555f5ff096ae96d1aff4baaf23fed7d2b0;hpb=8354267448dab01626da0c4b3d2eedfa20e6858a;p=chaz%2Ftint2 diff --git a/src/taskbar/task.c b/src/taskbar/task.c index 500d7f5..21b741b 100644 --- a/src/taskbar/task.c +++ b/src/taskbar/task.c @@ -25,13 +25,22 @@ #include #include #include +#include #include "window.h" #include "task.h" #include "server.h" #include "panel.h" #include "tooltip.h" +#include "timer.h" +static const struct timeout* urgent_timeout = 0; + +const char* task_get_tooltip(void* obj) +{ + Task* t = obj; + return t->title; +} Task *add_task (Window win) @@ -43,10 +52,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 @@ -72,7 +84,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; @@ -82,6 +99,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; } @@ -126,6 +145,8 @@ void remove_task (Task *tsk) task_active = 0; if (tsk2 == task_drag) task_drag = 0; + if (is_urgent(tsk2)) + del_urgent(tsk2); XFreePixmap (server.dsp, tsk2->area.pix.pmap); XFreePixmap (server.dsp, tsk2->area.pix_active.pmap); @@ -174,6 +195,10 @@ void get_icon (Task *tsk) { Panel *panel = tsk->area.panel; if (!panel->g_task.icon) return; + int i; + Imlib_Image img = NULL; + XWMHints *hints = 0; + long *data = 0; if (tsk->icon) { imlib_context_set_image(tsk->icon); @@ -184,9 +209,7 @@ void get_icon (Task *tsk) } tsk->area.redraw = 1; - int i; - Imlib_Image img = NULL; - long *data = server_get_property (tsk->win, server.atom._NET_WM_ICON, XA_CARDINAL, &i); + data = server_get_property (tsk->win, server.atom._NET_WM_ICON, XA_CARDINAL, &i); if (data) { // get ARGB icon int w, h; @@ -195,21 +218,18 @@ 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); + img = imlib_create_image_using_copied_data (w, h, icon_data); #else img = imlib_create_image_using_data (w, h, (DATA32*)tmp_data); #endif - imlib_context_set_image(img); - imlib_image_set_has_alpha(1); - XFree (data); } else { // get Pixmap icon - XWMHints *hints = XGetWMHints(server.dsp, tsk->win); + hints = XGetWMHints(server.dsp, tsk->win); if (hints) { if (hints->flags & IconPixmapHint && hints->icon_pixmap != 0) { // get width, height and depth for the pixmap @@ -224,7 +244,6 @@ void get_icon (Task *tsk) img = imlib_create_image_from_drawable(hints->icon_mask, 0, 0, w, h, 0); } } - XFree(hints); } if (img == NULL) { imlib_context_set_image(default_icon); @@ -233,7 +252,11 @@ void get_icon (Task *tsk) // transform icons imlib_context_set_image(img); - tsk->icon = imlib_create_cropped_scaled_image(0, 0, imlib_image_get_width(), imlib_image_get_height(), panel->g_task.icon_size1, panel->g_task.icon_size1); + imlib_image_set_has_alpha(1); + int w, h; + w = imlib_image_get_width(); + h = imlib_image_get_height(); + tsk->icon = imlib_create_cropped_scaled_image(0, 0, w, h, panel->g_task.icon_size1, panel->g_task.icon_size1); imlib_free_image(); imlib_context_set_image(tsk->icon); @@ -254,6 +277,11 @@ void get_icon (Task *tsk) adjust_asb(data32, tsk->icon_width, tsk->icon_height, panel->g_task.alpha_active, (float)panel->g_task.saturation_active/100, (float)panel->g_task.brightness_active/100); imlib_image_put_back_data(data32); } + + if (hints) + XFree(hints); + if (data) + XFree (data); } @@ -337,3 +365,179 @@ 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 ( is_urgent(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_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; + } + 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; + + // 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; + } + + // 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); + + if (urgent_timeout == 0) + urgent_timeout = add_timeout(10, 1000, blink_urgent); +} + + +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; + 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 0; +}