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

dix: unexport events related request handlers 

Request handlers aren't supposed to be called by external drivers directly,
so no need to keep them in the public SDK API.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-05-22 12:35:40 +02:00
parent 4cbe7e550c
commit 9f0fa773b9
6 changed files with 84 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dix/events.c
View File

@ -124,6 +124,7 @@ Equipment Corporation.
#include "dix/input_priv.h"
#include "dix/eventconvert.h"
#include "dix/exevents_priv.h"
#include "dix/reqhandlers_priv.h"
#include "os/bug_priv.h"
#include "os/client_priv.h"
#include "os/fmt.h"

77
dix/reqhandlers_priv.h Normal file
View File

@ -0,0 +1,77 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
*/
#ifndef _XSERVER_DIX_REQHANDLERS_H
#define _XSERVER_DIX_REQHANDLERS_H
#include "include/dix.h"
#include "include/os.h"
/*
* prototypes for various X11 request handlers
*
* those should only be called by the dispatcher
*/
/* events.c */
XRetCode ProcAllowEvents(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode ProcChangeActivePointerGrab(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode ProcGrabButton(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode ProcGetInputFocus(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode ProcGrabKey(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode ProcGrabKeyboard(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode ProcGrabPointer(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode ProcQueryPointer(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode ProcRecolorCursor(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode ProcSendEvent(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode ProcSetInputFocus(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode ProcUngrabButton(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode ProcUngrabKey(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode ProcUngrabKeyboard(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode ProcUngrabPointer(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode ProcWarpPointer(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode SProcChangeActivePointerGrab(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode SProcGrabButton(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode SProcGrabKey(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode SProcGrabKeyboard(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode SProcGrabPointer(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode SProcRecolorCursor(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode SProcSetInputFocus(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode SProcSendEvent(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode SProcUngrabButton(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode SProcUngrabKey(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode SProcUngrabKeyboard(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
XRetCode SProcWarpPointer(ClientPtr pClient)
_X_ATTRIBUTE_NONNULL_ARG(1);
#endif /* _XSERVER_DIX_REQHANDLERS_H */

3
dix/swapreq.c
View File

@ -49,6 +49,9 @@ SOFTWARE.
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/Xprotostr.h>
#include "dix/reqhandlers_priv.h"
#include "misc.h"
#include "dixstruct.h"
#include "extnsionst.h" /* for SendEvent */

3
dix/tables.c
View File

@ -48,6 +48,9 @@ SOFTWARE.
#include <X11/X.h>
#include <X11/Xproto.h>
#include "dix/reqhandlers_priv.h"
#include "windowstr.h"
#include "extnsionst.h"
#include "dixstruct.h"

32
include/dixevents.h
View File

@ -30,16 +30,12 @@ extern _X_EXPORT void SetCriticalEvent(int /* event */ );
extern _X_EXPORT CursorPtr GetSpriteCursor(DeviceIntPtr /*pDev */ );
extern _X_EXPORT int ProcAllowEvents(ClientPtr /* client */ );
extern _X_EXPORT int MaybeDeliverEventsToClient(WindowPtr /* pWin */ ,
xEvent * /* pEvents */ ,
int /* count */ ,
Mask /* filter */ ,
ClientPtr /* dontClient */ );
extern _X_EXPORT int ProcWarpPointer(ClientPtr /* client */ );
extern _X_EXPORT int EventSelectForWindow(WindowPtr /* pWin */ ,
ClientPtr /* client */ ,
Mask /* mask */ );
@ -49,32 +45,4 @@ extern _X_EXPORT int EventSuppressForWindow(WindowPtr /* pWin */ ,
Mask /* mask */ ,
Bool * /* checkOptional */ );
extern _X_EXPORT int ProcSetInputFocus(ClientPtr /* client */ );
extern _X_EXPORT int ProcGetInputFocus(ClientPtr /* client */ );
extern _X_EXPORT int ProcGrabPointer(ClientPtr /* client */ );
extern _X_EXPORT int ProcChangeActivePointerGrab(ClientPtr /* client */ );
extern _X_EXPORT int ProcUngrabPointer(ClientPtr /* client */ );
extern _X_EXPORT int ProcGrabKeyboard(ClientPtr /* client */ );
extern _X_EXPORT int ProcUngrabKeyboard(ClientPtr /* client */ );
extern _X_EXPORT int ProcQueryPointer(ClientPtr /* client */ );
extern _X_EXPORT int ProcSendEvent(ClientPtr /* client */ );
extern _X_EXPORT int ProcUngrabKey(ClientPtr /* client */ );
extern _X_EXPORT int ProcGrabKey(ClientPtr /* client */ );
extern _X_EXPORT int ProcGrabButton(ClientPtr /* client */ );
extern _X_EXPORT int ProcUngrabButton(ClientPtr /* client */ );
extern _X_EXPORT int ProcRecolorCursor(ClientPtr /* client */ );
#endif /* DIXEVENTS_H */

11
include/swapreq.h
View File

@ -34,7 +34,6 @@ int SProcAllocColor(ClientPtr client);
int SProcAllocColorCells(ClientPtr client);
int SProcAllocColorPlanes(ClientPtr client);
int SProcAllocNamedColor(ClientPtr client);
int SProcChangeActivePointerGrab(ClientPtr client);
int SProcChangeGC(ClientPtr client);
int SProcChangeHosts(ClientPtr client);
int SProcChangeKeyboardControl(ClientPtr client);
@ -61,10 +60,6 @@ int SProcFreeColors(ClientPtr client);
int SProcGetImage(ClientPtr client);
int SProcGetMotionEvents(ClientPtr client);
int SProcGetProperty(ClientPtr client);
int SProcGrabButton(ClientPtr client);
int SProcGrabKey(ClientPtr client);
int SProcGrabKeyboard(ClientPtr client);
int SProcGrabPointer(ClientPtr client);
int SProcImageText(ClientPtr client);
int SProcInternAtom(ClientPtr client);
int SProcListFonts(ClientPtr client);
@ -77,23 +72,17 @@ int SProcPutImage(ClientPtr client);
int SProcQueryBestSize(ClientPtr client);
int SProcQueryColors(ClientPtr client);
int SProcQueryExtension(ClientPtr client);
int SProcRecolorCursor(ClientPtr client);
int SProcReparentWindow(ClientPtr client);
int SProcResourceReq(ClientPtr client);
int SProcRotateProperties(ClientPtr client);
int SProcSendEvent(ClientPtr client);
int SProcSetClipRectangles(ClientPtr client);
int SProcSetDashes(ClientPtr client);
int SProcSetFontPath(ClientPtr client);
int SProcSetInputFocus(ClientPtr client);
int SProcSetScreenSaver(ClientPtr client);
int SProcSetSelectionOwner(ClientPtr client);
int SProcSimpleReq(ClientPtr client);
int SProcStoreColors(ClientPtr client);
int SProcStoreNamedColor(ClientPtr client);
int SProcTranslateCoords(ClientPtr client);
int SProcUngrabButton(ClientPtr client);
int SProcUngrabKey(ClientPtr client);
int SProcWarpPointer(ClientPtr client);
#endif /* SWAPREQ_H */