Attachment 21546 Details for Bug 19048 – Update ctrls too

[patch] Update ctrls too

xkbcopykeymap-update-ctrls-too.diff (text/plain), 1.47 KB, created by Sascha Hlusiak on 2008-12-29 04:20:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sascha Hlusiak

Created: 2008-12-29 04:20:19 UTC

Size: 1.47 KB

patch

obsolete

>diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
>index aafc1ab..43540f7 100644
>--- a/xkb/xkbUtils.c
>+++ b/xkb/xkbUtils.c
>@@ -2108,6 +2108,12 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
>     DeviceIntPtr pDev = NULL, tmpDev = NULL;
>     xkbMapNotify mn;
>     xkbNewKeyboardNotify nkn;
>+    XkbEventCauseRec cause;
>+    XkbChangesRec changes;
>+    unsigned int check = 0;
>+
>+    memset(&changes, 0, sizeof(changes));
>+    memset(&cause, 0, sizeof(cause));
> 
>     if (!src || !dst || src == dst)
>         return FALSE;
>@@ -2190,9 +2196,18 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
>                 mn.firstVModMapKey = src->min_key_code;
>                 mn.nVModMapKeys = XkbNumKeys(src);
>                 mn.virtualMods = ~0; /* ??? */
>-                mn.changed = XkbAllMapComponentsMask;                
>+                mn.changed = XkbAllMapComponentsMask;
>                 XkbSendMapNotify(pDev, &mn);
>             }
>+
>+            XkbUpdateActions(pDev, pDev->key->xkbInfo->desc->min_key_code, XkbNumKeys(pDev->key->xkbInfo->desc),
>+                             &changes, &check, &cause);
>+            if (check)
>+                XkbCheckSecondaryEffects(pDev->key->xkbInfo, check, &changes,
>+                                         &cause);
>+            memcpy(pDev->kbdfeed->ctrl.autoRepeats, dst->ctrls->per_key_repeat,
>+                   XkbPerKeyBitArraySize);
>+            pDev->kbdfeed->CtrlProc(pDev, &pDev->kbdfeed->ctrl);
>         }
>     }
>

Actions: View | Splinter Review

Attachments on bug 19048: 21140 | 21546 | 21892

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.