From 6f74db9b067976657cfb164f49941f08b746bc78 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 9 Feb 2024 14:42:00 +0100 Subject: [PATCH] (submit/dixgrabs.h) dix: move non-public functions out from dixgrabs.h Moving out the private functions from dixgrabs.h into dixgrabs_priv.h Signed-off-by: Enrico Weigelt, metux IT consult --- Xi/exevents.c | 3 ++- Xi/ungrdevb.c | 1 + Xi/ungrdevk.c | 1 + Xi/xipassivegrab.c | 1 + dix/devices.c | 2 +- dix/dixgrabs_priv.h | 40 +++++++++++++++++++++++++++++++++++++ dix/events.c | 1 + dix/gestures.c | 2 +- dix/grabs.c | 1 + dix/touch.c | 2 +- hw/xfree86/xkb/xkbPrivate.c | 1 - include/dixgrabs.h | 22 -------------------- xkb/xkbActions.c | 2 +- 13 files changed, 51 insertions(+), 28 deletions(-) create mode 100644 dix/dixgrabs_priv.h diff --git a/Xi/exevents.c b/Xi/exevents.c index 5c866e2ec..2c4a57c6e 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -91,6 +91,7 @@ SOFTWARE. #include #include "dix/dix_priv.h" +#include "dix/dixgrabs_priv.h" #include "dix/eventconvert.h" #include "dix/exevents_priv.h" #include "dix/input_priv.h" @@ -103,7 +104,7 @@ SOFTWARE. #include "exglobals.h" #include "eventstr.h" #include "dixevents.h" /* DeliverFocusedEvent */ -#include "dixgrabs.h" /* CreateGrab() */ +#include "dixgrabs.h" #include "scrnintstr.h" #include "listdev.h" /* for CopySwapXXXClass */ #include "xace.h" diff --git a/Xi/ungrdevb.c b/Xi/ungrdevb.c index 8c02852c5..3b7293ccf 100644 --- a/Xi/ungrdevb.c +++ b/Xi/ungrdevb.c @@ -56,6 +56,7 @@ SOFTWARE. #include #include "dix/dix_priv.h" +#include "dix/dixgrabs_priv.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ diff --git a/Xi/ungrdevk.c b/Xi/ungrdevk.c index af6b87a58..c89031cbc 100644 --- a/Xi/ungrdevk.c +++ b/Xi/ungrdevk.c @@ -56,6 +56,7 @@ SOFTWARE. #include #include "dix/dix_priv.h" +#include "dix/dixgrabs_priv.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c index 130db4af7..b19f7dcce 100644 --- a/Xi/xipassivegrab.c +++ b/Xi/xipassivegrab.c @@ -35,6 +35,7 @@ #include #include "dix/dix_priv.h" +#include "dix/dixgrabs_priv.h" #include "dix/exevents_priv.h" #include "inputstr.h" /* DeviceIntPtr */ diff --git a/dix/devices.c b/dix/devices.c index cfccc4098..9e29f011c 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -56,6 +56,7 @@ SOFTWARE. #include #include "dix/dix_priv.h" +#include "dix/dixgrabs_priv.h" #include "dix/exevents_priv.h" #include "dix/input_priv.h" #include "dix/ptrveloc_priv.h" @@ -77,7 +78,6 @@ SOFTWARE. #include "dixevents.h" #include "mipointer.h" #include "eventstr.h" -#include "dixgrabs.h" #include "exglobals.h" #include "xiquerydevice.h" /* for SizeDeviceClasses */ #include "xiproperty.h" diff --git a/dix/dixgrabs_priv.h b/dix/dixgrabs_priv.h new file mode 100644 index 000000000..4735473f0 --- /dev/null +++ b/dix/dixgrabs_priv.h @@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: MIT OR X11 + * + * Copyright © 2024 Enrico Weigelt, metux IT consult + */ +#ifndef _XSERVER_DIXGRABS_PRIV_H +#define _XSERVER_DIXGRABS_PRiV_H + +#include + +#include "misc.h" +#include "window.h" +#include "input.h" +#include "cursor.h" + +struct _GrabParameters; + +void PrintDeviceGrabInfo(DeviceIntPtr dev); +void UngrabAllDevices(Bool kill_client); + +GrabPtr AllocGrab(const GrabPtr src); +void FreeGrab(GrabPtr grab); +Bool CopyGrab(GrabPtr dst, const GrabPtr src); + +GrabPtr CreateGrab(int client, + DeviceIntPtr device, + DeviceIntPtr modDevice, + WindowPtr window, + enum InputLevel grabtype, + GrabMask *mask, + struct _GrabParameters *param, + int type, + KeyCode keybut, + WindowPtr confineTo, + CursorPtr cursor); + +Bool GrabIsPointerGrab(GrabPtr grab); +Bool GrabIsKeyboardGrab(GrabPtr grab); +Bool GrabIsGestureGrab(GrabPtr grab); + +#endif /* _XSERVER_DIXGRABS_PRIV_H */ diff --git a/dix/events.c b/dix/events.c index a6232fda5..858ee268e 100644 --- a/dix/events.c +++ b/dix/events.c @@ -114,6 +114,7 @@ Equipment Corporation. #include "dix/cursor_priv.h" #include "dix/dix_priv.h" +#include "dix/dixgrabs_priv.h" #include "dix/eventconvert.h" #include "dix/exevents_priv.h" #include "dix/input_priv.h" diff --git a/dix/gestures.c b/dix/gestures.c index ff9631460..0e385d1b2 100644 --- a/dix/gestures.c +++ b/dix/gestures.c @@ -26,12 +26,12 @@ #include #include "dix/dix_priv.h" +#include "dix/dixgrabs_priv.h" #include "dix/eventconvert.h" #include "dix/input_priv.h" #include "inputstr.h" #include "scrnintstr.h" -#include "dixgrabs.h" #include "eventstr.h" #include "exevents.h" #include "exglobals.h" diff --git a/dix/grabs.c b/dix/grabs.c index fc27f8612..241298ff6 100644 --- a/dix/grabs.c +++ b/dix/grabs.c @@ -53,6 +53,7 @@ SOFTWARE. #include "dix/cursor_priv.h" #include "dix/dix_priv.h" +#include "dix/dixgrabs_priv.h" #include "dix/exevents_priv.h" #include "os/auth.h" #include "os/client_priv.h" diff --git a/dix/touch.c b/dix/touch.c index f48fe1406..d7d6f2ec7 100644 --- a/dix/touch.c +++ b/dix/touch.c @@ -27,13 +27,13 @@ #include #include "dix/dix_priv.h" +#include "dix/dixgrabs_priv.h" #include "dix/eventconvert.h" #include "dix/exevents_priv.h" #include "dix/input_priv.h" #include "inputstr.h" #include "scrnintstr.h" -#include "dixgrabs.h" #include "eventstr.h" #include "exglobals.h" #include "inpututils.h" diff --git a/hw/xfree86/xkb/xkbPrivate.c b/hw/xfree86/xkb/xkbPrivate.c index 54ba1e36f..779fda187 100644 --- a/hw/xfree86/xkb/xkbPrivate.c +++ b/hw/xfree86/xkb/xkbPrivate.c @@ -10,7 +10,6 @@ #include "windowstr.h" #include -#include "dixgrabs.h" #include "os.h" #include "xf86.h" diff --git a/include/dixgrabs.h b/include/dixgrabs.h index dc1068fef..28195c7a0 100644 --- a/include/dixgrabs.h +++ b/include/dixgrabs.h @@ -28,25 +28,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. struct _GrabParameters; -extern void PrintDeviceGrabInfo(DeviceIntPtr dev); -extern void UngrabAllDevices(Bool kill_client); - -extern GrabPtr AllocGrab(const GrabPtr src); -extern void FreeGrab(GrabPtr grab); -extern Bool CopyGrab(GrabPtr dst, const GrabPtr src); - -extern GrabPtr CreateGrab(int /* client */ , - DeviceIntPtr /* device */ , - DeviceIntPtr /* modDevice */ , - WindowPtr /* window */ , - enum InputLevel /* grabtype */ , - GrabMask * /* mask */ , - struct _GrabParameters * /* param */ , - int /* type */ , - KeyCode /* keybut */ , - WindowPtr /* confineTo */ , - CursorPtr /* cursor */ ); - extern _X_EXPORT int DeletePassiveGrab(void *value, XID id); @@ -59,7 +40,4 @@ extern _X_EXPORT int AddPassiveGrabToList(ClientPtr /* client */ , extern _X_EXPORT Bool DeletePassiveGrabFromList(GrabPtr /* pMinuendGrab */ ); -extern Bool GrabIsPointerGrab(GrabPtr grab); -extern Bool GrabIsKeyboardGrab(GrabPtr grab); -extern Bool GrabIsGestureGrab(GrabPtr grab); #endif /* DIXGRABS_H */ diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index f3e602ec4..1743e107f 100644 --- a/xkb/xkbActions.c +++ b/xkb/xkbActions.c @@ -35,6 +35,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "dix/cursor_priv.h" #include "dix/dix_priv.h" +#include "dix/dixgrabs_priv.h" #include "dix/input_priv.h" #include "xkb/xkbsrv_priv.h" @@ -45,7 +46,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "mi.h" #include "mipointer.h" #include "inpututils.h" -#include "dixgrabs.h" #define EXTENSION_EVENT_BASE 64