INTEGRATION: CWS vcl87 (1.1.118); FILE MERGED

2008/03/10 12:27:23 hdu 1.1.118.1: #i86875# update xrender headers

x11_extensions/inc/render.h

 /*
- * $XFree86: xc/include/extensions/render.h,v 1.3 2000/11/20 07:13:09 keithp Exp $
+ * $XFree86: xc/include/extensions/render.h,v 1.10 2002/11/06 22:47:49 keithp Exp $
  *
- * Copyright  2000 SuSE, Inc.
+ * Copyright © 2000 SuSE, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -26,18 +26,18 @@
 #ifndef _RENDER_H_
 #define _RENDER_H_
 
-typedef unsigned long   Glyph;
-typedef unsigned long   GlyphSet;
-typedef unsigned long   Picture;
-typedef unsigned long   PictFormat;
+typedef XID     Glyph;
+typedef XID     GlyphSet;
+typedef XID     Picture;
+typedef XID     PictFormat;
 
 #define RENDER_NAME "RENDER"
 #define RENDER_MAJOR    0
-#define RENDER_MINOR    1
+#define RENDER_MINOR    10
 
 #define X_RenderQueryVersion            0
 #define X_RenderQueryPictFormats        1
-#define X_RenderQueryPictIndexValues        2
+#define X_RenderQueryPictIndexValues        2   /* 0.7 */
 #define X_RenderQueryDithers            3
 #define X_RenderCreatePicture           4
 #define X_RenderChangePicture           5
@@ -51,7 +51,7 @@ typedef unsigned long   PictFormat;
 #define X_RenderTriFan              13
 #define X_RenderColorTrapezoids         14
 #define X_RenderColorTriangles          15
-#define X_RenderTransform           16
+/* #define X_RenderTransform            16 */
 #define X_RenderCreateGlyphSet          17
 #define X_RenderReferenceGlyphSet       18
 #define X_RenderFreeGlyphSet            19
@@ -62,6 +62,22 @@ typedef unsigned long   PictFormat;
 #define X_RenderCompositeGlyphs16       24
 #define X_RenderCompositeGlyphs32       25
 #define X_RenderFillRectangles          26
+/* 0.5 */
+#define X_RenderCreateCursor            27
+/* 0.6 */
+#define X_RenderSetPictureTransform     28
+#define X_RenderQueryFilters            29
+#define X_RenderSetPictureFilter        30
+/* 0.8 */
+#define X_RenderCreateAnimCursor        31
+/* 0.9 */
+#define X_RenderAddTraps            32
+/* 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
@@ -73,6 +89,7 @@ typedef unsigned long   PictFormat;
 #define PictTypeIndexed             0
 #define PictTypeDirect              1
 
+#define PictOpMinimum               0
 #define PictOpClear             0
 #define PictOpSrc               1
 #define PictOpDst               2
@@ -89,6 +106,39 @@ typedef unsigned long   PictFormat;
 #define PictOpSaturate              13
 #define PictOpMaximum               13
 
+/*
+ * Operators only available in version 0.2
+ */
+#define PictOpDisjointMinimum               0x10
+#define PictOpDisjointClear             0x10
+#define PictOpDisjointSrc               0x11
+#define PictOpDisjointDst               0x12
+#define PictOpDisjointOver              0x13
+#define PictOpDisjointOverReverse           0x14
+#define PictOpDisjointIn                0x15
+#define PictOpDisjointInReverse             0x16
+#define PictOpDisjointOut               0x17
+#define PictOpDisjointOutReverse            0x18
+#define PictOpDisjointAtop              0x19
+#define PictOpDisjointAtopReverse           0x1a
+#define PictOpDisjointXor               0x1b
+#define PictOpDisjointMaximum               0x1b
+
+#define PictOpConjointMinimum               0x20
+#define PictOpConjointClear             0x20
+#define PictOpConjointSrc               0x21
+#define PictOpConjointDst               0x22
+#define PictOpConjointOver              0x23
+#define PictOpConjointOverReverse           0x24
+#define PictOpConjointIn                0x25
+#define PictOpConjointInReverse             0x26
+#define PictOpConjointOut               0x27
+#define PictOpConjointOutReverse            0x28
+#define PictOpConjointAtop              0x29
+#define PictOpConjointAtopReverse           0x2a
+#define PictOpConjointXor               0x2b
+#define PictOpConjointMaximum               0x2b
+
 #define PolyEdgeSharp               0
 #define PolyEdgeSmooth              1
 
