xserver: Branch 'input-hotplug'

[Daniel Stone]

 xkb/xkbUtils.c |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

New commits:
diff-tree 33af05d58f1f4f021036e9ce4b60fd76dbaebe73 (from 6323a11d0db4d3cf0317af83f0362730142f5325)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Wed Aug 23 19:05:50 2006 +0300

    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.

diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index da790f9..74799e8 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -1418,20 +1418,20 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr
                 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);