allow multi_desktop even with multi monitors config

[chaz/tint2] / src / panel.c

diff --git a/src/panel.c b/src/panel.c
index 3a8bb8fb6c74997c1c402e812d400cecfc57d310..84d5ab9d8d4dac0e2a8d22a24c7ccb2f8f2640dc 100644 (file)
--- a/src/panel.c
+++ b/src/panel.c
@@ -40,11 +40,13 @@ int mouse_scroll_up;
 int mouse_scroll_down;
 
 int panel_mode;
+int wm_menu;
 int panel_position;
 int panel_refresh;
 
-Task *task_active = 0;
-Task *task_drag = 0;
+Task *task_active;
+Task *task_drag;
+Task *task_urgent;
 
 Panel *panel1 = 0;
 int  nb_panel;
@@ -116,11 +118,7 @@ void init_panel()
 
                // Catch some events
                XSetWindowAttributes att = { ParentRelative, 0L, 0, 0L, 0, 0, Always, 0L, 0L, False, ExposureMask|ButtonPressMask|ButtonReleaseMask, NoEventMask, False, 0, 0 };
-
-               // XCreateWindow(display, parent, x, y, w, h, border, depth, class, visual, mask, attrib)
-               // main_win doesn't include panel.area.paddingx, so we have WM capabilities on left and right.
                if (p->main_win) XDestroyWindow(server.dsp, p->main_win);
-               //win = XCreateWindow (server.dsp, server.root_win, p->posx+p->area.paddingxlr, p->posy, p->area.width-(2*p->area.paddingxlr), p->area.height, 0, server.depth, InputOutput, CopyFromParent, CWEventMask, &att);
                p->main_win = XCreateWindow(server.dsp, server.root_win, p->posx, p->posy, p->area.width, p->area.height, 0, server.depth, InputOutput, CopyFromParent, CWEventMask, &att);
 
                set_panel_properties(p);
@@ -136,6 +134,9 @@ void cleanup_panel()
 {
        if (!panel1) return;
 
+       task_active = 0;
+       task_drag = 0;
+       task_urgent = 0;
        cleanup_systray();
    cleanup_taskbar();
 
@@ -174,11 +175,6 @@ void resize_panel(void *obj)
    Panel *panel = (Panel*)obj;
    int taskbar_width, modulo_width, taskbar_on_screen;
 
-//printf("resize_panel :  : posx et width des barres de taches\n");
-
-   if (panel_mode == MULTI_DESKTOP) taskbar_on_screen = panel->nb_desktop;
-   else taskbar_on_screen = 1;
-
    taskbar_width = panel->area.width - (2 * panel->area.paddingxlr) - (2 * panel->area.pix.border.width);
    if (panel->clock.area.on_screen && panel->clock.area.width)
       taskbar_width -= (panel->clock.area.width + panel->area.paddingx);
@@ -188,29 +184,31 @@ void resize_panel(void *obj)
    if (systray.area.on_screen && systray.area.width && panel == &panel1[0])
        taskbar_width -= (systray.area.width + panel->area.paddingx);
 
-   taskbar_width = (taskbar_width - ((taskbar_on_screen-1) * panel->area.paddingx)) / taskbar_on_screen;
-
-   if (taskbar_on_screen > 1)
-      modulo_width = (taskbar_width - ((taskbar_on_screen-1) * panel->area.paddingx)) % taskbar_on_screen;
-   else
+   if (panel_mode == MULTI_DESKTOP) {
+               taskbar_on_screen = panel->nb_desktop;
+               int width = taskbar_width - ((taskbar_on_screen-1) * panel->area.paddingx);
+          taskbar_width = width / taskbar_on_screen;
+      modulo_width = width % taskbar_on_screen;
+       }
+   else {
+               taskbar_on_screen = 1;
       modulo_width = 0;
+       }
 
        // change posx and width for all taskbar
-   int i, modulo=0, posx=0;
+   int i, posx;
+       posx = panel->area.pix.border.width + panel->area.paddingxlr;
    for (i=0 ; i < panel->nb_desktop ; i++) {
-      if ((i % taskbar_on_screen) == 0) {
-         posx = panel->area.pix.border.width + panel->area.paddingxlr;
-         modulo = modulo_width;
-      }
-      else posx += taskbar_width + panel->area.paddingx;
-
       panel->taskbar[i].area.posx = posx;
       panel->taskbar[i].area.width = taskbar_width;
       panel->taskbar[i].area.resize = 1;
-      if (modulo) {
+      if (modulo_width) {
          panel->taskbar[i].area.width++;
-         modulo--;
+         modulo_width--;
       }
+               //printf("taskbar %d : posx %d, width, %d, posy %d\n", i, posx, panel->taskbar[i].area.width, posx + panel->taskbar[i].area.width);
+      if (panel_mode == MULTI_DESKTOP)
+       posx += panel->taskbar[i].area.width + panel->area.paddingx;
    }
 }
 
@@ -227,7 +225,7 @@ void visible_object()
                for (j=0 ; j < panel->nb_desktop ; j++) {
                        taskbar = &panel->taskbar[j];
                        if (panel_mode != MULTI_DESKTOP && taskbar->desktop != server.desktop) {
-                               // (SINGLE_DESKTOP or SINGLE_MONITOR) and not current desktop
+                               // SINGLE_DESKTOP and not current desktop
                                taskbar->area.on_screen = 0;
                        }
                        else {