aboutsummaryrefslogtreecommitdiff
path: root/X11/extensions
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-01-05 17:18:15 +0100
committermarha <marha@users.sourceforge.net>2014-01-05 17:18:15 +0100
commit0fd65ec557757ec8760a96400a09b8a8a92a7b14 (patch)
tree961d86d49281cf94e2dc85ffb88c6b1491036338 /X11/extensions
parent68c12003597662f95eac07ddeee99637f7caa3e5 (diff)
parent1b37f71714e2ca4af60bd050adbbb7969534dfd6 (diff)
downloadvcxsrv-0fd65ec557757ec8760a96400a09b8a8a92a7b14.tar.gz
vcxsrv-0fd65ec557757ec8760a96400a09b8a8a92a7b14.tar.bz2
vcxsrv-0fd65ec557757ec8760a96400a09b8a8a92a7b14.zip
Merge remote-tracking branch 'origin/released'
* origin/released: randrproto libXau libxcb mesa mkfontscale pixman git update 5 Jan 2014
Diffstat (limited to 'X11/extensions')
-rw-r--r--X11/extensions/randr.h1
-rw-r--r--X11/extensions/randrproto.txt12
2 files changed, 13 insertions, 0 deletions
diff --git a/X11/extensions/randr.h b/X11/extensions/randr.h
index 33d22fb3d..3c6721bc5 100644
--- a/X11/extensions/randr.h
+++ b/X11/extensions/randr.h
@@ -180,6 +180,7 @@ typedef unsigned long XRandrModeFlags;
#define RR_PROPERTY_CLONE_LIST "CloneList"
#define RR_PROPERTY_BORDER "Border"
#define RR_PROPERTY_BORDER_DIMENSIONS "BorderDimensions"
+#define RR_PROPERTY_GUID "GUID"
/* roles this device can carry out */
#define RR_Capability_None 0
diff --git a/X11/extensions/randrproto.txt b/X11/extensions/randrproto.txt
index 2bf065f6d..f82407c30 100644
--- a/X11/extensions/randrproto.txt
+++ b/X11/extensions/randrproto.txt
@@ -1957,6 +1957,17 @@ doesn't handle a mandatory property correctly.
2 = left/right and top/bottom borders can be specified independently
4 = all four borders can be specified independently
+ "GUID" aka RR_PROPERTY_GUID
+ Type: INTEGER
+ Format: 8
+ Num items: 16
+ Flags: Immutable
+ Range/List: -
+
+ Some display devices, such as DisplayPort 1.2 devices, have globally
+ unique identifiers. When such an identifier is available, this property
+ contains its raw bytes.
+
9.2 Properties introduced with version 1.2 of the RandR extension
@@ -1990,6 +2001,7 @@ Property Immutable Mandatory since
──────── ───────── ───────────────
Border yes not mandatory
BorderDimensions yes: static not mandatory
+GUID yes not mandatory
❧❧❧❧❧❧❧❧❧❧❧