include: windowstr.h: unexport w*() macros

These aren't used by any drivers, so no need to keep them public.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

Xext/shm.c

@@ -47,6 +47,7 @@ in this Software without prior written authorization from The Open Group.
 #include "dix/screenint_priv.h"
 #include "dix/screen_hooks_priv.h"
 #include "dix/screenint_priv.h"
+#include "dix/window_priv.h"
 #include "miext/extinit_priv.h"
 #include "os/auth.h"
 #include "os/busfault.h"

Xext/xtest.c

@@ -41,6 +41,7 @@
 #include "dix/inpututils_priv.h"
 #include "dix/request_priv.h"
 #include "dix/screensaver_priv.h"
+#include "dix/window_priv.h"
 #include "mi/mi_priv.h"
 #include "mi/mipointer_priv.h"
 #include "miext/extinit_priv.h"

Xi/chgprop.c

@@ -57,6 +57,7 @@ SOFTWARE.
 
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
+#include "dix/window_priv.h"
 #include "Xi/handlers.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */

Xi/closedev.c

@@ -57,6 +57,7 @@ SOFTWARE.
 
 #include "dix/resource_priv.h"
 #include "dix/screenint_priv.h"
+#include "dix/window_priv.h"
 #include "Xi/handlers.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */

Xi/getprop.c

@@ -58,6 +58,7 @@ SOFTWARE.
 #include "dix/dix_priv.h"
 #include "dix/request_priv.h"
 #include "dix/rpcbuf_priv.h"
+#include "dix/window_priv.h"
 #include "Xi/handlers.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */

Xi/getselev.c

@@ -59,6 +59,7 @@ SOFTWARE.
 #include "dix/resource_priv.h"
 #include "dix/request_priv.h"
 #include "dix/rpcbuf_priv.h"
+#include "dix/window_priv.h"
 #include "Xi/handlers.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */

Xi/xiselectev.c

@@ -32,6 +32,7 @@
 #include "dix/inpututils_priv.h"
 #include "dix/request_priv.h"
 #include "dix/resource_priv.h"
+#include "dix/window_priv.h"
 #include "Xi/handlers.h"
 
 #include "dixstruct.h"

composite/compwindow.c

@@ -46,6 +46,7 @@
 #include "dix/dix_priv.h"
 #include "dix/resource_priv.h"
 #include "dix/screensaver_priv.h"
+#include "dix/window_priv.h"
 #include "include/extinit.h"
 #include "os/osdep.h"
 #include "Xext/panoramiXsrv.h"

dbe/dbe.c

@@ -42,6 +42,7 @@
 #include "dix/rpcbuf_priv.h"
 #include "dix/screen_hooks_priv.h"
 #include "dix/screenint_priv.h"
+#include "dix/window_priv.h"
 #include "miext/extinit_priv.h"
 
 #include "scrnintstr.h"

dix/colormap.c

@@ -56,6 +56,7 @@ SOFTWARE.
 #include "dix/colormap_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/resource_priv.h"
+#include "dix/window_priv.h"
 #include "os/osdep.h"
 #include "os/bug_priv.h"
 

dix/enterleave.c

@@ -37,6 +37,7 @@
 #include "dix/input_priv.h"
 #include "dix/inpututils_priv.h"
 #include "dix/screenint_priv.h"
+#include "dix/window_priv.h"
 #include "include/extinit.h"
 #include "os/bug_priv.h"
 

dix/gestures.c

@@ -32,6 +32,7 @@
 #include "dix/inpututils_priv.h"
 #include "dix/resource_priv.h"
 #include "dix/screenint_priv.h"
+#include "dix/window_priv.h"
 #include "mi/mi_priv.h"
 #include "os/bug_priv.h"
 

dix/touch.c

@@ -34,6 +34,7 @@
 #include "dix/inpututils_priv.h"
 #include "dix/resource_priv.h"
 #include "dix/screenint_priv.h"
+#include "dix/window_priv.h"
 #include "mi/mi_priv.h"
 #include "os/bug_priv.h"
 #include "os/log_priv.h"

dix/window_priv.h

@@ -9,6 +9,28 @@
 
 #include "include/dix.h"
 #include "include/window.h"
