diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-29 08:50:02 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-29 08:50:02 +0200 |
| commit | 4c8cee9b5a37db30af50aafcbf54b36b9fd9e03a (patch) | |
| tree | 30b754ce6f4bb714f948a1bcec554335d402e42b /libX11/src/ModMap.c | |
| parent | 8647aa1a5029fcd96f134103331ddf3c21bc0a0b (diff) | |
| download | vcxsrv-4c8cee9b5a37db30af50aafcbf54b36b9fd9e03a.tar.gz vcxsrv-4c8cee9b5a37db30af50aafcbf54b36b9fd9e03a.tar.bz2 vcxsrv-4c8cee9b5a37db30af50aafcbf54b36b9fd9e03a.zip | |
libX11 mesa xserver git update 29 July 2013
xserver commit ff38bbe81ace85bf675bbaa0a9ca5f3b32ede449
libX11 commit 208e586c808e88a2ee819e4450dc27f557afc2bf
mesa commit e847b5ae066bf9a209dad482fcc664f944983633
Diffstat (limited to 'libX11/src/ModMap.c')
| -rw-r--r-- | libX11/src/ModMap.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/libX11/src/ModMap.c b/libX11/src/ModMap.c index 836a67621..2fabc560c 100644 --- a/libX11/src/ModMap.c +++ b/libX11/src/ModMap.c @@ -79,17 +79,11 @@ XSetModifierMapping( int mapSize = modifier_map->max_keypermod << 3; /* 8 modifiers */ LockDisplay(dpy); - GetReqExtra(SetModifierMapping, mapSize, req); - if (!req) { - UnlockDisplay(dpy); - return MappingFailed; - } - + GetReq(SetModifierMapping, req); + req->length += mapSize >> 2; req->numKeyPerModifier = modifier_map->max_keypermod; - memcpy((char *) NEXTPTR(req,xSetModifierMappingReq), - (char *) modifier_map->modifiermap, - mapSize); + Data(dpy, modifier_map->modifiermap, mapSize); (void) _XReply(dpy, (xReply *) & rep, (SIZEOF(xSetModifierMappingReply) - SIZEOF(xReply)) >> 2, xTrue); |