summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@nokia.com>2010-12-20 16:30:52 +0200
committerVille Syrjälä <ville.syrjala@nokia.com>2011-05-04 19:01:01 +0300
commita6ae91746212203a19450ac955fbb7abffff1ed3 (patch)
treefc352868f4c42802588e5ec022e63233e8142e80
parentce9eff9e4c30deb16f059ed84b436d37da45d5d5 (diff)
composite: Initialize borderClip with current values
ValidateTree needs a valid borderClip so initialize the parent constrained border clip with the window's current borderClip in compRedirectWindow. Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
-rw-r--r--composite/compalloc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/composite/compalloc.c b/composite/compalloc.c
index 2b6864519..6d10b2ea0 100644
--- a/composite/compalloc.c
+++ b/composite/compalloc.c
@@ -170,9 +170,11 @@ compRedirectWindow (ClientPtr pClient, WindowPtr pWin, int update)
EnableMapUnmapEvents (pWin);
}
+ /* Make sure our borderClip is correct for ValidateTree */
RegionNull(&cw->borderClip);
- cw->borderClipX = 0;
- cw->borderClipY = 0;
+ RegionCopy(&cw->borderClip, &pWin->borderClip);
+ cw->borderClipX = pWin->drawable.x;
+ cw->borderClipY = pWin->drawable.y;
cw->update = CompositeRedirectAutomatic;
cw->clients = 0;
cw->oldx = COMP_ORIGIN_INVALID;