diff --git a/include/xkbsrv.h b/include/xkbsrv.h index db133242e..430860f55 100644 --- a/include/xkbsrv.h +++ b/include/xkbsrv.h @@ -368,24 +368,6 @@ extern _X_EXPORT void XkbUpdateAllDeviceIndicators(XkbChangesPtr /* changes */, XkbEventCausePtr /* cause */ ); -extern _X_EXPORT XkbSrvLedInfoPtr XkbAllocSrvLedInfo(DeviceIntPtr /* dev */ , - KbdFeedbackPtr /* kf */ , - LedFeedbackPtr /* lf */ , - unsigned int /* needed_parts */ - ); - -extern _X_EXPORT XkbSrvLedInfoPtr XkbCopySrvLedInfo(DeviceIntPtr /* dev */ , - XkbSrvLedInfoPtr /* src */ , - KbdFeedbackPtr /* kf */ , - LedFeedbackPtr /* lf */ - ); - -extern _X_EXPORT XkbSrvLedInfoPtr XkbFindSrvLedInfo(DeviceIntPtr /* dev */ , - unsigned int /* class */ , - unsigned int /* id */ , - unsigned int /* needed_parts */ - ); - extern _X_EXPORT void XkbApplyLedNameChanges(DeviceIntPtr /* dev */ , XkbSrvLedInfoPtr /* sli */ , unsigned int /* changed_names */ , @@ -521,9 +503,6 @@ extern _X_EXPORT Status XkbChangeKeycodeRange(XkbDescPtr /* xkb */ , XkbChangesPtr /* changes */ ); -extern _X_EXPORT void XkbFreeSrvLedInfo(XkbSrvLedInfoPtr /* sli */ - ); - extern _X_EXPORT void XkbFreeInfo(XkbSrvInfoPtr /* xkbi */ ); diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h index 42e3618c6..b0531887b 100644 --- a/xkb/xkbsrv_priv.h +++ b/xkb/xkbsrv_priv.h @@ -112,6 +112,7 @@ void XkbMergeLockedPtrBtns(DeviceIntPtr master); void XkbFakeDeviceButton(DeviceIntPtr dev, int press, int button); + extern DevPrivateKeyRec xkbDevicePrivateKeyRec; #define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr)dixLookupPrivate(&(dev)->devPrivates, &xkbDevicePrivateKeyRec)) @@ -183,4 +184,13 @@ int _XkbLookupLedDevice(DeviceIntPtr *pDev, int id, ClientPtr client, int _XkbLookupButtonDevice(DeviceIntPtr *pDev, int id, ClientPtr client, Mask access_mode, int *xkb_err); +/* XkbSrvLedInfo functions */ +XkbSrvLedInfoPtr XkbAllocSrvLedInfo(DeviceIntPtr dev, KbdFeedbackPtr kf, + LedFeedbackPtr lf, unsigned int needed_parts); +XkbSrvLedInfoPtr XkbCopySrvLedInfo(DeviceIntPtr dev, XkbSrvLedInfoPtr src, + KbdFeedbackPtr kf, LedFeedbackPtr lf); +XkbSrvLedInfoPtr XkbFindSrvLedInfo(DeviceIntPtr dev, unsigned int class, + unsigned int id, unsigned int needed_parts); +void XkbFreeSrvLedInfo(XkbSrvLedInfoPtr sli); + #endif /* _XSERVER_XKBSRV_PRIV_H_ */