Clear damage before rendering the window

[geometrycompositor.git] / source / main.c

diff --git a/source/main.c b/source/main.c
index 08be9dda8e8f8224f384939342fa07db2cc48ec5..074477bd35dca4e556b0c2cc113ddaf759d2127a 100644 (file)
--- a/source/main.c
+++ b/source/main.c
@@ -1069,14 +1069,15 @@ void refresh_screen(Compositor *compositor, CompositedScreen *screen)
                if(window->map_state!=IsViewable)
                        continue;
 
+               XDamageSubtract(compositor->display, window->damage, None, None);
+
                glBindTexture(GL_TEXTURE_2D, window->texture);
                compositor->glXBindTexImageEXT(compositor->display, window->glx_pixmap, GLX_FRONT_LEFT_EXT, NULL);
                glUniform4f(screen->geometry_loc,
-                       (float)window->x/screen->width, ((float)screen->height-window->y-window->height)/screen->height,
+                       (float)window->x/screen->width, 1.0f-(float)(window->y+window->height)/screen->height,
                        (float)(window->width+2*window->border)/screen->width, (float)(window->height+2*window->border)/screen->height);
                glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
                compositor->glXReleaseTexImageEXT(compositor->display, window->glx_pixmap, GLX_FRONT_LEFT_EXT);
-               XDamageSubtract(compositor->display, window->damage, None, None);
        }
 
        glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
@@ -1093,7 +1094,7 @@ void refresh_screen(Compositor *compositor, CompositedScreen *screen)
                        continue;
 
                glUniform4f(screen->geometry_loc,
-                       (float)monitor->x/screen->width, ((float)screen->height-monitor->y-monitor->height)/screen->height,
+                       (float)monitor->x/screen->width, 1.0f-(float)(monitor->y+monitor->height)/screen->height,
                        (float)monitor->width/screen->width, (float)monitor->height/screen->height);
 
                glBindVertexArray(monitor->vertex_array);