Initialize some variables

[geometrycompositor.git] / source / main.c

diff --git a/source/main.c b/source/main.c
index a1bfe6a3dc5373e16f15c1a09e121df006ebdad7..36e8d28a63f11b5f14ce7da8578c7cb78247a521 100644 (file)
--- 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);