wip1

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"
 

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
 

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)

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 {

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"

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

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

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; \

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"