summaryrefslogtreecommitdiff
path: root/Xi
diff options
context:
space:
mode:
Diffstat (limited to 'Xi')
-rw-r--r--Xi/chgprop.c7
-rw-r--r--Xi/exevents.c6
-rw-r--r--Xi/getprop.c8
-rw-r--r--Xi/getselev.c4
-rw-r--r--Xi/selectev.c7
-rw-r--r--Xi/ungrdevb.c8
-rw-r--r--Xi/ungrdevk.c8
-rw-r--r--Xi/xiallowev.c8
-rw-r--r--Xi/xibarriers.c2
-rw-r--r--Xi/xichangecursor.c8
-rw-r--r--Xi/xigetclientpointer.c8
-rw-r--r--Xi/xipassivegrab.c8
-rw-r--r--Xi/xiquerypointer.c5
-rw-r--r--Xi/xiselectev.c6
-rw-r--r--Xi/xisetclientpointer.c4
-rw-r--r--Xi/xiwarppointer.c9
16 files changed, 68 insertions, 38 deletions
diff --git a/Xi/chgprop.c b/Xi/chgprop.c
index 1d72770f1..892ac4a23 100644
--- a/Xi/chgprop.c
+++ b/Xi/chgprop.c
@@ -54,14 +54,15 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#include "inputstr.h" /* DeviceIntPtr */
-#include "windowstr.h"
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
+#include "dix/dix_priv.h"
+
+#include "inputstr.h" /* DeviceIntPtr */
+#include "windowstr.h"
#include "exevents.h"
#include "exglobals.h"
-
#include "chgprop.h"
#include "grabdev.h"
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 4ffc93bbd..e8267d3ea 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -82,16 +82,18 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#include "inputstr.h"
#include <X11/X.h>
#include <X11/Xproto.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 "inputstr.h"
#include "windowstr.h"
#include "miscstruct.h"
#include "region.h"
@@ -108,8 +110,6 @@ SOFTWARE.
#include "eventstr.h"
#include "inpututils.h"
#include "mi.h"
-
-#include <X11/extensions/XKBproto.h>
#include "xkbsrv.h"
#define WID(w) ((w) ? ((w)->drawable.id) : 0)
diff --git a/Xi/getprop.c b/Xi/getprop.c
index b744f35cb..282831310 100644
--- a/Xi/getprop.c
+++ b/Xi/getprop.c
@@ -54,13 +54,15 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#include "inputstr.h" /* DeviceIntPtr */
-#include "windowstr.h" /* window structs */
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
+
+#include "dix/dix_priv.h"
+
+#include "inputstr.h" /* DeviceIntPtr */
+#include "windowstr.h" /* window structs */
#include "exglobals.h"
#include "swaprep.h"
-
#include "getprop.h"
extern XExtEventInfo EventInfo[];
diff --git a/Xi/getselev.c b/Xi/getselev.c
index 0623c7ac4..b85eca3ff 100644
--- a/Xi/getselev.c
+++ b/Xi/getselev.c
@@ -56,11 +56,13 @@ SOFTWARE.
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
+
+#include "dix/dix_priv.h"
+
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window struct */
#include "exglobals.h"
#include "swaprep.h"
-
#include "getprop.h"
#include "getselev.h"
diff --git a/Xi/selectev.c b/Xi/selectev.c
index 65c7bc868..6b7bdc512 100644
--- a/Xi/selectev.c
+++ b/Xi/selectev.c
@@ -54,11 +54,14 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#include "inputstr.h" /* DeviceIntPtr */
-#include "windowstr.h" /* window structure */
#include <X11/extensions/XI.h>
#include <X11/extensions/XI2.h>
#include <X11/extensions/XIproto.h>
+
+#include "dix/dix_priv.h"
+
+#include "inputstr.h" /* DeviceIntPtr */
+#include "windowstr.h" /* window structure */
#include "exevents.h"
#include "exglobals.h"
diff --git a/Xi/ungrdevb.c b/Xi/ungrdevb.c
index 47b97d716..0f5c7913c 100644
--- a/Xi/ungrdevb.c
+++ b/Xi/ungrdevb.c
@@ -54,13 +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 "dix/dix_priv.h"
+
+#include "inputstr.h" /* DeviceIntPtr */
+#include "windowstr.h" /* window structure */
#include "exglobals.h"
#include "dixgrabs.h"
-
#include "ungrdevb.h"
#define AllModifiersMask ( \
diff --git a/Xi/ungrdevk.c b/Xi/ungrdevk.c
index 753b14d70..8aa797b4d 100644
--- a/Xi/ungrdevk.c
+++ b/Xi/ungrdevk.c
@@ -54,15 +54,17 @@ 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 "dix/dix_priv.h"
+
+#include "inputstr.h" /* DeviceIntPtr */
+#include "windowstr.h" /* window structure */
#include "exglobals.h"
#include "dixgrabs.h"
#include "xkbsrv.h"
#include "xkbstr.h"
-
#include "ungrdevk.h"
#define AllModifiersMask ( \
diff --git a/Xi/xiallowev.c b/Xi/xiallowev.c
index 676480157..ab83a19e7 100644
--- a/Xi/xiallowev.c
+++ b/Xi/xiallowev.c
@@ -33,13 +33,15 @@
#include <dix-config.h>
#endif
+#include <X11/extensions/XI2.h>
+#include <X11/extensions/XI2proto.h>
+
+#include "dix/dix_priv.h"
+
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */
#include "mi.h"
#include "eventstr.h"
-#include <X11/extensions/XI2.h>
-#include <X11/extensions/XI2proto.h>
-
#include "exglobals.h" /* BadDevice */
#include "exevents.h"
#include "xiallowev.h"
diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c
index 1926762ad..809a81a0a 100644
--- a/Xi/xibarriers.c
+++ b/Xi/xibarriers.c
@@ -45,6 +45,8 @@
#include <dix-config.h>
#endif
+#include "dix/dix_priv.h"
+
#include "xibarriers.h"
#include "scrnintstr.h"
#include "cursorstr.h"
diff --git a/Xi/xichangecursor.c b/Xi/xichangecursor.c
index a9a1ac9fc..bfa2e777c 100644
--- a/Xi/xichangecursor.c
+++ b/Xi/xichangecursor.c
@@ -35,16 +35,18 @@
#include <X11/X.h> /* for inputstr.h */
#include <X11/Xproto.h> /* Request macro */
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XI2proto.h>
+
+#include "dix/dix_priv.h"
+
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */
#include "scrnintstr.h" /* screen structure */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XI2proto.h>
#include "extnsionst.h"
#include "exevents.h"
#include "exglobals.h"
#include "input.h"
-
#include "xichangecursor.h"
/***********************************************************************
diff --git a/Xi/xigetclientpointer.c b/Xi/xigetclientpointer.c
index c3d494d61..f63d6006e 100644
--- a/Xi/xigetclientpointer.c
+++ b/Xi/xigetclientpointer.c
@@ -29,16 +29,18 @@
#include <X11/X.h> /* for inputstr.h */
#include <X11/Xproto.h> /* Request macro */
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XI2proto.h>
+
+#include "dix/dix_priv.h"
+
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */
#include "scrnintstr.h" /* screen structure */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XI2proto.h>
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
#include "exevents.h"
#include "exglobals.h"
-
#include "xigetclientpointer.h"
/***********************************************************************
diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c
index 896233bec..6f1eca2a1 100644
--- a/Xi/xipassivegrab.c
+++ b/Xi/xipassivegrab.c
@@ -33,12 +33,14 @@
#include <dix-config.h>
#endif
-#include "inputstr.h" /* DeviceIntPtr */
-#include "windowstr.h" /* window structure */
#include <X11/extensions/XI2.h>
#include <X11/extensions/XI2proto.h>
-#include "swaprep.h"
+#include "dix/dix_priv.h"
+
+#include "inputstr.h" /* DeviceIntPtr */
+#include "windowstr.h" /* window structure */
+#include "swaprep.h"
#include "exglobals.h" /* BadDevice */
#include "exevents.h"
#include "xipassivegrab.h"
diff --git a/Xi/xiquerypointer.c b/Xi/xiquerypointer.c
index 02efdffb9..7da45fdc2 100644
--- a/Xi/xiquerypointer.c
+++ b/Xi/xiquerypointer.c
@@ -35,13 +35,14 @@
#include <X11/X.h> /* for inputstr.h */
#include <X11/Xproto.h> /* Request macro */
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XI2proto.h>
+#include "dix/dix_priv.h"
#include "dix/eventconvert.h"
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XI2proto.h>
#include "extnsionst.h"
#include "exevents.h"
#include "exglobals.h"
diff --git a/Xi/xiselectev.c b/Xi/xiselectev.c
index ac1494987..4d025b6e0 100644
--- a/Xi/xiselectev.c
+++ b/Xi/xiselectev.c
@@ -27,13 +27,15 @@
#include <dix-config.h>
#endif
+#include <X11/extensions/XI2proto.h>
+
+#include "dix/dix_priv.h"
+
#include "dixstruct.h"
#include "windowstr.h"
#include "exglobals.h"
#include "exevents.h"
-#include <X11/extensions/XI2proto.h>
#include "inpututils.h"
-
#include "xiselectev.h"
/**
diff --git a/Xi/xisetclientpointer.c b/Xi/xisetclientpointer.c
index e02eac4bc..a865c164c 100644
--- a/Xi/xisetclientpointer.c
+++ b/Xi/xisetclientpointer.c
@@ -36,6 +36,9 @@
#include <X11/X.h> /* for inputstr.h */
#include <X11/Xproto.h> /* Request macro */
+
+#include "dix/dix_priv.h"
+
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */
#include "scrnintstr.h" /* screen structure */
@@ -44,7 +47,6 @@
#include "extnsionst.h"
#include "exevents.h"
#include "exglobals.h"
-
#include "xisetclientpointer.h"
int _X_COLD
diff --git a/Xi/xiwarppointer.c b/Xi/xiwarppointer.c
index 955fdb965..1d8926935 100644
--- a/Xi/xiwarppointer.c
+++ b/Xi/xiwarppointer.c
@@ -35,17 +35,20 @@
#include <X11/X.h> /* for inputstr.h */
#include <X11/Xproto.h> /* Request macro */
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XI2proto.h>
+
+#include "dix/dix_priv.h"
+
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */
#include "scrnintstr.h" /* screen structure */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XI2proto.h>
#include "extnsionst.h"
#include "exevents.h"
#include "exglobals.h"
#include "mipointer.h" /* for miPointerUpdateSprite */
-
#include "xiwarppointer.h"
+
/***********************************************************************
*
* This procedure allows a client to warp the pointer of a device.
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 07:45:43 +0000