merge autotool build system by Christian Ruppert

[chaz/tint2] / src / panel.c

diff --git a/src/panel.c b/src/panel.c
index c3c58032a894f3fe1fc1fd6861123665224ea5c1..e202f816950ac80dbdbb9601ce5f7910596cf4d2 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;
@@ -61,7 +63,7 @@ void init_panel()
 
                p->area.parent = p;
                p->area.panel = p;
-               p->area.visible = 1;
+               p->area.on_screen = 1;
           p->area.resize = 1;
                p->area._resize = resize_panel;
                p->g_taskbar.parent = p;
@@ -69,9 +71,11 @@ void init_panel()
                p->g_task.area.panel = p;
 
                // add childs
-          if (p->clock.area.visible)
+          if (p->clock.area.on_screen)
                        p->area.list = g_slist_append(p->area.list, &p->clock);
-          if (systray.area.visible && i == 0) {
+               if (p->battery.area.on_screen)
+                       p->area.list = g_slist_append(p->area.list, &p->battery);
+          if (systray.area.on_screen && i == 0) {
                // systray only on first panel
                        p->area.list = g_slist_append(p->area.list, &systray);
                }
@@ -134,6 +138,10 @@ void cleanup_panel()
 {
        if (!panel1) return;
 
+       task_active = 0;
+       task_drag = 0;
+       task_urgent = 0;
+       cleanup_systray();
    cleanup_taskbar();
 
        // font allocated once
@@ -171,40 +179,40 @@ 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.visible && panel->clock.area.width)
+   if (panel->clock.area.on_screen && panel->clock.area.width)
       taskbar_width -= (panel->clock.area.width + panel->area.paddingx);
-   if (systray.area.visible && systray.area.width)
+       if (panel->battery.area.on_screen && panel->battery.area.width)
+               taskbar_width -= (panel->battery.area.width + panel->area.paddingx);
+   // TODO : systray only on first panel. search better implementation !
+   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;
    }
 }
 
@@ -222,10 +230,10 @@ void visible_object()
                        taskbar = &panel->taskbar[j];
                        if (panel_mode != MULTI_DESKTOP && taskbar->desktop != server.desktop) {
                                // (SINGLE_DESKTOP or SINGLE_MONITOR) and not current desktop
-                               taskbar->area.visible = 0;
+                               taskbar->area.on_screen = 0;
                        }
                        else {
-                               taskbar->area.visible = 1;
+                               taskbar->area.on_screen = 1;
                        }
                }
        }
@@ -246,8 +254,8 @@ void set_panel_properties(Panel *p)
    }
 
    // Dock
-   long val = server.atom._NET_WM_WINDOW_TYPE_DOCK;
-   XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_WINDOW_TYPE, XA_ATOM, 32, PropModeReplace, (unsigned char *) &val, 1);
+   //long val = server.atom._NET_WM_WINDOW_TYPE_DOCK;
+   //XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_WINDOW_TYPE, XA_ATOM, 32, PropModeReplace, (unsigned char *) &val, 1);
 
    // Reserved space
    long   struts [12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
@@ -268,7 +276,7 @@ void set_panel_properties(Panel *p)
    XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_STRUT_PARTIAL, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &struts, 12);
 
    // Sticky and below other window
-   val = 0xFFFFFFFF;
+   long val = 0xFFFFFFFF;
    XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_DESKTOP, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &val, 1);
    Atom state[4];
    state[0] = server.atom._NET_WM_STATE_SKIP_PAGER;