@@ -108,6 +158,32 @@ typedef unsigned long   PictFormat;
 #define CPPolyMode              (1 << 10)
 #define CPDither                (1 << 11)
 #define CPComponentAlpha            (1 << 12)
-#define CPLastBit               11
+#define CPLastBit               12
+
+/* 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 FilterAliasNone             -1
+
+/* Subpixel orders included in 0.6 */
+#define SubPixelUnknown             0
+#define SubPixelHorizontalRGB           1
+#define SubPixelHorizontalBGR           2
+#define SubPixelVerticalRGB         3
+#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_ */

x11_extensions/inc/renderproto.h

 /*
- * $XFree86: xc/include/extensions/renderproto.h,v 1.5 2000/11/20 07:13:09 keithp Exp $
+ * $XFree86: xc/include/extensions/renderproto.h,v 1.12 2002/09/26 02:56:48 keithp Exp $
  *
- * Copyright  2000 SuSE, Inc.
+ * Copyright © 2000 SuSE, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -26,7 +26,8 @@
 #ifndef _XRENDERP_H_
 #define _XRENDERP_H_
 
-#include "render.h"
+#include <X11/Xmd.h>
+#include <X11/extensions/render.h>
 
 #define Window CARD32
 #define Drawable CARD32
@@ -45,7 +46,6 @@
 #define PictFormat  CARD32
 #define Fixed       INT32
 #define Glyphset    CARD32
-#define Glyph       CARD32
 
 /*
  * data structures
@@ -73,7 +73,7 @@ typedef struct {
     Colormap    colormap;
 } xPictFormInfo;
 
-#define sz_xPictFormInfo    16
+#define sz_xPictFormInfo    28
 
 typedef struct {
     VisualID    visual;
@@ -124,12 +124,28 @@ typedef struct {
 
 #define sz_xPointFixed  8
 
+typedef struct {
+    xPointFixed p1;
+    xPointFixed p2;
+} xLineFixed;
+
+#define sz_xLineFixed   16
+
 typedef struct {
     xPointFixed p1, p2, p3;
 } xTriangle;
 
 #define sz_xTriangle    24
 
+typedef struct {
+    Fixed   top B32;
+    Fixed   bottom B32;
+    xLineFixed  left;
+    xLineFixed  right;
+} xTrapezoid;
+
+#define sz_xTrapezoid   40
+
 typedef struct {
     CARD16  width B16;
     CARD16  height B16;
@@ -151,6 +167,18 @@ typedef struct {
 
 #define sz_xGlyphElt    8
 
+typedef struct {
+    Fixed   l, r, y;
+} xSpanFix;
+
+#define sz_xSpanFix 12
+
+typedef struct {
+    xSpanFix    top, bot;
+} xTrap;
+
+#define sz_xTrap    24
+
 /*
  * requests and replies
  */
@@ -196,7 +224,7 @@ typedef struct {
     CARD32  numScreens B32;
     CARD32  numDepths B32;
     CARD32  numVisuals B32;
-    CARD32  pad4 B32;
+    CARD32  numSubpixel B32;        /* Version 0.6 */
     CARD32  pad5 B32;
 } xRenderQueryPictFormatsReply;
 
@@ -312,13 +340,65 @@ typedef struct {
     CARD8       reqType;
     CARD8       renderReqType;
     CARD16      length B16;
+    CARD8   op;
+    CARD8   pad1;
+    CARD16  pad2 B16;
+    Picture src B32;
+    Picture dst B32;
+    PictFormat  maskFormat B32;
+    INT16   xSrc B16;
+    INT16   ySrc B16;
+} xRenderTrapezoidsReq;
+
+#define sz_xRenderTrapezoidsReq             24
+
+typedef struct {
+    CARD8       reqType;
+    CARD8       renderReqType;
+    CARD16      length B16;
+    CARD8   op;
+    CARD8   pad1;
+    CARD16  pad2 B16;
     Picture src B32;
     Picture dst B32;
+    PictFormat  maskFormat B32;
     INT16   xSrc B16;
     INT16   ySrc B16;
 } xRenderTrianglesReq;
 
