diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2021-02-09 19:40:47 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-08 08:23:35 +0200 |
| commit | 3fcb7ae3f1bef5eab1b9a284dac24bc5db2aeaca (patch) | |
| tree | 9a5b88b068e2f84ef9218d23c10b529a9f93668f /nx-X11/programs/Xserver/hw/nxagent/Window.c | |
| parent | 666c4d16aea1f35a50595ef81ab8bb94b23b1097 (diff) | |
| download | nx-libs-3fcb7ae3f1bef5eab1b9a284dac24bc5db2aeaca.tar.gz nx-libs-3fcb7ae3f1bef5eab1b9a284dac24bc5db2aeaca.tar.bz2 nx-libs-3fcb7ae3f1bef5eab1b9a284dac24bc5db2aeaca.zip | |
nxagent: drop NXAGENT_SHAPE2 define
it was the default for years now, so let's drop the define and include the
code unconditonally.
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Window.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Window.c | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c index 0e26a322c..6f98ee57b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -471,13 +471,8 @@ Bool nxagentCreateWindow(WindowPtr pWin) } #ifdef SHAPE - #ifdef NXAGENT_SHAPE2 - nxagentWindowPriv(pWin)->boundingShape = NULL; - nxagentWindowPriv(pWin)->clipShape = NULL; - #else - nxagentWindowPriv(pWin)->boundingShape = RegionCreate(NULL, 1); - nxagentWindowPriv(pWin)->clipShape = RegionCreate(NULL, 1); - #endif + nxagentWindowPriv(pWin)->boundingShape = NULL; + nxagentWindowPriv(pWin)->clipShape = NULL; #endif /* SHAPE */ fbCreateWindow(pWin); @@ -583,21 +578,16 @@ Bool nxagentDestroyWindow(WindowPtr pWin) pWindowPriv->siblingAbove; } - #ifdef NXAGENT_SHAPE2 - #ifdef SHAPE - if (pWindowPriv->boundingShape) - { - RegionDestroy(pWindowPriv->boundingShape); - } - - if (pWindowPriv->clipShape) - { - RegionDestroy(pWindowPriv->clipShape); - } - #endif - #else + #ifdef SHAPE + if (pWindowPriv->boundingShape) + { RegionDestroy(pWindowPriv->boundingShape); + } + + if (pWindowPriv->clipShape) + { RegionDestroy(pWindowPriv->clipShape); + } #endif if (pWindowPriv -> corruptedRegion) @@ -2352,12 +2342,10 @@ void nxagentShapeWindow(WindowPtr pWin) RegionNumRects(wBoundingShape(pWin))); #endif - #ifdef NXAGENT_SHAPE2 if (!nxagentWindowPriv(pWin)->boundingShape) { nxagentWindowPriv(pWin)->boundingShape = RegionCreate(NULL, 1); } - #endif RegionCopy(nxagentWindowPriv(pWin)->boundingShape, wBoundingShape(pWin)); @@ -2407,12 +2395,10 @@ void nxagentShapeWindow(WindowPtr pWin) RegionNumRects(wClipShape(pWin))); #endif - #ifdef NXAGENT_SHAPE2 if (!nxagentWindowPriv(pWin)->clipShape) { nxagentWindowPriv(pWin)->clipShape = RegionCreate(NULL, 1); } - #endif RegionCopy(nxagentWindowPriv(pWin)->clipShape, wClipShape(pWin)); |