Synchronize after subtracting damage from windows

[geometrycompositor.git] / source / main.c

diff --git a/source/main.c b/source/main.c
index 64f5ed98c26288237e9e9b956579fcfaf65613de..185c6b4b7bd609e35cfaaa8f28cd7e77fda2e87b 100644 (file)
--- a/source/main.c
+++ b/source/main.c
@@ -25,9 +25,11 @@ typedef struct CompositedWindow
        Damage damage;
        Pixmap pixmap;
        GLXPixmap glx_pixmap;
+       int recreate_pixmap;
        unsigned texture;
        unsigned mask_texture;
        int use_mask;
+       int recreate_mask;
 } CompositedWindow;
 
 typedef struct CompositedMonitor
@@ -269,13 +271,11 @@ unsigned create_2d_texture()
        return texture;
 }
 
-int create_gl_resources(Compositor *compositor, CompositedScreen *screen)
+int create_gl_resources(CompositedScreen *screen)
 {
        unsigned stride;
        int loc;
 
-       use_gl(compositor, screen);
-
        screen->shaders[0] = compile_shader(GL_VERTEX_SHADER, vshader_src);
        screen->shaders[1] = compile_shader(GL_FRAGMENT_SHADER, fshader_src);
        screen->shaders[2] = compile_shader(GL_FRAGMENT_SHADER, masked_fshader_src);
@@ -377,6 +377,7 @@ void create_window_pixmap(Compositor *compositor, CompositedScreen *screen, Comp
 
        window->pixmap = XCompositeNameWindowPixmap(compositor->display, window->window);
        window->glx_pixmap = glXCreatePixmap(compositor->display, screen->fbconfig, window->pixmap, attribs);
+       window->recreate_pixmap = 0;
 }
 
 void update_window_mask(Compositor *compositor, CompositedWindow *window)
@@ -446,6 +447,8 @@ void update_window_mask(Compositor *compositor, CompositedWindow *window)
        glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width, height, 0, GL_RED, GL_UNSIGNED_BYTE, data);
 
        free(data);
+
+       window->recreate_mask = 0;
 }
 
 CompositedWindow *add_window(Compositor *compositor, CompositedScreen *screen, Window w)
@@ -488,14 +491,11 @@ CompositedWindow *add_window(Compositor *compositor, CompositedScreen *screen, W
        window->glx_pixmap = None;
 
        XCompositeRedirectWindow(compositor->display, window->window, CompositeRedirectManual);
-       if(window->map_state==IsViewable)
-               create_window_pixmap(compositor, screen, window);
+       window->recreate_pixmap = (window->map_state==IsViewable);
 
        window->texture = create_2d_texture();
        window->mask_texture = create_2d_texture();
-
-       if(window->map_state==IsViewable)
-               update_window_mask(compositor, window);
+       window->recreate_mask = (window->map_state==IsViewable);
 
        XShapeSelectInput(compositor->display, window->window, ShapeNotifyMask);
 
@@ -828,7 +828,9 @@ int initialize_screen(Compositor *compositor, unsigned number)
        if(!initialize_gl(compositor, screen))
                return 0;
 
-       if(!create_gl_resources(compositor, screen))
+       use_gl(compositor, screen);
+
+       if(!create_gl_resources(screen))
                return 0;
 
        xrr_res = XRRGetScreenResources(compositor->display, screen->root);
@@ -1005,7 +1007,10 @@ void process_destroy_window_event(Compositor *compositor, XDestroyWindowEvent *e
 
        if((screen = find_screen_by_root(compositor, event->event)))
                if((window = find_window(screen, event->window)))
+               {
+                       use_gl(compositor, screen);
                        remove_window(compositor, screen, window, 1);
+               }
 }
 
 void process_map_event(Compositor *compositor, XMapEvent *event)
@@ -1022,8 +1027,8 @@ void process_map_event(Compositor *compositor, XMapEvent *event)
                return;
 
        window->map_state = IsViewable;
-       create_window_pixmap(compositor, screen, window);
-       update_window_mask(compositor, window);
+       window->recreate_pixmap = 1;
+       window->recreate_mask = 1;
 
        mark_dirty(compositor, screen);
 }
@@ -1088,8 +1093,7 @@ void process_configure_event(Compositor *compositor, XConfigureEvent *event)
                window->width = event->width;
                window->height = event->height;
                window->border = event->border_width;
-               create_window_pixmap(compositor, screen, window);
-               update_window_mask(compositor, window);
+               window->recreate_pixmap = 1;
        }
        reorder_window(screen, window, event->above);
 
@@ -1132,7 +1136,7 @@ void process_shape_event(Compositor *compositor, XShapeEvent *event)
        window = find_window_global(compositor, event->window, &screen);
        if(window && window->map_state==IsViewable)
        {
-               update_window_mask(compositor, window);
+               window->recreate_mask = 1;
                mark_dirty(compositor, screen);
        }
 }
@@ -1191,6 +1195,11 @@ void refresh_screen(Compositor *compositor, CompositedScreen *screen)
        unsigned i;
        int use_mask;
 
+       for(i=0; i<screen->nwindows; ++i)
+               if(screen->windows[i].map_state==IsViewable)
+                       XDamageSubtract(compositor->display, screen->windows[i].damage, None, None);
+       glXWaitX();
+
        use_gl(compositor, screen);
 
        glBindFramebuffer(GL_DRAW_FRAMEBUFFER, screen->framebuffer);
@@ -1221,7 +1230,10 @@ void refresh_screen(Compositor *compositor, CompositedScreen *screen)
                        glActiveTexture(GL_TEXTURE0);
                }
 
-               XDamageSubtract(compositor->display, window->damage, None, None);
+               if(window->recreate_pixmap)
+                       create_window_pixmap(compositor, screen, window);
+               if(window->recreate_mask)
+                       update_window_mask(compositor, window);
 
                glBindTexture(GL_TEXTURE_2D, window->texture);
                compositor->glXBindTexImageEXT(compositor->display, window->glx_pixmap, GLX_FRONT_LEFT_EXT, NULL);