include: move private definitions out of exevents.h

Public server module API shouldn't be clobbered with private definitions,
thus move them out to private header.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1289>

Xext/xtest.c

@@ -38,6 +38,7 @@
 #include <X11/extensions/XIproto.h>
 
 #include "dix/dix_priv.h"
+#include "dix/exevents_priv.h"
 #include "os/osdep.h"
 
 #include "misc.h"
@@ -55,7 +56,6 @@
 #include "exglobals.h"
 #include "mipointer.h"
 #include "xserver-properties.h"
-#include "exevents.h"
 #include "eventstr.h"
 #include "inpututils.h"
 #include "extinit_priv.h"

Xi/chgdctl.c

@@ -54,14 +54,14 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>     /* control constants */
+
+#include "dix/exevents_priv.h"
+
+#include "inputstr.h"           /* DeviceIntPtr      */
 #include "XIstubs.h"
-
 #include "exglobals.h"
-#include "exevents.h"
-
 #include "chgdctl.h"
 
 /***********************************************************************

Xi/chgkmap.c

@@ -54,10 +54,12 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "exevents.h"
+
+#include "dix/exevents_priv.h"
+
+#include "inputstr.h"           /* DeviceIntPtr      */
 #include "exglobals.h"
 
 #include "chgkmap.h"

Xi/chgprop.c

@@ -58,6 +58,7 @@ SOFTWARE.
 #include <X11/extensions/XIproto.h>
 
 #include "dix/dix_priv.h"
+#include "dix/exevents_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"

Xi/exevents.c

@@ -84,20 +84,20 @@ SOFTWARE.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/geproto.h>
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 #include <X11/extensions/XI2proto.h>
-#include <X11/extensions/geproto.h>
 #include <X11/extensions/XKBproto.h>
 
 #include "dix/dix_priv.h"
 #include "dix/eventconvert.h"
+#include "dix/exevents_priv.h"
 
 #include "inputstr.h"
 #include "windowstr.h"
 #include "miscstruct.h"
 #include "region.h"
-#include "exevents.h"
 #include "extnsionst.h"
 #include "exglobals.h"
 #include "eventstr.h"

Xi/extinit.c

@@ -61,13 +61,13 @@ SOFTWARE.
 #include <X11/extensions/geproto.h>
 
 #include "dix/dix_priv.h"
+#include "dix/exevents_priv.h"
 
 #include "inputstr.h"
 #include "gcstruct.h"           /* pointer for extnsionst.h */
 #include "extnsionst.h"         /* extension entry   */
 #include "geext.h"              /* extension interfaces for ge */
 #include "dixevents.h"
-#include "exevents.h"
 #include "extinit_priv.h"
 #include "exglobals.h"
 #include "swaprep.h"

Xi/grabdevb.c

@@ -54,14 +54,15 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include "inputstr.h"           /* DeviceIntPtr      */
-#include "windowstr.h"          /* window structure  */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "exevents.h"
+
+#include "dix/exevents_priv.h"
+
+#include "inputstr.h"           /* DeviceIntPtr      */
+#include "windowstr.h"          /* window structure  */
 #include "exglobals.h"
 #include "xace.h"
-
 #include "grabdev.h"
 #include "grabdevb.h"
 

Xi/grabdevk.c

@@ -54,14 +54,15 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include "inputstr.h"           /* DeviceIntPtr      */
-#include "windowstr.h"          /* window structure  */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "exevents.h"
+
+#include "dix/exevents_priv.h"
+
+#include "inputstr.h"           /* DeviceIntPtr      */
+#include "windowstr.h"          /* window structure  */
 #include "exglobals.h"
 #include "xace.h"
-
 #include "grabdev.h"
 #include "grabdevk.h"
 

Xi/gtmotion.c

@@ -54,12 +54,13 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "exevents.h"
-#include "exglobals.h"
 
