From 030745a0e739e015b2ad56d415f31a39b016a008 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 8 Jul 2025 20:27:50 +0200 Subject: [PATCH] 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 --- Xext/xtest.c | 2 +- Xi/exevents.c | 2 +- Xi/xigrabdev.c | 2 +- Xi/xipassivegrab.c | 2 +- Xi/xiquerydevice.c | 2 +- Xi/xiquerypointer.c | 2 +- Xi/xiselectev.c | 2 +- dix/enterleave.c | 2 +- dix/eventconvert.c | 3 +-- dix/events.c | 2 +- dix/gestures.c | 2 +- dix/getevents.c | 2 +- dix/grabs.c | 2 +- dix/inpututils.c | 2 +- include/inpututils.h => dix/inpututils_priv.h | 0 dix/touch.c | 2 +- dix/window.c | 2 +- hw/kdrive/src/kinput.c | 2 +- hw/xfree86/common/xf86Xinput.c | 4 ++-- hw/xnest/Events.c | 2 +- hw/xquartz/darwinEvents.c | 2 +- hw/xwin/winmouse.c | 3 ++- mi/mieq.c | 2 +- mi/mipointer.c | 2 +- test/input.c | 2 +- test/xi2/protocol-eventconvert.c | 2 +- test/xi2/xi2.c | 4 +++- xkb/xkbAccessX.c | 2 +- xkb/xkbActions.c | 2 +- 29 files changed, 32 insertions(+), 30 deletions(-) rename include/inpututils.h => dix/inpututils_priv.h (100%) diff --git a/Xext/xtest.c b/Xext/xtest.c index 90a3b278c6..c216b9810e 100644 --- a/Xext/xtest.c +++ b/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; diff --git a/Xi/exevents.c b/Xi/exevents.c index 5608fed908..add24d7b77 100644 --- a/Xi/exevents.c +++ b/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 ( \ diff --git a/Xi/xigrabdev.c b/Xi/xigrabdev.c index 3494c41cc9..80b3ca17ea 100644 --- a/Xi/xigrabdev.c +++ b/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) diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c index 2eb8820aa9..caa02261c1 100644 --- a/Xi/xipassivegrab.c +++ b/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) diff --git a/Xi/xiquerydevice.c b/Xi/xiquerydevice.c index 95d18f20f0..07cd04387e 100644 --- a/Xi/xiquerydevice.c +++ b/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" diff --git a/Xi/xiquerypointer.c b/Xi/xiquerypointer.c index ef7f16dffa..2fc179a559 100644 --- a/Xi/xiquerypointer.c +++ b/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" /*********************************************************************** diff --git a/Xi/xiselectev.c b/Xi/xiselectev.c index 337485fa78..f844ec36ee 100644 --- a/Xi/xiselectev.c +++ b/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" /** diff --git a/dix/enterleave.c b/dix/enterleave.c index 1ff5e35ee9..429639550b 100644 --- a/dix/enterleave.c +++ b/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 diff --git a/dix/eventconvert.c b/dix/eventconvert.c index 1b6bf55d1f..374d1e778e 100644 --- a/dix/eventconvert.c +++ b/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); diff --git a/dix/events.c b/dix/events.c index 9a09ab75f7..e18e240525 100644 --- a/dix/events.c +++ b/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" diff --git a/dix/gestures.c b/dix/gestures.c index 974c465933..ed11eab90d 100644 --- a/dix/gestures.c +++ b/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 diff --git a/dix/getevents.c b/dix/getevents.c index 0fec6dcfcc..c5fbb24544 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -41,6 +41,7 @@ #include #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" diff --git a/dix/grabs.c b/dix/grabs.c index aabb0af4a4..60f993e215 100644 --- a/dix/grabs.c +++ b/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 diff --git a/dix/inpututils.c b/dix/inpututils.c index 551df77745..ffdc0eaea1 100644 --- a/dix/inpututils.c +++ b/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" diff --git a/include/inpututils.h b/dix/inpututils_priv.h similarity index 100% rename from include/inpututils.h rename to dix/inpututils_priv.h diff --git a/dix/touch.c b/dix/touch.c index ed21821398..8c1eddbbdc 100644 --- a/dix/touch.c +++ b/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 diff --git a/dix/window.c b/dix/window.c index f4d39fd758..a75a7551d6 100644 --- a/dix/window.c +++ b/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" diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index 1cffacc7b8..539118116b 100644 --- a/hw/kdrive/src/kinput.c +++ b/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) diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index bb9b128501..5511507dde 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -58,8 +58,9 @@ #include #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" diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c index 7fb633ad3a..dde8fe432e 100644 --- a/hw/xnest/Events.c +++ b/hw/xnest/Events.c @@ -18,6 +18,7 @@ is" without express or implied warranty. #include #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" diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c index 5aa16ffabd..f94565033c 100644 --- a/hw/xquartz/darwinEvents.c +++ b/hw/xquartz/darwinEvents.c @@ -46,6 +46,7 @@ #include #include +#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" diff --git a/hw/xwin/winmouse.c b/hw/xwin/winmouse.c index 2e8f56d340..d5b24c33c8 100644 --- a/hw/xwin/winmouse.c +++ b/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; diff --git a/mi/mieq.c b/mi/mieq.c index 8da1d9b568..795bc44ff4 100644 --- a/mi/mieq.c +++ b/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" diff --git a/mi/mipointer.c b/mi/mipointer.c index ff0db9f6b6..52301a164b 100644 --- a/mi/mipointer.c +++ b/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 { diff --git a/test/input.c b/test/input.c index 063db31e1e..6528eca3b5 100644 --- a/test/input.c +++ b/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" diff --git a/test/xi2/protocol-eventconvert.c b/test/xi2/protocol-eventconvert.c index f340838c27..33729c855c 100644 --- a/test/xi2/protocol-eventconvert.c +++ b/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" diff --git a/test/xi2/xi2.c b/test/xi2/xi2.c index 00bcccebd6..842bc4a004 100644 --- a/test/xi2/xi2.c +++ b/test/xi2/xi2.c @@ -27,7 +27,9 @@ #include #include -#include "inpututils.h" + +#include "dix/inpututils_priv.h" + #include "inputstr.h" #include "assert.h" diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c index 3a65a3d8f0..556ee84da2 100644 --- a/xkb/xkbAccessX.c +++ b/xkb/xkbAccessX.c @@ -37,13 +37,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #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; diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index df7abd2bd0..28ba5654ab 100644 --- a/xkb/xkbActions.c +++ b/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