[mutter/wip/wayland-display: 61/62] meta-wayland: intersect the damage region with the window size before applying

[Giovanni Campagna <gcampagna src gnome org>]

commit 8db697effdc42edfde201f50e13d157476264a2d
Author: Giovanni Campagna <gcampagn redhat com>
Date:   Mon Jul 29 14:09:26 2013 +0200

    meta-wayland: intersect the damage region with the window size before applying
    
    According to the wayland documentation, damage outside the
    window size is ignored.
    This happened with xwayland+wlshm (causing a GL error when calling
    TexSubImage2D), probably due to not resizing the buffer
    until we receive the corresponding X event.
    Might also be an off-by-one in xwayland, as the window size did
    not actually change.
    
    Note: we might want to take the configure_notify path instead,
    and keep the GL/clutter size consistent with wayland rather than
    X, because in the end that's what matters for events and composition.

 src/wayland/meta-wayland.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index cb23796..cf79df1 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -214,6 +214,16 @@ surface_process_damage (MetaWaylandSurface *surface,
     {
       MetaWindowActor *window_actor =
         META_WINDOW_ACTOR (meta_window_get_compositor_private (surface->window));
+      MetaRectangle rect;
+      cairo_rectangle_int_t cairo_rect;
+
+      meta_window_get_input_rect (surface->window, &rect);
+      cairo_rect.x = rect.x;
+      cairo_rect.y = rect.y;
+      cairo_rect.width = rect.width;
+      cairo_rect.height = rect.height;
+
+      cairo_region_intersect_rectangle (region, &cairo_rect);
 
       if (window_actor)
         {