From 33729b136130cc4a46111e49f756f94223a3f9c9 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 10 Nov 2025 19:24:08 +0100
Subject: [PATCH] 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                       |  1 +
 Xext/xtest.c                     |  1 +
 Xi/chgprop.c                     |  1 +
 Xi/closedev.c                    |  1 +
 Xi/getprop.c                     |  1 +
 Xi/getselev.c                    |  1 +
 Xi/xiselectev.c                  |  1 +
 composite/compwindow.c           |  1 +
 dbe/dbe.c                        |  1 +
 dix/colormap.c                   |  1 +
 dix/enterleave.c                 |  1 +
 dix/gestures.c                   |  1 +
 dix/touch.c                      |  1 +
 dix/window_priv.h                | 22 ++++++++++++++++++++++
 glx/glxcmds.c                    |  1 +
 hw/xnest/Color.c                 |  1 +
 hw/xnest/Window.c                |  1 +
 hw/xwin/winmultiwindowshape.c    |  1 +
 hw/xwin/winwindow.c              |  2 +-
 include/windowstr.h              | 25 -------------------------
 mi/miexpose.c                    |  1 +
 mi/mioverlay.c                   |  1 +
 mi/mivaltree.c                   |  3 ++-
 mi/miwindow.c                    |  1 +
 miext/rootless/rootlessValTree.c |  1 +
 miext/rootless/rootlessWindow.c  |  1 +
 26 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/Xext/shm.c b/Xext/shm.c
index 8fe4d0ea2..605178c20 100644
--- a/Xext/shm.c
+++ b/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"
diff --git a/Xext/xtest.c b/Xext/xtest.c
index 2048da3fa..a72988360 100644
--- a/Xext/xtest.c
+++ b/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"
diff --git a/Xi/chgprop.c b/Xi/chgprop.c
index 7ff1b266e..74895d994 100644
--- a/Xi/chgprop.c
+++ b/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      */
diff --git a/Xi/closedev.c b/Xi/closedev.c
index b93745f5c..2442b7474 100644
--- a/Xi/closedev.c
+++ b/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      */
diff --git a/Xi/getprop.c b/Xi/getprop.c
index 7838840ec..75eee3773 100644
--- a/Xi/getprop.c
+++ b/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      */
diff --git a/Xi/getselev.c b/Xi/getselev.c
index a348e0fd2..8fa0c8b8a 100644
--- a/Xi/getselev.c
+++ b/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      */
diff --git a/Xi/xiselectev.c b/Xi/xiselectev.c
index 91ead5f45..9f40e9d5e 100644
--- a/Xi/xiselectev.c
+++ b/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"
diff --git a/composite/compwindow.c b/composite/compwindow.c
index ef0c70589..722139c2a 100644
--- a/composite/compwindow.c
+++ b/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"
diff --git a/dbe/dbe.c b/dbe/dbe.c
index 8550d8b4a..7517bed13 100644
--- a/dbe/dbe.c
+++ b/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"
diff --git a/dix/colormap.c b/dix/colormap.c
index 372098341..22c6c1838 100644
--- a/dix/colormap.c
+++ b/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"
 
diff --git a/dix/enterleave.c b/dix/enterleave.c
index ece1606d4..a29a8e56c 100644
--- a/dix/enterleave.c
+++ b/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"
 
diff --git a/dix/gestures.c b/dix/gestures.c
index 3495a4df8..abe190519 100644
--- a/dix/gestures.c
+++ b/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"
 
diff --git a/dix/touch.c b/dix/touch.c
index cc444f2a2..c25869600 100644
--- a/dix/touch.c
+++ b/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"
diff --git a/dix/window_priv.h b/dix/window_priv.h
index 50363b4d1..e01c46fd5 100644
--- a/dix/window_priv.h
+++ b/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 ||				\
diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index a338236da..8a19959fd 100644
--- a/glx/glxcmds.c
+++ b/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"
 
diff --git a/hw/xnest/Color.c b/hw/xnest/Color.c
index bb7fddf53..3c013ae7f 100644
--- a/hw/xnest/Color.c
+++ b/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"
diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c
index 7cf9befab..ee066fc11 100644
--- a/hw/xnest/Window.c
+++ b/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"
 
diff --git a/hw/xwin/winmultiwindowshape.c b/hw/xwin/winmultiwindowshape.c
index cbc85f8b7..7d77a4153 100644
--- a/hw/xwin/winmultiwindowshape.c
+++ b/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"
diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c
index cdb17677c..1852595cf 100644
--- a/hw/xwin/winwindow.c
+++ b/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
diff --git a/include/windowstr.h b/include/windowstr.h
index 255ed03b3..2eb0dda29 100644
--- a/include/windowstr.h
+++ b/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; }
diff --git a/mi/miexpose.c b/mi/miexpose.c
index 726c5a4b4..ba0ccc007 100644
--- a/mi/miexpose.c
+++ b/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"
diff --git a/mi/mioverlay.c b/mi/mioverlay.c
index eb905e40e..aa9544d8c 100644
--- a/mi/mioverlay.c
+++ b/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"
diff --git a/mi/mivaltree.c b/mi/mivaltree.c
index 5d59d0f41..f812e52f9 100644
--- a/mi/mivaltree.c
+++ b/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"
diff --git a/mi/miwindow.c b/mi/miwindow.c
index 63b8bea55..7eaa45c0e 100644
--- a/mi/miwindow.c
+++ b/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"
 
diff --git a/miext/rootless/rootlessValTree.c b/miext/rootless/rootlessValTree.c
index beacff99f..3a6b7f689 100644
--- a/miext/rootless/rootlessValTree.c
+++ b/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"
diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index d3826c164..5a6c2b31f 100644
--- a/miext/rootless/rootlessWindow.c
+++ b/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"