From eff7ccc11c5e5ef6f8a0cf99a8c2f6e926c726ab Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 12 Feb 2024 18:57:22 +0100 Subject: [PATCH] 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 Part-of: --- Xext/xtest.c | 2 +- Xi/chgdctl.c | 8 +- Xi/chgkmap.c | 6 +- Xi/chgprop.c | 1 + Xi/exevents.c | 4 +- Xi/extinit.c | 2 +- Xi/grabdevb.c | 9 +- Xi/grabdevk.c | 9 +- Xi/gtmotion.c | 7 +- Xi/queryst.c | 9 +- Xi/selectev.c | 3 +- Xi/sendexev.c | 9 +- Xi/xiallowev.c | 2 +- Xi/xichangehierarchy.c | 2 +- Xi/xigrabdev.c | 2 +- Xi/xipassivegrab.c | 2 +- Xi/xiproperty.c | 13 +- Xi/xiquerydevice.c | 8 +- Xi/xiquerypointer.c | 2 +- Xi/xiqueryversion.c | 3 +- Xi/xiselectev.c | 2 +- dix/devices.c | 2 +- dix/eventconvert.c | 2 +- dix/events.c | 2 +- dix/exevents_priv.h | 158 +++++++++++++++++++++ dix/grabs.c | 4 +- dix/inpututils.c | 3 +- dix/touch.c | 3 +- dix/window.c | 3 +- hw/xfree86/common/xf86DGA.c | 2 +- hw/xwayland/xwayland-input.c | 2 +- include/exevents.h | 178 ------------------------ test/input.c | 10 +- test/xi2/protocol-common.c | 3 +- test/xi2/protocol-eventconvert.c | 4 +- test/xi2/protocol-xigetselectedevents.c | 4 +- test/xi2/protocol-xipassivegrabdevice.c | 4 +- test/xi2/protocol-xiqueryversion.c | 3 + xkb/xkbEvents.c | 4 +- 39 files changed, 247 insertions(+), 249 deletions(-) create mode 100644 dix/exevents_priv.h diff --git a/Xext/xtest.c b/Xext/xtest.c index 8fb580927..b451e41cd 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -38,6 +38,7 @@ #include #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" diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c index a778fa380..a6325a1c6 100644 --- a/Xi/chgdctl.c +++ b/Xi/chgdctl.c @@ -54,14 +54,14 @@ SOFTWARE. #include #endif -#include "inputstr.h" /* DeviceIntPtr */ #include #include /* control constants */ + +#include "dix/exevents_priv.h" + +#include "inputstr.h" /* DeviceIntPtr */ #include "XIstubs.h" - #include "exglobals.h" -#include "exevents.h" - #include "chgdctl.h" /*********************************************************************** diff --git a/Xi/chgkmap.c b/Xi/chgkmap.c index befe6e7ae..2940a2cb0 100644 --- a/Xi/chgkmap.c +++ b/Xi/chgkmap.c @@ -54,10 +54,12 @@ SOFTWARE. #include #endif -#include "inputstr.h" /* DeviceIntPtr */ #include #include -#include "exevents.h" + +#include "dix/exevents_priv.h" + +#include "inputstr.h" /* DeviceIntPtr */ #include "exglobals.h" #include "chgkmap.h" diff --git a/Xi/chgprop.c b/Xi/chgprop.c index 892ac4a23..a97fab18d 100644 --- a/Xi/chgprop.c +++ b/Xi/chgprop.c @@ -58,6 +58,7 @@ SOFTWARE. #include #include "dix/dix_priv.h" +#include "dix/exevents_priv.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" diff --git a/Xi/exevents.c b/Xi/exevents.c index 7ef0f2df6..61de1dfda 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -84,20 +84,20 @@ SOFTWARE. #include #include +#include #include #include #include -#include #include #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" diff --git a/Xi/extinit.c b/Xi/extinit.c index e99da9ce6..6354ad059 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -61,13 +61,13 @@ SOFTWARE. #include #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" diff --git a/Xi/grabdevb.c b/Xi/grabdevb.c index a2f7eb395..6b54dd425 100644 --- a/Xi/grabdevb.c +++ b/Xi/grabdevb.c @@ -54,14 +54,15 @@ SOFTWARE. #include #endif -#include "inputstr.h" /* DeviceIntPtr */ -#include "windowstr.h" /* window structure */ #include #include -#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" diff --git a/Xi/grabdevk.c b/Xi/grabdevk.c index e856fa82c..f63de62d3 100644 --- a/Xi/grabdevk.c +++ b/Xi/grabdevk.c @@ -54,14 +54,15 @@ SOFTWARE. #include #endif -#include "inputstr.h" /* DeviceIntPtr */ -#include "windowstr.h" /* window structure */ #include #include -#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" diff --git a/Xi/gtmotion.c b/Xi/gtmotion.c index 7c6684996..57a25bb2e 100644 --- a/Xi/gtmotion.c +++ b/Xi/gtmotion.c @@ -54,12 +54,13 @@ SOFTWARE. #include #endif -#include "inputstr.h" /* DeviceIntPtr */ #include #include -#include "exevents.h" -#include "exglobals.h" +#include "dix/exevents_priv.h" + +#include "inputstr.h" /* DeviceIntPtr */ +#include "exglobals.h" #include "gtmotion.h" /*********************************************************************** diff --git a/Xi/queryst.c b/Xi/queryst.c index 6c9d66606..34bfa9031 100644 --- a/Xi/queryst.c +++ b/Xi/queryst.c @@ -36,15 +36,16 @@ from The Open Group. #include #endif -#include "inputstr.h" /* DeviceIntPtr */ -#include "windowstr.h" /* window structure */ #include #include -#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" /*********************************************************************** diff --git a/Xi/selectev.c b/Xi/selectev.c index 6b7bdc512..378403d3b 100644 --- a/Xi/selectev.c +++ b/Xi/selectev.c @@ -59,12 +59,11 @@ SOFTWARE. #include #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" diff --git a/Xi/sendexev.c b/Xi/sendexev.c index 5c2e0fc56..0f6b4e46a 100644 --- a/Xi/sendexev.c +++ b/Xi/sendexev.c @@ -54,14 +54,15 @@ SOFTWARE. #include #endif +#include +#include + +#include "dix/exevents_priv.h" + #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* Window */ #include "extnsionst.h" /* EventSwapPtr */ -#include -#include -#include "exevents.h" #include "exglobals.h" - #include "grabdev.h" #include "sendexev.h" diff --git a/Xi/xiallowev.c b/Xi/xiallowev.c index ab83a19e7..03ced79bb 100644 --- a/Xi/xiallowev.c +++ b/Xi/xiallowev.c @@ -37,13 +37,13 @@ #include #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 diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c index e31d3332d..eea917ff6 100644 --- a/Xi/xichangehierarchy.c +++ b/Xi/xichangehierarchy.c @@ -41,12 +41,12 @@ #include #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" diff --git a/Xi/xigrabdev.c b/Xi/xigrabdev.c index d23d58ecd..604f8c926 100644 --- a/Xi/xigrabdev.c +++ b/Xi/xigrabdev.c @@ -37,11 +37,11 @@ #include #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" diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c index 900a3e113..78147d8dd 100644 --- a/Xi/xipassivegrab.c +++ b/Xi/xipassivegrab.c @@ -37,12 +37,12 @@ #include #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" diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c index 9c44f9d3e..aaafc629b 100644 --- a/Xi/xiproperty.c +++ b/Xi/xiproperty.c @@ -29,16 +29,17 @@ #include #endif -#include "dix.h" -#include "inputstr.h" -#include #include +#include #include #include -#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" diff --git a/Xi/xiquerydevice.c b/Xi/xiquerydevice.c index e4731a119..c9a9864bc 100644 --- a/Xi/xiquerydevice.c +++ b/Xi/xiquerydevice.c @@ -32,20 +32,20 @@ #include #endif -#include "inputstr.h" #include #include #include + +#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); diff --git a/Xi/xiquerypointer.c b/Xi/xiquerypointer.c index 7da45fdc2..2ac3e73a0 100644 --- a/Xi/xiquerypointer.c +++ b/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" diff --git a/Xi/xiqueryversion.c b/Xi/xiqueryversion.c index 111f1d61a..dc3860a21 100644 --- a/Xi/xiqueryversion.c +++ b/Xi/xiqueryversion.c @@ -39,8 +39,9 @@ #include #include +#include "dix/exevents_priv.h" + #include "exglobals.h" -#include "exevents.h" #include "xiqueryversion.h" #include "misc.h" diff --git a/Xi/xiselectev.c b/Xi/xiselectev.c index 4d025b6e0..6c6aff884 100644 --- a/Xi/xiselectev.c +++ b/Xi/xiselectev.c @@ -30,11 +30,11 @@ #include #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" diff --git a/dix/devices.c b/dix/devices.c index 4d8974b67..73402e091 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -58,6 +58,7 @@ SOFTWARE. #include #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() */ diff --git a/dix/eventconvert.c b/dix/eventconvert.c index 998304ad9..a7f43efe6 100644 --- a/dix/eventconvert.c +++ b/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" diff --git a/dix/events.c b/dix/events.c index 00ada3340..361a1c298 100644 --- a/dix/events.c +++ b/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" diff --git a/dix/exevents_priv.h b/dix/exevents_priv.h new file mode 100644 index 000000000..b9e397987 --- /dev/null +++ b/dix/exevents_priv.h @@ -0,0 +1,158 @@ +/* SPDX-License-Identifier: MIT OR X11 + * + * Copyright © 1996 Thomas E. Dickey + * Copyright © 2024 Enrico Weigelt, metux IT consult + */ +#ifndef _XSERVER_EXEVENTS_PRIV_H +#define _XSERVER_EXEVENTS_PRIV_H + +#include +#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 */ diff --git a/dix/grabs.c b/dix/grabs.c index bc8fd69bb..d6017bef2 100644 --- a/dix/grabs.c +++ b/dix/grabs.c @@ -50,19 +50,19 @@ SOFTWARE. #endif #include -#include "misc.h" #include #include #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" diff --git a/dix/inpututils.c b/dix/inpututils.c index 9026f651b..240d0ff8a 100644 --- a/dix/inpututils.c +++ b/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" diff --git a/dix/touch.c b/dix/touch.c index a2d65eee6..ef5dd4ae3 100644 --- a/dix/touch.c +++ b/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" diff --git a/dix/window.c b/dix/window.c index d30aff350..3534ff19b 100644 --- a/dix/window.c +++ b/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 /* must come after server includes */ diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index 97769c0b8..614c35ae4 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/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" diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c index 9ad0cc66f..da7e80e88 100644 --- a/hw/xwayland/xwayland-input.c +++ b/hw/xwayland/xwayland-input.c @@ -30,9 +30,9 @@ #include #include "dix/dix_priv.h" +#include "dix/exevents_priv.h" #include -#include #include #include #include diff --git a/include/exevents.h b/include/exevents.h index 7e3029fc9..50a777a33 100644 --- a/include/exevents.h +++ b/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 */ diff --git a/test/input.c b/test/input.c index 945680001..b0de20331 100644 --- a/test/input.c +++ b/test/input.c @@ -30,18 +30,18 @@ #include #include -#include "misc.h" -#include "resource.h" #include #include #include -#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" diff --git a/test/xi2/protocol-common.c b/test/xi2/protocol-common.c index b985e35b7..aae84180a 100644 --- a/test/xi2/protocol-common.c +++ b/test/xi2/protocol-common.c @@ -30,15 +30,16 @@ #include #include +#include #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 #include "protocol-common.h" diff --git a/test/xi2/protocol-eventconvert.c b/test/xi2/protocol-eventconvert.c index fb0627bb5..e1317ca1b 100644 --- a/test/xi2/protocol-eventconvert.c +++ b/test/xi2/protocol-eventconvert.c @@ -28,14 +28,14 @@ #endif #include +#include +#include "dix/exevents_priv.h" #include "dix/eventconvert.h" #include "inputstr.h" #include "eventstr.h" -#include "exevents.h" #include "inpututils.h" -#include #include "protocol-common.h" diff --git a/test/xi2/protocol-xigetselectedevents.c b/test/xi2/protocol-xigetselectedevents.c index 2ea365d01..937b52b2e 100644 --- a/test/xi2/protocol-xigetselectedevents.c +++ b/test/xi2/protocol-xigetselectedevents.c @@ -43,12 +43,14 @@ #include #include #include + +#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" diff --git a/test/xi2/protocol-xipassivegrabdevice.c b/test/xi2/protocol-xipassivegrabdevice.c index d7aaf23d4..bc9866493 100644 --- a/test/xi2/protocol-xipassivegrabdevice.c +++ b/test/xi2/protocol-xipassivegrabdevice.c @@ -35,11 +35,13 @@ #include #include #include + +#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" diff --git a/test/xi2/protocol-xiqueryversion.c b/test/xi2/protocol-xiqueryversion.c index 521703c5a..b8145bc1c 100644 --- a/test/xi2/protocol-xiqueryversion.c +++ b/test/xi2/protocol-xiqueryversion.c @@ -43,6 +43,9 @@ #include #include #include + +#include "dix/exevents_priv.h" + #include "inputstr.h" #include "extinit.h" /* for XInputExtensionInit */ #include "scrnintstr.h" diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c index c31f89740..e6325d875 100644 --- a/xkb/xkbEvents.c +++ b/xkb/xkbEvents.c @@ -34,8 +34,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include #include + +#include "dix/exevents_priv.h" + #include "inputstr.h" -#include "exevents.h" #include "exglobals.h" #include "windowstr.h" #include "xkbsrv_priv.h"