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;
Panel *panel = tsk->area.panel;
char *title, *name;
- if (!panel->g_task.text && !g_tooltip.enabled) return 0;
+ 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)) {
if (tsk == 0)
return 0;
- GSList *l0;
+ GSList *l0, *lfirst_tsk;
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;
+ lfirst_tsk = l0;
+ for (; l0 ; l0 = l0->next) {
tsk1 = l0->data;
if (tsk1 == tsk) {
- if (l0->next == 0) l0 = tskbar->area.list;
+ if (l0->next == 0) l0 = lfirst_tsk;
else l0 = l0->next;
return l0->data;
}
if (tsk == 0)
return 0;
- GSList *l0;
+ GSList *l0, *lfirst_tsk;
Task *tsk1, *tsk2;
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;
+ lfirst_tsk = l0;
+ for (; l0 ; l0 = l0->next) {
tsk1 = l0->data;
if (tsk1 == tsk) {
- if (l0 == tskbar->area.list) {
+ if (l0 == lfirst_tsk) {
l0 = g_slist_last ( l0 );
tsk2 = l0->data;
}