diff --git a/xkb/xkb.c b/xkb/xkb.c index ba1a4f6..9400453 100644 --- a/xkb/xkb.c +++ b/xkb/xkb.c @@ -1359,19 +1359,36 @@ XkbSendMap(ClientPtr client,XkbDescPtr xkb,xkbGetMapReply *rep) { unsigned i,len; char *desc,*start; +char *tmp; len= (rep->length*4)-(SIZEOF(xkbGetMapReply)-SIZEOF(xGenericReply)); start= desc= (char *)xcalloc(1, len); if (!start) return BadAlloc; if ( rep->nTypes>0 ) + { + tmp = desc; desc = XkbWriteKeyTypes(xkb,rep,desc,client); + ErrorF("---- TYPES: %d - %d\n", (desc - tmp), XkbSizeKeyTypes(xkb, rep)); + } if ( rep->nKeySyms>0 ) + { + tmp = desc; desc = XkbWriteKeySyms(xkb,rep,desc,client); + ErrorF("---- SYMS: %d - %d\n", (desc - tmp), XkbSizeKeySyms(xkb, rep)); + } if ( rep->nKeyActs>0 ) + { + tmp = desc; desc = XkbWriteKeyActions(xkb,rep,desc,client); + ErrorF("---- ACTIONS: %d - %d\n", (desc - tmp), XkbSizeKeyActions(xkb, rep)); + } if ( rep->totalKeyBehaviors>0 ) + { + tmp = desc; desc = XkbWriteKeyBehaviors(xkb,rep,desc,client); + ErrorF("---- BEHAV: %d - %d\n", (desc - tmp), XkbSizeKeyBehaviors(xkb, rep)); + } if ( rep->virtualMods ) { register int sz,bit; for (i=sz=0,bit=1;itotalKeyExplicit>0 ) + { + tmp = desc; desc= XkbWriteExplicit(xkb,rep,desc,client); + ErrorF("---- EXPLIC: %d - %d\n", (desc - tmp), XkbSizeExplicit(xkb, rep)); + } if ( rep->totalModMapKeys>0 ) + { + tmp = desc; desc= XkbWriteModifierMap(xkb,rep,desc,client); + ErrorF("---- MOD: %d - %d\n", (desc - tmp), XkbSizeModifierMap(xkb, rep)); + } if ( rep->totalVModMapKeys>0 ) + { + tmp = desc; desc= XkbWriteVirtualModMap(xkb,rep,desc,client); + ErrorF("---- VIRTMOD: %d - %d\n", (desc - tmp), XkbSizeVirtualModMap(xkb, rep)); + } if ((desc-start)!=(len)) { ErrorF("[xkb] BOGUS LENGTH in write keyboard desc, expected %d, got %ld\n", len, (unsigned long)(desc-start));