[cairo-commit] 2 commits - src/cairo-xlib-surface-shm.c

[Chris Wilson]

 src/cairo-xlib-surface-shm.c |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 10ef077324bb4c23630dcdab5f281f6fca00b78e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Aug 18 09:16:49 2012 +0100

    xlib/shm: Mark the ShmPixmap as active following an upload flush
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-xlib-surface-shm.c b/src/cairo-xlib-surface-shm.c
index 496bfc9..7b27f25 100644
--- a/src/cairo-xlib-surface-shm.c
+++ b/src/cairo-xlib-surface-shm.c
@@ -943,6 +943,9 @@ _cairo_xlib_surface_put_shm (cairo_xlib_surface_t *surface)
 	}
 	_cairo_damage_destroy (damage);
 
+	shm->active = NextRequest (display->display);
+	trigger_event (display->display);
+
 	_cairo_xlib_surface_put_gc (display, surface, gc);
 out:
 	cairo_device_release (&display->base);
commit 99a0d38a33a3dd311a4cf4481b7286db4e8ec775
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Aug 18 09:10:07 2012 +0100

    xlib/shm: Fix runtime checking of has-shm-pixmaps for !shm case
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-xlib-surface-shm.c b/src/cairo-xlib-surface-shm.c
index 2d20127..496bfc9 100644
--- a/src/cairo-xlib-surface-shm.c
+++ b/src/cairo-xlib-surface-shm.c
@@ -621,6 +621,9 @@ static int
 has_shm_pixmaps (cairo_xlib_surface_t *surface)
 {
     cairo_xlib_display_t *display = (cairo_xlib_display_t *)surface->base.device;
+    if (!display->shm)
+	return 0;
+
     return display->shm->has_pixmaps;
 }