diff options
| author | Adam Jackson <ajax@redhat.com> | 2013-11-08 09:44:24 -0500 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2014-03-25 08:50:35 +1000 |
| commit | 78167a98a8631ee3fad145ddc051ceb8487b9683 (patch) | |
| tree | 370e54446af44a9de606cc41c646fc8ea747c27d | |
| parent | 215f3d2e0f2a4ef6fc2f2c08fb991e1f00b747c8 (diff) | |
xkb: Restore XkbCopyDeviceKeymap
Removed in d35a02a767017f13db4bd4742eef49293d5a30ea, tigervnc 1.2.80 and
xf86-video-nested need it for now.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | include/xkbsrv.h | 3 | ||||
| -rw-r--r-- | xkb/xkbUtils.c | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/xkbsrv.h b/include/xkbsrv.h index a80e11970..229de2194 100644 --- a/include/xkbsrv.h +++ b/include/xkbsrv.h @@ -824,6 +824,9 @@ extern _X_EXPORT void XkbSendNewKeyboardNotify(DeviceIntPtr /* kbd */ , extern Bool XkbCopyKeymap(XkbDescPtr /* dst */ , XkbDescPtr /* src */ ); +extern _X_EXPORT Bool XkbCopyDeviceKeymap(DeviceIntPtr /* dst */, + DeviceIntPtr /* src */); + extern _X_EXPORT Bool XkbDeviceApplyKeymap(DeviceIntPtr /* dst */ , XkbDescPtr /* src */ ); diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index 6cf6e79df..c14a790df 100644 --- a/xkb/xkbUtils.c +++ b/xkb/xkbUtils.c @@ -2027,6 +2027,12 @@ XkbDeviceApplyKeymap(DeviceIntPtr dst, XkbDescPtr desc) return ret; } +Bool +XkbCopyDeviceKeymap(DeviceIntPtr dst, DeviceIntPtr src) +{ + return XkbDeviceApplyKeymap(dst, src->key->xkbInfo->desc); +} + int XkbGetEffectiveGroup(XkbSrvInfoPtr xkbi, XkbStatePtr xkbState, CARD8 keycode) { |