diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-08-23 19:05:50 +0300 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-08-23 19:05:50 +0300 |
| commit | 33af05d58f1f4f021036e9ce4b60fd76dbaebe73 (patch) | |
| tree | 5a712fd9128d32b178d783b6bd5080871d3d2ac6 /xkb/xkbUtils.c | |
| parent | 6323a11d0db4d3cf0317af83f0362730142f5325 (diff) | |
XkbCopyKeymap: use correct range for MapNotify
We haven't copied {min,max}_key_code by the time the notifies run, so use
src instead of dst to determine number of keys, et al.
Diffstat (limited to 'xkb/xkbUtils.c')
| -rw-r--r-- | xkb/xkbUtils.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index da790f933..74799e891 100644 --- a/xkb/xkbUtils.c +++ b/xkb/xkbUtils.c @@ -1418,20 +1418,20 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies) mn.minKeyCode = src->min_key_code; mn.maxKeyCode = src->max_key_code; mn.firstType = 0; - mn.nTypes = dst->map->num_types; - mn.firstKeySym = dst->min_key_code; - mn.nKeySyms = XkbNumKeys(dst); - mn.firstKeyAct = dst->min_key_code; - mn.nKeyActs = XkbNumKeys(dst); + mn.nTypes = src->map->num_types; + mn.firstKeySym = src->min_key_code; + mn.nKeySyms = XkbNumKeys(src); + mn.firstKeyAct = src->min_key_code; + mn.nKeyActs = XkbNumKeys(src); /* Cargo-culted from ProcXkbGetMap. */ - mn.firstKeyBehavior = dst->min_key_code; - mn.nKeyBehaviors = XkbNumKeys(dst); - mn.firstKeyExplicit = dst->min_key_code; - mn.nKeyExplicit = XkbNumKeys(dst); - mn.firstModMapKey = dst->min_key_code; - mn.nModMapKeys = XkbNumKeys(dst); - mn.firstVModMapKey = dst->min_key_code; - mn.nVModMapKeys = XkbNumKeys(dst); + mn.firstKeyBehavior = src->min_key_code; + mn.nKeyBehaviors = XkbNumKeys(src); + mn.firstKeyExplicit = src->min_key_code; + mn.nKeyExplicit = XkbNumKeys(src); + mn.firstModMapKey = src->min_key_code; + mn.nModMapKeys = XkbNumKeys(src); + mn.firstVModMapKey = src->min_key_code; + mn.nVModMapKeys = XkbNumKeys(src); mn.virtualMods = ~0; /* ??? */ mn.changed = XkbAllMapComponentsMask; XkbSendMapNotify(pDev, &mn); |