diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:47:59 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:47:59 +0200 |
| commit | 15cee47a496ef891923949ade073cf4ffabb9c73 (patch) | |
| tree | a1d5648dfb070a10794384ff119d4d77f91539d3 /nx-X11/lib/X11/XKBMAlloc.c | |
| parent | 964f539648bb74098972b09d576b0bb4dd21a3c5 (diff) | |
| download | nx-libs-15cee47a496ef891923949ade073cf4ffabb9c73.tar.gz nx-libs-15cee47a496ef891923949ade073cf4ffabb9c73.tar.bz2 nx-libs-15cee47a496ef891923949ade073cf4ffabb9c73.zip | |
Imported nx-X11-3.5.0-2.tar.gznx-X11/3.5.0-2nx-X11
Summary: Imported nx-X11-3.5.0-2.tar.gz
Keywords:
Imported nx-X11-3.5.0-2.tar.gz
into Git repository
Diffstat (limited to 'nx-X11/lib/X11/XKBMAlloc.c')
| -rw-r--r-- | nx-X11/lib/X11/XKBMAlloc.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/nx-X11/lib/X11/XKBMAlloc.c b/nx-X11/lib/X11/XKBMAlloc.c index 91d87d57c..d57d9a58d 100644 --- a/nx-X11/lib/X11/XKBMAlloc.c +++ b/nx-X11/lib/X11/XKBMAlloc.c @@ -738,8 +738,13 @@ int tmp; _XkbFree(prev_key_sym_map); return BadAlloc; } +#ifdef NXAGENT_SERVER + bzero((char *)&xkb->map->key_sym_map[xkb->max_key_code+1], + tmp*sizeof(XkbSymMapRec)); +#else bzero((char *)&xkb->map->key_sym_map[xkb->max_key_code], tmp*sizeof(XkbSymMapRec)); +#endif if (changes) { changes->map.changed= _ExtendRange(changes->map.changed, XkbKeySymsMask,maxKC, @@ -756,7 +761,11 @@ int tmp; _XkbFree(prev_modmap); return BadAlloc; } +#ifdef NXAGENT_SERVER + bzero((char *)&xkb->map->modmap[xkb->max_key_code+1],tmp); +#else bzero((char *)&xkb->map->modmap[xkb->max_key_code],tmp); +#endif if (changes) { changes->map.changed= _ExtendRange(changes->map.changed, XkbModifierMapMask,maxKC, @@ -775,8 +784,13 @@ int tmp; _XkbFree(prev_behaviors); return BadAlloc; } +#ifdef NXAGENT_SERVER + bzero((char *)&xkb->server->behaviors[xkb->max_key_code+1], + tmp*sizeof(XkbBehavior)); +#else bzero((char *)&xkb->server->behaviors[xkb->max_key_code], tmp*sizeof(XkbBehavior)); +#endif if (changes) { changes->map.changed= _ExtendRange(changes->map.changed, XkbKeyBehaviorsMask,maxKC, @@ -793,8 +807,13 @@ int tmp; _XkbFree(prev_key_acts); return BadAlloc; } +#ifdef NXAGENT_SERVER + bzero((char *)&xkb->server->key_acts[xkb->max_key_code+1], + tmp*sizeof(unsigned short)); +#else bzero((char *)&xkb->server->key_acts[xkb->max_key_code], tmp*sizeof(unsigned short)); +#endif if (changes) { changes->map.changed= _ExtendRange(changes->map.changed, XkbKeyActionsMask,maxKC, @@ -811,8 +830,13 @@ int tmp; _XkbFree(prev_vmodmap); return BadAlloc; } +#ifdef NXAGENT_SERVER + bzero((char *)&xkb->server->vmodmap[xkb->max_key_code+1], + tmp*sizeof(unsigned short)); +#else bzero((char *)&xkb->server->vmodmap[xkb->max_key_code], tmp*sizeof(unsigned short)); +#endif if (changes) { changes->map.changed= _ExtendRange(changes->map.changed, XkbVirtualModMapMask,maxKC, @@ -830,8 +854,13 @@ int tmp; _XkbFree(prev_keys); return BadAlloc; } +#ifdef NXAGENT_SERVER + bzero((char *)&xkb->names->keys[xkb->max_key_code+1], + tmp*sizeof(XkbKeyNameRec)); +#else bzero((char *)&xkb->names->keys[xkb->max_key_code], tmp*sizeof(XkbKeyNameRec)); +#endif if (changes) { changes->names.changed= _ExtendRange(changes->names.changed, XkbKeyNamesMask,maxKC, |