+#include "dix/exevents_priv.h"
+
+#include "inputstr.h"           /* DeviceIntPtr      */
+#include "exglobals.h"
 #include "gtmotion.h"
 
 /***********************************************************************

Xi/queryst.c

@@ -36,15 +36,16 @@ from The Open Group.
 #include <dix-config.h>
 #endif
 
-#include "inputstr.h"           /* DeviceIntPtr      */
-#include "windowstr.h"          /* window structure  */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "exevents.h"
+
+#include "dix/exevents_priv.h"
+
+#include "inputstr.h"           /* DeviceIntPtr      */
+#include "windowstr.h"          /* window structure  */
 #include "exglobals.h"
 #include "xkbsrv.h"
 #include "xkbstr.h"
-
 #include "queryst.h"
 
 /***********************************************************************

Xi/selectev.c

@@ -59,12 +59,11 @@ SOFTWARE.
 #include <X11/extensions/XIproto.h>
 
 #include "dix/dix_priv.h"
+#include "dix/exevents_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
-#include "exevents.h"
 #include "exglobals.h"
-
 #include "grabdev.h"
 #include "selectev.h"
 

Xi/sendexev.c

@@ -54,14 +54,15 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+
+#include "dix/exevents_priv.h"
+
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* Window            */
 #include "extnsionst.h"         /* EventSwapPtr      */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
-#include "exevents.h"
 #include "exglobals.h"
-
 #include "grabdev.h"
 #include "sendexev.h"
 

Xi/xiallowev.c

@@ -37,13 +37,13 @@
 #include <X11/extensions/XI2proto.h>
 
 #include "dix/dix_priv.h"
+#include "dix/exevents_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
 #include "mi.h"
 #include "eventstr.h"
 #include "exglobals.h"          /* BadDevice */
-#include "exevents.h"
 #include "xiallowev.h"
 
 int _X_COLD

Xi/xichangehierarchy.c

@@ -41,12 +41,12 @@
 #include <X11/extensions/geproto.h>
 
 #include "dix/dix_priv.h"
+#include "dix/exevents_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
 #include "scrnintstr.h"         /* screen structure  */
 #include "extnsionst.h"
-#include "exevents.h"
 #include "exglobals.h"
 #include "geext.h"
 #include "xace.h"

Xi/xigrabdev.c

@@ -37,11 +37,11 @@
 #include <X11/extensions/XI2proto.h>
 
 #include "dix/dix_priv.h"
+#include "dix/exevents_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
 #include "exglobals.h"          /* BadDevice */
-#include "exevents.h"
 #include "xigrabdev.h"
 #include "inpututils.h"
 

Xi/xipassivegrab.c

@@ -37,12 +37,12 @@
 #include <X11/extensions/XI2proto.h>
 
 #include "dix/dix_priv.h"
+#include "dix/exevents_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
 #include "swaprep.h"
 #include "exglobals.h"          /* BadDevice */
-#include "exevents.h"
 #include "xipassivegrab.h"
 #include "dixgrabs.h"
 #include "misc.h"

Xi/xiproperty.c

@@ -29,16 +29,17 @@
 #include <dix-config.h>
 #endif
 
-#include "dix.h"
-#include "inputstr.h"
-#include <X11/extensions/XI.h>
 #include <X11/Xatom.h>
+#include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 #include <X11/extensions/XI2proto.h>
-#include "exglobals.h"
-#include "exevents.h"
-#include "swaprep.h"
 
+#include "dix/exevents_priv.h"
+
+#include "dix.h"
+#include "inputstr.h"
+#include "exglobals.h"
+#include "swaprep.h"
 #include "xiproperty.h"
 #include "xserver-properties.h"
 

Xi/xiquerydevice.c

@@ -32,20 +32,20 @@
 #include <dix-config.h>
 #endif
 
-#include "inputstr.h"
 #include <X11/X.h>
 #include <X11/Xatom.h>
 #include <X11/extensions/XI2proto.h>
+
+#include "dix/exevents_priv.h"
+
+#include "inputstr.h"
 #include "xkbstr.h"
 #include "xkbsrv.h"
 #include "xserver-properties.h"
-#include "exevents.h"
 #include "xace.h"
 #include "inpututils.h"
-
 #include "exglobals.h"
 #include "privates.h"
-
 #include "xiquerydevice.h"
 
 static Bool ShouldSkipDevice(ClientPtr client, int deviceid, DeviceIntPtr d);

