Merge branch 'transform-proposal' of git.freedesktop.org:/git/xorg/lib/libXrandr

Conflicts:

	src/Xrandr.c

1 files changed, 35 insertions, 6 deletions

diff --git a/include/X11/extensions/Xrandr.h b/include/X11/extensions/Xrandr.h
index 0a75576..892fae8 100644
--- a/include/X11/extensions/Xrandr.h
+++ b/include/X11/extensions/Xrandr.h
@@ -29,6 +29,7 @@
 #define _XRANDR_H_
 
 #include <X11/extensions/randr.h>
+#include <X11/extensions/Xrender.h>
 
 #include <X11/Xfuncproto.h>
 
@@ -371,18 +372,46 @@ XRRSetCrtcGamma (Display *dpy, RRCrtc crtc, XRRCrtcGamma *gamma);
 void
 XRRFreeGamma (XRRCrtcGamma *gamma);
 
-/* 
+/* Version 1.3 additions */
+
+XRRScreenResources *
+XRRGetScreenResourcesCurrent (Display *dpy, Window window);
+
+void
+XRRSetCrtcTransform (Display	*dpy,
+		     RRCrtc	crtc, 
+		     XTransform	*transform,
+		     char	*filter,
+		     XFixed	*params,
+		     int	nparams);
+
+typedef struct _XRRCrtcTransformAttributes {
+    XTransform	pendingTransform;
+    char	*pendingFilter;
+    int		pendingNparams;
+    XFixed	*pendingParams;
+    XTransform	currentTransform;
+    char	*currentFilter;
+    int		currentNparams;
+    XFixed	*currentParams;
+} XRRCrtcTransformAttributes;
+
+/*
+ * Get current crtc transforms and filters.
+ * Pass *attributes to XFree to free
+ */
+Status
+XRRGetCrtcTransform (Display	*dpy,
+		     RRCrtc	crtc,
+		     XRRCrtcTransformAttributes **attributes);
+
+/*
  * intended to take RRScreenChangeNotify,  or 
  * ConfigureNotify (on the root window)
  * returns 1 if it is an event type it understands, 0 if not
  */
 int XRRUpdateConfiguration(XEvent *event);
 
-/* Version 1.3 additions */
-
-XRRScreenResources *
-XRRGetScreenResourcesCurrent (Display *dpy, Window window);
-
 _XFUNCPROTOEND
 
 #endif /* _XRANDR_H_ */