xcb: Move cairo_xcb_picture_t to cairo-xcb-private.h

The next commit will make cairo-xcb-screen.c use this struct and add new
members. Splitting off the move into its own commits makes that easier to
understand.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2011-07-08 17:09:45 +02:00
parent 5b9205cc52
commit e775db35d9
2 changed files with 20 additions and 19 deletions

View file

@ -63,6 +63,7 @@ typedef struct _cairo_xcb_connection cairo_xcb_connection_t;
typedef struct _cairo_xcb_font cairo_xcb_font_t;
typedef struct _cairo_xcb_screen cairo_xcb_screen_t;
typedef struct _cairo_xcb_surface cairo_xcb_surface_t;
typedef struct _cairo_xcb_picture cairo_xcb_picture_t;
typedef struct _cairo_xcb_shm_mem_pool cairo_xcb_shm_mem_pool_t;
typedef struct _cairo_xcb_shm_info cairo_xcb_shm_info_t;
@ -105,6 +106,25 @@ struct _cairo_xcb_surface {
cairo_list_t link;
};
struct _cairo_xcb_picture {
cairo_surface_t base;
cairo_xcb_screen_t *screen;
xcb_render_picture_t picture;
xcb_render_pictformat_t xrender_format;
pixman_format_code_t pixman_format;
int width, height;
cairo_extend_t extend;
cairo_filter_t filter;
cairo_bool_t has_component_alpha;
xcb_render_transform_t transform;
int x0, y0;
int x, y;
};
#if CAIRO_HAS_XLIB_XCB_FUNCTIONS
typedef struct _cairo_xlib_xcb_surface {
cairo_surface_t base;

View file

@ -59,25 +59,6 @@
* extension if it is available.
*/
typedef struct _cairo_xcb_picture {
cairo_surface_t base;
cairo_xcb_screen_t *screen;
xcb_render_picture_t picture;
xcb_render_pictformat_t xrender_format;
pixman_format_code_t pixman_format;
int width, height;
cairo_extend_t extend;
cairo_filter_t filter;
cairo_bool_t has_component_alpha;
xcb_render_transform_t transform;
int x0, y0;
int x, y;
} cairo_xcb_picture_t;
static inline cairo_xcb_connection_t *
_picture_to_connection (cairo_xcb_picture_t *picture)
{