Xi/xiquerypointer.c

@@ -40,11 +40,11 @@
 
 #include "dix/dix_priv.h"
 #include "dix/eventconvert.h"
+#include "dix/exevents_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
 #include "extnsionst.h"
-#include "exevents.h"
 #include "exglobals.h"
 #include "scrnintstr.h"
 #include "xkbsrv.h"

Xi/xiqueryversion.c

@@ -39,8 +39,9 @@
 #include <X11/X.h>
 #include <X11/extensions/XI2proto.h>
 
+#include "dix/exevents_priv.h"
+
 #include "exglobals.h"
-#include "exevents.h"
 #include "xiqueryversion.h"
 #include "misc.h"
 

Xi/xiselectev.c

@@ -30,11 +30,11 @@
 #include <X11/extensions/XI2proto.h>
 
 #include "dix/dix_priv.h"
+#include "dix/exevents_priv.h"
 
 #include "dixstruct.h"
 #include "windowstr.h"
 #include "exglobals.h"
-#include "exevents.h"
 #include "inpututils.h"
 #include "xiselectev.h"
 

dix/devices.c

@@ -58,6 +58,7 @@ SOFTWARE.
 #include <X11/extensions/XIproto.h>
 
 #include "dix/dix_priv.h"
+#include "dix/exevents_priv.h"
 #include "dix/ptrveloc_priv.h"
 #include "xkb/xkbsrv_priv.h"
 
@@ -79,7 +80,6 @@ SOFTWARE.
 #include "eventstr.h"
 #include "dixgrabs.h"
 #include "exglobals.h"
-#include "exevents.h"
 #include "xiquerydevice.h"      /* for SizeDeviceClasses */
 #include "xiproperty.h"
 #include "enterleave.h"         /* for EnterWindow() */

dix/eventconvert.c

@@ -41,12 +41,12 @@
 
 #include "dix/dix_priv.h"
 #include "dix/eventconvert.h"
+#include "dix/exevents_priv.h"
 
 #include "dix.h"
 #include "inputstr.h"
 #include "misc.h"
 #include "eventstr.h"
-#include "exevents.h"
 #include "exglobals.h"
 #include "inpututils.h"
 #include "xiquerydevice.h"

dix/events.c

@@ -116,6 +116,7 @@ Equipment Corporation.
 
 #include "dix/dix_priv.h"
 #include "dix/eventconvert.h"
+#include "dix/exevents_priv.h"
 #include "xkb/xkbsrv_priv.h"
 
 #include "misc.h"
@@ -134,7 +135,6 @@ Equipment Corporation.
 #include "xace.h"
 #include "probes.h"
 #include "exglobals.h"
-#include "exevents.h"
 #include "extnsionst.h"
 #include "dixevents.h"
 #include "dixgrabs.h"

dix/exevents_priv.h

