moved initial values in function default_xxx

[chaz/tint2] / src / panel.c

diff --git a/src/panel.c b/src/panel.c
index b271b23601c625277bee5db9328de63ba8ecae54..66fc90e6711676642b778f983d97ffd69c9748ab 100644 (file)
--- a/src/panel.c
+++ b/src/panel.c
@@ -27,6 +27,7 @@
 #include <pango/pangocairo.h>
 
 #include "server.h"
+#include "config.h"
 #include "window.h"
 #include "task.h"
 #include "panel.h"
@@ -190,8 +191,8 @@ void init_panel()
                //printf("panel %d : %d, %d, %d, %d\n", i, p->posx, p->posy, p->area.width, p->area.height);
                set_panel_properties(p);
                set_panel_background(p);
-               if (i >= old_nb_panel) {
-                       // map new panel
+               if (i >= old_nb_panel && snapshot_path == 0) {
+                       // if we are not in 'snapshot' mode then map new panel
                        XMapWindow (server.dsp, p->main_win);
                }
 
@@ -287,6 +288,7 @@ void cleanup_panel()
 {
        if (!panel1) return;
 
+printf("*** cleanup_panel()\n");
        task_active = 0;
        task_drag = 0;
 
@@ -433,6 +435,12 @@ void visible_object()
 
 void update_strut(Panel* p)
 {
+       if (panel_strut_policy == STRUT_NONE) {
+               XDeleteProperty(server.dsp, p->main_win, server.atom._NET_WM_STRUT);
+               XDeleteProperty(server.dsp, p->main_win, server.atom._NET_WM_STRUT_PARTIAL);
+               return;
+       }
+
        // Reserved space
        unsigned int d1, screen_width, screen_height;
        Window d2;
@@ -561,7 +569,7 @@ void set_panel_background(Panel *p)
        else if (!panel_horizontal && panel_position & RIGHT)
                xoff = p->area.width-p->hidden_width;
 
-       if (real_transparency) {
+       if (server.real_transparency) {
                clear_pixmap(p->area.pix, 0, 0, p->area.width, p->area.height);
        }
        else {