/**************************************************************************
*
* 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.
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);
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)];
+ tskbar = &panel.taskbar[index(desktop, monitor)];
new_tsk->area.parent = tskbar;
tskbar->area.list = g_slist_append(tskbar->area.list, new_tsk);
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);
free (tsk->icon_data);
tsk->icon_data = 0;
}
- XFreePixmap (server.dsp, tsk->area.pmap);
- XFreePixmap (server.dsp, tsk->area_active.pmap);
+ XFreePixmap (server.dsp, tsk->area.pix.pmap);
+ XFreePixmap (server.dsp, tsk->area.pix_active.pmap);
free(tsk);
}
}
// add space before title
- title = malloc(strlen(name)+2);
+ title = malloc(strlen(name)+2);
if (g_task.icon) strcpy(title, " ");
else title[0] = 0;
strcat(title, name);
void get_icon (Task *tsk)
{
if (!g_task.icon) return;
-
+
long *data;
int num;
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 {
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;
-
+ Pixmap *pmap = (active == 0) ? (&tsk->area.pix.pmap) : (&tsk->area.pix_active.pmap);
+
/* Find pos */
int pos_x;
if (g_task.centered) {
else
pos_x = (tsk->area.width - g_task.icon_size1) / 2;
}
- else pos_x = g_task.area.paddingx + g_task.area.border.width;
-
+ else pos_x = g_task.area.paddingx + g_task.area.pix.border.width;
+
/* Render */
Imlib_Image icon;
Imlib_Color_Modifier cmod;
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);
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;
-
+ opacity = (active == 0) ? (255*g_task.font.alpha) : (255*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, 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);
}
-void draw_task_title (cairo_t *c, Task *tsk, int active)
+void draw_foreground_task (void *obj, cairo_t *c, int active)
{
+ Task *tsk = obj;
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);
+ /* 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);
+ /* 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);
+ /* 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);
+ pango_layout_get_pixel_size (layout, &width, &height);
- if (active) config_text = &g_task.font_active;
- else config_text = &g_task.font;
+ 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);
+ 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);
+ 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.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) {
}
}
-
-void draw_background_task (void *obj, cairo_t *c)
-{
- Task *tsk = obj;
-
- draw_background (&tsk->area_active, c);
- draw_background (&tsk->area_inactive, c);
-}
-
-
-void draw_foreground_task (void *obj, cairo_t *c)
-{
- Task *tsk = obj;
- cairo_surface_t *cs;
- cairo_t *ca;
- //printf(" draw_foreground_task\n");
-
- draw_task_title (c, tsk, 0);
-
- // 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);
-
- 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);
-}
-
projects / chaz / tint2 / blobdiff