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

xkb: unexport XkbDDX*() functions 

Not used by any drivers, so no need to keep it 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:39:44 +02:00
parent 2eb90fc722
commit e70aeae0eb
4 changed files with 22 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/xkbsrv.h
View File

@ -395,23 +395,11 @@ extern _X_EXPORT Bool XkbEnableDisableControls(XkbSrvInfoPtr /* xkbi */ ,
XkbEventCausePtr /* cause */ XkbEventCausePtr /* cause */
); );
extern _X_EXPORT int XkbDDXUsesSoftRepeat(DeviceIntPtr /* dev */
);
extern _X_EXPORT void XkbDDXKeybdCtrlProc(DeviceIntPtr /* dev */ ,
KeybdCtrl * /* ctrl */
);
extern _X_EXPORT void XkbDDXChangeControls(DeviceIntPtr /* dev */ , extern _X_EXPORT void XkbDDXChangeControls(DeviceIntPtr /* dev */ ,
XkbControlsPtr /* old */ , XkbControlsPtr /* old */ ,
XkbControlsPtr /* new */ XkbControlsPtr /* new */
); );
extern _X_EXPORT void XkbDDXUpdateDeviceIndicators(DeviceIntPtr /* dev */ ,
XkbSrvLedInfoPtr /* sli */ ,
CARD32 /* newState */
);
extern _X_EXPORT void XkbDisableComputedAutoRepeats(DeviceIntPtr /* pXDev */ , extern _X_EXPORT void XkbDisableComputedAutoRepeats(DeviceIntPtr /* pXDev */ ,
unsigned int /* key */ unsigned int /* key */
); );
@ -489,22 +477,4 @@ extern _X_EXPORT void XkbCopyControls(XkbDescPtr /* dst */ ,
#include "xkbstr.h" #include "xkbstr.h"
#include "xkbrules.h" #include "xkbrules.h"
extern _X_EXPORT unsigned int XkbDDXLoadKeymapByNames(DeviceIntPtr /* keybd */ ,
XkbComponentNamesPtr
/* names */ ,
unsigned int /* want */ ,
unsigned int /* need */ ,
XkbDescPtr *
/* finfoRtrn */ ,
char *
/* keymapNameRtrn */ ,
int /* keymapNameRtrnLen */
);
extern _X_EXPORT Bool XkbDDXNamesFromRules(DeviceIntPtr /* keybd */ ,
const char * /* rules */ ,
XkbRF_VarDefsPtr /* defs */ ,
XkbComponentNamesPtr /* names */
);
#endif /* _XKBSRV_H_ */ #endif /* _XKBSRV_H_ */

6
xkb/ddxCtrls.c
View File

@ -30,11 +30,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>
void void
XkbDDXKeybdCtrlProc(DeviceIntPtr dev, KeybdCtrl * ctrl) XkbDDXKeybdCtrlProc(DeviceIntPtr dev, KeybdCtrl * ctrl)

6
xkb/ddxLEDs.c
View File

@ -30,11 +30,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>
static void static void
XkbDDXUpdateIndicators(DeviceIntPtr dev, CARD32 new) XkbDDXUpdateIndicators(DeviceIntPtr dev, CARD32 new)

14
xkb/xkbsrv_priv.h
View File

@ -221,4 +221,18 @@ void XkbFlushLedEvents(DeviceIntPtr dev, DeviceIntPtr kbd, XkbSrvLedInfoPtr sli,
xkbExtensionDeviceNotify *ed, XkbChangesPtr changes, xkbExtensionDeviceNotify *ed, XkbChangesPtr changes,
XkbEventCausePtr cause); XkbEventCausePtr cause);
/* XkbDDX* functions */
unsigned int XkbDDXLoadKeymapByNames(DeviceIntPtr keybd,
XkbComponentNamesPtr names,
unsigned int want,
unsigned int need,
XkbDescPtr *finfoRtrn,
char *keymapNameRtrn,
int keymapNameRtrnLen);
Bool XkbDDXNamesFromRules(DeviceIntPtr keybd, const char *rules,
XkbRF_VarDefsPtr defs, XkbComponentNamesPtr names);
int XkbDDXUsesSoftRepeat(DeviceIntPtr dev);
void XkbDDXKeybdCtrlProc(DeviceIntPtr dev, KeybdCtrl *ctrl);
void XkbDDXUpdateDeviceIndicators(DeviceIntPtr dev, XkbSrvLedInfoPtr sli,
CARD32 newState);
#endif /* _XSERVER_XKBSRV_PRIV_H_ */ #endif /* _XSERVER_XKBSRV_PRIV_H_ */