xserver: Branch 'master'

[GitLab Mirror]

 Xext/bigreq.c          |    6 ++++--
 dix/dispatch.c         |    2 +-
 dix/dix_priv.h         |   17 +++++++++++++++++
 dix/globals.c          |    4 +++-
 dix/touch.c            |    2 ++
 hw/xwayland/xwayland.c |    1 +
 include/dix.h          |   17 +++--------------
 os/WaitFor.c           |    4 ++--
 os/io.c                |    4 +++-
 os/utils.c             |    3 ++-
 xfixes/disconnect.c    |    2 ++
 11 files changed, 40 insertions(+), 22 deletions(-)

New commits:
commit 040e41c7e9325f27817037f814b5f7107b5d6472
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Mar 7 14:39:50 2024 +0100

    dix: unexport global variables
    
    Those aren't used by drivers, so no need to export them.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1375>

diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index b2b9dce67..aca5afb96 100644
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@@ -32,12 +32,14 @@ from The Open Group.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/bigreqsproto.h>
+
+#include "dix/dix_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
-#include "dix_priv.h"
 #include "extnsionst.h"
-#include <X11/extensions/bigreqsproto.h>
 #include "opaque.h"
 #include "extinit.h"
 
diff --git a/dix/dispatch.c b/dix/dispatch.c
index e88e8de1d..9e3f38285 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -101,6 +101,7 @@ Equipment Corporation.
 #include <version-config.h>
 #endif
 
+#include "dix/dix_priv.h"
 #include "dix/registry_priv.h"
 
 #include "windowstr.h"
@@ -110,7 +111,6 @@ Equipment Corporation.
 #include "dix/screenint_priv.h"
 
 #include "dixfontstr.h"
-#include "dix_priv.h"
 #include "gcstruct.h"
 #include "selection.h"
 #include "colormapst.h"
diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index 0fae86405..181c0eda8 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -11,10 +11,27 @@
  *  Xserver's module API/ABI.
  */
 
+#include <X11/Xdefs.h>
+#include <X11/Xfuncproto.h>
+
+#include "include/dix.h"
+
 /* server setting: maximum size for big requests */
 #define MAX_BIG_REQUEST_SIZE 4194303
 extern long maxBigRequestSize;
 
+extern char dispatchExceptionAtReset;
+extern int terminateDelay;
+extern Bool touchEmulatePointer;
+
+extern HWEventQueuePtr checkForInput[2];
+
+static inline _X_NOTSAN Bool
+InputCheckPending(void)
+{
+    return (*checkForInput[0] != *checkForInput[1]);
+}
+
 void ClearWorkQueue(void);
 void ProcessWorkQueue(void);
 void ProcessWorkQueueZombies(void);
diff --git a/dix/globals.c b/dix/globals.c
index cce23ad1f..65edfc11f 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -50,13 +50,15 @@ SOFTWARE.
 
 #include <X11/X.h>
 #include <X11/Xmd.h>
+
+#include "dix/dix_priv.h"
+
 #include "misc.h"
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "input.h"
 #include "dixfont.h"
 #include "dixstruct.h"
-#include "dix_priv.h"
 #include "os.h"
 
 ScreenInfo screenInfo;
diff --git a/dix/touch.c b/dix/touch.c
index d0d286f80..67d4f2dda 100644
--- a/dix/touch.c
+++ b/dix/touch.c
@@ -28,6 +28,8 @@
 #include <dix-config.h>
 #endif
 
+#include "dix/dix_priv.h"
+
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "dixgrabs.h"
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index a1914fff6..1bc4239f8 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -34,6 +34,7 @@
 
 #include <X11/Xatom.h>
 
+#include "dix/dix_priv.h"
 #include "dix/screenint_priv.h"
 
 #include <selection.h>
diff --git a/include/dix.h b/include/dix.h
index 85c97dd03..a3a9f5309 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -145,26 +145,15 @@ typedef struct _WorkQueue *WorkQueuePtr;
 extern _X_EXPORT ClientPtr clients[MAXCLIENTS];
 extern _X_EXPORT ClientPtr serverClient;
 extern _X_EXPORT int currentMaxClients;
-extern _X_EXPORT char dispatchExceptionAtReset;
-extern _X_EXPORT int terminateDelay;
-extern _X_EXPORT Bool touchEmulatePointer;
-
-typedef int HWEventQueueType;
-typedef HWEventQueueType *HWEventQueuePtr;
-
-extern _X_EXPORT HWEventQueuePtr checkForInput[2];
-
-static inline _X_NOTSAN Bool
-InputCheckPending(void)
-{
-    return (*checkForInput[0] != *checkForInput[1]);
-}
 
 typedef struct _TimeStamp {
     CARD32 months;              /* really ~49.7 days */
     CARD32 milliseconds;
 } TimeStamp;
 
+typedef int HWEventQueueType;
+typedef HWEventQueueType *HWEventQueuePtr;
+
 /* dispatch.c */
 extern _X_EXPORT ClientPtr GetCurrentClient(void);
 
diff --git a/os/WaitFor.c b/os/WaitFor.c
index c27be11fd..a388cd573 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -56,12 +56,12 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <errno.h>
+#include <stdio.h>
 #ifdef WIN32
 #include <X11/Xwinsock.h>
 #endif
 #include <X11/Xos.h>            /* for strings, fcntl, time */
-#include <errno.h>
-#include <stdio.h>
 #include <X11/X.h>
 
 #include "dix/dix_priv.h"
diff --git a/os/io.c b/os/io.c
index c727f4bff..1e9258cd0 100644
--- a/os/io.c
+++ b/os/io.c
@@ -72,11 +72,13 @@ SOFTWARE.
 #endif
 #include <X11/X.h>
 #include <X11/Xproto.h>
+
+#include "dix/dix_priv.h"
+
 #include "os.h"
 #include "osdep.h"
 #include "opaque.h"
 #include "dixstruct.h"
-#include "dix_priv.h"
 #include "misc.h"
 
 CallbackListPtr ReplyCallback;
diff --git a/os/utils.c b/os/utils.c
index c5fe86c8f..739c01c3f 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -103,8 +103,9 @@ __stdcall unsigned long GetTickCount(void);
 #endif
 #endif
 
+#include "dix/dix_priv.h"
+
 #include "dixstruct.h"
-#include "dix_priv.h"
 #include "xkbsrv.h"
 
 #include "picture.h"
diff --git a/xfixes/disconnect.c b/xfixes/disconnect.c
index 28aac45aa..e412942b1 100644
--- a/xfixes/disconnect.c
+++ b/xfixes/disconnect.c
@@ -46,6 +46,8 @@
 #include <dix-config.h>
 #endif
 
+#include "dix/dix_priv.h"
+
 #include "xfixesint.h"
 #include "opaque.h"