@@ -0,0 +1,158 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 1996 Thomas E. Dickey <dickey@clark.net>
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XSERVER_EXEVENTS_PRIV_H
+#define _XSERVER_EXEVENTS_PRIV_H
+
+#include <X11/extensions/XIproto.h>
+#include "exevents.h"
+
+/**
+ * Attached to the devPrivates of each client. Specifies the version number as
+ * supported by the client.
+ */
+typedef struct _XIClientRec {
+    int major_version;
+    int minor_version;
+} XIClientRec, *XIClientPtr;
+
+typedef struct _GrabParameters {
+    int grabtype;               /* CORE, etc. */
+    unsigned int ownerEvents;
+    unsigned int this_device_mode;
+    unsigned int other_devices_mode;
+    Window grabWindow;
+    Window confineTo;
+    Cursor cursor;
+    unsigned int modifiers;
+} GrabParameters;
+
+int UpdateDeviceState(DeviceIntPtr device, DeviceEvent *xE);
+
+void ProcessOtherEvent(InternalEvent *ev, DeviceIntPtr other);
+
+int CheckGrabValues(ClientPtr client, GrabParameters *param);
+
+int GrabButton(ClientPtr client,
+               DeviceIntPtr dev,
+               DeviceIntPtr modifier_device,
+               int button,
+               GrabParameters *param,
+               enum InputLevel grabtype,
+               GrabMask *eventMask);
+
+int GrabKey(ClientPtr client,
+            DeviceIntPtr dev,
+            DeviceIntPtr modifier_device,
+            int key,
+            GrabParameters *param,
+            enum InputLevel grabtype,
+            GrabMask *eventMask);
+
+int GrabWindow(ClientPtr client,
+               DeviceIntPtr dev,
+               int type,
+               GrabParameters *param,
+               GrabMask *eventMask);
+
+int GrabTouchOrGesture(ClientPtr client,
+                       DeviceIntPtr dev,
+                       DeviceIntPtr mod_dev,
+                       int type,
+                       GrabParameters *param,
+                       GrabMask *eventMask);
+
+int SelectForWindow(DeviceIntPtr dev,
+                    WindowPtr pWin,
+                    ClientPtr client,
+                    Mask mask,
+                    Mask exclusivemasks);
+
+int AddExtensionClient(WindowPtr pWin,
+                       ClientPtr client,
+                       Mask mask,
+                       int mskidx);
+
+void RecalculateDeviceDeliverableEvents(WindowPtr pWin);
+
+int InputClientGone(WindowPtr pWin, XID id);
+
+void WindowGone(WindowPtr win);
+
+int SendEvent(ClientPtr client,
+              DeviceIntPtr d,
+              Window dest,
+              Bool propagate,
+              xEvent *ev,
+              Mask mask ,
+              int count);
+
+int SetButtonMapping(ClientPtr client,
+                     DeviceIntPtr dev,
+                     int nElts,
+                     BYTE *map);
+
+int ChangeKeyMapping(ClientPtr client,
+                     DeviceIntPtr dev,
+                     unsigned len,
+                     int type,
+                     KeyCode firstKeyCode,
+                     CARD8 keyCodes,
+                     CARD8 keySymsPerKeyCode,
+                     KeySym *map);
+
+void DeleteWindowFromAnyExtEvents(WindowPtr pWin, Bool freeResources);
+
+int MaybeSendDeviceMotionNotifyHint(deviceKeyButtonPointer *pEvents, Mask mask);
+
+void CheckDeviceGrabAndHintWindow(WindowPtr pWin,
+                                  int type,
+                                  deviceKeyButtonPointer *xE,
+                                  GrabPtr grab,
+                                  ClientPtr client,
+                                  Mask deliveryMask);
+
+void MaybeStopDeviceHint(DeviceIntPtr dev, ClientPtr client);
+
+int DeviceEventSuppressForWindow(WindowPtr pWin,
+                                 ClientPtr client,
+                                 Mask mask,
+                                 int maskndx);
+
+void SendEventToAllWindows(DeviceIntPtr dev, Mask mask, xEvent *ev, int count);
+
+void TouchRejected(DeviceIntPtr sourcedev,
+                   TouchPointInfoPtr ti,
+                   XID resource,
+                   TouchOwnershipEvent *ev);
+
+_X_HIDDEN void XI2EventSwap(xGenericEvent *from, xGenericEvent *to);
+
+/* For an event such as MappingNotify which affects client interpretation
+ * of input events sent by device dev, should we notify the client, or
+ * would it merely be irrelevant and confusing? */
+int XIShouldNotify(ClientPtr client,
+                   DeviceIntPtr dev);
+
+void XISendDeviceChangedEvent(DeviceIntPtr device,
+                              DeviceChangedEvent *dce);
+
+int XISetEventMask(DeviceIntPtr dev,
+                   WindowPtr win,
+                   ClientPtr client,
+                   unsigned int len,
+                   unsigned char *mask);
+
+int  XICheckInvalidMaskBits(ClientPtr client,
+                            unsigned char *mask,
+                            int len);
+
+void XTestDeviceSendEvents(DeviceIntPtr dev,
+                           int type,
+                           int detail,
+                           int flags,
+                           const ValuatorMask *mask);
+
+#endif /* _XSERVER_EXEVENTS_PRIV_H */

dix/grabs.c

@@ -50,19 +50,19 @@ SOFTWARE.
 #endif
 
 #include <X11/X.h>
