moved initial values in function default_xxx

[chaz/tint2] / src / server.c

diff --git a/src/server.c b/src/server.c
index 99c4e5118b65e3c4f9002d97d9af460823f54d9b..20e8095df15a90a3f875f9c3b47e47a9bc83304f 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -27,13 +27,12 @@
 #include <unistd.h>
 
 #include "server.h"
+#include "config.h"
 #include "task.h"
 #include "window.h"
 
 void server_catch_error (Display *d, XErrorEvent *ev){}
 
-int real_transparency = 0;
-
 void server_init_atoms ()
 {
        server.atom._XROOTPMAP_ID = XInternAtom (server.dsp, "_XROOTPMAP_ID", False);
@@ -95,10 +94,6 @@ void server_init_atoms ()
        server.atom.XdndAware = XInternAtom(server.dsp, "XdndAware", False);
        server.atom.XdndPosition = XInternAtom(server.dsp, "XdndPosition", False);
        server.atom.XdndStatus = XInternAtom(server.dsp, "XdndStatus", False);
-
-       server.colormap = 0;
-       server.monitor = 0;
-       server.gc = 0;
 }
 
 
@@ -385,19 +380,20 @@ void server_init_visual()
                server.colormap32 = XCreateColormap(server.dsp, server.root_win, visual, AllocNone);
        }
 
-       if (visual && server.composite_manager != None) {
+       if (visual && server.composite_manager != None && snapshot_path == 0) {
                XSetWindowAttributes attrs;
                attrs.event_mask = StructureNotifyMask;
                XChangeWindowAttributes (server.dsp, server.composite_manager, CWEventMask, &attrs);
 
-               real_transparency = 1;
+               server.real_transparency = 1;
                server.depth = 32;
                printf("real transparency on... depth: %d\n", server.depth);
                server.colormap = XCreateColormap(server.dsp, server.root_win, visual, AllocNone);
                server.visual = visual;
        }
        else {
-               real_transparency = 0;
+               // no composite manager or snapshot mode => fake transparency
+               server.real_transparency = 0;
                server.depth = DefaultDepth(server.dsp, server.screen);
                printf("real transparency off.... depth: %d\n", server.depth);
                server.colormap = DefaultColormap(server.dsp, server.screen);