aboutsummaryrefslogtreecommitdiff
path: root/X11/extensions/randr.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 18:18:08 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 18:18:08 +0000
commite445df175688f07d599649591c990d432375c67e (patch)
treefc2295b9683852cab5394a4f187ca0001c987e4a /X11/extensions/randr.h
parentcbeb9ffa0c58e5e9b012ea3eb17dbf192659627f (diff)
parentcd50a4bbac9375d3cd460bbdf88395f802609daf (diff)
downloadvcxsrv-e445df175688f07d599649591c990d432375c67e.tar.gz
vcxsrv-e445df175688f07d599649591c990d432375c67e.tar.bz2
vcxsrv-e445df175688f07d599649591c990d432375c67e.zip
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'X11/extensions/randr.h')
-rw-r--r--X11/extensions/randr.h27
1 files changed, 24 insertions, 3 deletions
diff --git a/X11/extensions/randr.h b/X11/extensions/randr.h
index 17e6ef9f6..c624d96b2 100644
--- a/X11/extensions/randr.h
+++ b/X11/extensions/randr.h
@@ -2,6 +2,7 @@
* Copyright © 2000 Compaq Computer Corporation
* Copyright © 2002 Hewlett Packard Company
* Copyright © 2006 Intel Corporation
+ * Copyright © 2008 Red Hat, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@ -39,11 +40,11 @@ typedef unsigned long XRandrModeFlags;
#define RANDR_NAME "RANDR"
#define RANDR_MAJOR 1
-#define RANDR_MINOR 2
+#define RANDR_MINOR 3
#define RRNumberErrors 3
#define RRNumberEvents 2
-#define RRNumberRequests 25
+#define RRNumberRequests 32
#define X_RRQueryVersion 0
/* we skip 1 to make old clients fail pretty immediately */
@@ -77,6 +78,20 @@ typedef unsigned long XRandrModeFlags;
#define X_RRGetCrtcGamma 23
#define X_RRSetCrtcGamma 24
+/* V1.3 additions */
+#define X_RRGetScreenResourcesCurrent 25
+#define X_RRSetCrtcTransform 26
+#define X_RRGetCrtcTransform 27
+#define X_RRGetPanning 28
+#define X_RRSetPanning 29
+#define X_RRSetOutputPrimary 30
+#define X_RRGetOutputPrimary 31
+
+#define RRTransformUnit (1L << 0)
+#define RRTransformScaleUp (1L << 1)
+#define RRTransformScaleDown (1L << 2)
+#define RRTransformProjective (1L << 3)
+
/* Event selection bits */
#define RRScreenChangeNotifyMask (1L << 0)
/* V1.2 additions */
@@ -136,6 +151,12 @@ typedef unsigned long XRandrModeFlags;
/* Conventional RandR output properties */
-#define RR_PROPERTY_RANDR_EDID "RANDR_EDID"
+#define RR_PROPERTY_RANDR_EDID "EDID"
+#define RR_PROPERTY_SIGNAL_FORMAT "SignalFormat"
+#define RR_PROPERTY_SIGNAL_PROPERTIES "SignalProperties"
+#define RR_PROPERTY_CONNECTOR_TYPE "ConnectorType"
+#define RR_PROPERTY_CONNECTOR_NUMBER "ConnectorNumber"
+#define RR_PROPERTY_COMPATIBILITY_LIST "CompatibilityList"
+#define RR_PROPERTY_CLONE_LIST "CloneList"
#endif /* _RANDR_H_ */