aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2021-02-09 19:40:47 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-06-08 08:23:35 +0200
commit3fcb7ae3f1bef5eab1b9a284dac24bc5db2aeaca (patch)
tree9a5b88b068e2f84ef9218d23c10b529a9f93668f /nx-X11/programs/Xserver
parent666c4d16aea1f35a50595ef81ab8bb94b23b1097 (diff)
downloadnx-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')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Imakefile2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Window.c34
2 files changed, 10 insertions, 26 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
index f62ff9185..4e48f62f5 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile
+++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
@@ -192,7 +192,6 @@ INCLUDES = \
### list of existing NXAGENT macros:
#
-# NXAGENT_SHAPE2 New shape code
# NXAGENT_FIXKEYS Force the release of pressed key when losing focus
# NXAGENT_CLIPBOARD Enables clipboard cut and paste function between X servers.
# NXAGENT_RANDR_MODE_PREFIX Prefix for RandR display modes (i.e., nx_<x>x<y>) (default: nx_)
@@ -245,7 +244,6 @@ DEFINES = \
-UXF86VIDMODE -UXFreeXDGA -UXF86MISC -UXF86DRI \
-DNXAGENT_SERVER \
-DNXAGENT_RENDER_CLEANUP \
- -DNXAGENT_SHAPE2 \
-DNXAGENT_FIXKEYS \
-DNXAGENT_CLIPBOARD \
-DNXAGENT_WAKEUP=1000 \
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));