X Strike Force Render SVN commit: r71 - in branches/HEAD: . autom4te.cache debian
Author: dnusinow
Date: 2005-09-05 22:14:55 -0500 (Mon, 05 Sep 2005)
New Revision: 71
Modified:
branches/HEAD/autom4te.cache/requests
branches/HEAD/debian/changelog
branches/HEAD/protocol
branches/HEAD/render.h
branches/HEAD/renderproto.h
Log:
* Pull from latest CVS for real (Sun, 5 Sep 2005)
+ Change package version to use CVS dating scheme
* Re-run autogen.sh
Modified: branches/HEAD/autom4te.cache/requests
===================================================================
--- branches/HEAD/autom4te.cache/requests 2005-09-03 19:24:00 UTC (rev 70)
+++ branches/HEAD/autom4te.cache/requests 2005-09-06 03:14:55 UTC (rev 71)
@@ -17,19 +17,19 @@
{
'm4_pattern_forbid' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1,
+ 'AC_C_VOLATILE' => 1,
'AC_TYPE_OFF_T' => 1,
- 'AC_C_VOLATILE' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_FUNC_STAT' => 1,
+ 'AC_FUNC_WAIT3' => 1,
'AC_HEADER_TIME' => 1,
- 'AC_FUNC_WAIT3' => 1,
+ 'AC_FUNC_LSTAT' => 1,
+ 'AC_STRUCT_TM' => 1,
'AM_AUTOMAKE_VERSION' => 1,
- 'AC_STRUCT_TM' => 1,
- 'AC_FUNC_LSTAT' => 1,
+ 'AC_FUNC_GETMNTENT' => 1,
'AC_TYPE_MODE_T' => 1,
- 'AC_FUNC_GETMNTENT' => 1,
'AC_FUNC_STRTOD' => 1,
'AC_CHECK_HEADERS' => 1,
'AC_FUNC_STRNLEN' => 1,
@@ -48,17 +48,17 @@
'AC_STRUCT_ST_BLOCKS' => 1,
'AC_TYPE_SIGNAL' => 1,
'AC_TYPE_UID_T' => 1,
+ 'AC_CONFIG_AUX_DIR' => 1,
'AC_PROG_MAKE_SET' => 1,
- 'AC_CONFIG_AUX_DIR' => 1,
+ 'm4_pattern_allow' => 1,
'sinclude' => 1,
- 'm4_pattern_allow' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_CC' => 1,
+ 'AC_FUNC_FORK' => 1,
'AC_DECL_SYS_SIGLIST' => 1,
- 'AC_FUNC_FORK' => 1,
+ 'AC_FUNC_STRCOLL' => 1,
'AC_FUNC_VPRINTF' => 1,
- 'AC_FUNC_STRCOLL' => 1,
'AC_PROG_YACC' => 1,
'AC_STRUCT_TIMEZONE' => 1,
'AC_INIT' => 1,
@@ -80,34 +80,34 @@
'AM_MAINTAINER_MODE' => 1,
'AC_FUNC_UTIME_NULL' => 1,
'AC_FUNC_SELECT_ARGTYPES' => 1,
+ 'AC_HEADER_STAT' => 1,
'AC_FUNC_STRFTIME' => 1,
- 'AC_HEADER_STAT' => 1,
+ 'AC_PROG_CPP' => 1,
'AC_C_INLINE' => 1,
- 'AC_PROG_CPP' => 1,
+ 'AC_PROG_LEX' => 1,
+ 'AC_C_CONST' => 1,
+ 'AC_TYPE_PID_T' => 1,
'AM_ENABLE_MULTILIB' => 1,
- 'AC_TYPE_PID_T' => 1,
- 'AC_C_CONST' => 1,
- 'AC_PROG_LEX' => 1,
'AC_CONFIG_FILES' => 1,
'include' => 1,
'AC_FUNC_SETVBUF_REVERSED' => 1,
'AC_PROG_INSTALL' => 1,
'AM_GNU_GETTEXT' => 1,
+ 'AC_FUNC_OBSTACK' => 1,
'AC_CHECK_LIB' => 1,
- 'AC_FUNC_OBSTACK' => 1,
'AC_FUNC_MALLOC' => 1,
'AC_FUNC_GETGROUPS' => 1,
'AC_FUNC_GETLOADAVG' => 1,
'AH_OUTPUT' => 1,
'AC_FUNC_FSEEKO' => 1,
'AM_PROG_CC_C_O' => 1,
+ 'AC_FUNC_MKTIME' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
'AM_CONDITIONAL' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
- 'AC_FUNC_MKTIME' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_HEADER_SYS_WAIT' => 1,
+ 'AC_FUNC_MEMCMP' => 1,
'AC_PROG_LN_S' => 1,
- 'AC_FUNC_MEMCMP' => 1,
'm4_include' => 1,
'AC_HEADER_DIRENT' => 1,
'AC_CHECK_FUNCS' => 1
Modified: branches/HEAD/debian/changelog
===================================================================
--- branches/HEAD/debian/changelog 2005-09-03 19:24:00 UTC (rev 70)
+++ branches/HEAD/debian/changelog 2005-09-06 03:14:55 UTC (rev 71)
@@ -1,3 +1,11 @@
+renderext (1:0.9+CVS20050905-1) experimental; urgency=low
+
+ * Pull from latest CVS for real (Sun, 5 Sep 2005)
+ + Change package version to use CVS dating scheme
+ * Re-run autogen.sh
+
+ -- David Nusinow <dnusinow@debian.org> Mon, 5 Sep 2005 22:23:35 -0400
+
renderext (1:0.9+CVS-1) experimental; urgency=low
* Pull from latest CVS (Sun, 14 Aug 2005)
Modified: branches/HEAD/protocol
===================================================================
--- branches/HEAD/protocol 2005-09-03 19:24:00 UTC (rev 70)
+++ branches/HEAD/protocol 2005-09-06 03:14:55 UTC (rev 71)
@@ -187,6 +187,7 @@
]
POLYEDGE { Sharp, Smooth }
POLYMODE { Precise, Imprecise }
+REPEAT { None, Regular, Pad, Reflect }
COLORPOINT [
point: POINTFIX
color: COLOR
@@ -591,8 +592,7 @@
The value-mask and value-list specify attributes of the picture that
are to be explicitly initialized. The possible values are:
- repeat: BOOL
- fill-nearest: BOOL
+ repeat: REPEAT
alpha-map: PICTURE or None
alpha-x-origin: INT16
alpha-y-origin: INT16
@@ -610,16 +610,8 @@
values control how pixels outside the geometry of the drawable are
computed.
- Fill-nearest indicates that pixel values outside of the drawable
- geometry should be replaced the nearest available pixel within the
- drawable geometry is used. When multiple pixels are equidistant,
- those with smaller Y and then X values are preferred. Otherwise,
- missing pixels are replaced with transparent.
-
- Repeat indicates that the drawable contents should be treated
- as if tiled in both directions. Pixels falling in missing
- areas of this tile are replaced according to the fill-nearest
- rule.
+ Repeat indicates how the drawable contents should be extented
+ in both directions.
The alpha channel of alpha-map is used in place of any alpha channel
contained within the drawable for all rendering operations. The
@@ -1124,6 +1116,82 @@
'picture' must be an alpha-only picture else a 'Match' error is
returned.
+CreateSolidFill
+ pid: PICTURE
+ color: COLOR
+
+ Creates a Source picture that represents a solid fill with
+ the specified color.
+
+CreateLinearGradient
+ pid: PICTURE
+ p1, p2: POINTFIX
+ nstops: CARD32
+ stops: LISTofFIXED
+ stop_colors: LISTofCOLOR
+
+ Errors: Alloc, Value
+
+ Creates a source picture representing a linear Gradient. The gradients
+ bounds are defined by the two end points p1 and p2.
+
+ The gradient has nstops stop points between 0 and 1, each
+ having a stop color defined in stop_colors.
+
+ The array of stops has to contain values between 0 and 1 (inclusive) and
+ has to be ordered in increasing size or a Value error is generated. If
+ p1 == p2 a Value error is generated.
+
+ The colors are non premultiplied.
+
+CreateRadialGradient
+ pid: PICTURE
+ inner_center: POINTFIX
+ outer_center: POINTFIX
+ inner_radius: FIXED
+ outer_radius: FIXED
+ nstops: CARD32
+ stops: LISTofFIXED
+ stop_colors: LISTofCOLOR
+
+ Errors: Alloc, Value
+
+ Creates a source picture representing a radial Gradient. The
+ gradients bounds are defined by a center point, a focal point and a
+ radius around the center.
+
+ The gradient has nstops stop points between 0 and 1, each
+ having a stop color defined in stop_colors.
+
+ The array of stops has to contain values between 0 and 1 (inclusive) and
+ has to be ordered in increasing size or a Value error is generated. The inner
+ circle has to be completely contained inside the outer one or a Value error is
+ generated.
+
+ The colors are non premultiplied.
+
+CreateConicalGradient
+ pid: PICTURE
+ center: POINTFIX
+ angle: FIXED
+ nstops: CARD32
+ stops: LISTofFIXED
+ stop_colors: LISTofCOLOR
+
+ Errors: Alloc, Value
+
+ Creates a source picture representing a conical Gradient. The
+ gradient is defined by a center point and an angle (in degrees).
+
+ The gradient has nstops stop points between 0 and 1, each
+ having a stop color defined in stop_colors.
+
+ The array of stops has to contain values between 0 and 1 (inclusive) and
+ has to be ordered in increasing size or a Value error is generated.
+
+ The colors are non premultiplied.
+
+
15. Extension Versioning
The Render extension was developed in parallel with the implementation to
@@ -1174,3 +1242,12 @@
CreateAnimCursor
0.9:
AddTrapezoids
+
+ 0.10:
+ CreateSolidFill
+ CreateLinearGradient
+ CreateRadialGradient
+ CreateConicalGradient
+
+ The repeat picture attribute now supports Pad and
+ Reflect, older versions only supported None and Normal.
Modified: branches/HEAD/render.h
===================================================================
--- branches/HEAD/render.h 2005-09-03 19:24:00 UTC (rev 70)
+++ branches/HEAD/render.h 2005-09-06 03:14:55 UTC (rev 71)
@@ -1,5 +1,5 @@
/*
- * $Id: render.h,v 1.14 2004/07/29 07:58:03 keithp Exp $
+ * $Id: render.h,v 1.15 2005/06/29 11:52:07 lars Exp $
*
* Copyright � 2000 SuSE, Inc.
*
@@ -33,7 +33,7 @@
#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 @@
#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
@@ -177,4 +182,10 @@
#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_ */
Modified: branches/HEAD/renderproto.h
===================================================================
--- branches/HEAD/renderproto.h 2005-09-03 19:24:00 UTC (rev 70)
+++ branches/HEAD/renderproto.h 2005-09-06 03:14:55 UTC (rev 71)
@@ -1,5 +1,5 @@
/*
- * $Id: renderproto.h,v 1.15 2004/07/29 07:58:03 keithp Exp $
+ * $Id: renderproto.h,v 1.16 2005/06/29 11:52:07 lars Exp $
*
* Copyright � 2000 SuSE, Inc.
*
@@ -593,6 +593,56 @@
#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
Reply to: