diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-05-31 12:09:23 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-05-31 12:09:23 +0200 |
commit | 4a9c1b9465f189a1477b1ecce7cdfacfd266cd65 (patch) | |
tree | 4688606f66a7e3a79944bd23299dddda06c2a219 /nx-X11/programs/Xserver/dix/window.c | |
parent | aba2a534f630f5b65a53e0ea7cdba17b77263f87 (diff) | |
parent | cad9f4ef87ddf4e2865783ce7ea7e772d7b196b7 (diff) | |
download | nx-libs-4a9c1b9465f189a1477b1ecce7cdfacfd266cd65.tar.gz nx-libs-4a9c1b9465f189a1477b1ecce7cdfacfd266cd65.tar.bz2 nx-libs-4a9c1b9465f189a1477b1ecce7cdfacfd266cd65.zip |
Merge branch 'Ionic-feature/composite-update' into 3.6.x
Diffstat (limited to 'nx-X11/programs/Xserver/dix/window.c')
-rw-r--r-- | nx-X11/programs/Xserver/dix/window.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/dix/window.c b/nx-X11/programs/Xserver/dix/window.c index 916d7e276..c3d901fb9 100644 --- a/nx-X11/programs/Xserver/dix/window.c +++ b/nx-X11/programs/Xserver/dix/window.c @@ -535,9 +535,21 @@ ClippedRegionFromBox(register WindowPtr pWin, RegionPtr Rgn, RegionIntersect(Rgn, Rgn, &pWin->winSize); } +static RealChildHeadProc realChildHeadProc = NULL; + +void +RegisterRealChildHeadProc (RealChildHeadProc proc) +{ + realChildHeadProc = proc; +} + WindowPtr RealChildHead(register WindowPtr pWin) { + if (realChildHeadProc) { + return realChildHeadProc (pWin); + } + if (!pWin->parent && (screenIsSaved == SCREEN_SAVER_ON) && (HasSaverWindow (pWin->drawable.pScreen->myNum))) |