-#include "misc.h"
 #include <X11/Xproto.h>
 #include <X11/extensions/XI2.h>
 
 #include "dix/dix_priv.h"
+#include "dix/exevents_priv.h"
 #include "os/auth.h"
 
+#include "misc.h"
 #include "windowstr.h"
 #include "inputstr.h"
 #include "cursorstr.h"
 #include "dixgrabs.h"
 #include "xace.h"
-#include "exevents.h"
 #include "exglobals.h"
 #include "inpututils.h"
 #include "client.h"

dix/inpututils.c

@@ -27,7 +27,8 @@
 #include "dix-config.h"
 #endif
 
-#include "exevents.h"
+#include "dix/exevents_priv.h"
+
 #include "exglobals.h"
 #include "misc.h"
 #include "input.h"

dix/touch.c

@@ -30,13 +30,12 @@
 
 #include "dix/dix_priv.h"
 #include "dix/eventconvert.h"
+#include "dix/exevents_priv.h"
 
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "dixgrabs.h"
-
 #include "eventstr.h"
-#include "exevents.h"
 #include "exglobals.h"
 #include "inpututils.h"
 #include "windowstr.h"

dix/window.c

@@ -101,6 +101,7 @@ Equipment Corporation.
 #endif
 
 #include "dix/dix_priv.h"
+#include "dix/exevents_priv.h"
 #include "os/auth.h"
 
 #include "misc.h"
@@ -131,10 +132,8 @@ Equipment Corporation.
 #endif
 #include "selection.h"
 #include "inpututils.h"
-
 #include "privates.h"
 #include "xace.h"
-#include "exevents.h"
 
 #include <X11/Xatom.h>          /* must come after server includes */
 

hw/xfree86/common/xf86DGA.c

@@ -48,6 +48,7 @@
 
 #include "dix/dix_priv.h"
 #include "dix/eventconvert.h"
+#include "dix/exevents_priv.h"
 
 #include "xf86.h"
 #include "xf86str.h"
@@ -63,7 +64,6 @@
 #include "xkbsrv.h"
 #include "xf86Xinput.h"
 #include "exglobals.h"
-#include "exevents.h"
 #include "eventstr.h"
 #include "xf86Extensions.h"
 #include "mi.h"

hw/xwayland/xwayland-input.c

@@ -30,9 +30,9 @@
 #include <sys/mman.h>
 
 #include "dix/dix_priv.h"
+#include "dix/exevents_priv.h"
 
 #include <inputstr.h>
-#include <exevents.h>
 #include <xkbsrv.h>
 #include <xserver-properties.h>
 #include <inpututils.h>

include/exevents.h

