X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmain.c;h=36e8d28a63f11b5f14ce7da8578c7cb78247a521;hb=e2b40ef8ad9a553ef7ca3e17684d23b20a884a36;hp=a1bfe6a3dc5373e16f15c1a09e121df006ebdad7;hpb=d5ba32711fdc4c589bf5755efac7d10218bf5217;p=geometrycompositor.git

diff --git a/source/main.c b/source/main.c
index a1bfe6a..36e8d28 100644
--- a/source/main.c
+++ b/source/main.c
@@ -506,6 +506,7 @@ CompositedWindow *add_window(Compositor *compositor, CompositedScreen *screen, W
 
 	window->texture = create_2d_texture();
 	window->mask_texture = create_2d_texture();
+	window->use_mask = 0;
 	window->recreate_mask = (window->map_state==IsViewable);
 
 	XShapeSelectInput(compositor->display, window->window, ShapeNotifyMask);
@@ -879,6 +880,9 @@ int initialize_screen(Compositor *compositor, unsigned number)
 			return 0;
 	XRRFreeScreenResources(xrr_res);
 
+	screen->root_pixmap = 0;
+	screen->root_glx_pixmap = 0;
+
 	update_geometry_correction(compositor, screen);
 	update_root_pixmap(compositor, screen);
 
@@ -1242,6 +1246,7 @@ void refresh_screen(Compositor *compositor, CompositedScreen *screen)
 
 	use_gl(compositor, screen);
 
+	glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 	glBindFramebuffer(GL_DRAW_FRAMEBUFFER, screen->framebuffer);
 
 	use_mask = -1;
@@ -1258,10 +1263,7 @@ void refresh_screen(Compositor *compositor, CompositedScreen *screen)
 		compositor->glXReleaseTexImageEXT(compositor->display, screen->root_glx_pixmap, GLX_FRONT_LEFT_EXT);
 	}
 	else
-	{
-		glClearColor(0.5f, 0.5f, 0.5f, 0.0f);
 		glClear(GL_COLOR_BUFFER_BIT);
-	}
 
 	for(i=0; i<screen->nwindows; ++i)
 	{
@@ -1299,7 +1301,6 @@ void refresh_screen(Compositor *compositor, CompositedScreen *screen)
 	}
 
 	glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
-	glClearColor(0.5f, 0.0f, 0.5f, 0.0f);
 	glClear(GL_COLOR_BUFFER_BIT);
 	glBindTexture(GL_TEXTURE_2D, screen->fb_texture);
 	glEnable(GL_PRIMITIVE_RESTART);