Refactor the transform_t structure to XRUTransform

3 files changed, 22 insertions, 15 deletions

diff --git a/examples/xrandr.c b/examples/xrandr.c
index 96cc9f6..08f7142 100644
--- a/examples/xrandr.c
+++ b/examples/xrandr.c
@@ -188,16 +188,8 @@ typedef enum _changes {
 
 typedef struct _crtc crtc_t;
 typedef struct _output	output_t;
-typedef struct _transform transform_t;
 typedef struct _umode	umode_t;
 
-struct _transform {
-    XTransform	    transform;
-    char	    *filter;
-    int		    nparams;
-    XFixed	    *params;
-};
-
 struct _crtc {
     XRUName	    crtc;
     Bool	    changing;
@@ -210,7 +202,7 @@ struct _crtc {
     Rotation	    rotation;
     output_t	    **outputs;
     int		    noutput;
-    transform_t	    current_transform, pending_transform;
+    XRUTransform    current_transform, pending_transform;
 };
 
 struct _output {
@@ -242,7 +234,7 @@ struct _output {
     XRRPanning      panning;
 
     Bool    	    automatic;
-    transform_t	    transform;
+    XRUTransform    transform;
 
     struct {
 	float red;
@@ -454,7 +446,7 @@ mode_hsync (XRRModeInfo *mode_info)
 }
 
 static void
-init_transform (transform_t *transform)
+init_transform (XRUTransform *transform)
 {
     int x;
     memset (&transform->transform, '\0', sizeof (transform->transform));
@@ -466,7 +458,7 @@ init_transform (transform_t *transform)
 }
 
 static void
-set_transform (transform_t  *dest,
+set_transform (XRUTransform *dest,
 	       XTransform   *transform,
 	       char	    *filter,
 	       XFixed	    *params,
@@ -480,14 +472,14 @@ set_transform (transform_t  *dest,
 }
 
 static void
-copy_transform (transform_t *dest, transform_t *src)
+copy_transform (XRUTransform *dest, XRUTransform *src)
 {
     set_transform (dest, &src->transform,
 		   src->filter, src->params, src->nparams);
 }
 
 static Bool
-equal_transform (transform_t *a, transform_t *b)
+equal_transform (XRUTransform *a, XRUTransform *b)
 {
     if (memcmp (&a->transform, &b->transform, sizeof (XTransform)) != 0)
 	return False;
@@ -1244,7 +1236,7 @@ crtc_disable (crtc_t *crtc)
 }
 
 static void
-crtc_set_transform (crtc_t *crtc, transform_t *transform)
+crtc_set_transform (crtc_t *crtc, XRUTransform *transform)
 {
     int	major, minor;
 
diff --git a/include/X11/extensions/XrandrUtils.h b/include/X11/extensions/XrandrUtils.h
index 9c192bb..e0e1ff8 100644
--- a/include/X11/extensions/XrandrUtils.h
+++ b/include/X11/extensions/XrandrUtils.h
@@ -69,6 +69,13 @@ struct _xru_output_prop {
     char *value;
 };
 
+typedef struct {
+    XTransform      transform;
+    char            *filter;
+    int             nparams;
+    XFixed          *params;
+} XRUTransform;
+
 /* Geometry */
 const char *
 XRURotationName(Rotation rotation);
diff --git a/man/XrandrUtils.man b/man/XrandrUtils.man
index a0e9dd3..43878dc 100644
--- a/man/XrandrUtils.man
+++ b/man/XrandrUtils.man
@@ -55,6 +55,14 @@ typedef struct {
   char *value;
 } XRUOutputProp;
 
+typedef struct {
+    XTransform      transform;
+    char            *filter;
+    int             nparams;
+    XFixed          *params;
+} XRUTransform;
+
+
 /**
  * Return string name for the given rotation,
  * or "invalid rotation" on error.