dix: move inpututils.h and rename it to inpututil_privs.h

it's a private header, thus should not be in public include directory.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

Xext/xtest.c

@@ -38,6 +38,7 @@
 #include "dix/input_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
+#include "dix/inpututils_priv.h"
 #include "mi/mi_priv.h"
 #include "mi/mipointer_priv.h"
 #include "miext/extinit_priv.h"
@@ -60,7 +61,6 @@
 #include "mipointer.h"
 #include "xserver-properties.h"
 #include "eventstr.h"
-#include "inpututils.h"
 
 Bool noTestExtensions = FALSE;
 

Xi/exevents.c

@@ -96,6 +96,7 @@ SOFTWARE.
 #include "dix/eventconvert.h"
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
+#include "dix/inpututils_priv.h"
 #include "dix/resource_priv.h"
 #include "dix/window_priv.h"
 #include "mi/mi_priv.h"
@@ -114,7 +115,6 @@ SOFTWARE.
 #include "xace.h"
 #include "xiquerydevice.h"      /* For List*Info */
 #include "eventstr.h"
-#include "inpututils.h"
 
 #define WID(w) ((w) ? ((w)->drawable.id) : 0)
 #define AllModifiersMask ( \

Xi/xigrabdev.c

@@ -36,13 +36,13 @@
 
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
+#include "dix/inpututils_priv.h"
 #include "dix/resource_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
 #include "exglobals.h"          /* BadDevice */
 #include "xigrabdev.h"
-#include "inpututils.h"
 
 int _X_COLD
 SProcXIGrabDevice(ClientPtr client)

Xi/xipassivegrab.c

@@ -37,6 +37,7 @@
 #include "dix/dix_priv.h"
 #include "dix/dixgrabs_priv.h"
 #include "dix/exevents_priv.h"
+#include "dix/inpututils_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
@@ -44,7 +45,6 @@
 #include "exglobals.h"          /* BadDevice */
 #include "xipassivegrab.h"
 #include "misc.h"
-#include "inpututils.h"
 
 int _X_COLD
 SProcXIPassiveGrabDevice(ClientPtr client)

Xi/xiquerydevice.c

@@ -36,6 +36,7 @@
 
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
+#include "dix/inpututils_priv.h"
 #include "os/fmt.h"
 
 #include "inputstr.h"
@@ -43,7 +44,6 @@
 #include "xkbsrv.h"
 #include "xserver-properties.h"
 #include "xace.h"
-#include "inpututils.h"
 #include "exglobals.h"
 #include "privates.h"
 #include "xiquerydevice.h"

Xi/xiquerypointer.c

@@ -40,6 +40,7 @@
 #include "dix/eventconvert.h"
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
+#include "dix/inpututils_priv.h"
 #include "os/fmt.h"
 #include "Xext/panoramiXsrv.h"
 
@@ -50,7 +51,6 @@
 #include "scrnintstr.h"
 #include "xkbsrv.h"
 
