From 6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 5 Nov 2017 21:25:49 +0100 Subject: Lift mi to xorg-xserver-7.1/1.1.0 state I left out glx changes to miinitext.c for now. --- nx-X11/programs/Xserver/mi/mivaltree.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'nx-X11/programs/Xserver/mi/mivaltree.c') diff --git a/nx-X11/programs/Xserver/mi/mivaltree.c b/nx-X11/programs/Xserver/mi/mivaltree.c index 0435925ed..21534cee0 100644 --- a/nx-X11/programs/Xserver/mi/mivaltree.c +++ b/nx-X11/programs/Xserver/mi/mivaltree.c @@ -237,6 +237,18 @@ miComputeClips ( dy = 32767; borderSize.y2 = dy; +#ifdef COMPOSITE + /* + * In redirected drawing case, reset universe to borderSize + */ + if (pParent->redirectDraw) + { + if (miSetRedirectBorderClipProc) + (*miSetRedirectBorderClipProc) (pParent, universe); + RegionCopy(universe, &pParent->borderSize); + } +#endif + oldVis = pParent->visibility; switch (RegionContainsRect(universe, &borderSize)) { @@ -276,18 +288,6 @@ miComputeClips ( ((pParent->eventMask | wOtherEventMasks(pParent)) & VisibilityChangeMask)) SendVisibilityNotify(pParent); -#ifdef COMPOSITE - /* - * In redirected drawing case, reset universe to borderSize - */ - if (pParent->redirectDraw) - { - if (miSetRedirectBorderClipProc) - (*miSetRedirectBorderClipProc) (pParent, universe); - RegionCopy(universe, &pParent->borderSize); - } -#endif - dx = pParent->drawable.x - pParent->valdata->before.oldAbsCorner.x; dy = pParent->drawable.y - pParent->valdata->before.oldAbsCorner.y; -- cgit v1.2.3