Merge branch 'transform-proposal'

Conflicts:

	randr.h
	randrproto.h
	randrproto.txt

1 files changed, 9 insertions, 2 deletions

diff --git a/randr.h b/randr.h
index 74a780c..87cd4a8 100644
--- a/randr.h
+++ b/randr.h
@@ -40,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	26
+#define RRNumberRequests	28
 
 #define X_RRQueryVersion	0
 /* we skip 1 to make old clients fail pretty immediately */
@@ -80,6 +80,13 @@ typedef unsigned long	XRandrModeFlags;
 
 /* V1.3 additions */
 #define X_RRGetScreenResourcesCurrent	25
+#define X_RRSetCrtcTransform	    26
+#define X_RRGetCrtcTransform	    27
+
+#define RRTransformUnit		    (1L << 0)
+#define RRTransformScaleUp	    (1L << 1)
+#define RRTransformScaleDown	    (1L << 2)
+#define RRTransformProjective	    (1L << 3)
 
 /* Event selection bits */
 #define RRScreenChangeNotifyMask  (1L << 0)