-#include "inpututils.h"
 #include "xiquerypointer.h"
 
 /***********************************************************************

Xi/xiselectev.c

@@ -29,12 +29,12 @@
 
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
+#include "dix/inpututils_priv.h"
 #include "dix/resource_priv.h"
 
 #include "dixstruct.h"
 #include "windowstr.h"
 #include "exglobals.h"
-#include "inpututils.h"
 #include "xiselectev.h"
 
 /**

dix/enterleave.c

@@ -35,6 +35,7 @@
 #include "dix/eventconvert.h"
 #include "dix/extension_priv.h"
 #include "dix/input_priv.h"
+#include "dix/inpututils_priv.h"
 #include "os/bug_priv.h"
 
 #include "inputstr.h"
@@ -43,7 +44,6 @@
 #include "exglobals.h"
 #include "enterleave.h"
 #include "xkbsrv.h"
-#include "inpututils.h"
 
 /**
  * @file

dix/eventconvert.c

@@ -41,16 +41,15 @@
 #include "dix/eventconvert.h"
 #include "dix/exevents_priv.h"
 #include "dix/extension_priv.h"
+#include "dix/inpututils_priv.h"
 
 #include "dix.h"
 #include "inputstr.h"
 #include "misc.h"
 #include "eventstr.h"
 #include "exglobals.h"
-#include "inpututils.h"
 #include "xiquerydevice.h"
 #include "xkbsrv.h"
-#include "inpututils.h"
 
 static int countValuators(DeviceEvent *ev, int *first);
 static int getValuatorEvents(DeviceEvent *ev, deviceValuator * xv);

dix/events.c

@@ -125,6 +125,7 @@ Equipment Corporation.
 #include "dix/exevents_priv.h"
 #include "dix/extension_priv.h"
 #include "dix/input_priv.h"
+#include "dix/inpututils_priv.h"
 #include "dix/reqhandlers_priv.h"
 #include "dix/resource_priv.h"
 #include "dix/window_priv.h"
@@ -141,7 +142,6 @@ Equipment Corporation.
 #include "resource.h"
 #include "windowstr.h"
 #include "inputstr.h"
-#include "inpututils.h"
 #include "scrnintstr.h"
 #include "cursorstr.h"
 #include "dixstruct.h"

dix/gestures.c

@@ -29,6 +29,7 @@
 #include "dix/dixgrabs_priv.h"
 #include "dix/eventconvert.h"
 #include "dix/input_priv.h"
+#include "dix/inpututils_priv.h"
 #include "dix/resource_priv.h"
 #include "mi/mi_priv.h"
 #include "os/bug_priv.h"
@@ -38,7 +39,6 @@
 #include "eventstr.h"
 #include "exevents.h"
 #include "exglobals.h"
-#include "inpututils.h"
 #include "windowstr.h"
 
 #define GESTURE_HISTORY_SIZE 100

dix/getevents.c

@@ -41,6 +41,7 @@
 #include <X11/extensions/XKBproto.h>
 
 #include "dix/input_priv.h"
+#include "dix/inpututils_priv.h"
 #include "mi/mi_priv.h"
 #include "os/bug_priv.h"
 #include "os/probes_priv.h"
@@ -57,7 +58,6 @@
 #include "mipointer.h"
 #include "eventstr.h"
 #include "eventconvert.h"
-#include "inpututils.h"
 #include "windowstr.h"
 #include "xkbsrv.h"
 #include "exglobals.h"

dix/grabs.c

@@ -55,6 +55,7 @@ SOFTWARE.
 #include "dix/dix_priv.h"
 #include "dix/dixgrabs_priv.h"
 #include "dix/exevents_priv.h"
+#include "dix/inpututils_priv.h"
 #include "dix/resource_priv.h"
 #include "dix/window_priv.h"
 #include "os/auth.h"
@@ -66,7 +67,6 @@ SOFTWARE.
 #include "cursorstr.h"
 #include "xace.h"
 #include "exglobals.h"
-#include "inpututils.h"
 
 #define MasksPerDetailMask 8    /* 256 keycodes and 256 possible
                                    modifier combinations, but only

dix/inpututils.c

@@ -27,6 +27,7 @@
 
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
+#include "dix/inpututils_priv.h"
 #include "os/bug_priv.h"
 
 #include "exglobals.h"
@@ -35,7 +36,6 @@
 #include "xace.h"
 #include "xkbsrv.h"
 #include "xkbstr.h"
-#include "inpututils.h"
 #include "eventstr.h"
 #include "scrnintstr.h"
 #include "optionstr.h"

dix/touch.c

@@ -31,6 +31,7 @@
 #include "dix/eventconvert.h"
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
+#include "dix/inpututils_priv.h"
 #include "dix/resource_priv.h"
 #include "mi/mi_priv.h"
 #include "os/bug_priv.h"
@@ -40,7 +41,6 @@
 #include "scrnintstr.h"
 #include "eventstr.h"
 #include "exglobals.h"
-#include "inpututils.h"
 #include "windowstr.h"
 
 #define TOUCH_HISTORY_SIZE 100

dix/window.c

@@ -104,6 +104,7 @@ Equipment Corporation.
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
+#include "dix/inpututils_priv.h"
 #include "dix/property_priv.h"
 #include "dix/resource_priv.h"
 #include "dix/selection_priv.h"
@@ -131,7 +132,6 @@ Equipment Corporation.
 #include "mivalidate.h"
 #include "globals.h"
 #include "compint.h"
-#include "inpututils.h"
 #include "privates.h"
 #include "xace.h"
 

hw/kdrive/src/kinput.c

@@ -39,6 +39,7 @@
 
 #include "config/hotplug_priv.h"
 #include "dix/input_priv.h"
+#include "dix/inpututils_priv.h"
 #include "mi/mi_priv.h"
 #include "mi/mipointer_priv.h"
 #include "os/cmdline.h"
@@ -49,7 +50,6 @@
 #include "exglobals.h"
 #include "eventstr.h"
 #include "xserver-properties.h"
-#include "inpututils.h"
 #include "optionstr.h"
 
 #define AtomFromName(x) MakeAtom(x, strlen(x), 1)

hw/xfree86/common/xf86Xinput.c

@@ -58,8 +58,9 @@
 #include <X11/Xatom.h>
 
 #include "dix/dix_priv.h"
-#include "dix/ptrveloc_priv.h"
 #include "dix/input_priv.h"
+#include "dix/inpututils_priv.h"
+#include "dix/ptrveloc_priv.h"
 
 #include "xf86_priv.h"
 #include "xf86Priv.h"
@@ -73,7 +74,6 @@
 #include "exevents.h"           /* AddInputDevice */
 #include "exglobals.h"
 #include "eventstr.h"
-#include "inpututils.h"
 #include "optionstr.h"
 #include "xf86Module_priv.h"
 #include "xf86Opt_priv.h"

hw/xnest/Events.c

@@ -18,6 +18,7 @@ is" without express or implied warranty.
 #include <X11/Xproto.h>
 
 #include "dix/cursor_priv.h"