-#define sz_xRenderTrianglesReq              16
+#define sz_xRenderTrianglesReq              24
+
+typedef struct {
+    CARD8       reqType;
+    CARD8       renderReqType;
+    CARD16      length B16;
+    CARD8   op;
+    CARD8   pad1;
+    CARD16  pad2 B16;
+    Picture src B32;
+    Picture dst B32;
+    PictFormat  maskFormat B32;
+    INT16   xSrc B16;
+    INT16   ySrc B16;
+} xRenderTriStripReq;
+
+#define sz_xRenderTriStripReq               24
+
+typedef struct {
+    CARD8       reqType;
+    CARD8       renderReqType;
+    CARD16      length B16;
+    CARD8   op;
+    CARD8   pad1;
+    CARD16  pad2 B16;
+    Picture src B32;
+    Picture dst B32;
+    PictFormat  maskFormat B32;
+    INT16   xSrc B16;
+    INT16   ySrc B16;
+} xRenderTriFanReq;
+
+#define sz_xRenderTriFanReq             24
 
 typedef struct {
     CARD8       reqType;
@@ -403,6 +483,165 @@ typedef struct {
 
 #define sz_xRenderFillRectanglesReq         20
 
+/* 0.5 and higher */
+
+typedef struct {
+    CARD8   reqType;
+    CARD8   renderReqType;
+    CARD16  length B16;
+    Cursor  cid B32;
+    Picture src B32;
+    CARD16  x B16;
+    CARD16  y B16;
+} xRenderCreateCursorReq;
+
+#define sz_xRenderCreateCursorReq           16
+
+/* 0.6 and higher */
+
+/*
+ * This can't use an array because 32-bit values may be in bitfields
+ */
+typedef struct {
+    Fixed   matrix11 B32;
+    Fixed   matrix12 B32;
+    Fixed   matrix13 B32;
+    Fixed   matrix21 B32;
+    Fixed   matrix22 B32;
+    Fixed   matrix23 B32;
+    Fixed   matrix31 B32;
+    Fixed   matrix32 B32;
+    Fixed   matrix33 B32;
+} xRenderTransform;
+
+#define sz_xRenderTransform 36
+
+typedef struct {
+    CARD8       reqType;
+    CARD8       renderReqType;
+    CARD16      length B16;
+    Picture     picture B32;
+    xRenderTransform    transform;
+} xRenderSetPictureTransformReq;
+
+#define sz_xRenderSetPictureTransformReq        44
+
+typedef struct {
+    CARD8       reqType;
+    CARD8       renderReqType;
+    CARD16      length B16;
+    Drawable        drawable B32;
+} xRenderQueryFiltersReq;
+
+#define sz_xRenderQueryFiltersReq           8
+
+typedef struct {
+    BYTE    type;   /* X_Reply */
+    BYTE    pad1;
+    CARD16  sequenceNumber B16;
+    CARD32  length B32;
+    CARD32  numAliases B32; /* LISTofCARD16 */
+    CARD32  numFilters B32; /* LISTofSTRING8 */
+    CARD32  pad2 B32;
+    CARD32  pad3 B32;
+    CARD32  pad4 B32;
+    CARD32  pad5 B32;
+} xRenderQueryFiltersReply;
+
+#define sz_xRenderQueryFiltersReply         32
+
+typedef struct {
+    CARD8       reqType;
+    CARD8       renderReqType;
+    CARD16      length B16;
+    Picture     picture B32;
+    CARD16      nbytes B16; /* number of bytes in name */
+    CARD16      pad B16;
+} xRenderSetPictureFilterReq;
+
+#define sz_xRenderSetPictureFilterReq           12
+
+/* 0.8 and higher */
+
+typedef struct {
+    Cursor      cursor B32;
+    CARD32      delay B32;
+} xAnimCursorElt;
+
+#define sz_xAnimCursorElt               8
+
+typedef struct {
+    CARD8       reqType;
+    CARD8       renderReqType;
+    CARD16      length B16;
+    Cursor      cid B32;
+} xRenderCreateAnimCursorReq;
+
+#define sz_xRenderCreateAnimCursorReq           8
+
+/* 0.9 and higher */
+
+typedef struct {
+    CARD8       reqType;
+    CARD8       renderReqType;
+    CARD16      length B16;
+    Picture     picture;
+    INT16       xOff B16;
+    INT16       yOff B16;
+} 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
@@ -420,6 +659,5 @@ typedef struct {
 #undef PictFormat
 #undef Fixed
 #undef Glyphset
-#undef Glyph
 
 #endif /* _XRENDERP_H_ */