cleanup duplicate code and fixed ALLDESKTOP task

[chaz/tint2] / src / taskbar / taskbar.c

diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c
index aa65991ad5fe4483b7a903c6eb498af4c304f12a..6605b5befcaf93dadeb45799489f0faad4eb6173 100644 (file)
--- a/src/taskbar/taskbar.c
+++ b/src/taskbar/taskbar.c
@@ -125,6 +125,7 @@ void init_taskbar_panel(void *p)
        // task
        panel->g_task.area.size_mode = SIZE_BY_LAYOUT;
        panel->g_task.area._draw_foreground = draw_task;
+       panel->g_task.area._on_change_layout = on_change_task;
        panel->g_task.area.redraw = 1;
        panel->g_task.area.on_screen = 1;
        if ((panel->g_task.config_asb_mask & (1<<TASK_NORMAL)) == 0) {
@@ -198,7 +199,7 @@ void init_taskbar_panel(void *p)
                tskbar = &panel->taskbar[j];
                memcpy(&tskbar->area, &panel->g_taskbar, sizeof(Area));
                tskbar->desktop = j;
-               if (j == server.desktop && panel->g_taskbar.use_active)
+               if (j == server.desktop)
                        tskbar->area.bg = panel->g_taskbar.bg_active;
        }
 }
@@ -262,91 +263,45 @@ int resize_taskbar(void *obj)
 {
        Taskbar *taskbar = (Taskbar*)obj;
        Panel *panel = (Panel*)taskbar->area.panel;
+       int text_width;
        Task *tsk;
-       GSList *l;
-       int  task_count, border_width;
-
-       //printf("resize_taskbar : posx et width des taches\n");
-       taskbar->area.redraw = 1;
-
-       border_width = taskbar->area.bg->border.width;
 
+       //printf("resize_taskbar %d %d\n", taskbar->area.posx, taskbar->area.posy);
        if (panel_horizontal) {
-               int  pixel_width, modulo_width=0;
-               int  taskbar_width;
-
-               // new task width for 'desktop'
-               task_count = g_slist_length(taskbar->area.list);
-               if (!task_count) pixel_width = panel->g_task.maximum_width;
-               else {
-                       taskbar_width = taskbar->area.width - (2 * border_width) - (2 * panel->g_taskbar.area.paddingxlr);
-                       if (task_count>1) taskbar_width -= ((task_count-1) * panel->g_taskbar.area.paddingx);
-
-                       pixel_width = taskbar_width / task_count;
-                       if (pixel_width > panel->g_task.maximum_width)
-                               pixel_width = panel->g_task.maximum_width;
-                       else
-                               modulo_width = taskbar_width % task_count;
-               }
-
-               taskbar->task_width = pixel_width;
-               taskbar->task_modulo = modulo_width;
-               taskbar->text_width = pixel_width - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingx;
-
-               // change pos_x and width for all tasks
-               for (l = taskbar->area.list; l ; l = l->next) {
-                       tsk = l->data;
-                       if (!tsk->area.on_screen) continue;
-                       set_task_redraw(tsk);  // always redraw task, because the background could have changed (taskbar_active_id)
-                       tsk->area.width = pixel_width;
-// TODO : move later (when posx is known)
-//                     long value[] = { panel->posx+x, panel->posy, pixel_width, panel->area.height };
-//                     XChangeProperty (server.dsp, tsk->win, server.atom._NET_WM_ICON_GEOMETRY, XA_CARDINAL, 32, PropModeReplace, (unsigned char*)value, 4);
-
-                       if (modulo_width) {
-                               tsk->area.width++;
-                               modulo_width--;
-                       }
+               resize_by_layout(obj, panel->g_task.maximum_width);
+               
+               text_width = panel->g_task.maximum_width;
+               if (taskbar->area.list != NULL) {
+                       tsk = taskbar->area.list->data;
+                       text_width = tsk->area.width;
                }
+               taskbar->text_width = text_width - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingx;
        }
        else {
-               int  pixel_height, modulo_height=0;
-               int  taskbar_height;
+               resize_by_layout(obj, panel->g_task.maximum_height);
+               
+               taskbar->text_width = taskbar->area.width - (2 * panel->g_taskbar.area.paddingy) - panel->g_task.text_posx -    panel->g_task.area.bg->border.width - panel->g_task.area.paddingx;
+       }
+       return 0;
+}
 
-               // new task width for 'desktop'
-               task_count = g_slist_length(taskbar->area.list);
-               if (!task_count) pixel_height = panel->g_task.maximum_height;
-               else {
-                       taskbar_height = taskbar->area.height - (2 * border_width) - (2 * panel->g_taskbar.area.paddingxlr);
-                       if (task_count>1) taskbar_height -= ((task_count-1) * panel->g_taskbar.area.paddingx);
-
-                       pixel_height = taskbar_height / task_count;
-                       if (pixel_height > panel->g_task.maximum_height)
-                               pixel_height = panel->g_task.maximum_height;
-                       else
-                               modulo_height = taskbar_height % task_count;
-               }
 
-               taskbar->task_width = pixel_height;
-               taskbar->task_modulo = modulo_height;
-               taskbar->text_width = taskbar->area.width - (2 * panel->g_taskbar.area.paddingy) - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingx;
-
-               // change pos_y and height for all tasks
-               for (l = taskbar->area.list; l ; l = l->next) {
-                       tsk = l->data;
-                       if (!tsk->area.on_screen) continue;
-                       set_task_redraw(tsk);  // always redraw task, because the background could have changed (taskbar_active_id)
-                       tsk->area.height = pixel_height;
-// TODO : move later (when posy is known)
-//                     long value[] = { panel->posx, panel->posy+y, panel->area.width, pixel_height };
-//                     XChangeProperty (server.dsp, tsk->win, server.atom._NET_WM_ICON_GEOMETRY, XA_CARDINAL, 32, PropModeReplace, (unsigned char*)value, 4);
-
-                       if (modulo_height) {
-                               tsk->area.height++;
-                               modulo_height--;
-                       }
+void visible_taskbar(void *p)
+{
+       Panel *panel =(Panel*)p;
+       int j;
+
+       Taskbar *taskbar;
+       for (j=0 ; j < panel->nb_desktop ; j++) {
+               taskbar = &panel->taskbar[j];
+               if (panel_mode != MULTI_DESKTOP && taskbar->desktop != server.desktop) {
+                       // SINGLE_DESKTOP and not current desktop
+                       taskbar->area.on_screen = 0;
+               }
+               else {
+                       taskbar->area.on_screen = 1;
                }
        }
-       return 0;
+       panel_refresh = 1;
 }