ahill/xlibre-xserver
1
0
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-01-26 05:57:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "xkb: unexport XkbGetCoreMap() and XkbSetRepeatKeys()"

Browse Source 
This reverts commit 25d99353eeb806f2929cf4423e481ff745ae4216.
These symbols are required by the xorgxrdp driver.

Signed-off-by: b-aaz <b-aazbsd@proton.me>
This commit is contained in:
b-aaz 2026-01-02 10:46:14 +00:00 committed by Enrico Weigelt
parent 65d4e5e081
commit d2dcac6eca
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Xi/getkmap.c
View File

@ -59,7 +59,6 @@ SOFTWARE.
#include "dix/request_priv.h" #include "dix/request_priv.h"
#include "dix/rpcbuf_priv.h" #include "dix/rpcbuf_priv.h"
#include "Xi/handlers.h" #include "Xi/handlers.h"
#include "xkb/xkbsrv_priv.h"
#include "inputstr.h" /* DeviceIntPtr */ #include "inputstr.h" /* DeviceIntPtr */
#include "swaprep.h" #include "swaprep.h"

7
hw/xquartz/quartzKeyboard.c
View File

@ -44,10 +44,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <assert.h>
#include <pthread.h>
#include "xkb/xkbsrv_priv.h"
#include "quartz.h" #include "quartz.h"
#include "darwin.h" #include "darwin.h"
@ -57,6 +53,9 @@
#include "X11Application.h" #include "X11Application.h"
#include <assert.h>
#include <pthread.h>
#include "xkbsrv.h" #include "xkbsrv.h"
#include "exevents.h" #include "exevents.h"
#include "X11/keysym.h" #include "X11/keysym.h"

8
include/xkbsrv.h
View File

@ -197,6 +197,9 @@ extern _X_EXPORT void XkbFreeKeyboard(XkbDescPtr /* xkb */ ,
Bool /* freeDesc */ Bool /* freeDesc */
); );
extern _X_EXPORT KeySymsPtr XkbGetCoreMap(DeviceIntPtr /* keybd */
);
extern _X_EXPORT void XkbApplyMappingChange(DeviceIntPtr /* pXDev */ , extern _X_EXPORT void XkbApplyMappingChange(DeviceIntPtr /* pXDev */ ,
KeySymsPtr /* map */ , KeySymsPtr /* map */ ,
KeyCode /* firstKey */ , KeyCode /* firstKey */ ,
@ -210,6 +213,11 @@ extern _X_EXPORT void XkbDDXChangeControls(DeviceIntPtr /* dev */ ,
XkbControlsPtr /* new */ XkbControlsPtr /* new */
); );
extern _X_EXPORT void XkbSetRepeatKeys(DeviceIntPtr /* pXDev */ ,
int /* key */ ,
int /* onoff */
);
extern _X_EXPORT void XkbGetRulesDflts(XkbRMLVOSet * /* rmlvo */ extern _X_EXPORT void XkbGetRulesDflts(XkbRMLVOSet * /* rmlvo */
); );

4
xkb/xkbsrv_priv.h
View File

@ -303,8 +303,4 @@ int XkbDDXUsesSoftRepeat(DeviceIntPtr dev);
void XkbDDXKeybdCtrlProc(DeviceIntPtr dev, KeybdCtrl *ctrl); void XkbDDXKeybdCtrlProc(DeviceIntPtr dev, KeybdCtrl *ctrl);
void XkbDDXUpdateDeviceIndicators(DeviceIntPtr dev, XkbSrvLedInfoPtr sli, void XkbDDXUpdateDeviceIndicators(DeviceIntPtr dev, XkbSrvLedInfoPtr sli,
CARD32 newState); CARD32 newState);
KeySymsPtr XkbGetCoreMap(DeviceIntPtr keybd);
void XkbSetRepeatKeys(DeviceIntPtr pXDev, int key, int onoff);
#endif /* _XSERVER_XKBSRV_PRIV_H_ */ #endif /* _XSERVER_XKBSRV_PRIV_H_ */