From 6ca09e8725703eb8d485b07be451fc7a7a75c841 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 4 Apr 2024 19:46:13 +0200 Subject: [PATCH] xkb: unexport key latch functions These aren't used by drivers, so no need to keep them exported. Signed-off-by: Enrico Weigelt, metux IT consult --- include/xkbsrv.h | 17 ----------------- xkb/xkb.c | 4 ++-- xkb/xkbAccessX.c | 2 +- xkb/xkbActions.c | 8 ++++---- xkb/xkbLEDs.c | 6 +++--- xkb/xkbsrv_priv.h | 6 ++++++ 6 files changed, 16 insertions(+), 27 deletions(-) diff --git a/include/xkbsrv.h b/include/xkbsrv.h index 6ecad2f72..391ea3a59 100644 --- a/include/xkbsrv.h +++ b/include/xkbsrv.h @@ -46,8 +46,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define XkbFreeCompatMap SrvXkbFreeCompatMap #define XkbFreeKeyboard SrvXkbFreeKeyboard #define XkbFreeNames SrvXkbFreeNames -#define XkbLatchModifiers SrvXkbLatchModifiers -#define XkbLatchGroup SrvXkbLatchGroup #define XkbVirtualModsToReal SrvXkbVirtualModsToReal #define XkbChangeKeycodeRange SrvXkbChangeKeycodeRange #define XkbApplyVirtualModChanges SrvXkbApplyVirtualModChanges @@ -566,21 +564,6 @@ extern _X_EXPORT void XkbSetRepeatKeys(DeviceIntPtr /* pXDev */ , int /* onoff */ ); -extern _X_EXPORT int XkbLatchModifiers(DeviceIntPtr /* pXDev */ , - CARD8 /* mask */ , - CARD8 /* latches */ - ); - -extern _X_EXPORT int XkbLatchGroup(DeviceIntPtr /* pXDev */ , - int /* group */ - ); - -extern _X_EXPORT void XkbClearAllLatchesAndLocks(DeviceIntPtr /* dev */ , - XkbSrvInfoPtr /* xkbi */ , - Bool /* genEv */ , - XkbEventCausePtr /* cause */ - ); - extern _X_EXPORT void XkbInitRules(XkbRMLVOSet * /* rmlvo */, const char * /* rules */, const char * /* model */, diff --git a/xkb/xkb.c b/xkb/xkb.c index 80b7d4d81..37b8e8c56 100644 --- a/xkb/xkb.c +++ b/xkb/xkb.c @@ -658,10 +658,10 @@ ProcXkbLatchLockState(ClientPtr client) if (status == Success && stuff->lockGroup) newState->locked_group = stuff->groupLock; if (status == Success && stuff->affectModLatches) - status = XkbLatchModifiers(tmpd, stuff->affectModLatches, + status = SrvXkbLatchModifiers(tmpd, stuff->affectModLatches, stuff->modLatches); if (status == Success && stuff->latchGroup) - status = XkbLatchGroup(tmpd, stuff->groupLatch); + status = SrvXkbLatchGroup(tmpd, stuff->groupLatch); if (status != Success) return status; diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c index 32892ac20..fc6adb58e 100644 --- a/xkb/xkbAccessX.c +++ b/xkb/xkbAccessX.c @@ -776,7 +776,7 @@ ProcessPointerEvent(InternalEvent *ev, DeviceIntPtr mouse) sli = XkbFindSrvLedInfo(dev, XkbDfltXIClass, XkbDfltXIId, 0); oldState = xkbi->state; - XkbLatchModifiers(dev, 0xFF, 0x00); + SrvXkbLatchModifiers(dev, 0xFF, 0x00); XkbComputeDerivedState(xkbi); changed |= XkbStateChangedFlags(&oldState, &xkbi->state); diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index aad475e6f..8b5c305fc 100644 --- a/xkb/xkbActions.c +++ b/xkb/xkbActions.c @@ -1440,7 +1440,7 @@ XkbHandleActions(DeviceIntPtr dev, DeviceIntPtr kbd, DeviceEvent *event) } int -XkbLatchModifiers(DeviceIntPtr pXDev, CARD8 mask, CARD8 latches) +SrvXkbLatchModifiers(DeviceIntPtr pXDev, CARD8 mask, CARD8 latches) { XkbSrvInfoPtr xkbi; XkbFilterPtr filter; @@ -1468,7 +1468,7 @@ XkbLatchModifiers(DeviceIntPtr pXDev, CARD8 mask, CARD8 latches) } int -XkbLatchGroup(DeviceIntPtr pXDev, int group) +SrvXkbLatchGroup(DeviceIntPtr pXDev, int group) { XkbSrvInfoPtr xkbi; XkbFilterPtr filter; @@ -1501,11 +1501,11 @@ XkbClearAllLatchesAndLocks(DeviceIntPtr dev, sn.changed = 0; os = xkbi->state; if (os.latched_mods) { /* clear all latches */ - XkbLatchModifiers(dev, ~0, 0); + SrvXkbLatchModifiers(dev, ~0, 0); sn.changed |= XkbModifierLatchMask; } if (os.latched_group) { - XkbLatchGroup(dev, 0); + SrvXkbLatchGroup(dev, 0); sn.changed |= XkbGroupLatchMask; } if (os.locked_mods) { diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c index 749123577..06f1926f7 100644 --- a/xkb/xkbLEDs.c +++ b/xkb/xkbLEDs.c @@ -130,7 +130,7 @@ XkbApplyLEDChangeToKeyboard(XkbSrvInfoPtr xkbi, break; } if (map->which_groups & XkbIM_UseLatched) - XkbLatchGroup(xkbi->device, 0); /* unlatch group */ + SrvXkbLatchGroup(xkbi->device, 0); /* unlatch group */ state->locked_group = i; stateChange = TRUE; } @@ -140,7 +140,7 @@ XkbApplyLEDChangeToKeyboard(XkbSrvInfoPtr xkbi, break; } state->locked_group = 0; - XkbLatchGroup(xkbi->device, i); + SrvXkbLatchGroup(xkbi->device, i); stateChange = TRUE; } } @@ -166,7 +166,7 @@ XkbApplyLEDChangeToKeyboard(XkbSrvInfoPtr xkbi, newmods &= ~map->mods.mask; if (newmods != state->locked_mods) { newmods &= map->mods.mask; - XkbLatchModifiers(xkbi->device, map->mods.mask, newmods); + SrvXkbLatchModifiers(xkbi->device, map->mods.mask, newmods); stateChange = TRUE; } } diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h index 142f9e730..6e52dbce5 100644 --- a/xkb/xkbsrv_priv.h +++ b/xkb/xkbsrv_priv.h @@ -141,4 +141,10 @@ XkbInterestPtr XkbFindClientResource(DevicePtr inDev, ClientPtr client); XkbInterestPtr XkbAddClientResource(DevicePtr inDev, ClientPtr client, XID id); int XkbRemoveResourceClient(DevicePtr inDev, XID id); +/* key latching */ +int SrvXkbLatchModifiers(DeviceIntPtr pXDev, CARD8 mask, CARD8 latches); +int SrvXkbLatchGroup(DeviceIntPtr pXDev, int group); +void XkbClearAllLatchesAndLocks(DeviceIntPtr dev, XkbSrvInfoPtr xkbi, + Bool genEv, XkbEventCausePtr cause); + #endif /* _XSERVER_XKBSRV_PRIV_H_ */