@@ -134,182 +134,4 @@ extern _X_EXPORT int XIPropToFloat(XIPropertyValuePtr val,
  *                      End of driver interface                             *
  ****************************************************************************/
 
-/**
- * Attached to the devPrivates of each client. Specifies the version number as
- * supported by the client.
- */
-typedef struct _XIClientRec {
-    int major_version;
-    int minor_version;
-} XIClientRec, *XIClientPtr;
-
-typedef struct _GrabParameters {
-    int grabtype;               /* CORE, etc. */
-    unsigned int ownerEvents;
-    unsigned int this_device_mode;
-    unsigned int other_devices_mode;
-    Window grabWindow;
-    Window confineTo;
-    Cursor cursor;
-    unsigned int modifiers;
-} GrabParameters;
-
-extern int
- UpdateDeviceState(DeviceIntPtr /* device */ ,
-                   DeviceEvent * /*  xE    */ );
-
-extern void
- ProcessOtherEvent(InternalEvent * /* ev */ ,
-                   DeviceIntPtr /* other */ );
-
-extern int
- CheckGrabValues(ClientPtr /* client */ ,
-                 GrabParameters * /* param */ );
-
-extern int
- GrabButton(ClientPtr /* client */ ,
-            DeviceIntPtr /* dev */ ,
-            DeviceIntPtr /* modifier_device */ ,
-            int /* button */ ,
-            GrabParameters * /* param */ ,
-            enum InputLevel /* grabtype */ ,
-            GrabMask * /* eventMask */ );
-
-extern int
- GrabKey(ClientPtr /* client */ ,
-         DeviceIntPtr /* dev */ ,
-         DeviceIntPtr /* modifier_device */ ,
-         int /* key */ ,
-         GrabParameters * /* param */ ,
-         enum InputLevel /* grabtype */ ,
-         GrabMask * /* eventMask */ );
-
-extern int
- GrabWindow(ClientPtr /* client */ ,
-            DeviceIntPtr /* dev */ ,
-            int /* type */ ,
-            GrabParameters * /* param */ ,
-            GrabMask * /* eventMask */ );
-
-extern int
- GrabTouchOrGesture(ClientPtr /* client */ ,
-                    DeviceIntPtr /* dev */ ,
-                    DeviceIntPtr /* mod_dev */ ,
-                    int /* type */ ,
-                    GrabParameters * /* param */ ,
-                    GrabMask * /* eventMask */ );
-
-extern int
- SelectForWindow(DeviceIntPtr /* dev */ ,
-                 WindowPtr /* pWin */ ,
-                 ClientPtr /* client */ ,
-                 Mask /* mask */ ,
-                 Mask /* exclusivemasks */ );
-
-extern int
- AddExtensionClient(WindowPtr /* pWin */ ,
-                    ClientPtr /* client */ ,
-                    Mask /* mask */ ,
-                    int /* mskidx */ );
-
-extern void
- RecalculateDeviceDeliverableEvents(WindowPtr /* pWin */ );
-
-extern int
- InputClientGone(WindowPtr /* pWin */ ,
-                 XID /* id */ );
-
-extern void
- WindowGone(WindowPtr /* win */ );
-
-extern int
- SendEvent(ClientPtr /* client */ ,
-           DeviceIntPtr /* d */ ,
-           Window /* dest */ ,
-           Bool /* propagate */ ,
-           xEvent * /* ev */ ,
-           Mask /* mask */ ,
-           int /* count */ );
-
-extern int
- SetButtonMapping(ClientPtr /* client */ ,
-                  DeviceIntPtr /* dev */ ,
-                  int /* nElts */ ,
-                  BYTE * /* map */ );
-
-extern int
- ChangeKeyMapping(ClientPtr /* client */ ,
-                  DeviceIntPtr /* dev */ ,
-                  unsigned /* len */ ,
-                  int /* type */ ,
-                  KeyCode /* firstKeyCode */ ,
-                  CARD8 /* keyCodes */ ,
-                  CARD8 /* keySymsPerKeyCode */ ,
-                  KeySym * /* map */ );
-
-extern void
- DeleteWindowFromAnyExtEvents(WindowPtr /* pWin */ ,
-                              Bool /* freeResources */ );
-
-extern int
- MaybeSendDeviceMotionNotifyHint(deviceKeyButtonPointer * /* pEvents */ ,
-                                 Mask /* mask */ );
-
-extern void
- CheckDeviceGrabAndHintWindow(WindowPtr /* pWin */ ,
-                              int /* type */ ,
-                              deviceKeyButtonPointer * /* xE */ ,
-                              GrabPtr /* grab */ ,
-                              ClientPtr /* client */ ,
-                              Mask /* deliveryMask */ );
-
-extern void
- MaybeStopDeviceHint(DeviceIntPtr /* dev */ ,
-                     ClientPtr /* client */ );
-
-extern int
- DeviceEventSuppressForWindow(WindowPtr /* pWin */ ,
-                              ClientPtr /* client */ ,
-                              Mask /* mask */ ,
-                              int /* maskndx */ );
-
-extern void
- SendEventToAllWindows(DeviceIntPtr /* dev */ ,
-                       Mask /* mask */ ,
-                       xEvent * /* ev */ ,
-                       int /* count */ );
-
-extern void
- TouchRejected(DeviceIntPtr /* sourcedev */ ,
-               TouchPointInfoPtr /* ti */ ,
-               XID /* resource */ ,
-               TouchOwnershipEvent * /* ev */ );
-
-extern _X_HIDDEN void XI2EventSwap(xGenericEvent * /* from */ ,
-                                   xGenericEvent * /* to */ );
-
-/* For an event such as MappingNotify which affects client interpretation
- * of input events sent by device dev, should we notify the client, or
- * would it merely be irrelevant and confusing? */
-extern int
- XIShouldNotify(ClientPtr client, DeviceIntPtr dev);
-
-extern void
- XISendDeviceChangedEvent(DeviceIntPtr device, DeviceChangedEvent *dce);
-
-extern int
-
-XISetEventMask(DeviceIntPtr dev, WindowPtr win, ClientPtr client,
-               unsigned int len, unsigned char *mask);
-
-extern int
- XICheckInvalidMaskBits(ClientPtr client, unsigned char *mask, int len);
-
-void
-XTestDeviceSendEvents(DeviceIntPtr dev,
-                      int type,
-                      int detail,
-                      int flags,
-                      const ValuatorMask *mask);
-
 #endif                          /* EXEVENTS_H */

test/input.c

@@ -30,18 +30,18 @@
 
 #include <stdint.h>
 #include <X11/X.h>
-#include "misc.h"
-#include "resource.h"
 #include <X11/Xproto.h>
 #include <X11/extensions/XI2proto.h>
 #include <X11/Xatom.h>
-#include "windowstr.h"
-#include "inputstr.h"
-#include "exevents.h"
 
 #include "dix/dix_priv.h"
 #include "dix/eventconvert.h"
+#include "dix/exevents_priv.h"
 
+#include "misc.h"
+#include "resource.h"
+#include "windowstr.h"
+#include "inputstr.h"
 #include "exglobals.h"
 #include "dixgrabs.h"
 #include "eventstr.h"

test/xi2/protocol-common.c

@@ -30,15 +30,16 @@
 
 #include <errno.h>
 #include <stdint.h>
+#include <X11/extensions/XI2.h>
 
 #include "dix/dix_priv.h"
+#include "dix/exevents_priv.h"
 
 #include "extinit_priv.h"
 #include "exglobals.h"
 #include "xkbsrv.h"             /* for XkbInitPrivates */
 #include "xserver-properties.h"
 #include "syncsrv.h"
-#include <X11/extensions/XI2.h>
 
 #include "protocol-common.h"
 

test/xi2/protocol-eventconvert.c

@@ -28,14 +28,14 @@
 #endif
 
 #include <stdint.h>
+#include <X11/extensions/XI2proto.h>
 
+#include "dix/exevents_priv.h"
 #include "dix/eventconvert.h"
 
 #include "inputstr.h"
 #include "eventstr.h"
-#include "exevents.h"
 #include "inpututils.h"
-#include <X11/extensions/XI2proto.h>
 
 #include "protocol-common.h"
 

test/xi2/protocol-xigetselectedevents.c

@@ -43,12 +43,14 @@
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/extensions/XI2proto.h>
+
+#include "dix/exevents_priv.h"
+
 #include "inputstr.h"
 #include "windowstr.h"
 #include "extinit.h"            /* for XInputExtensionInit */
 #include "scrnintstr.h"
 #include "xiselectev.h"
-#include "exevents.h"
 
 #include "protocol-common.h"
 

test/xi2/protocol-xipassivegrabdevice.c

@@ -35,11 +35,13 @@
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/extensions/XI2proto.h>
+
+#include "dix/exevents_priv.h"
+
 #include "inputstr.h"
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "xipassivegrab.h"
-#include "exevents.h"
 #include "exglobals.h"
 
 #include "protocol-common.h"

test/xi2/protocol-xiqueryversion.c

@@ -43,6 +43,9 @@
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/extensions/XI2proto.h>
+
+#include "dix/exevents_priv.h"
+
 #include "inputstr.h"
 #include "extinit.h"            /* for XInputExtensionInit */
 #include "scrnintstr.h"

xkb/xkbEvents.c

@@ -34,8 +34,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/keysym.h>
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
+
+#include "dix/exevents_priv.h"
+
 #include "inputstr.h"
-#include "exevents.h"
 #include "exglobals.h"
 #include "windowstr.h"
 #include "xkbsrv_priv.h"