Attachment 11366 Details for Bug 12210 – patch

[patch] patch

cairo-no-xrender.h (text/plain), 30.40 KB, created by Behdad Esfahbod on 2007-08-31 18:34:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Behdad Esfahbod

Created: 2007-08-31 18:34:38 UTC

Size: 30.40 KB

patch

obsolete

>commit 740fed62d236224fdfbfccf8c49a199851189107
>Author: Behdad Esfahbod <behdad@behdad.org>
>Date:   Fri Aug 31 20:52:43 2007 -0400
>
>    [xlib] Make it compile without Xrender available at compile time (#12210)
>
>diff --git a/src/Makefile.am b/src/Makefile.am
>index 5cd368b..dd8d66e 100644
>--- a/src/Makefile.am
>+++ b/src/Makefile.am
>@@ -51,7 +51,8 @@ libcairo_xlib_sources = cairo-xlib-surface.c \
> 			cairo-xlib-surface-private.h \
> 			cairo-xlib-display.c \
> 			cairo-xlib-screen.c \
>-			cairo-xlib-private.h
>+			cairo-xlib-private.h \
>+			cairo-xlib-xrender-private.h
> backend_pkgconfigs += cairo-xlib.pc
> endif
> 
>diff --git a/src/cairo-xlib-display.c b/src/cairo-xlib-display.c
>index b8f35cb..5d4f339 100644
>--- a/src/cairo-xlib-display.c
>+++ b/src/cairo-xlib-display.c
>@@ -38,7 +38,6 @@
> #include <fontconfig/fontconfig.h>
> 
> #include <X11/Xlibint.h>	/* For XESetCloseDisplay */
>-#include <X11/extensions/Xrender.h>
> 
> typedef int (*cairo_xlib_error_func_t) (Display     *display,
> 					XErrorEvent *event);
>diff --git a/src/cairo-xlib-private.h b/src/cairo-xlib-private.h
>index 6157775..9b806ee 100644
>--- a/src/cairo-xlib-private.h
>+++ b/src/cairo-xlib-private.h
>@@ -35,8 +35,11 @@
> 
> #include "cairoint.h"
> #include "cairo-xlib.h"
>+#include "cairo-xlib-xrender-private.h"
> #include "cairo-freelist-private.h"
> 
>+#include <X11/Xutil.h> /* for XDestroyImage */
>+
> typedef struct _cairo_xlib_display cairo_xlib_display_t;
> typedef struct _cairo_xlib_hook cairo_xlib_hook_t;
> typedef struct _cairo_xlib_job cairo_xlib_job_t;
>@@ -121,11 +124,4 @@ _cairo_xlib_screen_get_gc (cairo_xlib_screen_info_t *info, int depth);
> cairo_private cairo_status_t
> _cairo_xlib_screen_put_gc (cairo_xlib_screen_info_t *info, int depth, GC gc, cairo_bool_t reset_clip);
> 
>-#if CAIRO_HAS_XLIB_XRENDER_SURFACE
>-
>-#include "cairo-xlib-xrender.h"
>-slim_hidden_proto (cairo_xlib_surface_create_with_xrender_format);
>-
>-#endif
>-
> #endif /* CAIRO_XLIB_PRIVATE_H */
>diff --git a/src/cairo-xlib-screen.c b/src/cairo-xlib-screen.c
>index 2e8c913..88f0899 100644
>--- a/src/cairo-xlib-screen.c
>+++ b/src/cairo-xlib-screen.c
>@@ -58,8 +58,6 @@
> 
> #include <fontconfig/fontconfig.h>
> 
>-#include <X11/extensions/Xrender.h>
>-
> static int
> parse_boolean (const char *v)
> {
>diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
>index c95ec16..9478594 100644
>--- a/src/cairo-xlib-surface.c
>+++ b/src/cairo-xlib-surface.c
>@@ -37,13 +37,10 @@
>  */
> 
> #include "cairoint.h"
>-#include "cairo-xlib.h"
>-#include "cairo-xlib-xrender.h"
>+
> #include "cairo-xlib-private.h"
> #include "cairo-xlib-surface-private.h"
> #include "cairo-clip-private.h"
>-#include <X11/extensions/Xrender.h>
>-#include <X11/extensions/renderproto.h>
> 
> /* Xlib doesn't define a typedef, so define one ourselves */
> typedef int (*cairo_xlib_error_func_t) (Display     *display,
>@@ -2126,6 +2123,7 @@ cairo_xlib_surface_create_for_bitmap (Display  *dpy,
> 						NULL, NULL, width, height, 1);
> }
> 
>+#if CAIRO_HAS_XLIB_XRENDER_SURFACE
> /**
>  * cairo_xlib_surface_create_with_xrender_format:
>  * @dpy: an X Display
>@@ -2158,6 +2156,7 @@ cairo_xlib_surface_create_with_xrender_format (Display		    *dpy,
> 						NULL, format, width, height, 0);
> }
> slim_hidden_def (cairo_xlib_surface_create_with_xrender_format);
>+#endif
> 
> /**
>  * cairo_xlib_surface_set_size:
>diff --git a/src/cairo-xlib-xrender-private.h b/src/cairo-xlib-xrender-private.h
>new file mode 100644
>index 0000000..41dc6c1
>--- /dev/null
>+++ b/src/cairo-xlib-xrender-private.h
>@@ -0,0 +1,1102 @@
>+/* Cairo - a vector graphics library with display and print output
>+ *
>+ * Copyright Â© 2007 Red Hat, Inc.
>+ *
>+ * This library is free software; you can redistribute it and/or
>+ * modify it either under the terms of the GNU Lesser General Public
>+ * License version 2.1 as published by the Free Software Foundation
>+ * (the "LGPL") or, at your option, under the terms of the Mozilla
>+ * Public License Version 1.1 (the "MPL"). If you do not alter this
>+ * notice, a recipient may use your version of this file under either
>+ * the MPL or the LGPL.
>+ *
>+ * You should have received a copy of the LGPL along with this library
>+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
>+ * You should have received a copy of the MPL along with this library
>+ * in the file COPYING-MPL-1.1
>+ *
>+ * The contents of this file are subject to the Mozilla Public License
>+ * Version 1.1 (the "License"); you may not use this file except in
>+ * compliance with the License. You may obtain a copy of the License at
>+ * http://www.mozilla.org/MPL/
>+ *
>+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
>+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
>+ * the specific language governing rights and limitations.
>+ *
>+ * The Original Code is the cairo graphics library.
>+ *
>+ * The Initial Developer of the Original Code is Red Hat, Inc.
>+ */
>+
>+#ifndef CAIRO_XLIB_XRENDER_PRIVATE_H
>+#define CAIRO_XLIB_XRENDER_PRIVATE_H
>+
>+#include "cairoint.h"
>+
>+#if CAIRO_HAS_XLIB_XRENDER_SURFACE
>+
>+#include "cairo-xlib-xrender.h"
>+slim_hidden_proto (cairo_xlib_surface_create_with_xrender_format);
>+
>+#include <X11/extensions/Xrender.h>
>+#include <X11/extensions/renderproto.h>
>+
>+#else /* !CAIRO_HAS_XLIB_XRENDER_SURFACE */
>+
>+/* Provide dummy symbols and macros to get it compile and take the fallback
>+ * route, just like as if Xrender is not available in the server at run-time. */
>+
>+
>+
>+/* Copied from X11/extensions/render.h */
>+
>+typedef unsigned long	Glyph;
>+typedef unsigned long	GlyphSet;
>+typedef unsigned long	Picture;
>+typedef unsigned long	PictFormat;
>+
>+#define RENDER_NAME	"RENDER"
>+#define RENDER_MAJOR	0
>+#define RENDER_MINOR	10
>+
>+#define X_RenderQueryVersion		    0
>+#define X_RenderQueryPictFormats	    1
>+#define X_RenderQueryPictIndexValues	    2	/* 0.7 */
>+#define X_RenderQueryDithers		    3
>+#define X_RenderCreatePicture		    4
>+#define X_RenderChangePicture		    5
>+#define X_RenderSetPictureClipRectangles    6
>+#define X_RenderFreePicture		    7
>+#define X_RenderComposite		    8
>+#define X_RenderScale			    9
>+#define X_RenderTrapezoids		    10
>+#define X_RenderTriangles		    11
>+#define X_RenderTriStrip		    12
>+#define X_RenderTriFan			    13
>+#define X_RenderColorTrapezoids		    14
>+#define X_RenderColorTriangles		    15
>+/* #define X_RenderTransform		    16 */
>+#define X_RenderCreateGlyphSet		    17
>+#define X_RenderReferenceGlyphSet	    18
>+#define X_RenderFreeGlyphSet		    19
>+#define X_RenderAddGlyphs		    20
>+#define X_RenderAddGlyphsFromPicture	    21
>+#define X_RenderFreeGlyphs		    22
>+#define X_RenderCompositeGlyphs8	    23
>+#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
>+#define BadPictOp			    2
>+#define BadGlyphSet			    3
>+#define BadGlyph			    4
>+#define RenderNumberErrors		    (BadGlyph+1)
>+
>+#define PictTypeIndexed			    0
>+#define PictTypeDirect			    1
>+
>+#define PictOpMinimum			    0
>+#define PictOpClear			    0
>+#define PictOpSrc			    1
>+#define PictOpDst			    2
>+#define PictOpOver			    3
>+#define PictOpOverReverse		    4
>+#define PictOpIn			    5
>+#define PictOpInReverse			    6
>+#define PictOpOut			    7
>+#define PictOpOutReverse		    8
>+#define PictOpAtop			    9
>+#define PictOpAtopReverse		    10
>+#define PictOpXor			    11
>+#define PictOpAdd			    12
>+#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
>+
>+#define PolyModePrecise			    0
>+#define PolyModeImprecise		    1
>+
>+#define CPRepeat			    (1 << 0)
>+#define CPAlphaMap			    (1 << 1)
>+#define CPAlphaXOrigin			    (1 << 2)
>+#define CPAlphaYOrigin			    (1 << 3)
>+#define CPClipXOrigin			    (1 << 4)
>+#define CPClipYOrigin			    (1 << 5)
>+#define CPClipMask			    (1 << 6)
>+#define CPGraphicsExposure		    (1 << 7)
>+#define CPSubwindowMode			    (1 << 8)
>+#define CPPolyEdge			    (1 << 9)
>+#define CPPolyMode			    (1 << 10)
>+#define CPDither			    (1 << 11)
>+#define CPComponentAlpha		    (1 << 12)
>+#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
>+
>+
>+
>+/* Copied from X11/extensions/Xrender.h */
>+
>+typedef struct {
>+    short   red;
>+    short   redMask;
>+    short   green;
>+    short   greenMask;
>+    short   blue;
>+    short   blueMask;
>+    short   alpha;
>+    short   alphaMask;
>+} XRenderDirectFormat;
>+
>+typedef struct {
>+    PictFormat		id;
>+    int			type;
>+    int			depth;
>+    XRenderDirectFormat	direct;
>+    Colormap		colormap;
>+} XRenderPictFormat;
>+
>+#define PictFormatID	    (1 << 0)
>+#define PictFormatType	    (1 << 1)
>+#define PictFormatDepth	    (1 << 2)
>+#define PictFormatRed	    (1 << 3)
>+#define PictFormatRedMask   (1 << 4)
>+#define PictFormatGreen	    (1 << 5)
>+#define PictFormatGreenMask (1 << 6)
>+#define PictFormatBlue	    (1 << 7)
>+#define PictFormatBlueMask  (1 << 8)
>+#define PictFormatAlpha	    (1 << 9)
>+#define PictFormatAlphaMask (1 << 10)
>+#define PictFormatColormap  (1 << 11)
>+
>+typedef struct _XRenderPictureAttributes {
>+    int 		repeat;
>+    Picture		alpha_map;
>+    int			alpha_x_origin;
>+    int			alpha_y_origin;
>+    int			clip_x_origin;
>+    int			clip_y_origin;
>+    Pixmap		clip_mask;
>+    Bool		graphics_exposures;
>+    int			subwindow_mode;
>+    int			poly_edge;
>+    int			poly_mode;
>+    Atom		dither;
>+    Bool		component_alpha;
>+} XRenderPictureAttributes;
>+
>+typedef struct {
>+    unsigned short   red;
>+    unsigned short   green;
>+    unsigned short   blue;
>+    unsigned short   alpha;
>+} XRenderColor;
>+
>+typedef struct _XGlyphInfo {
>+    unsigned short  width;
>+    unsigned short  height;
>+    short	    x;
>+    short	    y;
>+    short	    xOff;
>+    short	    yOff;
>+} XGlyphInfo;
>+
>+typedef struct _XGlyphElt8 {
>+    GlyphSet		    glyphset;
>+    _Xconst char	    *chars;
>+    int			    nchars;
>+    int			    xOff;
>+    int			    yOff;
>+} XGlyphElt8;
>+
>+typedef struct _XGlyphElt16 {
>+    GlyphSet		    glyphset;
>+    _Xconst unsigned short  *chars;
>+    int			    nchars;
>+    int			    xOff;
>+    int			    yOff;
>+} XGlyphElt16;
>+
>+typedef struct _XGlyphElt32 {
>+    GlyphSet		    glyphset;
>+    _Xconst unsigned int    *chars;
>+    int			    nchars;
>+    int			    xOff;
>+    int			    yOff;
>+} XGlyphElt32;
>+
>+typedef double	XDouble;
>+
>+typedef struct _XPointDouble {
>+    XDouble  x, y;
>+} XPointDouble;
>+
>+#define XDoubleToFixed(f)    ((XFixed) ((f) * 65536))
>+#define XFixedToDouble(f)    (((XDouble) (f)) / 65536)
>+
>+typedef int XFixed;
>+
>+typedef struct _XPointFixed {
>+    XFixed  x, y;
>+} XPointFixed;
>+
>+typedef struct _XLineFixed {
>+    XPointFixed	p1, p2;
>+} XLineFixed;
>+
>+typedef struct _XTriangle {
>+    XPointFixed	p1, p2, p3;
>+} XTriangle;
>+
>+typedef struct _XCircle {
>+    XFixed x;
>+    XFixed y;
>+    XFixed radius;
>+} XCircle;
>+
>+typedef struct _XTrapezoid {
>+    XFixed  top, bottom;
>+    XLineFixed	left, right;
>+} XTrapezoid;
>+
>+typedef struct _XTransform {
>+    XFixed  matrix[3][3];
>+} XTransform;
>+
>+typedef struct _XFilters {
>+    int	    nfilter;
>+    char    **filter;
>+    int	    nalias;
>+    short   *alias;
>+} XFilters;
>+
>+typedef struct _XIndexValue {
>+    unsigned long    pixel;
>+    unsigned short   red, green, blue, alpha;
>+} XIndexValue;
>+
>+typedef struct _XAnimCursor {
>+    Cursor	    cursor;
>+    unsigned long   delay;
>+} XAnimCursor;
>+
>+typedef struct _XSpanFix {
>+    XFixed	    left, right, y;
>+} XSpanFix;
>+
>+typedef struct _XTrap {
>+    XSpanFix	    top, bottom;
>+} XTrap;
>+
>+typedef struct _XLinearGradient {
>+    XPointFixed p1;
>+    XPointFixed p2;
>+} XLinearGradient;
>+
>+typedef struct _XRadialGradient {
>+    XCircle inner;
>+    XCircle outer;
>+} XRadialGradient;
>+
>+typedef struct _XConicalGradient {
>+    XPointFixed center;
>+    XFixed angle; /* in degrees */
>+} XConicalGradient;
>+
>+#define PictStandardARGB32  0
>+#define PictStandardRGB24   1
>+#define PictStandardA8	    2
>+#define PictStandardA4	    3
>+#define PictStandardA1	    4
>+#define PictStandardNUM	    5
>+
>+
>+
>+/* Copied from X11/extensions/renderproto.h */
>+
>+#include <X11/Xmd.h>
>+
>+#define Window CARD32
>+#define Drawable CARD32
>+#define Font CARD32
>+#define Pixmap CARD32
>+#define Cursor CARD32
>+#define Colormap CARD32
>+#define GContext CARD32
>+#define Atom CARD32
>+#define VisualID CARD32
>+#define Time CARD32
>+#define KeyCode CARD8
>+#define KeySym CARD32
>+
>+#define Picture	    CARD32
>+#define PictFormat  CARD32
>+#define Fixed	    INT32
>+#define Glyphset    CARD32
>+#define Glyph	    CARD32
>+
>+/*
>+ * data structures
>+ */
>+
>+typedef struct {
>+    CARD16  red B16;
>+    CARD16  redMask B16;
>+    CARD16  green B16;
>+    CARD16  greenMask B16;
>+    CARD16  blue B16;
>+    CARD16  blueMask B16;
>+    CARD16  alpha B16;
>+    CARD16  alphaMask B16;
>+} xDirectFormat;
>+
>+#define sz_xDirectFormat    16
>+
>+typedef struct {
>+    PictFormat	id B32;
>+    CARD8	type;
>+    CARD8	depth;
>+    CARD16	pad1 B16;
>+    xDirectFormat   direct;
>+    Colormap	colormap;
>+} xPictFormInfo;
>+
>+#define sz_xPictFormInfo    28
>+
>+typedef struct {
>+    VisualID	visual;
>+    PictFormat	format;
>+} xPictVisual;
>+
>+#define sz_xPictVisual	    8
>+
>+typedef struct {
>+    CARD8	depth;
>+    CARD8	pad1;
>+    CARD16	nPictVisuals B16;
>+    CARD32	pad2 B32;
>+} xPictDepth;
>+
>+#define sz_xPictDepth	8
>+
>+typedef struct {
>+    CARD32	nDepth B32;
>+    PictFormat	fallback B32;
>+} xPictScreen;
>+
>+#define sz_xPictScreen	8
>+
>+typedef struct {
>+    CARD32	pixel B32;
>+    CARD16	red B16;
>+    CARD16	green B16;
>+    CARD16	blue B16;
>+    CARD16	alpha B16;
>+} xIndexValue;
>+
>+#define sz_xIndexValue	12
>+
>+typedef struct {
>+    CARD16	red B16;
>+    CARD16	green B16;
>+    CARD16	blue B16;
>+    CARD16	alpha B16;
>+} xRenderColor;
>+
>+#define sz_xRenderColor	8
>+
>+typedef struct {
>+    Fixed	x B32;
>+    Fixed	y B32;
>+} xPointFixed;
>+
>+#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;
>+    INT16   x B16;
>+    INT16   y B16;
>+    INT16   xOff B16;
>+    INT16   yOff B16;
>+} xGlyphInfo;
>+
>+#define sz_xGlyphInfo	12
>+
>+typedef struct {
>+    CARD8   len;
>+    CARD8   pad1;
>+    CARD16  pad2;
>+    INT16   deltax;
>+    INT16   deltay;
>+} xGlyphElt;
>+
>+#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
>+ */
>+typedef struct {
>+    CARD8   reqType;
>+    CARD8   renderReqType;
>+    CARD16  length B16;
>+    CARD32  majorVersion B32;
>+    CARD32  minorVersion B32;
>+} xRenderQueryVersionReq;
>+
>+#define sz_xRenderQueryVersionReq   12
>+
>+typedef struct {
>+    BYTE    type;   /* X_Reply */
>+    BYTE    pad1;
>+    CARD16  sequenceNumber B16;
>+    CARD32  length B32;
>+    CARD32  majorVersion B32;
>+    CARD32  minorVersion B32;
>+    CARD32  pad2 B32;
>+    CARD32  pad3 B32;
>+    CARD32  pad4 B32;
>+    CARD32  pad5 B32;
>+} xRenderQueryVersionReply;
>+
>+#define sz_xRenderQueryVersionReply	32
>+
>+typedef struct {
>+    CARD8   reqType;
>+    CARD8   renderReqType;
>+    CARD16  length B16;
>+} xRenderQueryPictFormatsReq;
>+
>+#define sz_xRenderQueryPictFormatsReq	4
>+
>+typedef struct {
>+    BYTE    type;   /* X_Reply */
>+    BYTE    pad1;
>+    CARD16  sequenceNumber B16;
>+    CARD32  length B32;
>+    CARD32  numFormats B32;
>+    CARD32  numScreens B32;
>+    CARD32  numDepths B32;
>+    CARD32  numVisuals B32;
>+    CARD32  numSubpixel B32;	    /* Version 0.6 */
>+    CARD32  pad5 B32;
>+} xRenderQueryPictFormatsReply;
>+
>+#define sz_xRenderQueryPictFormatsReply	32
>+
>+typedef struct {
>+    CARD8   reqType;
>+    CARD8   renderReqType;
>+    CARD16  length B16;
>+    PictFormat	format B32;
>+} xRenderQueryPictIndexValuesReq;
>+
>+#define sz_xRenderQueryPictIndexValuesReq   8
>+
>+typedef struct {
>+    BYTE    type;   /* X_Reply */
>+    BYTE    pad1;
>+    CARD16  sequenceNumber B16;
>+    CARD32  length B32;
>+    CARD32  numIndexValues;
>+    CARD32  pad2 B32;
>+    CARD32  pad3 B32;
>+    CARD32  pad4 B32;
>+    CARD32  pad5 B32;
>+    CARD32  pad6 B32;
>+} xRenderQueryPictIndexValuesReply;
>+
>+#define sz_xRenderQueryPictIndexValuesReply 32
>+
>+typedef struct {
>+    CARD8	reqType;
>+    CARD8	renderReqType;
>+    CARD16	length B16;
>+    Picture	pid B32;
>+    Drawable	drawable B32;
>+    PictFormat	format B32;
>+    CARD32	mask B32;
>+} xRenderCreatePictureReq;
>+
>+#define sz_xRenderCreatePictureReq	    20
>+
>+typedef struct {
>+    CARD8	reqType;
>+    CARD8	renderReqType;
>+    CARD16	length B16;
>+    Picture	picture B32;
>+    CARD32	mask B32;
>+} xRenderChangePictureReq;
>+
>+#define sz_xRenderChangePictureReq	    12
>+
>+typedef struct {
>+    CARD8       reqType;
>+    CARD8       renderReqType;
>+    CARD16      length B16;
>+    Picture     picture B32;
>+    INT16	xOrigin B16;
>+    INT16	yOrigin B16;
>+} xRenderSetPictureClipRectanglesReq;
>+
>+#define sz_xRenderSetPictureClipRectanglesReq	    12
>+
>+typedef struct {
>+    CARD8       reqType;
>+    CARD8       renderReqType;
>+    CARD16      length B16;
>+    Picture     picture B32;
>+} xRenderFreePictureReq;
>+
>+#define sz_xRenderFreePictureReq	    8
>+
>+typedef struct {
>+    CARD8       reqType;
>+    CARD8       renderReqType;
>+    CARD16      length B16;
>+    CARD8	op;
>+    CARD8	pad1;
>+    CARD16	pad2 B16;
>+    Picture	src B32;
>+    Picture	mask B32;
>+    Picture	dst B32;
>+    INT16	xSrc B16;
>+    INT16	ySrc B16;
>+    INT16	xMask B16;
>+    INT16	yMask B16;
>+    INT16	xDst B16;
>+    INT16	yDst B16;
>+    CARD16	width B16;
>+    CARD16	height B16;
>+} xRenderCompositeReq;
>+
>+#define sz_xRenderCompositeReq		    36
>+
>+typedef struct {
>+    CARD8       reqType;
>+    CARD8       renderReqType;
>+    CARD16      length B16;
>+    Picture	src B32;
>+    Picture	dst B32;
>+    CARD32	colorScale B32;
>+    CARD32	alphaScale B32;
>+    INT16	xSrc B16;
>+    INT16	ySrc B16;
>+    INT16	xDst B16;
>+    INT16	yDst B16;
>+    CARD16	width B16;
>+    CARD16	height B16;
>+} xRenderScaleReq;
>+
>+#define sz_xRenderScaleReq			    32
>+
>+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			    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;
>+    CARD8       renderReqType;
>+    CARD16      length B16;
>+    Glyphset	gsid B32;
>+    PictFormat	format B32;
>+} xRenderCreateGlyphSetReq;
>+
>+#define sz_xRenderCreateGlyphSetReq		    12
>+
>+typedef struct {
>+    CARD8       reqType;
>+    CARD8       renderReqType;
>+    CARD16      length B16;
>+    Glyphset    gsid B32;
>+    Glyphset    existing B32;
>+} xRenderReferenceGlyphSetReq;
>+
>+#define sz_xRenderReferenceGlyphSetReq		    24
>+
>+typedef struct {
>+    CARD8       reqType;
>+    CARD8       renderReqType;
>+    CARD16      length B16;
>+    Glyphset    glyphset B32;
>+} xRenderFreeGlyphSetReq;
>+
>+#define sz_xRenderFreeGlyphSetReq		    8
>+
>+typedef struct {
>+    CARD8       reqType;
>+    CARD8       renderReqType;
>+    CARD16      length B16;
>+    Glyphset    glyphset B32;
>+    CARD32	nglyphs;
>+} xRenderAddGlyphsReq;
>+
>+#define sz_xRenderAddGlyphsReq			    12
>+
>+typedef struct {
>+    CARD8       reqType;
>+    CARD8       renderReqType;
>+    CARD16      length B16;
>+    Glyphset    glyphset B32;
>+} xRenderFreeGlyphsReq;
>+
>+#define sz_xRenderFreeGlyphsReq			    8
>+
>+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;
>+    Glyphset    glyphset B32;
>+    INT16	xSrc B16;
>+    INT16	ySrc B16;
>+} xRenderCompositeGlyphsReq, xRenderCompositeGlyphs8Req,
>+xRenderCompositeGlyphs16Req, xRenderCompositeGlyphs32Req;
>+
>+#define sz_xRenderCompositeGlyphs8Req		    28
>+#define sz_xRenderCompositeGlyphs16Req		    28
>+#define sz_xRenderCompositeGlyphs32Req		    28
>+
>+/* 0.1 and higher */
>+
>+typedef struct {
>+    CARD8	reqType;
>+    CARD8       renderReqType;
>+    CARD16      length B16;
>+    CARD8	op;
>+    CARD8	pad1;
>+    CARD16	pad2 B16;
>+    Picture	dst B32;
>+    xRenderColor    color;
>+} xRenderFillRectanglesReq;
>+
>+#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
>+#undef Pixmap
>+#undef Cursor
>+#undef Colormap
>+#undef GContext
>+#undef Atom
>+#undef VisualID
>+#undef Time
>+#undef KeyCode
>+#undef KeySym
>+
>+#undef Picture
>+#undef PictFormat
>+#undef Fixed
>+#undef Glyphset
>+#undef Glyph
>+
>+
>+/* Functions */
>+
>+#define CONSUME(a)				+(((void)(a)),0)
>+#define CONSUME2(a,b)				CONSUME((a,b))
>+#define CONSUME3(a,b,c)				CONSUME((a,b,c))
>+#define CONSUME4(a,b,c,d)			CONSUME((a,b,c,d))
>+#define CONSUME5(a,b,c,d,e)			CONSUME((a,b,c,d,e))
>+#define CONSUME6(a,b,c,d,e,f)			CONSUME((a,b,c,d,e,f))
>+#define CONSUME7(a,b,c,d,e,f,g)			CONSUME((a,b,c,d,e,f,g))
>+#define CONSUME8(a,b,c,d,e,f,g,h)		CONSUME((a,b,c,d,e,f,g,h))
>+#define CONSUME9(a,b,c,d,e,f,g,h,i)		CONSUME((a,b,c,d,e,f,g,h,i))
>+#define CONSUME10(a,b,c,d,e,f,g,h,i,j)		CONSUME((a,b,c,d,e,f,g,h,i,j))
>+#define CONSUME11(a,b,c,d,e,f,g,h,i,j,k)	CONSUME((a,b,c,d,e,f,g,h,i,j,k))
>+#define CONSUME12(a,b,c,d,e,f,g,h,i,j,k,l)	CONSUME((a,b,c,d,e,f,g,h,i,j,k,l))
>+#define CONSUME13(a,b,c,d,e,f,g,h,i,j,k,l,m)	CONSUME((a,b,c,d,e,f,g,h,i,j,k,l,m))
>+
>+/* for when functions are not called */
>+static void (CONSUME2)() {}
>+static void (CONSUME4)() {}
>+static void (CONSUME11)() {}
>+
>+#define XRenderQueryExtension			0	CONSUME3
>+#define XRenderQueryVersion			0	CONSUME3
>+#define XRenderQueryFormats			0	CONSUME1
>+#define XRenderQuerySubpixelOrder		0	CONSUME2
>+#define XRenderSetSubpixelOrder			0	CONSUME3
>+#define XRenderFindVisualFormat			NULL	CONSUME2
>+#define XRenderFindFormat			NULL	CONSUME4
>+#define XRenderFindStandardFormat		NULL	CONSUME2
>+#define XRenderQueryPictIndexValues		NULL	CONSUME2
>+#define XRenderCreatePicture			0	CONSUME5
>+#define XRenderChangePicture				CONSUME4
>+#define XRenderSetPictureClipRectangles			CONSUME6
>+#define XRenderSetPictureClipRegion			CONSUME3
>+#define XRenderSetPictureTransform			CONSUME3
>+#define XRenderFreePicture				CONSUME2
>+#define XRenderComposite				CONSUME13
>+#define XRenderCreateGlyphSet			0	CONSUME2
>+#define XRenderReferenceGlyphSet		0	CONSUME2
>+#define XRenderFreeGlyphSet				CONSUME2
>+#define XRenderAddGlyphs				CONSUME7
>+#define XRenderFreeGlyphs				CONSUME4
>+#define XRenderCompositeString8				CONSUME12
>+#define XRenderCompositeString16			CONSUME12
>+#define XRenderCompositeString32			CONSUME12
>+#define XRenderCompositeText8				CONSUME11
>+#define XRenderCompositeText16				CONSUME11
>+#define XRenderCompositeText32				CONSUME11
>+#define XRenderFillRectangle				CONSUME8
>+#define XRenderFillRectangles				CONSUME6
>+#define XRenderCompositeTrapezoids			CONSUME9
>+#define XRenderCompositeTriangles			CONSUME9
>+#define XRenderCompositeTriStrip			CONSUME9
>+#define XRenderCompositeTriFan				CONSUME9
>+#define XRenderCompositeDoublePoly			CONSUME12
>+#define XRenderParseColor			0	CONSUME3
>+#define XRenderCreateCursor			0	CONSUME4
>+#define XRenderQueryFilters			NULL	CONSUME2
>+#define XRenderSetPictureFilter				CONSUME5
>+#define XRenderCreateAnimCursor			0	CONSUME3
>+#define XRenderAddTraps					CONSUME6
>+#define XRenderCreateSolidFill			0	CONSUME2
>+#define XRenderCreateLinearGradient		0	CONSUME5
>+#define XRenderCreateRadialGradient		0	CONSUME5
>+#define XRenderCreateConicalGradient		0	CONSUME5
>+
>+#define cairo_xlib_surface_create_with_xrender_format	NULL	CONSUME6
>+
>+#endif /* CAIRO_HAS_XLIB_XRENDER_SURFACE */
>+
>+#endif /* CAIRO_XLIB_XRENDER_PRIVATE_H */

Actions: View | Splinter Review

Attachments on bug 12210: 11366

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.