aboutsummaryrefslogtreecommitdiff
path: root/libX11
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-07-29 08:51:48 +0200
committermarha <marha@users.sourceforge.net>2013-07-29 08:51:48 +0200
commit04f3d1515878e535b7e3876264eaa4d43a1e6d54 (patch)
tree58867d9fa0097be91f1717a693a7ca4b3eb77d71 /libX11
parentff986553659472cf191804eadb13c21e8f2b44c0 (diff)
parent4c8cee9b5a37db30af50aafcbf54b36b9fd9e03a (diff)
downloadvcxsrv-04f3d1515878e535b7e3876264eaa4d43a1e6d54.tar.gz
vcxsrv-04f3d1515878e535b7e3876264eaa4d43a1e6d54.tar.bz2
vcxsrv-04f3d1515878e535b7e3876264eaa4d43a1e6d54.zip
Merge remote-tracking branch 'origin/released'
* origin/released: libX11 mesa xserver git update 29 July 2013
Diffstat (limited to 'libX11')
-rw-r--r--libX11/modules/om/generic/omGeneric.c2
-rw-r--r--libX11/src/Host.c53
-rw-r--r--libX11/src/ModMap.c12
3 files changed, 18 insertions, 49 deletions
diff --git a/libX11/modules/om/generic/omGeneric.c b/libX11/modules/om/generic/omGeneric.c
index d34928784..301b6a0e8 100644
--- a/libX11/modules/om/generic/omGeneric.c
+++ b/libX11/modules/om/generic/omGeneric.c
@@ -1164,7 +1164,7 @@ parse_fontname(
* a "missing_charset" will be reported to the client
* for this CharSet.
*/
- font_data_return. xlfd_name = NULL;
+ font_data_return.xlfd_name = NULL;
font_data_return.side = XlcUnknown;
ret = parse_fontdata(oc, font_set, font_set->font_data,
diff --git a/libX11/src/Host.c b/libX11/src/Host.c
index da5e2f7d3..b07c9c312 100644
--- a/libX11/src/Host.c
+++ b/libX11/src/Host.c
@@ -64,13 +64,11 @@ X Window System is a trademark of The Open Group.
#endif
#include "Xlibint.h"
-int
-XAddHost (
- register Display *dpy,
- XHostAddress *host)
+static inline int
+changehost (Display *dpy, XHostAddress *host, BYTE mode)
{
- register xChangeHostsReq *req;
- register int length;
+ xChangeHostsReq *req;
+ int length;
XServerInterpretedAddress *siAddr;
int addrlen;
@@ -87,7 +85,7 @@ XAddHost (
UnlockDisplay(dpy);
return 0;
}
- req->mode = HostInsert;
+ req->mode = mode;
req->hostFamily = host->family;
req->hostLength = addrlen;
if (siAddr) {
@@ -104,42 +102,19 @@ XAddHost (
}
int
-XRemoveHost (
+XAddHost (
register Display *dpy,
XHostAddress *host)
{
- register xChangeHostsReq *req;
- register int length;
- XServerInterpretedAddress *siAddr;
- int addrlen;
-
- siAddr = host->family == FamilyServerInterpreted ?
- (XServerInterpretedAddress *)host->address : NULL;
- addrlen = siAddr ?
- siAddr->typelength + siAddr->valuelength + 1 : host->length;
-
- length = (addrlen + 3) & ~0x3; /* round up */
+ return changehost(dpy, host, HostInsert);
+}
- LockDisplay(dpy);
- GetReqExtra (ChangeHosts, length, req);
- if (!req) {
- UnlockDisplay(dpy);
- return 0;
- }
- req->mode = HostDelete;
- req->hostFamily = host->family;
- req->hostLength = addrlen;
- if (siAddr) {
- char *dest = (char *) NEXTPTR(req,xChangeHostsReq);
- memcpy(dest, siAddr->type, siAddr->typelength);
- dest[siAddr->typelength] = '\0';
- memcpy(dest + siAddr->typelength + 1,siAddr->value,siAddr->valuelength);
- } else {
- memcpy((char *) NEXTPTR(req,xChangeHostsReq), host->address, addrlen);
- }
- UnlockDisplay(dpy);
- SyncHandle();
- return 1;
+int
+XRemoveHost (
+ register Display *dpy,
+ XHostAddress *host)
+{
+ return changehost(dpy, host, HostDelete);
}
int
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);