frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(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 <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-02-09 14:42:00 +01:00
parent 529e80026f
commit 6f74db9b06
13 changed files with 51 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Xi/exevents.c
View File

@ -91,6 +91,7 @@ SOFTWARE.
#include <X11/extensions/XKBproto.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"
@ -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"

1
Xi/ungrdevb.c
View File

@ -56,6 +56,7 @@ SOFTWARE.
#include <X11/extensions/XIproto.h>
#include "dix/dix_priv.h"
#include "dix/dixgrabs_priv.h"
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */

1
Xi/ungrdevk.c
View File

@ -56,6 +56,7 @@ SOFTWARE.
#include <X11/extensions/XIproto.h>
#include "dix/dix_priv.h"
#include "dix/dixgrabs_priv.h"
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */

1
Xi/xipassivegrab.c
View File

@ -35,6 +35,7 @@
#include <X11/extensions/XI2proto.h>
#include "dix/dix_priv.h"
#include "dix/dixgrabs_priv.h"
#include "dix/exevents_priv.h"
#include "inputstr.h" /* DeviceIntPtr */

2
dix/devices.c
View File

@ -56,6 +56,7 @@ SOFTWARE.
#include <X11/extensions/XIproto.h>
#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"

40
dix/dixgrabs_priv.h Normal file
View File

@ -0,0 +1,40 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
*/
#ifndef _XSERVER_DIXGRABS_PRIV_H
#define _XSERVER_DIXGRABS_PRiV_H
#include <X11/extensions/XIproto.h>
#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 */

1
dix/events.c
View File

@ -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"

2
dix/gestures.c
View File

@ -26,12 +26,12 @@
#include <dix-config.h>
#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"

1
dix/grabs.c
View File

@ -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"

2
dix/touch.c
View File

@ -27,13 +27,13 @@
#include <dix-config.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"
#include "inputstr.h"
#include "scrnintstr.h"
#include "dixgrabs.h"
#include "eventstr.h"
#include "exglobals.h"
#include "inpututils.h"

1
hw/xfree86/xkb/xkbPrivate.c
View File

@ -10,7 +10,6 @@
#include "windowstr.h"
#include <xkbsrv.h>
#include "dixgrabs.h"
#include "os.h"
#include "xf86.h"

22
include/dixgrabs.h
View File

@ -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 */

2
xkb/xkbActions.c
View File

@ -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