aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-05-30 00:10:43 +0200
committerUlrich Sibiller <uli42@gmx.de>2019-06-12 18:45:02 +0200
commit9f5ddede95086c6f31efe89ed228ac035a89a8e5 (patch)
tree8b51e5b2ba36d9dfdf7e28c291f403ae918d4806
parenta3e0376f95cb57aeda12438313cba67b1690d685 (diff)
downloadnx-libs-9f5ddede95086c6f31efe89ed228ac035a89a8e5.tar.gz
nx-libs-9f5ddede95086c6f31efe89ed228ac035a89a8e5.tar.bz2
nx-libs-9f5ddede95086c6f31efe89ed228ac035a89a8e5.zip
Window.c: Drop defines CWParent and CWStackingOrder
They were just aliases to already existing defines and were not used stringently. So we had mix of aliased and non-aliased uses which is confusing when trying to understand the code...
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Window.c28
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Windows.h3
2 files changed, 14 insertions, 17 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index 7d98d25fe..f602d0ed3 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -727,7 +727,7 @@ Bool nxagentPositionWindow(WindowPtr pWin, int x, int y)
(void *) pWin, nxagentWindow(pWin), x, y);
#endif
- nxagentAddConfiguredWindow(pWin, CWParent | CWX | CWY | CWWidth |
+ nxagentAddConfiguredWindow(pWin, CWSibling | CWX | CWY | CWWidth |
CWHeight | CWBorderWidth);
return True;
@@ -1284,7 +1284,7 @@ void nxagentConfigureWindow(WindowPtr pWin, unsigned int mask)
{
if (mask & CW_RootlessRestack)
{
- mask = CWStackingOrder;
+ mask = CWStackMode;
}
}
@@ -1299,7 +1299,7 @@ void nxagentConfigureWindow(WindowPtr pWin, unsigned int mask)
if (mask & CW_Update)
{
- mask |= CWX | CWY | CWWidth | CWHeight | CWBorderWidth | CWStackingOrder;
+ mask |= CWX | CWY | CWWidth | CWHeight | CWBorderWidth | CWStackMode;
}
if (mask & CWX)
@@ -1378,7 +1378,7 @@ void nxagentConfigureWindow(WindowPtr pWin, unsigned int mask)
MAKE_SYNC_CONFIGURE_WINDOW;
}
- if (mask & CWStackingOrder &&
+ if (mask & CWStackMode &&
nxagentWindowPriv(pWin)->siblingAbove != nxagentWindowSiblingAbove(pWin))
{
WindowPtr pSib;
@@ -1478,7 +1478,7 @@ void nxagentConfigureWindow(WindowPtr pWin, unsigned int mask)
* really needed?
*
*
- * else if (mask & CWStackingOrder)
+ * else if (mask & CWStackMode)
* {
* if (nxagentSplashWindow)
* {
@@ -1920,12 +1920,12 @@ Bool nxagentRealizeWindow(WindowPtr pWin)
/*
* Not needed.
*
- * nxagentConfigureWindow(pWin, CWStackingOrder);
+ * nxagentConfigureWindow(pWin, CWStackMode);
*
* nxagentFlushConfigureWindow();
*/
- nxagentAddConfiguredWindow(pWin, CWStackingOrder);
+ nxagentAddConfiguredWindow(pWin, CWStackMode);
nxagentAddConfiguredWindow(pWin, CW_Shape);
/* add by dimbor */
@@ -2116,10 +2116,10 @@ void nxagentCopyWindow(WindowPtr pWin, xPoint oldOrigin, RegionPtr oldRegion)
void nxagentClipNotify(WindowPtr pWin, int dx, int dy)
{
/*
- * nxagentConfigureWindow(pWin, CWStackingOrder);
+ * nxagentConfigureWindow(pWin, CWStackMode);
*/
- nxagentAddConfiguredWindow(pWin, CWStackingOrder);
+ nxagentAddConfiguredWindow(pWin, CWStackMode);
nxagentAddConfiguredWindow(pWin, CW_Shape);
#ifndef NXAGENT_SHAPE
@@ -3572,10 +3572,10 @@ void nxagentAddConfiguredWindow(WindowPtr pWin, unsigned int valuemask)
{
unsigned int mask;
- mask = valuemask & (CWParent | CWX | CWY | CWWidth | CWHeight |
- CWBorderWidth | CWStackingOrder | CW_Map | CW_Update | CW_Shape);
+ mask = valuemask & (CWSibling | CWX | CWY | CWWidth | CWHeight |
+ CWBorderWidth | CWStackMode | CW_Map | CW_Update | CW_Shape);
- valuemask &= ~(CWParent | CWX | CWY | CWWidth | CWHeight | CWBorderWidth | CWStackingOrder);
+ valuemask &= ~(CWSibling | CWX | CWY | CWWidth | CWHeight | CWBorderWidth | CWStackMode);
if (mask & CWX &&
nxagentWindowPriv(pWin)->x !=
@@ -3612,11 +3612,11 @@ void nxagentAddConfiguredWindow(WindowPtr pWin, unsigned int valuemask)
valuemask |= CWBorderWidth;
}
- if (mask & CWStackingOrder &&
+ if (mask & CWStackMode &&
nxagentWindowPriv(pWin)->siblingAbove !=
nxagentWindowSiblingAbove(pWin))
{
- valuemask |= CWStackingOrder;
+ valuemask |= CWStackMode;
}
{
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Windows.h b/nx-X11/programs/Xserver/hw/nxagent/Windows.h
index 8612cdf82..35d686a33 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Windows.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Windows.h
@@ -159,9 +159,6 @@ extern int nxagentWindowPrivateIndex;
#define nxagentDefaultWindowIsVisible() \
(nxagentVisibility != VisibilityFullyObscured)
-#define CWParent CWSibling
-#define CWStackingOrder CWStackMode
-
#define CW_Map (1 << 15)
#define CW_Update (1 << 16)
#define CW_Shape (1 << 17)