From 885339b2ddcaa3fb76b8fcd477e31f8db060ce82 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 24 Nov 2025 17:07:39 +0100
Subject: [PATCH] wip1

---
 Xi/sendexev.c         |  1 +
 dix/extension.c       |  2 ++
 dix/extension_priv.h  |  2 ++
 dix/inpututils_priv.h |  6 ++++++
 dix/tables.c          |  1 +
 include/inputstr.h    |  2 ++
 include/misc.h        | 15 ---------------
 include/scrnintstr.h  |  4 ++++
 xkb/xkbEvents.c       |  1 +
 9 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/Xi/sendexev.c b/Xi/sendexev.c
index 52cab4c3e1..5e90c10e2a 100644
--- a/Xi/sendexev.c
+++ b/Xi/sendexev.c
@@ -58,6 +58,7 @@ SOFTWARE.
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
 #include "dix/extension_priv.h"
+#include "dix/inpututils_priv.h"
 #include "os/osdep.h"
 #include "Xi/handlers.h"
 
diff --git a/dix/extension.c b/dix/extension.c
index 73b0e51f74..e4bf84d3ab 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -51,6 +51,7 @@ SOFTWARE.
 
 #include "dix/dix_priv.h"
 #include "dix/extension_priv.h"
+#include "dix/inpututils_priv.h"
 #include "dix/registry_priv.h"
 #include "dix/request_priv.h"
 
@@ -62,6 +63,7 @@ SOFTWARE.
 #include "dispatch.h"
 #include "privates.h"
 #include "xace.h"
+#include "inputstr.h"
 
 #define LAST_ERROR 255
 
diff --git a/dix/extension_priv.h b/dix/extension_priv.h
index 03fd757e70..268bc340d7 100644
--- a/dix/extension_priv.h
+++ b/dix/extension_priv.h
@@ -9,6 +9,8 @@
 #include "include/extnsionst.h"
 #include "include/misc.h"
 
+#define EXTENSION_BASE 128
+
 #define EXTENSION_MAJOR_APPLE_WM            (EXTENSION_BASE + 0)
 #define EXTENSION_MAJOR_APPLE_DRI           (EXTENSION_BASE + 1)
 #define EXTENSION_MAJOR_BIG_REQUESTS        (EXTENSION_BASE + 2)
diff --git a/dix/inpututils_priv.h b/dix/inpututils_priv.h
index 2d2289773a..37d34972ef 100644
--- a/dix/inpututils_priv.h
+++ b/dix/inpututils_priv.h
@@ -28,6 +28,12 @@
 #include "eventstr.h"
 #include <X11/extensions/XI2proto.h>
 
+/* be cautious on changing those */
+/* 128 event opcodes for core + extension events, excluding GE */
+#define MAXEVENTS               128
+#define EXTENSION_EVENT_BASE    64
+#define EXTENSION_BASE 128
+
 extern Mask event_filters[MAXDEVICES][MAXEVENTS];
 
 struct _ValuatorMask {
diff --git a/dix/tables.c b/dix/tables.c
index 1c1a5aaa6c..2e2cd6da51 100644
--- a/dix/tables.c
+++ b/dix/tables.c
@@ -51,6 +51,7 @@ SOFTWARE.
 
 #include "dix/dix_priv.h"
 #include "dix/extension_priv.h"
+#include "dix/inpututils_priv.h"
 #include "dix/reqhandlers_priv.h"
 
 #include "windowstr.h"
diff --git a/include/inputstr.h b/include/inputstr.h
index e62e4731e5..e39bd46f9e 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -55,11 +55,13 @@ SOFTWARE.
 #include "dixstruct.h"
 #include "cursorstr.h"
 #include "privates.h"
+#include "scrnintstr.h"
 
 #define BitIsOn(ptr, bit) (!!(((const BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7))))
 #define SetBit(ptr, bit)  (((BYTE *) (ptr))[(bit)>>3] |= (1 << ((bit) & 7)))
 #define ClearBit(ptr, bit) (((BYTE *)(ptr))[(bit)>>3] &= ~(1 << ((bit) & 7)))
 
+#define MAXDEVICES              256      /* input devices */
 #define EMASKSIZE	(MAXDEVICES + 2)
 
 /* This is the last XI2 event supported by the server. If you add
diff --git a/include/misc.h b/include/misc.h
index 49d43fad64..883616b761 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -81,23 +81,8 @@ OF THIS SOFTWARE.
 #include <stdint.h>
 #include <pthread.h>
 
-#ifndef MAXSCREENS
-#define MAXSCREENS	16
-#endif
-#ifndef MAXGPUSCREENS // unexport
-#define MAXGPUSCREENS	16
-#endif
-#define MAXFORMATS	8 // unexport
-#ifndef MAXDEVICES // unexport
-#define MAXDEVICES	256      /* input devices */
-#endif
 #define GPU_SCREEN_OFFSET 256
 
-/* 128 event opcodes for core + extension events, excluding GE */
-#define MAXEVENTS       128 // unexport
-#define EXTENSION_EVENT_BASE 64 // unexport
-#define EXTENSION_BASE 128 // unexport
-
 typedef uint32_t ATOM;
 
 /* @brief generic X return code
diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index 3f5382f039..9f5ab6f8b0 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -502,6 +502,10 @@ typedef void (*DPMSProcPtr)(ScreenPtr pScreen, int level);
     use dixScreenHookWindowDestroy() instead.
  */
 
+#define MAXSCREENS 16
+#define MAXGPUSCREENS 16
+#define MAXFORMATS 8
+
 #define _SCREEN_HOOK_TYPE(NAME, FUNCTYPE, ARRSIZE) \
     struct { \
         FUNCTYPE func; \
diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c
index 280d4ef60f..d6cd9aeb2f 100644
--- a/xkb/xkbEvents.c
+++ b/xkb/xkbEvents.c
@@ -36,6 +36,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
+#include "dix/inpututils_priv.h"
 #include "os/log_priv.h"
 #include "xkb/xkbsrv_priv.h"