Multiple keyboard mapping issues

[Daniel Stone]

On Sun, Jan 28, 2007 at 09:13:34PM +1030, Peter Hutterer wrote:
> On 26/01/2007, at 08:38 , Daniel Stone wrote:
> >Hmm, I use evdev, and it works okay for me.
> 
> checked out master, still segfaulting (for  
> 1627af54497bee659ea30f2850b39cbbf576e22d).
> did a pull from scratch on a different box, same problem. Segfault  
> happens in XkbUpdateKeyTypesFromCore:249 when switching the core  
> keyboard.
> For all I know, the xkb->server->explicit is overwritten by a  
> previous memcpy() in xkbUtils.c:257. Buggered if I know what that  
> exactly does, it's obscured behind several layers of macros. Happens  
> on key=46 for me.

Damn.  Does:
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 400306a..062159e 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -1220,7 +1220,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr
                     tmp = xalloc(src->max_key_code + 1);
                 if (!tmp)
                     return FALSE;
-                dst->map->syms = tmp;
+                dst->map->modmap = tmp;
             }
             memcpy(dst->map->modmap, src->map->modmap, src->max_key_code + 1);
         }

fix it?

Cheers,
Daniel (who's spent far too long on this)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg/attachments/20070204/04a40091/attachment.pgp>