+#include "dix/inpututils_priv.h"
 #include "mi/mi_priv.h"
 
 #include "screenint.h"
@@ -27,7 +28,6 @@ is" without express or implied warranty.
 #include "windowstr.h"
 #include "servermd.h"
 #include "inputstr.h"
-#include "inpututils.h"
 
 #include "xnest-xcb.h"
 

hw/xquartz/darwinEvents.c

@@ -46,6 +46,7 @@
 #include <X11/Xmd.h>
 #include <X11/Xproto.h>
 
+#include "dix/inpututils_priv.h"
 #include "mi/mi_priv.h"
 #include "os/client_priv.h"
 
@@ -53,7 +54,6 @@
 #include "windowstr.h"
 #include "pixmapstr.h"
 #include "inputstr.h"
-#include "inpututils.h"
 #include "eventstr.h"
 #include "scrnintstr.h"
 #include "mipointer.h"

hw/xwin/winmouse.c

@@ -36,10 +36,11 @@
 #endif
 #include "win.h"
 
+#include "dix/inpututils_priv.h"
+
 #include "inputstr.h"
 #include "exevents.h"           /* for button/axes labels */
 #include "xserver-properties.h"
-#include "inpututils.h"
 
 /* Peek the internal button mapping */
 static CARD8 const *g_winMouseButtonMap = NULL;

mi/mieq.c

@@ -44,6 +44,7 @@ in this Software without prior written authorization from The Open Group.
 #include   "dix/cursor_priv.h"
 #include   "dix/dix_priv.h"
 #include   "dix/input_priv.h"
+#include   "dix/inpututils_priv.h"
 #include   "mi/mi_priv.h"
 #include   "mi/mipointer_priv.h"
 #include   "os/bug_priv.h"
@@ -53,7 +54,6 @@ in this Software without prior written authorization from The Open Group.
 #include   "windowstr.h"
 #include   "pixmapstr.h"
 #include   "inputstr.h"
-#include   "inpututils.h"
 #include   "mipointer.h"
 #include   "scrnintstr.h"
 #include   "exglobals.h"

mi/mipointer.c

@@ -55,6 +55,7 @@ in this Software without prior written authorization from The Open Group.
 #include   "dix/cursor_priv.h"
 #include   "dix/dix_priv.h"
 #include   "dix/input_priv.h"
+#include   "dix/inpututils_priv.h"
 #include   "dix/screen_hooks_priv.h"
 #include   "mi/mi_priv.h"
 #include   "mi/mipointer_priv.h"
@@ -67,7 +68,6 @@ in this Software without prior written authorization from The Open Group.
 #include   "cursorstr.h"
 #include   "dixstruct.h"
 #include   "inputstr.h"
-#include   "inpututils.h"
 #include   "eventstr.h"
 
 typedef struct {

test/input.c

@@ -37,6 +37,7 @@
 #include "dix/eventconvert.h"
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
+#include "dix/inpututils_priv.h"
 #include "mi/mi_priv.h"
 #include "os/fmt.h"
 
@@ -46,7 +47,6 @@
 #include "inputstr.h"
 #include "exglobals.h"
 #include "eventstr.h"
-#include "inpututils.h"
 #include "assert.h"
 
 #include "tests-common.h"

test/xi2/protocol-eventconvert.c

@@ -30,10 +30,10 @@
 
 #include "dix/exevents_priv.h"
 #include "dix/eventconvert.h"
+#include "dix/inpututils_priv.h"
 
 #include "inputstr.h"
 #include "eventstr.h"
-#include "inpututils.h"
 
 #include "protocol-common.h"
 

test/xi2/xi2.c

@@ -27,7 +27,9 @@
 #include <dix-config.h>
 
 #include <stdint.h>
-#include "inpututils.h"
+
+#include "dix/inpututils_priv.h"
+
 #include "inputstr.h"
 #include "assert.h"
 

xkb/xkbAccessX.c

@@ -37,13 +37,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/extensions/XIproto.h>
 
 #include "dix/input_priv.h"
+#include "dix/inpututils_priv.h"
 #include "os/log_priv.h"
 #include "xkb/xkbsrv_priv.h"
 
 #include "exglobals.h"
 #include "inputstr.h"
 #include "eventstr.h"
-#include "inpututils.h"
 
 int XkbDfltRepeatDelay = 660;
 int XkbDfltRepeatInterval = 40;

xkb/xkbActions.c

@@ -38,6 +38,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "dix/dix_priv.h"
 #include "dix/dixgrabs_priv.h"
 #include "dix/input_priv.h"
+#include "dix/inpututils_priv.h"
 #include "mi/mi_priv.h"
 #include "mi/mipointer_priv.h"
 #include "xkb/xkbsrv_priv.h"
@@ -47,7 +48,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "exevents.h"
 #include "eventstr.h"
 #include "mipointer.h"
-#include "inpututils.h"
 
 #define EXTENSION_EVENT_BASE 64