X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftaskbar%2Ftask.c;h=98590431da7a01a455f8c50cc9275f63140738c0;hb=8abd6d423bffc9cd35928e1911c138163f7dbda9;hp=1bac2f6aba95b68e4441dc0e41ece377f9871ff2;hpb=2930680396e47d66f7690e7ff92d5bcccbbf996c;p=chaz%2Ftint2 diff --git a/src/taskbar/task.c b/src/taskbar/task.c index 1bac2f6..9859043 100644 --- a/src/taskbar/task.c +++ b/src/taskbar/task.c @@ -1,10 +1,10 @@ /************************************************************************** * * Tint2 : task -* +* * Copyright (C) 2007 PÃ¥l Staurland (staura@gmail.com) * Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) -* +* * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 * as published by the Free Software Foundation. @@ -25,297 +25,508 @@ #include #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; +} -void add_task (Window win) +Task *add_task (Window win) { - Task *new_tsk; - int desktop, monitor; - - if (!win || window_is_hidden (win) || win == window.main_win) return; - - new_tsk = malloc(sizeof(Task)); - new_tsk->win = win; - 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)); - memcpy(&new_tsk->area_active, &g_task.area_active, sizeof(Area)); - desktop = window_get_desktop (new_tsk->win); - monitor = window_get_monitor (new_tsk->win); - - //if (panel.mode == MULTI_MONITOR) monitor = window_get_monitor (new_tsk->win); - //else monitor = 0; - //printf("task %s : desktop %d, monitor %d\n", new_tsk->title, desktop, monitor); - - XSelectInput (server.dsp, new_tsk->win, PropertyChangeMask|StructureNotifyMask); - - if (desktop == 0xFFFFFFFF) { - if (new_tsk->title) { - free (new_tsk->title); - new_tsk->title = 0; - } - if (new_tsk->icon_data) { - free (new_tsk->icon_data); - new_tsk->icon_data = 0; - } - free(new_tsk); - fprintf(stderr, "task on all desktop : ignored\n"); - return; - } - - //printf("add_task %d %s\n", index(desktop, monitor), new_tsk->title); - Taskbar *tskbar; - 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 (!win) return 0; + 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; + 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 + new_tsk.title = 0; + new_tsk.icon = new_tsk.icon_active = NULL; + 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); + + 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; + new_tsk2->icon = new_tsk.icon; + new_tsk2->icon_active = new_tsk.icon_active; + 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; + //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; } void remove_task (Task *tsk) { - if (!tsk) return; - - Taskbar *tskbar; - tskbar = (Taskbar*)tsk->area.parent; - tskbar->area.list = g_slist_remove(tskbar->area.list, tsk); - resize_tasks (tskbar); - set_redraw (&tskbar->area); - //printf("remove_task %d %s\n", index(tskbar->desktop, tskbar->monitor), tsk->title); - - if (tsk->title) { - free (tsk->title); - tsk->title = 0; - } - if (tsk->icon_data) { - free (tsk->icon_data); - tsk->icon_data = 0; - } - XFreePixmap (server.dsp, tsk->area.pmap); - XFreePixmap (server.dsp, tsk->area_active.pmap); - free(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 + //printf("remove_task %s %d\n", tsk->title, tsk->desktop); + if (tsk->title) + free (tsk->title); + if (tsk->icon) { + imlib_context_set_image(tsk->icon); + imlib_free_image(); + imlib_context_set_image(tsk->icon_active); + imlib_free_image(); + tsk->icon = tsk->icon_active = NULL; + } + + int i, j; + 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.pmap); + XFreePixmap (server.dsp, tsk2->area.pix_active.pmap); + free(tsk2); + } + } + } + } } void get_title(Task *tsk) { - if (!g_task.text) return; - - char *title, *name; - - name = server_get_property (tsk->win, server.atom._NET_WM_VISIBLE_NAME, server.atom.UTF8_STRING, 0); - if (!name || !strlen(name)) { - name = server_get_property (tsk->win, server.atom._NET_WM_NAME, server.atom.UTF8_STRING, 0); - if (!name || !strlen(name)) { - name = server_get_property (tsk->win, server.atom.WM_NAME, XA_STRING, 0); - if (!name || !strlen(name)) { - name = malloc(10); - strcpy(name, "Untitled"); - } - } - } - - // add space before title - title = malloc(strlen(name)+2); - if (g_task.icon) strcpy(title, " "); - else title[0] = 0; - strcat(title, name); - if (name) XFree (name); - - if (tsk->title) - free(tsk->title); - tsk->title = title; + Panel *panel = tsk->area.panel; + char *title, *name; + + if (!panel->g_task.text && !g_tooltip.enabled) return; + + name = server_get_property (tsk->win, server.atom._NET_WM_VISIBLE_NAME, server.atom.UTF8_STRING, 0); + if (!name || !strlen(name)) { + name = server_get_property (tsk->win, server.atom._NET_WM_NAME, server.atom.UTF8_STRING, 0); + if (!name || !strlen(name)) { + name = server_get_property (tsk->win, server.atom.WM_NAME, XA_STRING, 0); + if (!name || !strlen(name)) { + name = malloc(10); + strcpy(name, "Untitled"); + } + } + } + + // add space before title + title = malloc(strlen(name)+2); + if (panel->g_task.icon) strcpy(title, " "); + else title[0] = 0; + strcat(title, name); + if (name) XFree (name); + + tsk->area.redraw = 1; + if (tsk->title) + free(tsk->title); + tsk->title = title; } void get_icon (Task *tsk) { - if (!g_task.icon) return; - - long *data; - int num; - - data = server_get_property (tsk->win, server.atom._NET_WM_ICON, XA_CARDINAL, &num); - if (data) { - printf("get_icon plein\n"); - // ARGB - int w, h; - long *tmp_data; - tmp_data = get_best_icon (data, get_icon_count (data, num), num, &w, &h, g_task.icon_size1); - - tsk->icon_width = w; - tsk->icon_height = h; - tsk->icon_data = malloc (w * h * sizeof (long)); - memcpy (tsk->icon_data, tmp_data, w * h * sizeof (long)); - - XFree (data); - } - else { - //XWMHints *hints; - //hints = XGetWMHints(server.dsp, tkwin); - //if (hints != NULL) { - // XFree(hints); - //} - printf("get_icon vide\n"); - // XChangeProperty (display, windowH, XInternAtom (display, "_NET_WM_ICON", False), XA_CARDINAL, 32, PropModeReplace, (unsigned char*) data, dataSize); - return; - } + 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); + imlib_free_image(); + imlib_context_set_image(tsk->icon_active); + imlib_free_image(); + tsk->icon = tsk->icon_active = NULL; + } + tsk->area.redraw = 1; + + data = server_get_property (tsk->win, server.atom._NET_WM_ICON, XA_CARDINAL, &i); + if (data) { + // get ARGB icon + int w, h; + long *tmp_data; + + 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[w * h]; + int length = w * h; + for (i = 0; i < length; ++i) + icon_data[i] = tmp_data[i]; + img = imlib_create_image_using_copied_data (w, h, icon_data); +#else + img = imlib_create_image_using_data (w, h, (DATA32*)tmp_data); +#endif + } + else { + // get Pixmap icon + hints = XGetWMHints(server.dsp, tsk->win); + if (hints) { + if (hints->flags & IconPixmapHint && hints->icon_pixmap != 0) { + // get width, height and depth for the pixmap + Window root; + int icon_x, icon_y; + uint border_width, bpp; + uint w, h; + + //printf(" get pixmap\n"); + XGetGeometry(server.dsp, hints->icon_pixmap, &root, &icon_x, &icon_y, &w, &h, &border_width, &bpp); + imlib_context_set_drawable(hints->icon_pixmap); + img = imlib_create_image_from_drawable(hints->icon_mask, 0, 0, w, h, 0); + } + } + } + if (img == NULL) { + imlib_context_set_image(default_icon); + img = imlib_clone_image(); + } + + // transform icons + imlib_context_set_image(img); + 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); + tsk->icon_width = imlib_image_get_width(); + tsk->icon_height = imlib_image_get_height(); + tsk->icon_active = imlib_clone_image(); + + DATA32 *data32; + if (panel->g_task.alpha != 100 || panel->g_task.saturation != 0 || panel->g_task.brightness != 0) { + data32 = imlib_image_get_data(); + adjust_asb(data32, tsk->icon_width, tsk->icon_height, panel->g_task.alpha, (float)panel->g_task.saturation/100, (float)panel->g_task.brightness/100); + imlib_image_put_back_data(data32); + } + + if (panel->g_task.alpha_active != 100 || panel->g_task.saturation_active != 0 || panel->g_task.brightness_active != 0) { + imlib_context_set_image(tsk->icon_active); + data32 = imlib_image_get_data(); + 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); } void draw_task_icon (Task *tsk, int text_width, int active) { - if (tsk->icon_data == 0) get_icon (tsk); - if (tsk->icon_data == 0) return; - - Pixmap *pmap; - - if (active) pmap = &tsk->area_active.pmap; - else pmap = &tsk->area.pmap; - - /* Find pos */ - int pos_x; - if (g_task.centered) { - if (g_task.text) - pos_x = (tsk->area.width - text_width - g_task.icon_size1) / 2; - else - pos_x = (tsk->area.width - g_task.icon_size1) / 2; - } - else pos_x = g_task.area.paddingx + g_task.area.border.width; - - /* Render */ - Imlib_Image icon; - Imlib_Color_Modifier cmod; - DATA8 red[256], green[256], blue[256], alpha[256]; - - // TODO: cpu improvement : compute only when icon changed - DATA32 *data; - /* do we have 64bit? => long = 8bit */ - if (sizeof(long) != 4) { - int length = tsk->icon_width * tsk->icon_height; - data = malloc(sizeof(DATA32) * length); - int i; - for (i = 0; i < length; ++i) - data[i] = tsk->icon_data[i]; - } - else data = (DATA32 *) tsk->icon_data; - - icon = imlib_create_image_using_data (tsk->icon_width, tsk->icon_height, data); - imlib_context_set_image (icon); - imlib_context_set_drawable (*pmap); - - cmod = imlib_create_color_modifier (); - imlib_context_set_color_modifier (cmod); - imlib_image_set_has_alpha (1); - imlib_get_color_modifier_tables (red, green, blue, alpha); - - int i, opacity; - if (active) opacity = 255*g_task.font_active.alpha; - else opacity = 255*g_task.font.alpha; - for(i = 127; i < 256; i++) alpha[i] = opacity; - - imlib_set_color_modifier_tables (red, green, blue, alpha); - - //imlib_render_image_on_drawable (pos_x, pos_y); - imlib_render_image_on_drawable_at_size (pos_x, g_task.icon_posy, g_task.icon_size1, g_task.icon_size1); - - imlib_free_color_modifier (); - imlib_free_image (); - if (sizeof(long) != 4) free(data); + if (tsk->icon == NULL || tsk->icon_active == NULL) return; + + // Find pos + int pos_x; + Panel *panel = (Panel*)tsk->area.panel; + if (panel->g_task.centered) { + if (panel->g_task.text) + pos_x = (tsk->area.width - text_width - panel->g_task.icon_size1) / 2; + else + pos_x = (tsk->area.width - panel->g_task.icon_size1) / 2; + } + else pos_x = panel->g_task.area.paddingxlr + panel->g_task.area.pix.border.width; + + // Render + Pixmap *pmap; + if (active == 0) { + imlib_context_set_image (tsk->icon); + pmap = &tsk->area.pix.pmap; + } + else { + imlib_context_set_image (tsk->icon_active); + pmap = &tsk->area.pix_active.pmap; + } + 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); + } } -void draw_task_title (cairo_t *c, Task *tsk, int active) +void draw_task (void *obj, cairo_t *c, int active) { - PangoLayout *layout; - config_color *config_text; - int width, height; - - if (g_task.text) { - /* Layout */ - layout = pango_cairo_create_layout (c); - pango_layout_set_font_description (layout, g_task.font_desc); - pango_layout_set_text (layout, tsk->title, -1); - - /* Drawing width and Cut text */ - pango_layout_set_width (layout, ((Taskbar*)tsk->area.parent)->text_width * PANGO_SCALE); - pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END); - - /* Center text */ - if (g_task.centered) pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER); - else pango_layout_set_alignment (layout, PANGO_ALIGN_LEFT); - - pango_layout_get_pixel_size (layout, &width, &height); - - if (active) config_text = &g_task.font_active; - else config_text = &g_task.font; - - cairo_set_source_rgba (c, config_text->color[0], config_text->color[1], config_text->color[2], config_text->alpha); - - pango_cairo_update_layout (c, layout); - cairo_move_to (c, g_task.text_posx, g_task.text_posy); - pango_cairo_show_layout (c, layout); - - if (g_task.font_shadow) { - cairo_set_source_rgba (c, 0.0, 0.0, 0.0, 0.5); - pango_cairo_update_layout (c, layout); - cairo_move_to (c, g_task.text_posx + 1, g_task.text_posy + 1); - pango_cairo_show_layout (c, layout); - } - g_object_unref (layout); - } - - if (g_task.icon) { - // icon use same opacity as text - draw_task_icon (tsk, width, active); - } + Task *tsk = obj; + PangoLayout *layout; + config_color *config_text; + int width=0, height; + Panel *panel = (Panel*)tsk->area.panel; + + if (panel->g_task.text) { + /* Layout */ + layout = pango_cairo_create_layout (c); + pango_layout_set_font_description (layout, panel->g_task.font_desc); + pango_layout_set_text (layout, tsk->title, -1); + + /* Drawing width and Cut text */ + // pango use U+22EF or U+2026 + pango_layout_set_width (layout, ((Taskbar*)tsk->area.parent)->text_width * PANGO_SCALE); + pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END); + + /* Center text */ + if (panel->g_task.centered) pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER); + else pango_layout_set_alignment (layout, PANGO_ALIGN_LEFT); + + pango_layout_get_pixel_size (layout, &width, &height); + + if (active) config_text = &panel->g_task.font_active; + else config_text = &panel->g_task.font; + + cairo_set_source_rgba (c, config_text->color[0], config_text->color[1], config_text->color[2], config_text->alpha); + + pango_cairo_update_layout (c, layout); + cairo_move_to (c, panel->g_task.text_posx, panel->g_task.text_posy); + pango_cairo_show_layout (c, layout); + + if (panel->g_task.font_shadow) { + cairo_set_source_rgba (c, 0.0, 0.0, 0.0, 0.5); + pango_cairo_update_layout (c, layout); + cairo_move_to (c, panel->g_task.text_posx + 1, panel->g_task.text_posy + 1); + pango_cairo_show_layout (c, layout); + } + g_object_unref (layout); + } + + if (panel->g_task.icon) { + // icon use same opacity as text + draw_task_icon (tsk, width, active); + } } -void draw_background_task (void *obj, cairo_t *c) +Task *next_task(Task *tsk) { - Task *tsk = obj; + 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; +} - draw_background (&tsk->area_active, c); - draw_background (&tsk->area_inactive, c); +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 draw_foreground_task (void *obj, cairo_t *c) +void active_task() { - Task *tsk = obj; - cairo_surface_t *cs; - cairo_t *ca; - //printf(" draw_foreground_task\n"); - - draw_task_title (c, tsk, 0); + 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; + } +} - // draw active pmap - if (tsk->area_active.pmap) XFreePixmap (server.dsp, tsk->area_active.pmap); - tsk->area_active.pmap = server_create_pixmap (tsk->area.width, tsk->area.height); - // add layer of root pixmap - XCopyArea (server.dsp, server.pmap, tsk->area_active.pmap, server.gc, tsk->area.posx, tsk->area.posy, tsk->area.width, tsk->area.height, 0, 0); +void blink_urgent(void* arg) +{ + 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; +} - cs = cairo_xlib_surface_create (server.dsp, tsk->area_active.pmap, server.visual, tsk->area.width, tsk->area.height); - ca = cairo_create (cs); - // redraw task - draw_task_title (ca, tsk, 1); - - cairo_destroy (ca); - cairo_surface_destroy (cs); +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, 0); } + +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; + } +}