+#include "include/windowstr.h"
+
+#define wTrackParent(w,field)   ((w)->optional ? \
+                                    (w)->optional->field \
+                                 : FindWindowWithOptional(w)->optional->field)
+#define wUseDefault(w,field,def)        ((w)->optional ? \
+                                    (w)->optional->field \
+                                 : def)
+
+#define wVisual(w)              wTrackParent(w, visual)
+#define wCursor(w)              ((w)->cursorIsNone ? None : wTrackParent(w, cursor))
+#define wColormap(w)            ((w)->drawable.class == InputOnly ? None : wTrackParent(w, colormap))
+#define wDontPropagateMask(w)   wUseDefault(w, dontPropagateMask, DontPropagateMasks[(w)->dontPropagate])
+#define wOtherEventMasks(w)     wUseDefault(w, otherEventMasks, 0)
+#define wOtherClients(w)        wUseDefault(w, otherClients, NULL)
+#define wOtherInputMasks(w)     wUseDefault(w, inputMasks, NULL)
+#define wPassiveGrabs(w)        wUseDefault(w, passiveGrabs, NULL)
+#define wBackingBitPlanes(w)    wUseDefault(w, backingBitPlanes, ~0L)
+#define wBackingPixel(w)        wUseDefault(w, backingPixel, 0)
+#define wBoundingShape(w)       wUseDefault(w, boundingShape, NULL)
+#define wClipShape(w)           wUseDefault(w, clipShape, NULL)
+#define wInputShape(w)          wUseDefault(w, inputShape, NULL)
 
 #define SameBackground(as, a, bs, b)				\
     ((as) == (bs) && ((as) == None ||				\

glx/glxcmds.c

@@ -40,6 +40,7 @@
 #include "dix/request_priv.h"
 #include "dix/rpcbuf_priv.h"
 #include "dix/screenint_priv.h"
+#include "dix/window_priv.h"
 #include "os/bug_priv.h"
 #include "present/present_priv.h"
 

hw/xnest/Color.c

@@ -21,6 +21,7 @@ is" without express or implied warranty.
 
 #include "dix/colormap_priv.h"
 #include "os/osdep.h"
+#include "dix/window_priv.h"
 
 #include "scrnintstr.h"
 #include "window.h"

hw/xnest/Window.c

@@ -21,6 +21,7 @@ is" without express or implied warranty.
 #include <X11/Xdefs.h>
 #include <X11/Xproto.h>
 
+#include "dix/window_priv.h"
 #include "include/regionstr.h"
 #include "mi/mi_priv.h"
 

hw/xwin/winmultiwindowshape.c

@@ -33,6 +33,7 @@
 #include <xwin-config.h>
 #endif
 
+#include "dix/window_priv.h"
 #include "mi/mi_priv.h"
 
 #include "win.h"

hw/xwin/winwindow.c

@@ -33,11 +33,11 @@
 #include <xwin-config.h>
 #endif
 
+#include "dix/window_priv.h"
 #include "mi/mi_priv.h"
 
 #include "win.h"
 
-#include "mi/mi_priv.h"
 
 /*
  * Prototypes for local functions

include/windowstr.h

@@ -156,33 +156,8 @@ typedef struct _Window {
     PropertyPtr properties;     /* default: NULL */
 } WindowRec;
 
-/*
- * Ok, a bunch of macros for accessing the optional record
- * fields (or filling the appropriate default value)
- */
-
 extern _X_EXPORT Mask DontPropagateMasks[];
 
-#define wTrackParent(w,field)	((w)->optional ? \
-				    (w)->optional->field \
- 				 : FindWindowWithOptional(w)->optional->field)
-#define wUseDefault(w,field,def)	((w)->optional ? \
-				    (w)->optional->field \
-				 : def)
-
-#define wVisual(w)		wTrackParent(w, visual)
-#define wCursor(w)		((w)->cursorIsNone ? None : wTrackParent(w, cursor))
-#define wColormap(w)		((w)->drawable.class == InputOnly ? None : wTrackParent(w, colormap))
-#define wDontPropagateMask(w)	wUseDefault(w, dontPropagateMask, DontPropagateMasks[(w)->dontPropagate])
-#define wOtherEventMasks(w)	wUseDefault(w, otherEventMasks, 0)
-#define wOtherClients(w)	wUseDefault(w, otherClients, NULL)
-#define wOtherInputMasks(w)	wUseDefault(w, inputMasks, NULL)
-#define wPassiveGrabs(w)	wUseDefault(w, passiveGrabs, NULL)
-#define wBackingBitPlanes(w)	wUseDefault(w, backingBitPlanes, ~0L)
-#define wBackingPixel(w)	wUseDefault(w, backingPixel, 0)
-#define wBoundingShape(w)	wUseDefault(w, boundingShape, NULL)
-#define wClipShape(w)		wUseDefault(w, clipShape, NULL)
-#define wInputShape(w)          wUseDefault(w, inputShape, NULL)
 #define wBorderWidth(w)		((int) (w)->borderWidth)
 
 static inline PropertyPtr wUserProps(WindowPtr pWin) { return pWin->properties; }

mi/miexpose.c

@@ -80,6 +80,7 @@ Equipment Corporation.
 
 #include "dix/dix_priv.h"
 #include "dix/screenint_priv.h"
+#include "dix/window_priv.h"
 #include "include/extinit.h"
 #include "mi/mi_priv.h"
 #include "Xext/panoramiX.h"

mi/mioverlay.c

@@ -9,6 +9,7 @@
 #include "dix/dix_priv.h"
 #include "dix/screen_hooks_priv.h"
 #include "dix/screensaver_priv.h"
+#include "dix/window_priv.h"
 #include "mi/mi_priv.h"
 
 #include "scrnintstr.h"

mi/mivaltree.c

@@ -92,7 +92,8 @@ Equipment Corporation.
 
 #include    <X11/X.h>
 
-#include    "mi/mi_priv.h"
+#include "dix/window_priv.h"
+#include "mi/mi_priv.h"
 
 #include    "scrnintstr.h"
 #include    "validate.h"

mi/miwindow.c

@@ -52,6 +52,7 @@ SOFTWARE.
 #include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/input_priv.h"
+#include "dix/window_priv.h"
 #include "include/regionstr.h"
 #include "mi/mi_priv.h"
 

miext/rootless/rootlessValTree.c

@@ -94,6 +94,7 @@ Equipment Corporation.
 #include <stddef.h>             /* For NULL */
 #include <X11/X.h>
 
+#include "dix/window_priv.h"
 #include "mi/mi_priv.h"
 
 #include    "scrnintstr.h"

miext/rootless/rootlessWindow.c

@@ -40,6 +40,7 @@
 #include "dix/property_priv.h"
 #include "dix/screen_hooks_priv.h"
 #include "dix/screenint_priv.h"
+#include "dix/window_priv.h"
 #include "fb/fb_priv.h"
 #include "mi/mi_priv.h"