X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver.c;h=db50445133a71426af8039df174c7121ba0bc747;hb=880f96997be8b3be10d609ed829abec96e5391b3;hp=99c4e5118b65e3c4f9002d97d9af460823f54d9b;hpb=9f561215b52f7e275bbe50faa68cfc9fbc935994;p=chaz%2Ftint2

diff --git a/src/server.c b/src/server.c
index 99c4e51..db50445 100644
--- 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;
 }
 
 
@@ -109,7 +104,8 @@ void cleanup_server()
 	if (server.monitor) {
 		int i;
 		for (i=0; i<server.nb_monitor; ++i)
-			g_strfreev(server.monitor[i].names);
+			if (server.monitor[i].names)
+				g_strfreev(server.monitor[i].names);
 		free(server.monitor);
 	}
 	if (server.gc) XFreeGC(server.dsp, server.gc);
@@ -252,21 +248,12 @@ int compareMonitorIncluded(const void *monitor1, const void *monitor2)
 
 void get_monitors()
 {
-	if (server.monitor) {
-		int i;
-		for (i=0; i<server.nb_monitor; ++i)
-			g_strfreev(server.monitor[i].names);
-		free(server.monitor);
-	}
-	server.nb_monitor = 0;
-	server.monitor = 0;
-
 	int i, j, nbmonitor;
 	if (XineramaIsActive(server.dsp)) {
 		XineramaScreenInfo *info = XineramaQueryScreens(server.dsp, &nbmonitor);
 		XRRScreenResources *res = XRRGetScreenResourcesCurrent(server.dsp, server.root_win);
 
-		if (res->ncrtc >= nbmonitor) {
+		if (res && res->ncrtc >= nbmonitor) {
 			// use xrandr to identify monitors (does not work with proprietery nvidia drivers)
 			printf("xRandr: Found crtc's: %d\n", res->ncrtc );
 			server.monitor = malloc(res->ncrtc * sizeof(Monitor));
@@ -314,12 +301,14 @@ void get_monitors()
 		}
 next:
 		for (j=i; j<server.nb_monitor; ++j)
-			g_strfreev(server.monitor[j].names);
+			if (server.monitor[j].names)
+				g_strfreev(server.monitor[j].names);
 		server.nb_monitor = i;
 		server.monitor = realloc(server.monitor, server.nb_monitor * sizeof(Monitor));
 		qsort(server.monitor, server.nb_monitor, sizeof(Monitor), compareMonitorPos);
 
-		XRRFreeScreenResources(res);
+		if (res)
+			XRRFreeScreenResources(res);
 		XFree(info);
 	}
 
@@ -329,6 +318,7 @@ next:
 		server.monitor[0].x = server.monitor[0].y = 0;
 		server.monitor[0].width = DisplayWidth (server.dsp, server.screen);
 		server.monitor[0].height = DisplayHeight (server.dsp, server.screen);
+		server.monitor[0].names = 0;
 	}
 }
 
@@ -385,19 +375,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);