Module Name: xsrc
Committed By: mrg
Date: Mon Jul 20 03:11:12 UTC 2015
Modified Files:
xsrc/external/mit/libXrandr/dist/src: XrrProvider.c
xsrc/external/mit/randrproto/dist: randrproto.h
Removed Files:
xsrc/external/mit/libXrandr/dist: compile
Log Message:
merge randr 1.5.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXrandr/dist/compile
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXrandr/dist/src/XrrProvider.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/randrproto/dist/randrproto.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libXrandr/dist/src/XrrProvider.c
diff -u xsrc/external/mit/libXrandr/dist/src/XrrProvider.c:1.5 xsrc/external/mit/libXrandr/dist/src/XrrProvider.c:1.6
--- xsrc/external/mit/libXrandr/dist/src/XrrProvider.c:1.5 Mon Jul 1 19:46:01 2013
+++ xsrc/external/mit/libXrandr/dist/src/XrrProvider.c Mon Jul 20 03:11:11 2015
@@ -77,7 +77,7 @@ XRRGetProviderResources(Display *dpy, Wi
xrpr->nproviders = rep.nProviders;
xrpr->providers = (RRProvider *)(xrpr + 1);
- _XRead32(dpy, xrpr->providers, rep.nProviders << 2);
+ _XRead32(dpy, (long *) xrpr->providers, rep.nProviders << 2);
if (nbytes > nbytesRead)
_XEatData (dpy, (unsigned long) (nbytes - nbytesRead));
@@ -152,10 +152,10 @@ XRRGetProviderInfo(Display *dpy, XRRScre
xpi->associated_capability = (unsigned int *)(xpi->associated_providers + rep.nAssociatedProviders);
xpi->name = (char *)(xpi->associated_capability + rep.nAssociatedProviders);
- _XRead32(dpy, xpi->crtcs, rep.nCrtcs << 2);
- _XRead32(dpy, xpi->outputs, rep.nOutputs << 2);
+ _XRead32(dpy, (long *) xpi->crtcs, rep.nCrtcs << 2);
+ _XRead32(dpy, (long *) xpi->outputs, rep.nOutputs << 2);
- _XRead32(dpy, xpi->associated_providers, rep.nAssociatedProviders << 2);
+ _XRead32(dpy, (long *) xpi->associated_providers, rep.nAssociatedProviders << 2);
/*
* _XRead32 reads a series of 32-bit values from the protocol and writes
Index: xsrc/external/mit/randrproto/dist/randrproto.h
diff -u xsrc/external/mit/randrproto/dist/randrproto.h:1.4 xsrc/external/mit/randrproto/dist/randrproto.h:1.5
--- xsrc/external/mit/randrproto/dist/randrproto.h:1.4 Thu May 30 20:20:39 2013
+++ xsrc/external/mit/randrproto/dist/randrproto.h Mon Jul 20 03:11:12 2015
@@ -50,6 +50,7 @@
#define RRCrtc CARD32
#define RRProvider CARD32
#define RRModeFlags CARD32
+#define Atom CARD32
#define Rotation CARD16
#define SizeID CARD16
@@ -1012,6 +1013,63 @@ typedef struct {
} xRRSetPanningReply;
#define sz_xRRSetPanningReply 32
+typedef struct {
+ Atom name B32;
+ BOOL primary;
+ BOOL automatic;
+ CARD16 noutput B16;
+ INT16 x B16;
+ INT16 y B16;
+ CARD16 width B16;
+ CARD16 height B16;
+ CARD32 widthInMillimeters B32;
+ CARD32 heightInMillimeters B32;
+} xRRMonitorInfo;
+#define sz_xRRMonitorInfo 24
+
+typedef struct {
+ CARD8 reqType;
+ CARD8 randrReqType;
+ CARD16 length B16;
+ Window window B32;
+ BOOL get_active;
+ CARD8 pad;
+ CARD16 pad2;
+} xRRGetMonitorsReq;
+#define sz_xRRGetMonitorsReq 12
+
+typedef struct {
+ BYTE type;
+ CARD8 status;
+ CARD16 sequenceNumber B16;
+ CARD32 length B32;
+ Time timestamp B32;
+ CARD32 nmonitors B32;
+ CARD32 noutputs B32;
+ CARD32 pad1 B32;
+ CARD32 pad2 B32;
+ CARD32 pad3 B32;
+} xRRGetMonitorsReply;
+#define sz_xRRGetMonitorsReply 32
+
+typedef struct {
+ CARD8 reqType;
+ CARD8 randrReqType;
+ CARD16 length B16;
+ Window window B32;
+ xRRMonitorInfo monitor;
+} xRRSetMonitorReq;
+#define sz_xRRSetMonitorReq 32
+
+typedef struct {
+ CARD8 reqType;
+ CARD8 randrReqType;
+ CARD16 length B16;
+ Window window B32;
+ Atom name B32;
+} xRRDeleteMonitorReq;
+#define sz_xRRDeleteMonitorReq 12
+
#undef RRModeFlags
#undef RRCrtc
#undef RRMode
@@ -1033,5 +1091,6 @@ typedef struct {
#undef Rotation
#undef SizeID
#undef SubpixelOrder
+#undef Atom
#endif /* _XRANDRP_H_ */
