mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-03 22:25:44 +00:00
Input: Clean up keymap change notifications
Keyboard map notifications are always generated from within XKB code, which also takes care of copying the keysyms, etc. If you need to mangle the keymap yourself, generate a new core keymap/modmap, and pass it to XkbApplyMappingChange. SendMappingNotify is renamed to SendPointerMappingNotify (and ditto its Device variants), which still only _sends_ the notifications, as opposed to also doing the copying a la XkbApplyMappingChange. Also have the modmap change code traverse the device hierachy, rather than just going off the core keyboard. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
parent
1d1a0f67ee
commit
f06a9d2e05
11 changed files with 386 additions and 366 deletions
|
|
@ -5837,8 +5837,7 @@ ProcXkbGetKbdByName(ClientPtr client)
|
|||
(dev->id == inputInfo.keyboard->id && tmpd->key &&
|
||||
tmpd->coreEvents)) {
|
||||
if (tmpd != dev)
|
||||
XkbCopyKeymap(dev->key->xkbInfo->desc,
|
||||
tmpd->key->xkbInfo->desc, True);
|
||||
XkbCopyDeviceKeymap(tmpd, dev);
|
||||
XkbUpdateCoreDescription(tmpd, True);
|
||||
|
||||
if (tmpd->kbdfeed && tmpd->kbdfeed->xkb_sli) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue