X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Ftint2;a=blobdiff_plain;f=src%2Ftaskbar%2Ftask.c;h=83e827f5247ef181e1df0e51e5c95186f0c8b823;hp=64c86a82999770e0b77b846246651ab822de08bf;hb=63bbffa4af17926ba2d52728883988eae402b07a;hpb=8ae318e599f644ca96b09ed2e249ec7881742467 diff --git a/src/taskbar/task.c b/src/taskbar/task.c index 64c86a8..83e827f 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" +timeout* urgent_timeout; +GSList* urgent_list; + +const char* task_get_tooltip(void* obj) +{ + Task* t = obj; + return t->title; +} Task *add_task (Window win) @@ -40,49 +51,71 @@ Task *add_task (Window win) 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.area.panel = &panel1[0]; new_tsk.desktop = window_get_desktop (win); - if (nb_panel > 1) monitor = window_get_monitor (win); - else monitor = 0; + 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; - new_tsk.icon_data = 0; - new_tsk.icon_data_active = 0; + int k; + for (k=0; ktitle, 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; - 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; - new_tsk2->title = new_tsk.title; - new_tsk2->icon_data = new_tsk.icon_data; - new_tsk2->icon_data_active = new_tsk.icon_data_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); + 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; kicon[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; } @@ -92,46 +125,37 @@ 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 //printf("remove_task %s %d\n", tsk->title, tsk->desktop); if (tsk->title) free (tsk->title); - if (tsk->icon_data) { - free (tsk->icon_data); - free (tsk->icon_data_active); + int k; + for (k=0; kicon[k]) { + imlib_context_set_image(tsk->icon[k]); + imlib_free_image(); + tsk->icon[k] = 0; + if (tsk->state_pix[k]) XFreePixmap(server.dsp, tsk->state_pix[k]); + } } - 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; - - XFreePixmap (server.dsp, tsk2->area.pix.pmap); - XFreePixmap (server.dsp, tsk2->area.pix_active.pmap); - free(tsk2); - } - } - } + GPtrArray* task_group = g_hash_table_lookup(win_to_task_table, &win); + for (i=0; ilen; ++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); } @@ -161,10 +185,20 @@ void get_title(Task *tsk) strcat(title, name); if (name) XFree (name); - tsk->area.redraw = 1; 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; ilen; ++i) { + Task* tsk2 = g_ptr_array_index(task_group, i); + tsk2->title = tsk->title; + set_task_redraw(tsk2); + } + } + set_task_redraw(tsk); } @@ -172,91 +206,110 @@ void get_icon (Task *tsk) { Panel *panel = tsk->area.panel; if (!panel->g_task.icon) return; - unsigned int w, h, num; - long *data; - - if (tsk->icon_data) { - free (tsk->icon_data); - free (tsk->icon_data_active); - tsk->icon_data = tsk->icon_data_active = 0; + int i; + Imlib_Image img = NULL; + XWMHints *hints = 0; + gulong *data = 0; + + int k; + for (k=0; kicon[k]) { + imlib_context_set_image(tsk->icon[k]); + imlib_free_image(); + tsk->icon[k] = 0; + } } - tsk->area.redraw = 1; - data = server_get_property (tsk->win, server.atom._NET_WM_ICON, XA_CARDINAL, &num); + data = server_get_property (tsk->win, server.atom._NET_WM_ICON, XA_CARDINAL, &i); if (data) { // get ARGB icon - long *tmp_data; - tmp_data = get_best_icon (data, get_icon_count (data, num), num, &w, &h, panel->g_task.icon_size1); - - tsk->icon_width = w; - tsk->icon_height = h; - // DATA32 is provided by imlib2 - tsk->icon_data = malloc (w * h * sizeof (DATA32)); + int w, h; + gulong *tmp_data; - if (tsk->icon_data) { + tmp_data = get_best_icon (data, get_icon_count (data, i), i, &w, &h, panel->g_task.icon_size1); #ifdef __x86_64__ - int i, length = w * h; - for (i = 0; i < length; ++i) - tsk->icon_data[i] = tmp_data[i]; + 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 - memcpy (tsk->icon_data, tmp_data, w * h * sizeof (DATA32)); + img = imlib_create_image_using_data (w, h, (DATA32*)tmp_data); #endif - } - XFree (data); } else { // get Pixmap icon - XWMHints *hints = XGetWMHints(server.dsp, tsk->win); - Imlib_Image img; + 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"); + //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); - imlib_context_set_image(img); } - else - imlib_context_set_image(default_icon); } - else - imlib_context_set_image(default_icon); - data = imlib_image_get_data(); - tsk->icon_width = imlib_image_get_width(); - tsk->icon_height = imlib_image_get_height(); - tsk->icon_data = malloc (tsk->icon_width * tsk->icon_height * sizeof (DATA32)); - if (tsk->icon_data) - memcpy (tsk->icon_data, data, tsk->icon_width * tsk->icon_height * sizeof (DATA32)); - if (imlib_context_get_image() == img) - imlib_free_image(); - XFree(hints); + } + if (img == NULL) { + imlib_context_set_image(default_icon); + img = imlib_clone_image(); } - if (tsk->icon_data) { - tsk->icon_data_active = malloc (tsk->icon_width * tsk->icon_height * sizeof (DATA32)); - memcpy (tsk->icon_data_active, tsk->icon_data, tsk->icon_width * tsk->icon_height * sizeof (DATA32)); - - if (panel->g_task.hue != 0 || panel->g_task.saturation != 0 || panel->g_task.brightness != 0) { - adjust_hsb(tsk->icon_data, tsk->icon_width, tsk->icon_height, (float)panel->g_task.hue/100, (float)panel->g_task.saturation/100, (float)panel->g_task.brightness/100); + // 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(); + Imlib_Image orig_image = 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(orig_image); + tsk->icon_width = imlib_image_get_width(); + tsk->icon_height = imlib_image_get_height(); + for (k=0; kicon[k] = imlib_clone_image(); + imlib_context_set_image(tsk->icon[k]); + DATA32 *data32; + if (panel->g_task.alpha[k] != 100 || panel->g_task.saturation[k] != 0 || panel->g_task.brightness[k] != 0) { + data32 = imlib_image_get_data(); + adjust_asb(data32, tsk->icon_width, tsk->icon_height, panel->g_task.alpha[k], (float)panel->g_task.saturation[k]/100, (float)panel->g_task.brightness[k]/100); + imlib_image_put_back_data(data32); } - if (panel->g_task.hue_active != 0 || panel->g_task.saturation_active != 0 || panel->g_task.brightness_active != 0) { - adjust_hsb(tsk->icon_data_active, tsk->icon_width, tsk->icon_height, (float)panel->g_task.hue_active/100, (float)panel->g_task.saturation_active/100, (float)panel->g_task.brightness_active/100); + } + imlib_context_set_image(orig_image); + imlib_free_image(); + + if (hints) + XFree(hints); + if (data) + XFree (data); + + GPtrArray* task_group = task_get_tasks(tsk->win); + if (task_group) { + for (i=0; ilen; ++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; kicon[k] = tsk->icon[k]; + set_task_redraw(tsk2); } } + set_task_redraw(tsk); } -void draw_task_icon (Task *tsk, int text_width, int active) +void draw_task_icon (Task *tsk, int text_width) { - if (tsk->icon_data == 0 || tsk->icon_data_active == 0) return; - - Pixmap *pmap = (active == 0) ? (&tsk->area.pix.pmap) : (&tsk->area.pix_active.pmap); - unsigned int *icon_data = (active == 0) ? (tsk->icon_data) : (tsk->icon_data_active); + if (tsk->icon[tsk->current_state] == 0) return; // Find pos int pos_x; @@ -267,53 +320,41 @@ void draw_task_icon (Task *tsk, int text_width, int active) 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; + else pos_x = panel->g_task.area.paddingxlr + tsk->area.bg->border.width; // Render - Imlib_Image icon; - Imlib_Color_Modifier cmod; - DATA8 red[256], green[256], blue[256], alpha[256]; - - icon = imlib_create_image_using_data (tsk->icon_width, tsk->icon_height, icon_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; - opacity = (active == 0) ? (255*panel->g_task.font.alpha) : (255*panel->g_task.font_active.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, panel->g_task.icon_posy, panel->g_task.icon_size1, panel->g_task.icon_size1); - - imlib_free_color_modifier (); - imlib_free_image (); + imlib_context_set_image (tsk->icon[tsk->current_state]); + if (server.real_transparency) { + render_image(tsk->area.pix, pos_x, panel->g_task.icon_posy, imlib_image_get_width(), imlib_image_get_height() ); + } + else { + imlib_context_set_drawable(tsk->area.pix); + imlib_render_image_on_drawable (pos_x, panel->g_task.icon_posy); + } } -void draw_task (void *obj, cairo_t *c, int active) +void draw_task (void *obj, cairo_t *c) { Task *tsk = obj; + tsk->state_pix[tsk->current_state] = tsk->area.pix; PangoLayout *layout; - config_color *config_text; + Color *config_text; int width=0, height; Panel *panel = (Panel*)tsk->area.panel; + //printf("draw_task %d %d\n", tsk->area.posx, tsk->area.posy); 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); + 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_width(layout, ((Taskbar*)tsk->area.parent)->text_width * PANGO_SCALE); + pango_layout_set_height(layout, panel->g_task.text_height * PANGO_SCALE); + pango_layout_set_wrap(layout, PANGO_WRAP_CHAR); pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END); /* Center text */ @@ -322,28 +363,178 @@ void draw_task (void *obj, cairo_t *c, int active) pango_layout_get_pixel_size (layout, &width, &height); - if (active) config_text = &panel->g_task.font_active; - else config_text = &panel->g_task.font; - + config_text = &panel->g_task.font[tsk->current_state]; 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); + double text_posy = (panel->g_task.area.height - height) / 2.0; + cairo_move_to (c, panel->g_task.text_posx, 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); + cairo_move_to (c, panel->g_task.text_posx + 1, 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); + draw_task_icon (tsk, width); + } +} + + +Task *next_task(Task *tsk) +{ + if (tsk == 0) + return 0; + + GSList *l0; + Task *tsk1; + 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 0; +} + +Task *prev_task(Task *tsk) +{ + if (tsk == 0) + return 0; + + GSList *l0; + Task *tsk1, *tsk2; + 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 0; +} + + +void active_task() +{ + if (task_active) { + set_task_state(task_active, window_is_iconified(task_active->win) ? TASK_ICONIFIED : TASK_NORMAL); + task_active = 0; + } + + Window w1 = window_get_active(); + //printf("Change active task %ld\n", w1); + + if (w1) { + if (!task_get_tasks(w1)) { + Window w2; + while (XGetTransientForHint(server.dsp, w1, &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) { + GPtrArray* task_group = task_get_tasks(tsk->win); + if (task_group) { + int i; + for (i=0; ilen; ++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) +{ + int k; + for (k=0; kstate_pix[k]) XFreePixmap(server.dsp, tsk->state_pix[k]); + tsk->state_pix[k] = 0; + } + tsk->area.pix = 0; + tsk->area.redraw = 1; +} + + +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) { + if (t->urgent_tick++ % 2) + set_task_state(t, TASK_URGENT); + else + set_task_state(t, window_is_iconified(t->win) ? TASK_ICONIFIED : TASK_NORMAL); + } + 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; + + 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_prepend(urgent_list, tsk); + + if (urgent_timeout == 0) + urgent_timeout = add_timeout(10, 1000, blink_urgent, 0); +} + + +void del_urgent(Task *tsk) +{ + urgent_list = g_slist_remove(urgent_list, tsk); + if (urgent_list == 0) { + stop_timeout(urgent_timeout); + urgent_timeout = 0; + } +}