mirror of
https://gitlab.freedesktop.org/cairo/cairo.git
synced 2026-05-20 03:28:07 +02:00
[xlib] Move cairo_xlib_surface_t definition into cairo-xlib-surface-private.h
This commit is contained in:
Behdad Esfahbod
parent
735be3f09d
commit
1345552ac2
3 changed files with 94 additions and 54 deletions
|
|
@ -46,7 +46,8 @@ endif
|
|||
|
||||
if CAIRO_HAS_XLIB_SURFACE
|
||||
libcairo_xlib_headers = cairo-xlib.h cairo-xlib-xrender.h
|
||||
libcairo_xlib_sources = cairo-xlib-surface.c cairo-xlib-screen.c cairo-xlib-private.h cairo-xlib-test.h
|
||||
libcairo_xlib_sources = cairo-xlib-surface.c cairo-xlib-surface-private.h \
|
||||
cairo-xlib-screen.c cairo-xlib-private.h cairo-xlib-test.h
|
||||
backend_pkgconfigs += cairo-xlib.pc
|
||||
endif
|
||||
|
||||
|
|
|
|||
91
src/cairo-xlib-surface-private.h
Normal file
91
src/cairo-xlib-surface-private.h
Normal file
|
|
@ -0,0 +1,91 @@
|
|||
/* Cairo - a vector graphics library with display and print output
|
||||
*
|
||||
* Copyright © 2005 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_SURFACE_PRIVATE_H
|
||||
#define CAIRO_XLIB_SURFACE_PRIVATE_H
|
||||
|
||||
#include "cairo-xlib.h"
|
||||
|
||||
typedef struct _cairo_xlib_surface cairo_xlib_surface_t;
|
||||
|
||||
struct _cairo_xlib_surface {
|
||||
cairo_surface_t base;
|
||||
|
||||
Display *dpy;
|
||||
cairo_xlib_screen_info_t *screen_info;
|
||||
|
||||
GC gc;
|
||||
Drawable drawable;
|
||||
Screen *screen;
|
||||
cairo_bool_t owns_pixmap;
|
||||
Visual *visual;
|
||||
|
||||
int use_pixmap;
|
||||
|
||||
int render_major;
|
||||
int render_minor;
|
||||
|
||||
/* TRUE if the server has a bug with repeating pictures
|
||||
*
|
||||
* https://bugs.freedesktop.org/show_bug.cgi?id=3566
|
||||
*
|
||||
* We can't test for this because it depends on whether the
|
||||
* picture is in video memory or not.
|
||||
*
|
||||
* We also use this variable as a guard against a second
|
||||
* independent bug with transformed repeating pictures:
|
||||
*
|
||||
* http://lists.freedesktop.org/archives/cairo/2004-September/001839.html
|
||||
*
|
||||
* Both are fixed in xorg >= 6.9 and hopefully in > 6.8.2, so
|
||||
* we can reuse the test for now.
|
||||
*/
|
||||
cairo_bool_t buggy_repeat;
|
||||
|
||||
int width;
|
||||
int height;
|
||||
int depth;
|
||||
|
||||
Picture dst_picture, src_picture;
|
||||
|
||||
cairo_bool_t have_clip_rects;
|
||||
XRectangle embedded_clip_rects[4];
|
||||
XRectangle *clip_rects;
|
||||
int num_clip_rects;
|
||||
|
||||
XRenderPictFormat *xrender_format;
|
||||
cairo_filter_t filter;
|
||||
int repeat;
|
||||
XTransform xtransform;
|
||||
};
|
||||
|
||||
#endif /* CAIRO_XLIB_SURFACE_PRIVATE_H */
|
||||
|
|
@ -41,6 +41,7 @@
|
|||
#include "cairo-xlib-xrender.h"
|
||||
#include "cairo-xlib-test.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>
|
||||
|
|
@ -49,8 +50,6 @@
|
|||
typedef int (*cairo_xlib_error_func_t) (Display *display,
|
||||
XErrorEvent *event);
|
||||
|
||||
typedef struct _cairo_xlib_surface cairo_xlib_surface_t;
|
||||
|
||||
static cairo_status_t
|
||||
_cairo_xlib_surface_ensure_gc (cairo_xlib_surface_t *surface);
|
||||
|
||||
|
|
@ -82,57 +81,6 @@ _cairo_xlib_surface_show_glyphs (void *abstract_dst,
|
|||
|
||||
#define CAIRO_ASSUME_PIXMAP 20
|
||||
|
||||
struct _cairo_xlib_surface {
|
||||
cairo_surface_t base;
|
||||
|
||||
Display *dpy;
|
||||
cairo_xlib_screen_info_t *screen_info;
|
||||
|
||||
GC gc;
|
||||
Drawable drawable;
|
||||
Screen *screen;
|
||||
cairo_bool_t owns_pixmap;
|
||||
Visual *visual;
|
||||
|
||||
int use_pixmap;
|
||||
|
||||
int render_major;
|
||||
int render_minor;
|
||||
|
||||
/* TRUE if the server has a bug with repeating pictures
|
||||
*
|
||||
* https://bugs.freedesktop.org/show_bug.cgi?id=3566
|
||||
*
|
||||
* We can't test for this because it depends on whether the
|
||||
* picture is in video memory or not.
|
||||
*
|
||||
* We also use this variable as a guard against a second
|
||||
* independent bug with transformed repeating pictures:
|
||||
*
|
||||
* http://lists.freedesktop.org/archives/cairo/2004-September/001839.html
|
||||
*
|
||||
* Both are fixed in xorg >= 6.9 and hopefully in > 6.8.2, so
|
||||
* we can reuse the test for now.
|
||||
*/
|
||||
cairo_bool_t buggy_repeat;
|
||||
|
||||
int width;
|
||||
int height;
|
||||
int depth;
|
||||
|
||||
Picture dst_picture, src_picture;
|
||||
|
||||
cairo_bool_t have_clip_rects;
|
||||
XRectangle embedded_clip_rects[4];
|
||||
XRectangle *clip_rects;
|
||||
int num_clip_rects;
|
||||
|
||||
XRenderPictFormat *xrender_format;
|
||||
cairo_filter_t filter;
|
||||
int repeat;
|
||||
XTransform xtransform;
|
||||
};
|
||||
|
||||
static const XTransform identity = { {
|
||||
{ 1 << 16, 0x00000, 0x00000 },
|
||||
{ 0x00000, 1 << 16, 0x00000 },
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue