diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
| commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
| tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/hw/xnest/Window.c | |
| parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
| parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
| download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/xnest/Window.c')
| -rw-r--r-- | xorg-server/hw/xnest/Window.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/xorg-server/hw/xnest/Window.c b/xorg-server/hw/xnest/Window.c index bc9d8bed2..ae3487f4a 100644 --- a/xorg-server/hw/xnest/Window.c +++ b/xorg-server/hw/xnest/Window.c @@ -39,7 +39,8 @@ is" without express or implied warranty. #include "Events.h" #include "Args.h" -DevPrivateKey xnestWindowPrivateKey = &xnestWindowPrivateKey; +static int xnestWindowPrivateKeyIndex; +DevPrivateKey xnestWindowPrivateKey = &xnestWindowPrivateKeyIndex; static int xnestFindWindowMatch(WindowPtr pWin, pointer ptr) @@ -131,12 +132,10 @@ xnestCreateWindow(WindowPtr pWin) xnestWindowPriv(pWin)->sibling_above = None; if (pWin->nextSib) xnestWindowPriv(pWin->nextSib)->sibling_above = xnestWindow(pWin); -#ifdef SHAPE xnestWindowPriv(pWin)->bounding_shape = REGION_CREATE(pWin->drawable.pScreen, NULL, 1); xnestWindowPriv(pWin)->clip_shape = REGION_CREATE(pWin->drawable.pScreen, NULL, 1); -#endif /* SHAPE */ if (!pWin->parent) /* only the root window will have the right colormap */ xnestSetInstalledColormapWindows(pWin->drawable.pScreen); @@ -150,12 +149,10 @@ xnestDestroyWindow(WindowPtr pWin) if (pWin->nextSib) xnestWindowPriv(pWin->nextSib)->sibling_above = xnestWindowPriv(pWin)->sibling_above; -#ifdef SHAPE REGION_DESTROY(pWin->drawable.pScreen, xnestWindowPriv(pWin)->bounding_shape); REGION_DESTROY(pWin->drawable.pScreen, xnestWindowPriv(pWin)->clip_shape); -#endif XDestroyWindow(xnestDisplay, xnestWindow(pWin)); xnestWindowPriv(pWin)->window = None; @@ -362,9 +359,7 @@ Bool xnestRealizeWindow(WindowPtr pWin) { xnestConfigureWindow(pWin, CWStackingOrder); -#ifdef SHAPE xnestShapeWindow(pWin); -#endif /* SHAPE */ XMapWindow(xnestDisplay, xnestWindow(pWin)); return True; @@ -387,9 +382,7 @@ void xnestClipNotify(WindowPtr pWin, int dx, int dy) { xnestConfigureWindow(pWin, CWStackingOrder); -#ifdef SHAPE xnestShapeWindow(pWin); -#endif /* SHAPE */ } static Bool @@ -426,7 +419,6 @@ xnestWindowExposures(WindowPtr pWin, RegionPtr pRgn, RegionPtr other_exposed) miWindowExposures(pWin, pRgn, other_exposed); } -#ifdef SHAPE void xnestSetShape(WindowPtr pWin) { @@ -529,4 +521,3 @@ xnestShapeWindow(WindowPtr pWin) } } } -#endif /* SHAPE */ |