summaryrefslogtreecommitdiff
path: root/randr/randrstr.h
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2008-03-21 02:39:49 -0700
committerKeith Packard <keithp@keithp.com>2008-11-24 13:24:40 -0800
commit7c61db66a470a8306e346ed8bf8934f014dada42 (patch)
tree27215d0f0fa4a2823222fb37fc0ae5cff541780a /randr/randrstr.h
parentfa6a1df209bd74da1d545982cca437afc2198cc1 (diff)
Create rrtransform.[ch]. Add RRTransform argument to RRCrtcNotify.
Instead of using a separate function to notify DIX about transform changes, add the transform to RRCrtcNotify so that the whole Crtc state changes atomically.
Diffstat (limited to 'randr/randrstr.h')
-rw-r--r--randr/randrstr.h22
1 files changed, 3 insertions, 19 deletions
diff --git a/randr/randrstr.h b/randr/randrstr.h
index d4cfa67e6..822e37747 100644
--- a/randr/randrstr.h
+++ b/randr/randrstr.h
@@ -43,6 +43,7 @@
#include "pixmapstr.h"
#include "extnsionst.h"
#include "servermd.h"
+#include "rrtransform.h"
#include <X11/extensions/randr.h>
#include <X11/extensions/randrproto.h>
#ifdef RENDER
@@ -78,7 +79,6 @@ typedef struct _rrPropertyValue RRPropertyValueRec, *RRPropertyValuePtr;
typedef struct _rrProperty RRPropertyRec, *RRPropertyPtr;
typedef struct _rrCrtc RRCrtcRec, *RRCrtcPtr;
typedef struct _rrOutput RROutputRec, *RROutputPtr;
-typedef struct _rrTransform RRTransformRec, *RRTransformPtr;
struct _rrMode {
int refcnt;
@@ -105,17 +105,6 @@ struct _rrProperty {
RRPropertyValueRec current, pending;
};
-struct _rrTransform {
- PictTransform transform;
- struct pict_f_transform f_transform;
- struct pict_f_transform f_inverse;
- PictFilterPtr filter;
- xFixed *params;
- int nparams;
- int width;
- int height;
-};
-
struct _rrCrtc {
RRCrtc id;
ScreenPtr pScreen;
@@ -557,6 +546,7 @@ RRCrtcNotify (RRCrtcPtr crtc,
int x,
int y,
Rotation rotation,
+ RRTransformPtr transform,
int numOutputs,
RROutputPtr *outputs);
@@ -618,7 +608,7 @@ RRCrtcGetScanoutSize(RRCrtcPtr crtc, int *width, int *height);
* Return TRUE if the resulting transform is not a simple translation.
*/
Bool
-RRComputeTransform (int x,
+RRTransformCompute (int x,
int y,
int width,
int height,
@@ -636,12 +626,6 @@ RRTransformPtr
RRCrtcGetTransform (RRCrtcPtr crtc);
/*
- * Mark the pending transform as current
- */
-void
-RRCrtcSetTransform (RRCrtcPtr crtc, RRTransformPtr transform);
-
-/*
* Check whether the pending and current transforms are the same
*/
Bool