cleanup taskbar_name

[chaz/tint2] / src / panel.c

diff --git a/src/panel.c b/src/panel.c
index 7e21f86371100871d61ac51c7ac57d1fdb5db46a..96f20ccbe411744031f8357730fc0d2fe5af69b0 100644 (file)
--- a/src/panel.c
+++ b/src/panel.c
@@ -1,7 +1,7 @@
 /**************************************************************************
 *
 * Copyright (C) 2008 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
@@ -105,6 +105,8 @@ void cleanup_panel()
        if (!panel1) return;
 
        cleanup_taskbar();
+       // taskbarname_font_desc freed here because cleanup_taskbarname() called on _NET_NUMBER_OF_DESKTOPS
+       if (taskbarname_font_desc)      pango_font_description_free(taskbarname_font_desc);
 
        int i;
        Panel *p;
@@ -169,9 +171,6 @@ void init_panel()
                p->area.resize = 1;
                p->area.size_mode = SIZE_BY_LAYOUT;
                p->area._resize = resize_panel;
-               p->g_taskbar.area.parent = p;
-               p->g_taskbar.area.panel = p;
-               p->g_task.area.panel = p;
                init_panel_size_and_position(p);
                // add childs according to panel_items
                for (k=0 ; k < strlen(panel_items_order) ; k++) {
@@ -303,10 +302,11 @@ void init_panel_size_and_position(Panel *panel)
 
 
 int resize_panel(void *obj)
-{      
-       int ret = resize_by_layout(obj);
+{
+       resize_by_layout(obj, 0);
        
-       if (panel_mode != MULTI_DESKTOP) {
+       //printf("resize_panel\n");
+       if (panel_mode != MULTI_DESKTOP && taskbar_enabled) {
                // propagate width/height on hidden taskbar
                int i, width, height;
                Panel *panel = (Panel*)obj;
@@ -318,7 +318,7 @@ int resize_panel(void *obj)
                        panel->taskbar[i].area.resize = 1;
                }
        }
-       return ret;
+       return 0;
 }
 
 
@@ -522,7 +522,6 @@ void set_panel_background(Panel *p)
        }
 
        // redraw panel's object
-       //p->area.redraw = 1;
        GSList *l0;
        Area *a;
        for (l0 = p->area.list; l0 ; l0 = l0->next) {
@@ -530,12 +529,19 @@ void set_panel_background(Panel *p)
                set_redraw(a);
        }
        
-       // reset task 'state_pix'
-       int i;
+       // reset task/taskbar 'state_pix'
+       int i, k;
        Taskbar *tskbar;
        for (i=0 ; i < p->nb_desktop ; i++) {
                tskbar = &p->taskbar[i];
-               for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
+               for (k=0; k<TASKBAR_STATE_COUNT; ++k) {
+                       if (tskbar->state_pix[k]) XFreePixmap(server.dsp, tskbar->state_pix[k]);
+                       tskbar->state_pix[k] = 0;
+               }
+               tskbar->area.pix = 0;
+               l0 = tskbar->area.list;
+               if (taskbarname_enabled) l0 = l0->next;
+               for (; l0 ; l0 = l0->next) {
                        set_task_redraw((Task *)l0->data);
                }
        }
@@ -585,7 +591,9 @@ Task *click_task (Panel *panel, int x, int y)
        if ( (tskbar = click_taskbar(panel, x, y)) ) {
                if (panel_horizontal) {
                        Task *tsk;
-                       for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
+                       l0 = tskbar->area.list;
+                       if (taskbarname_enabled) l0 = l0->next;
+                       for (; l0 ; l0 = l0->next) {
                                tsk = l0->data;
                                if (tsk->area.on_screen && x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) {
                                        return tsk;
@@ -594,7 +602,9 @@ Task *click_task (Panel *panel, int x, int y)
                }
                else {
                        Task *tsk;
-                       for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
+                       l0 = tskbar->area.list;
+                       if (taskbarname_enabled) l0 = l0->next;
+                       for (; l0 ; l0 = l0->next) {
                                tsk = l0->data;
                                if (tsk->area.on_screen && y >= tsk->area.posy && y <= (tsk->area.posy + tsk->area.height)) {
                                        return tsk;