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

(!1799) xkb: unexport DDX entry points 

These functions are entry points of the DDX (or stubs thereof), not supposed
to be called by any drivers, so no need to keep them exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-04-04 17:49:02 +02:00
parent b251761e6c
commit c91ebfcaad
8 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xfree86/xkb/xkbKillSrv.c
View File

@ -34,11 +34,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/extensions/XI.h>
#include "xkb/xkbsrv_priv.h"
#include "inputstr.h" #include "inputstr.h"
#include "scrnintstr.h" #include "scrnintstr.h"
#include "windowstr.h" #include "windowstr.h"
#include <xkbsrv.h>
#include <X11/extensions/XI.h>
#include "xf86.h" #include "xf86.h"

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

@ -7,9 +7,10 @@
#include <stdio.h> #include <stdio.h>
#include <X11/X.h> #include <X11/X.h>
#include "windowstr.h"
#include <xkbsrv.h>
#include "xkb/xkbsrv_priv.h"
#include "windowstr.h"
#include "os.h" #include "os.h"
#include "xf86.h" #include "xf86.h"

6
hw/xfree86/xkb/xkbVT.c
View File

@ -34,11 +34,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/extensions/XI.h>
#include "xkb/xkbsrv_priv.h"
#include "inputstr.h" #include "inputstr.h"
#include "scrnintstr.h" #include "scrnintstr.h"
#include "windowstr.h" #include "windowstr.h"
#include <xkbsrv.h>
#include <X11/extensions/XI.h>
#include "xf86.h" #include "xf86.h"

15
include/xkbsrv.h
View File

@ -557,21 +557,6 @@ extern _X_EXPORT void XkbDDXUpdateDeviceIndicators(DeviceIntPtr /* dev */ ,
CARD32 /* newState */ CARD32 /* newState */
); );
extern _X_EXPORT int XkbDDXTerminateServer(DeviceIntPtr /* dev */ ,
KeyCode /* key */ ,
XkbAction * /* act */
);
extern _X_EXPORT int XkbDDXSwitchScreen(DeviceIntPtr /* dev */ ,
KeyCode /* key */ ,
XkbAction * /* act */
);
extern _X_EXPORT int XkbDDXPrivate(DeviceIntPtr /* dev */ ,
KeyCode /* key */ ,
XkbAction * /* act */
);
extern _X_EXPORT void XkbDisableComputedAutoRepeats(DeviceIntPtr /* pXDev */ , extern _X_EXPORT void XkbDisableComputedAutoRepeats(DeviceIntPtr /* pXDev */ ,
unsigned int /* key */ unsigned int /* key */
); );

4
xkb/ddxKillSrv.c
View File

@ -30,10 +30,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include "xkb/xkbsrv_priv.h"
#include "inputstr.h" #include "inputstr.h"
#include "scrnintstr.h" #include "scrnintstr.h"
#include "windowstr.h" #include "windowstr.h"
#include <xkbsrv.h>
int int
XkbDDXTerminateServer(DeviceIntPtr dev, KeyCode key, XkbAction *act) XkbDDXTerminateServer(DeviceIntPtr dev, KeyCode key, XkbAction *act)

4
xkb/ddxPrivate.c
View File

@ -2,8 +2,10 @@
#include <dix-config.h> #include <dix-config.h>
#include <X11/X.h> #include <X11/X.h>
#include "xkb/xkbsrv_priv.h"
#include "windowstr.h" #include "windowstr.h"
#include <xkbsrv.h>
int int
XkbDDXPrivate(DeviceIntPtr dev, KeyCode key, XkbAction *act) XkbDDXPrivate(DeviceIntPtr dev, KeyCode key, XkbAction *act)

4
xkb/ddxVT.c
View File

@ -30,10 +30,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include "xkb/xkbsrv_priv.h"
#include "inputstr.h" #include "inputstr.h"
#include "scrnintstr.h" #include "scrnintstr.h"
#include "windowstr.h" #include "windowstr.h"
#include <xkbsrv.h>
int int
XkbDDXSwitchScreen(DeviceIntPtr dev, KeyCode key, XkbAction *act) XkbDDXSwitchScreen(DeviceIntPtr dev, KeyCode key, XkbAction *act)

5
xkb/xkbsrv_priv.h
View File

@ -132,6 +132,11 @@ void AccessXCancelRepeatKey(XkbSrvInfoPtr xkbi, KeyCode key);
void AccessXComputeCurveFactor(XkbSrvInfoPtr xkbi, XkbControlsPtr ctrls); void AccessXComputeCurveFactor(XkbSrvInfoPtr xkbi, XkbControlsPtr ctrls);
int XkbDDXAccessXBeep(DeviceIntPtr dev, unsigned int what, unsigned int which); int XkbDDXAccessXBeep(DeviceIntPtr dev, unsigned int what, unsigned int which);
/* DDX entry points - DDX needs to implement these */
int XkbDDXTerminateServer(DeviceIntPtr dev, KeyCode key, XkbAction *act);
int XkbDDXSwitchScreen(DeviceIntPtr dev, KeyCode key, XkbAction *act);
int XkbDDXPrivate(DeviceIntPtr dev, KeyCode key, XkbAction *act);
/* client resources */ /* client resources */
XkbInterestPtr XkbFindClientResource(DevicePtr inDev, ClientPtr client); XkbInterestPtr XkbFindClientResource(DevicePtr inDev, ClientPtr client);
XkbInterestPtr XkbAddClientResource(DevicePtr inDev, ClientPtr client, XID id); XkbInterestPtr XkbAddClientResource(DevicePtr inDev, ClientPtr client, XID id);