xserver: Branch 'master'

[Keith Packard]

 damageext/damageext.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 7d3d4ae55dd6ee338439e2424ac423b1df80501b
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Sep 20 14:43:41 2013 -0500

    damage: Must translate initial window damage by window offset
    
    Damage is reported relative to the drawable origin, but the window
    borderClip is absolute. Translate the region by the window position
    before reporting damage to adjust.
    
    Reported-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/damageext/damageext.c b/damageext/damageext.c
index a942ffa..cf6b63b 100644
--- a/damageext/damageext.c
+++ b/damageext/damageext.c
@@ -223,7 +223,9 @@ ProcDamageCreate(ClientPtr client)
 
     if (pDrawable->type == DRAWABLE_WINDOW) {
         pRegion = &((WindowPtr) pDrawable)->borderClip;
+        RegionTranslate(pRegion, -pDrawable->x, -pDrawable->y);
         DamageReportDamage(pDamageExt->pDamage, pRegion);
+        RegionTranslate(pRegion, pDrawable->x, pDrawable->y);
     }
 
     return Success;