* Tint2 : task
*
* Copyright (C) 2007 Pål Staurland (staura@gmail.com)
-* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
+* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2
new_tsk2->area.on_screen = 0;
}
new_tsk2->title = new_tsk.title;
- new_tsk2->area._get_tooltip_text = task_get_tooltip;
+ if (panel1[monitor].g_task.tooltip_enabled)
+ new_tsk2->area._get_tooltip_text = task_get_tooltip;
for (k=0; k<TASK_STATE_COUNT; ++k) {
new_tsk2->icon[k] = new_tsk.icon[k];
new_tsk2->state_pix[k] = 0;
}
-void get_title(Task *tsk)
+int get_title(Task *tsk)
{
Panel *panel = tsk->area.panel;
char *title, *name;
- if (!panel->g_task.text && !g_tooltip.enabled) return;
+ if (!panel->g_task.text && !panel->g_task.tooltip_enabled) return 0;
name = server_get_property (tsk->win, server.atom._NET_WM_VISIBLE_NAME, server.atom.UTF8_STRING, 0);
if (!name || !strlen(name)) {
else title[0] = 0;
strcat(title, name);
if (name) XFree (name);
-
- if (tsk->title)
- free(tsk->title);
+
+ if (tsk->title) {
+ // check unecessary title change
+ if (strcmp(tsk->title, title) == 0) {
+ free(title);
+ return 0;
+ }
+ else
+ free(tsk->title);
+ }
tsk->title = title;
GPtrArray* task_group = task_get_tasks(tsk->win);
set_task_redraw(tsk2);
}
}
- set_task_redraw(tsk);
+ return 1;
}
int i;
Imlib_Image img = NULL;
XWMHints *hints = 0;
- long *data = 0;
+ gulong *data = 0;
int k;
for (k=0; k<TASK_STATE_COUNT; ++k) {
if (data) {
// get ARGB icon
int w, h;
- long *tmp_data;
+ gulong *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;
set_task_redraw(tsk2);
}
}
- set_task_redraw(tsk);
}
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_ellipsize (layout, PANGO_ELLIPSIZE_MIDDLE);
- //pango_layout_set_wrap(layout, PANGO_WRAP_CHAR);
+ 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 */
if (panel->g_task.centered) pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
pango_layout_get_pixel_size (layout, &width, &height);
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);
}
}
+void on_change_task (void *obj)
+{
+ Task *tsk = obj;
+ Panel *panel = (Panel*)tsk->area.panel;
+
+ long value[] = { panel->posx+tsk->area.posx, panel->posy+tsk->area.posy, tsk->area.width, tsk->area.height };
+ XChangeProperty (server.dsp, tsk->win, server.atom._NET_WM_ICON_GEOMETRY, XA_CARDINAL, 32, PropModeReplace, (unsigned char*)value, 4);
+
+ // reset Pixmap when position/size changed
+ set_task_redraw(tsk);
+}
+
+
Task *next_task(Task *tsk)
{
if (tsk == 0)
Task *tsk1;
Taskbar* tskbar = tsk->area.parent;
- for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
+ l0 = tskbar->area.list;
+ if (taskbarname_enabled) l0 = l0->next;
+ for (; l0 ; l0 = l0->next) {
tsk1 = l0->data;
if (tsk1 == tsk) {
if (l0->next == 0) l0 = tskbar->area.list;
Taskbar* tskbar = tsk->area.parent;
tsk2 = 0;
- for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
+ l0 = tskbar->area.list;
+ if (taskbarname_enabled) l0 = l0->next;
+ for (; l0 ; l0 = l0->next) {
tsk1 = l0->data;
if (tsk1 == tsk) {
if (l0 == tskbar->area.list) {
//printf("Change active task %ld\n", w1);
if (w1) {
- Window w2;
- if (XGetTransientForHint(server.dsp, w1, &w2) != 0)
- if (w2 && !task_get_tasks(w1)) w1 = w2;
+ 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);
}
}