From a6ae91746212203a19450ac955fbb7abffff1ed3 Mon Sep 17 00:00:00 2001 From: Ville Syrjälä Date: Mon, 20 Dec 2010 16:30:52 +0200 Subject: composite: Initialize borderClip with current values MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ä Reviewed-by: Adam Jackson Reviewed-by: Daniel Stone --- composite/compalloc.c | 6 ++++-- 1 file 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; -- cgit v1.2.3