xserver: Branch 'master'

[GitLab Mirror]

 composite/compositeext.h      |    3 +--
 composite/compositeext_priv.h |   17 +++++++++++++++++
 composite/compwindow.c        |    1 +
 hw/xwayland/xwayland-glamor.c |    1 +
 4 files changed, 20 insertions(+), 2 deletions(-)

New commits:
commit 06685cabdefafc88c4bb98b37a8af08cb21dd944
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Feb 8 18:59:23 2024 +0100

    composite: move out unexported CompositeIsImplicitRedirectException()
    
    Move out non-exported stuff from public module header compositeext.h,
    into compositeext_priv.h
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1284>

diff --git a/composite/compositeext.h b/composite/compositeext.h
index 27ce7ce40..24f4edac3 100644
--- a/composite/compositeext.h
+++ b/composite/compositeext.h
@@ -41,8 +41,7 @@ extern _X_EXPORT Bool CompositeRegisterImplicitRedirectionException(ScreenPtr pS
 
 
 extern _X_EXPORT Bool compIsAlternateVisual(ScreenPtr pScreen, XID visual);
-Bool CompositeIsImplicitRedirectException(ScreenPtr pScreen,
-                                          XID parentVisual, XID winVisual);
+
 extern _X_EXPORT RESTYPE CompositeClientWindowType;
 
 #endif                          /* _COMPOSITEEXT_H_ */
diff --git a/composite/compositeext_priv.h b/composite/compositeext_priv.h
new file mode 100644
index 000000000..92105ec74
--- /dev/null
+++ b/composite/compositeext_priv.h
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 1987, 1998  The Open Group
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info at metux.net>
+ */
+#ifndef _XSERVER_COMPOSITEEXT_PRIV_H_
+#define _XSERVER_COMPOSITEEXT_PRIV_H_
+
+#include <X11/X.h>
+
+typedef struct _Screen *ScreenPtr;
+
+Bool CompositeIsImplicitRedirectException(ScreenPtr pScreen,
+                                          XID parentVisual,
+                                          XID winVisual);
+
+#endif /* _XSERVER_COMPOSITEEXT_PRIV_H_ */
diff --git a/composite/compwindow.c b/composite/compwindow.c
index 7b4af9ee5..83ac1ca80 100644
--- a/composite/compwindow.c
+++ b/composite/compwindow.c
@@ -46,6 +46,7 @@
 #endif
 
 #include "compint.h"
+#include "compositeext_priv.h"
 
 #ifdef PANORAMIX
 #include "panoramiXsrv.h"
diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
index 150c5e971..28a8e7bc9 100644
--- a/hw/xwayland/xwayland-glamor.c
+++ b/hw/xwayland/xwayland-glamor.c
@@ -26,6 +26,7 @@
 #include <xwayland-config.h>
 
 #include <compositeext.h>
+#include "compositeext_priv.h"
 
 #define MESA_EGL_NO_X11_HEADERS
 #define EGL_NO_X11