summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Knoll <lars@trolltech.com>2005-07-01 10:03:25 +0000
committerLars Knoll <lars@trolltech.com>2005-07-01 10:03:25 +0000
commitc3526e7ea51b7b70d14fb6ad97cc234221ac875a (patch)
treeaf8f2f61dfe8d19cfa6c468052d2b12169805246
parentc1a679f90a1b9e011060661dfdadd2960489ba95 (diff)
-rw-r--r--render.h19
-rw-r--r--renderproto.h60
2 files changed, 70 insertions, 9 deletions
diff --git a/render.h b/render.h
index 5838246..691c63f 100644
--- a/render.h
+++ b/render.h
@@ -33,7 +33,7 @@ typedef unsigned long PictFormat;
#define RENDER_NAME "RENDER"
#define RENDER_MAJOR 0
-#define RENDER_MINOR 9
+#define RENDER_MINOR 10
#define X_RenderQueryVersion 0
#define X_RenderQueryPictFormats 1
@@ -72,7 +72,12 @@ typedef unsigned long PictFormat;
#define X_RenderCreateAnimCursor 31
/* 0.9 */
#define X_RenderAddTraps 32
-#define RenderNumberRequests (X_RenderAddTraps+1)
+/* 0.10 */
+#define X_RenderCreateSolidFill 33
+#define X_RenderCreateLinearGradient 34
+#define X_RenderCreateRadialGradient 35
+#define X_RenderCreateConicalGradient 36
+#define RenderNumberRequests (X_RenderCreateConicalGradient+1)
#define BadPictFormat 0
#define BadPicture 1
@@ -158,13 +163,13 @@ typedef unsigned long PictFormat;
/* Filters included in 0.6 */
#define FilterNearest "nearest"
#define FilterBilinear "bilinear"
+/* Filters included in 0.10 */
+#define FilterConvolution "convolution"
#define FilterFast "fast"
#define FilterGood "good"
#define FilterBest "best"
-#define FilterConvolution "convolution"
-
#define FilterAliasNone -1
/* Subpixel orders included in 0.6 */
@@ -175,4 +180,10 @@ typedef unsigned long PictFormat;
#define SubPixelVerticalBGR 4
#define SubPixelNone 5
+/* Extended repeat attributes included in 0.10 */
+#define RepeatNone 0
+#define RepeatNormal 1
+#define RepeatPad 2
+#define RepeatReflect 3
+
#endif /* _RENDER_H_ */
diff --git a/renderproto.h b/renderproto.h
index e705bb7..bdd4c74 100644
--- a/renderproto.h
+++ b/renderproto.h
@@ -17,7 +17,7 @@
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
* BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Keith Packard, SuSE, Inc.
@@ -180,7 +180,7 @@ typedef struct {
#define sz_xTrap 24
-/*
+/*
* requests and replies
*/
typedef struct {
@@ -462,7 +462,7 @@ typedef struct {
Glyphset glyphset B32;
INT16 xSrc B16;
INT16 ySrc B16;
-} xRenderCompositeGlyphsReq, xRenderCompositeGlyphs8Req,
+} xRenderCompositeGlyphsReq, xRenderCompositeGlyphs8Req,
xRenderCompositeGlyphs16Req, xRenderCompositeGlyphs32Req;
#define sz_xRenderCompositeGlyphs8Req 28
@@ -561,7 +561,7 @@ typedef struct {
} xRenderSetPictureFilterReq;
#define sz_xRenderSetPictureFilterReq 12
-
+
/* 0.8 and higher */
typedef struct {
@@ -592,7 +592,57 @@ typedef struct {
} xRenderAddTrapsReq;
#define sz_xRenderAddTrapsReq 12
-
+
+/* 0.10 and higher */
+
+typedef struct {
+ CARD8 reqType;
+ CARD8 renderReqType;
+ CARD16 length B16;
+ Picture pid B32;
+ xRenderColor color;
+} xRenderCreateSolidFillReq;
+
+#define sz_xRenderCreateSolidFillReq 16
+
+typedef struct {
+ CARD8 reqType;
+ CARD8 renderReqType;
+ CARD16 length B16;
+ Picture pid B32;
+ xPointFixed p1;
+ xPointFixed p2;
+ CARD32 nStops;
+} xRenderCreateLinearGradientReq;
+
+#define sz_xRenderCreateLinearGradientReq 28
+
+typedef struct {
+ CARD8 reqType;
+ CARD8 renderReqType;
+ CARD16 length B16;
+ Picture pid B32;
+ xPointFixed inner;
+ xPointFixed outer;
+ Fixed inner_radius;
+ Fixed outer_radius;
+ CARD32 nStops;
+} xRenderCreateRadialGradientReq;
+
+#define sz_xRenderCreateRadialGradientReq 36
+
+typedef struct {
+ CARD8 reqType;
+ CARD8 renderReqType;
+ CARD16 length B16;
+ Picture pid B32;
+ xPointFixed center;
+ Fixed angle; /* in degrees */
+ CARD32 nStops;
+} xRenderCreateConicalGradientReq;
+
+#define sz_xRenderCreateConicalGradientReq 24
+
#undef Window
#undef Drawable
#undef Font