From 1e210d6d10ec63d22247e5801890e024826fc861 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 4 Aug 2009 14:41:46 +1000 Subject: [PATCH] xkb: remove now-unused XkbGetKeysym. XkbGetKeysyms was only used by the now-removed Keysym grabs. Signed-off-by: Peter Hutterer --- include/xkbsrv.h | 4 ---- xkb/xkbUtils.c | 29 ----------------------------- 2 files changed, 33 deletions(-) diff --git a/include/xkbsrv.h b/include/xkbsrv.h index 31467e99f..cdca8f157 100644 --- a/include/xkbsrv.h +++ b/include/xkbsrv.h @@ -942,10 +942,6 @@ extern Bool XkbCopyDeviceKeymap( DeviceIntPtr /* dst */, DeviceIntPtr /* src */); -extern int XkbGetKeysym( - DeviceIntPtr /* dev */, - DeviceEvent* /* event*/); - extern Bool XkbFilterEvents( ClientPtr /* pClient */, int /* nEvents */, diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index 06da1d55c..63b1e31c7 100644 --- a/xkb/xkbUtils.c +++ b/xkb/xkbUtils.c @@ -2118,32 +2118,3 @@ XkbCopyDeviceKeymap(DeviceIntPtr dst, DeviceIntPtr src) return ret; } -int -XkbGetKeysym(DeviceIntPtr dev, DeviceEvent *event) -{ - XkbDescPtr xkb = dev->key->xkbInfo->desc; - XkbKeyTypePtr kt; - int group; - int i, level = 0; - int modmask; - - group = event->group.base + event->group.latched + event->group.locked; - - if (group >= xkb->ctrls->num_groups) - group = XkbAdjustGroup(group, xkb->ctrls); - - modmask = event->mods.base | event->mods.latched; /* don't care about - locked mods */ - kt = XkbKeyKeyType(xkb, event->detail.key, group); - - for (i = 0; i < kt->map_count; i++) - { - if (kt->map[i].mods.mask == modmask) - { - level = kt->map[i].level; - break; - } - } - - return XkbKeySymEntry(xkb, event->detail.key, level, group); -}