diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2017-11-05 21:25:49 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-27 02:42:18 +0100 |
| commit | 6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060 (patch) | |
| tree | 4786ef47d0905699657939e469414ab1438ff2e8 /nx-X11/programs/Xserver/mi/mivaltree.c | |
| parent | 23dd2959ba5e87d078436b2389d084b76581d12f (diff) | |
| download | nx-libs-6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060.tar.gz nx-libs-6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060.tar.bz2 nx-libs-6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060.zip | |
Lift mi to xorg-xserver-7.1/1.1.0 state
I left out glx changes to miinitext.c for now.
Diffstat (limited to 'nx-X11/programs/Xserver/mi/mivaltree.c')
| -rw-r--r-- | nx-X11/programs/Xserver/mi/mivaltree.c | 24 |
1 files changed, 12 insertions, 12 deletions
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; |