From 8a2429d209f995d4812db4adc222107af36dd196 Mon Sep 17 00:00:00 2001 From: "tor%cs.brown.edu" Date: Wed, 23 Mar 2005 19:53:40 +0000 Subject: [PATCH] Bug 287416 - update to libpixman 0.1.4, cairo 0.4.0. --- gfx/cairo/README | 15 +- gfx/cairo/cairo/AUTHORS | 9 +- gfx/cairo/cairo/ChangeLog | 969 +++++++ gfx/cairo/cairo/Makefile.am | 2 +- gfx/cairo/cairo/Makefile.in | 17 +- gfx/cairo/cairo/NEWS | 126 + gfx/cairo/cairo/README | 2 +- gfx/cairo/cairo/TODO | 203 +- gfx/cairo/cairo/acinclude.m4 | 53 + gfx/cairo/cairo/aclocal.m4 | 2143 +++++++-------- gfx/cairo/cairo/cairo.pc.in | 2 +- gfx/cairo/cairo/config.h.in | 3 + gfx/cairo/cairo/configure | 900 ++++--- gfx/cairo/cairo/configure.in | 144 +- gfx/cairo/cairo/doc/Makefile.am | 2 + gfx/cairo/cairo/doc/Makefile.in | 526 ++++ gfx/cairo/cairo/doc/public/Makefile.am | 46 + gfx/cairo/cairo/doc/public/Makefile.in | 584 ++++ gfx/cairo/cairo/doc/public/cairo-docs.xml | 31 + .../cairo/doc/public/cairo-overrides.txt | 0 gfx/cairo/cairo/doc/public/cairo-sections.txt | 251 ++ gfx/cairo/cairo/doc/public/cairo.types | 0 .../doc/public/html/cairo-ATSUI-Fonts.html | 14 + .../doc/public/html/cairo-FreeType-Fonts.html | 114 + .../doc/public/html/cairo-Glitz-backend.html | 23 + .../html/cairo-Microsoft-Windows-Backend.html | 83 + .../doc/public/html/cairo-PDF-Backend.html | 47 + .../doc/public/html/cairo-PNG-Backend.html | 41 + .../doc/public/html/cairo-PS-Backend.html | 51 + .../doc/public/html/cairo-Quartz-Backend.html | 37 + .../doc/public/html/cairo-XCB-Backend.html | 25 + .../doc/public/html/cairo-XLib-Backend.html | 45 + .../doc/public/html/cairo-cairo-matrix-t.html | 220 ++ .../public/html/cairo-cairo-pattern-t.html | 158 ++ .../public/html/cairo-cairo-surface-t.html | 117 + .../cairo/doc/public/html/cairo-cairo-t.html | 1281 +++++++++ gfx/cairo/cairo/doc/public/html/cairo.devhelp | 189 ++ gfx/cairo/cairo/doc/public/html/home.png | Bin 0 -> 654 bytes gfx/cairo/cairo/doc/public/html/index.html | 2 + gfx/cairo/cairo/doc/public/html/index.sgml | 179 ++ gfx/cairo/cairo/doc/public/html/left.png | Bin 0 -> 459 bytes gfx/cairo/cairo/doc/public/html/pt01.html | 1 + gfx/cairo/cairo/doc/public/html/pt02.html | 1 + gfx/cairo/cairo/doc/public/html/right.png | Bin 0 -> 472 bytes gfx/cairo/cairo/doc/public/html/style.css | 66 + gfx/cairo/cairo/doc/public/html/up.png | Bin 0 -> 406 bytes .../cairo/doc/public/tmpl/cairo-atsui.sgml | 25 + gfx/cairo/cairo/doc/public/tmpl/cairo-ft.sgml | 63 + .../cairo/doc/public/tmpl/cairo-glitz.sgml | 34 + .../cairo/doc/public/tmpl/cairo-matrix.sgml | 193 ++ .../cairo/doc/public/tmpl/cairo-pattern.sgml | 154 ++ .../cairo/doc/public/tmpl/cairo-pdf.sgml | 42 + .../cairo/doc/public/tmpl/cairo-png.sgml | 40 + gfx/cairo/cairo/doc/public/tmpl/cairo-ps.sgml | 42 + .../cairo/doc/public/tmpl/cairo-quartz.sgml | 38 + .../cairo/doc/public/tmpl/cairo-surface.sgml | 112 + .../cairo/doc/public/tmpl/cairo-xcb.sgml | 28 + .../cairo/doc/public/tmpl/cairo-xlib.sgml | 39 + gfx/cairo/cairo/doc/public/tmpl/cairo.sgml | 1019 +++++++ .../cairo/doc/public/xml/cairo-atsui.xml | 62 + gfx/cairo/cairo/doc/public/xml/cairo-ft.xml | 206 ++ .../cairo/doc/public/xml/cairo-glitz.xml | 80 + .../cairo/doc/public/xml/cairo-matrix.xml | 434 +++ .../cairo/doc/public/xml/cairo-pattern.xml | 334 +++ gfx/cairo/cairo/doc/public/xml/cairo-pdf.xml | 120 + gfx/cairo/cairo/doc/public/xml/cairo-png.xml | 110 + gfx/cairo/cairo/doc/public/xml/cairo-ps.xml | 125 + .../cairo/doc/public/xml/cairo-quartz.xml | 102 + .../cairo/doc/public/xml/cairo-surface.xml | 255 ++ gfx/cairo/cairo/doc/public/xml/cairo-win3.xml | 181 ++ .../cairo/doc/public/xml/cairo-win32.xml | 181 ++ gfx/cairo/cairo/doc/public/xml/cairo-xcb.xml | 80 + gfx/cairo/cairo/doc/public/xml/cairo-xlib.xml | 113 + gfx/cairo/cairo/doc/public/xml/cairo.xml | 2380 +++++++++++++++++ gfx/cairo/cairo/gtk-doc.make | 163 ++ gfx/cairo/cairo/src/Makefile.am | 81 +- gfx/cairo/cairo/src/Makefile.in | 134 +- gfx/cairo/cairo/src/cairo-atsui.h | 11 +- gfx/cairo/cairo/src/cairo-features.h | 8 +- gfx/cairo/cairo/src/cairo-features.h.in | 6 +- gfx/cairo/cairo/src/cairo-ft-private.h | 63 + gfx/cairo/cairo/src/cairo-ft.h | 33 +- gfx/cairo/cairo/src/cairo-glitz.h | 11 +- gfx/cairo/cairo/src/cairo-pdf.h | 11 +- gfx/cairo/cairo/src/cairo-png.h | 13 +- gfx/cairo/cairo/src/cairo-ps.h | 11 +- gfx/cairo/cairo/src/cairo-quartz.h | 11 +- gfx/cairo/cairo/src/cairo-wideint.h | 4 +- gfx/cairo/cairo/src/cairo-win32-private.h | 87 + gfx/cairo/cairo/src/cairo-win32.h | 71 + gfx/cairo/cairo/src/cairo-xcb.h | 11 +- gfx/cairo/cairo/src/cairo-xlib.h | 11 +- gfx/cairo/cairo/src/cairo.c | 225 +- gfx/cairo/cairo/src/cairo.h | 217 +- gfx/cairo/cairo/src/cairo_atsui_font.c | 1252 ++++----- gfx/cairo/cairo/src/cairo_cache.c | 104 +- gfx/cairo/cairo/src/cairo_color.c | 5 +- gfx/cairo/cairo/src/cairo_fixed.c | 2 +- gfx/cairo/cairo/src/cairo_font.c | 479 ++-- gfx/cairo/cairo/src/cairo_ft_font.c | 1299 +++++---- gfx/cairo/cairo/src/cairo_glitz_surface.c | 1522 ++++++----- gfx/cairo/cairo/src/cairo_gstate.c | 1040 ++++--- gfx/cairo/cairo/src/cairo_hull.c | 2 +- gfx/cairo/cairo/src/cairo_image_surface.c | 329 ++- gfx/cairo/cairo/src/cairo_matrix.c | 170 +- gfx/cairo/cairo/src/cairo_path.c | 4 +- gfx/cairo/cairo/src/cairo_path_bounds.c | 2 +- gfx/cairo/cairo/src/cairo_path_fill.c | 2 +- gfx/cairo/cairo/src/cairo_path_stroke.c | 2 +- gfx/cairo/cairo/src/cairo_pattern.c | 1232 ++++++--- gfx/cairo/cairo/src/cairo_pdf_surface.c | 404 +-- gfx/cairo/cairo/src/cairo_pen.c | 2 +- gfx/cairo/cairo/src/cairo_png_surface.c | 130 +- gfx/cairo/cairo/src/cairo_polygon.c | 2 +- gfx/cairo/cairo/src/cairo_ps_surface.c | 147 +- gfx/cairo/cairo/src/cairo_quartz_surface.c | 409 ++- gfx/cairo/cairo/src/cairo_slope.c | 2 +- gfx/cairo/cairo/src/cairo_spline.c | 2 +- gfx/cairo/cairo/src/cairo_surface.c | 542 ++-- gfx/cairo/cairo/src/cairo_traps.c | 269 +- gfx/cairo/cairo/src/cairo_unicode.c | 340 +++ gfx/cairo/cairo/src/cairo_win32_font.c | 1252 +++++++++ gfx/cairo/cairo/src/cairo_win32_surface.c | 931 +++++++ gfx/cairo/cairo/src/cairo_xcb_surface.c | 456 +++- gfx/cairo/cairo/src/cairo_xlib_surface.c | 617 +++-- gfx/cairo/cairo/src/cairoint.h | 538 ++-- gfx/cairo/cairo/test/Makefile.am | 35 +- gfx/cairo/cairo/test/Makefile.in | 141 +- gfx/cairo/cairo/test/buffer_diff.c | 73 + gfx/cairo/cairo/test/buffer_diff.h | 38 + gfx/cairo/cairo/test/cairo_test.c | 162 +- gfx/cairo/cairo/test/cairo_test.h | 4 + gfx/cairo/cairo/test/clip_twice-ref.png | Bin 0 -> 751 bytes gfx/cairo/cairo/test/clip_twice.c | 72 + gfx/cairo/cairo/test/coverage-ref.png | Bin 0 -> 44324 bytes gfx/cairo/cairo/test/coverage.c | 182 ++ gfx/cairo/cairo/test/imagediff.c | 84 + gfx/cairo/cairo/test/linear_gradient-ref.png | Bin 0 -> 12724 bytes gfx/cairo/cairo/test/linear_gradient.c | 141 + gfx/cairo/cairo/test/pixman_rotate-ref.png | Bin 0 -> 260 bytes gfx/cairo/cairo/test/pixman_rotate.c | 78 + gfx/cairo/cairo/test/read_png.c | 6 +- gfx/cairo/cairo/test/romedalen.png | Bin 0 -> 80944 bytes gfx/cairo/cairo/test/write_png.c | 17 +- gfx/cairo/cairo/test/write_png.h | 4 +- gfx/cairo/font-backend.diff | 24 - gfx/cairo/libpixman/ChangeLog | 92 + gfx/cairo/libpixman/Makefile.in | 4 +- gfx/cairo/libpixman/NEWS | 22 + gfx/cairo/libpixman/configure | 2 +- gfx/cairo/libpixman/configure.in | 4 +- gfx/cairo/libpixman/depcomp | 75 +- gfx/cairo/libpixman/install-sh | 414 +-- gfx/cairo/libpixman/missing | 127 +- gfx/cairo/libpixman/mkinstalldirs | 111 - gfx/cairo/libpixman/src/Makefile.in | 2 +- gfx/cairo/libpixman/src/ic.c | 7 +- gfx/cairo/libpixman/src/icblt.c | 2 +- gfx/cairo/libpixman/src/icbltone.c | 2 +- gfx/cairo/libpixman/src/iccolor.c | 2 +- gfx/cairo/libpixman/src/iccompose.c | 2 +- gfx/cairo/libpixman/src/icformat.c | 2 +- gfx/cairo/libpixman/src/icimage.c | 33 +- gfx/cairo/libpixman/src/icimage.h | 5 +- gfx/cairo/libpixman/src/icint.h | 11 +- gfx/cairo/libpixman/src/icpixels.c | 4 +- gfx/cairo/libpixman/src/icrect.c | 2 +- gfx/cairo/libpixman/src/icrop.h | 2 +- gfx/cairo/libpixman/src/icstipple.c | 2 +- gfx/cairo/libpixman/src/ictransform.c | 2 +- gfx/cairo/libpixman/src/ictrap.c | 177 +- gfx/cairo/libpixman/src/ictri.c | 2 +- gfx/cairo/libpixman/src/icutil.c | 2 +- .../libpixman/src/pixman-xserver-compat.h | 34 +- gfx/cairo/libpixman/src/pixman.h | 31 +- gfx/cairo/libpixman/src/renderedge.h | 61 +- gfx/cairo/libpixman/src/slim_internal.h | 2 +- gfx/cairo/quartz-surface.diff | 10 - gfx/cairo/quartz.diff | 1913 +++++++++++++ gfx/cairo/stdint.diff | 73 +- gfx/cairo/subdirs.diff | 19 + 181 files changed, 27397 insertions(+), 6904 deletions(-) create mode 100644 gfx/cairo/cairo/acinclude.m4 create mode 100644 gfx/cairo/cairo/doc/Makefile.am create mode 100644 gfx/cairo/cairo/doc/Makefile.in create mode 100644 gfx/cairo/cairo/doc/public/Makefile.am create mode 100644 gfx/cairo/cairo/doc/public/Makefile.in create mode 100644 gfx/cairo/cairo/doc/public/cairo-docs.xml create mode 100644 gfx/cairo/cairo/doc/public/cairo-overrides.txt create mode 100644 gfx/cairo/cairo/doc/public/cairo-sections.txt create mode 100644 gfx/cairo/cairo/doc/public/cairo.types create mode 100644 gfx/cairo/cairo/doc/public/html/cairo-ATSUI-Fonts.html create mode 100644 gfx/cairo/cairo/doc/public/html/cairo-FreeType-Fonts.html create mode 100644 gfx/cairo/cairo/doc/public/html/cairo-Glitz-backend.html create mode 100644 gfx/cairo/cairo/doc/public/html/cairo-Microsoft-Windows-Backend.html create mode 100644 gfx/cairo/cairo/doc/public/html/cairo-PDF-Backend.html create mode 100644 gfx/cairo/cairo/doc/public/html/cairo-PNG-Backend.html create mode 100644 gfx/cairo/cairo/doc/public/html/cairo-PS-Backend.html create mode 100644 gfx/cairo/cairo/doc/public/html/cairo-Quartz-Backend.html create mode 100644 gfx/cairo/cairo/doc/public/html/cairo-XCB-Backend.html create mode 100644 gfx/cairo/cairo/doc/public/html/cairo-XLib-Backend.html create mode 100644 gfx/cairo/cairo/doc/public/html/cairo-cairo-matrix-t.html create mode 100644 gfx/cairo/cairo/doc/public/html/cairo-cairo-pattern-t.html create mode 100644 gfx/cairo/cairo/doc/public/html/cairo-cairo-surface-t.html create mode 100644 gfx/cairo/cairo/doc/public/html/cairo-cairo-t.html create mode 100644 gfx/cairo/cairo/doc/public/html/cairo.devhelp create mode 100644 gfx/cairo/cairo/doc/public/html/home.png create mode 100644 gfx/cairo/cairo/doc/public/html/index.html create mode 100644 gfx/cairo/cairo/doc/public/html/index.sgml create mode 100644 gfx/cairo/cairo/doc/public/html/left.png create mode 100644 gfx/cairo/cairo/doc/public/html/pt01.html create mode 100644 gfx/cairo/cairo/doc/public/html/pt02.html create mode 100644 gfx/cairo/cairo/doc/public/html/right.png create mode 100644 gfx/cairo/cairo/doc/public/html/style.css create mode 100644 gfx/cairo/cairo/doc/public/html/up.png create mode 100644 gfx/cairo/cairo/doc/public/tmpl/cairo-atsui.sgml create mode 100644 gfx/cairo/cairo/doc/public/tmpl/cairo-ft.sgml create mode 100644 gfx/cairo/cairo/doc/public/tmpl/cairo-glitz.sgml create mode 100644 gfx/cairo/cairo/doc/public/tmpl/cairo-matrix.sgml create mode 100644 gfx/cairo/cairo/doc/public/tmpl/cairo-pattern.sgml create mode 100644 gfx/cairo/cairo/doc/public/tmpl/cairo-pdf.sgml create mode 100644 gfx/cairo/cairo/doc/public/tmpl/cairo-png.sgml create mode 100644 gfx/cairo/cairo/doc/public/tmpl/cairo-ps.sgml create mode 100644 gfx/cairo/cairo/doc/public/tmpl/cairo-quartz.sgml create mode 100644 gfx/cairo/cairo/doc/public/tmpl/cairo-surface.sgml create mode 100644 gfx/cairo/cairo/doc/public/tmpl/cairo-xcb.sgml create mode 100644 gfx/cairo/cairo/doc/public/tmpl/cairo-xlib.sgml create mode 100644 gfx/cairo/cairo/doc/public/tmpl/cairo.sgml create mode 100644 gfx/cairo/cairo/doc/public/xml/cairo-atsui.xml create mode 100644 gfx/cairo/cairo/doc/public/xml/cairo-ft.xml create mode 100644 gfx/cairo/cairo/doc/public/xml/cairo-glitz.xml create mode 100644 gfx/cairo/cairo/doc/public/xml/cairo-matrix.xml create mode 100644 gfx/cairo/cairo/doc/public/xml/cairo-pattern.xml create mode 100644 gfx/cairo/cairo/doc/public/xml/cairo-pdf.xml create mode 100644 gfx/cairo/cairo/doc/public/xml/cairo-png.xml create mode 100644 gfx/cairo/cairo/doc/public/xml/cairo-ps.xml create mode 100644 gfx/cairo/cairo/doc/public/xml/cairo-quartz.xml create mode 100644 gfx/cairo/cairo/doc/public/xml/cairo-surface.xml create mode 100644 gfx/cairo/cairo/doc/public/xml/cairo-win3.xml create mode 100644 gfx/cairo/cairo/doc/public/xml/cairo-win32.xml create mode 100644 gfx/cairo/cairo/doc/public/xml/cairo-xcb.xml create mode 100644 gfx/cairo/cairo/doc/public/xml/cairo-xlib.xml create mode 100644 gfx/cairo/cairo/doc/public/xml/cairo.xml create mode 100644 gfx/cairo/cairo/gtk-doc.make create mode 100644 gfx/cairo/cairo/src/cairo-ft-private.h create mode 100644 gfx/cairo/cairo/src/cairo-win32-private.h create mode 100644 gfx/cairo/cairo/src/cairo-win32.h create mode 100644 gfx/cairo/cairo/src/cairo_unicode.c create mode 100644 gfx/cairo/cairo/src/cairo_win32_font.c create mode 100644 gfx/cairo/cairo/src/cairo_win32_surface.c create mode 100644 gfx/cairo/cairo/test/buffer_diff.c create mode 100644 gfx/cairo/cairo/test/buffer_diff.h create mode 100644 gfx/cairo/cairo/test/clip_twice-ref.png create mode 100644 gfx/cairo/cairo/test/clip_twice.c create mode 100644 gfx/cairo/cairo/test/coverage-ref.png create mode 100644 gfx/cairo/cairo/test/coverage.c create mode 100644 gfx/cairo/cairo/test/imagediff.c create mode 100644 gfx/cairo/cairo/test/linear_gradient-ref.png create mode 100644 gfx/cairo/cairo/test/linear_gradient.c create mode 100644 gfx/cairo/cairo/test/pixman_rotate-ref.png create mode 100644 gfx/cairo/cairo/test/pixman_rotate.c create mode 100644 gfx/cairo/cairo/test/romedalen.png delete mode 100644 gfx/cairo/font-backend.diff delete mode 100755 gfx/cairo/libpixman/mkinstalldirs delete mode 100644 gfx/cairo/quartz-surface.diff create mode 100644 gfx/cairo/quartz.diff create mode 100644 gfx/cairo/subdirs.diff diff --git a/gfx/cairo/README b/gfx/cairo/README index bbb44c93049a..733668364c5f 100644 --- a/gfx/cairo/README +++ b/gfx/cairo/README @@ -5,18 +5,13 @@ file included in this directory. VERSIONS: - cairo 0.3.0 - libpixman 0.1.3 + cairo 0.4.0 + libpixman 0.1.4 PATCHES: - quartz-surface.diff - quartz backend get/set surface behave - differently than cairo expects, so partially transparent objects - tend to blend towards opaque the more that is drawn. Short term - inefficient workaround of clearing the buffer on each set. + subdirs.diff - don't build test/ or doc/. - font-backend.diff - upstream patch to configure.in to make sure - that a font backend is available. + stdint.diff - select between inttypes.h and stdint.h for AIX. - stdint.diff - add checking for appropriate stdint.h/inttypes.h - header to include. Needed for AIX. + quartz.diff - update cairo quartz/atsui backend for 0.4.0, reenable. diff --git a/gfx/cairo/cairo/AUTHORS b/gfx/cairo/cairo/AUTHORS index 43b265f79bc4..73c98350eab0 100644 --- a/gfx/cairo/cairo/AUTHORS +++ b/gfx/cairo/cairo/AUTHORS @@ -1,6 +1,7 @@ +Shawn T. Amundson Build fix Olivier Andrieu PNG backend Peter Dennis Bartok Bug fix for clipping -Dave Beckett Track rename of libpixman, build fixes +Dave Beckett Build fixes, Debian packaging Andrew Chant Adding const where needed John Ellson First font/glyph extents functions Richard Henderson "slim" macros for better shared libraries @@ -10,11 +11,13 @@ Thomas Hunger Initial version of cairo_in_stroke/fill Kristian Høgsberg PDF backend Alexander Larsson Profiling and performance fixes. Jordi Mas Bug fix for cairo_show_text -Keith Packard Original concept, polygon tessellation, dashing +Keith Packard Original concept, polygon tessellation, dashing, font metrics rewrite Christof Petig Build fixes related to freetype -David Reveman New pattern API, OpenGL backend +David Reveman New pattern API, glitz backend +Calum Robinson Quartz backend Jamey Sharp Surface/font backend virtualization, XCB backend Bill Spitzak Build fix to find Xrender.h without xrender.pc +Owen Taylor Font support rewrite Sasha Vasko Build fix to compile without xlib backend Vladimir Vukicevic Bug fix for clipping Carl Worth Original library, support for paths, images diff --git a/gfx/cairo/cairo/ChangeLog b/gfx/cairo/cairo/ChangeLog index 48c0cb466182..abf671a09a45 100644 --- a/gfx/cairo/cairo/ChangeLog +++ b/gfx/cairo/cairo/ChangeLog @@ -1,3 +1,972 @@ +2005-03-08 Carl Worth + + * gtk-doc.make (dist-check-gtkdoc): Commit workaround to prevent + make distcheck from making bogus complaints that gtk-doc is not + enabled. + + * test/cairo_test.c (cairo_test_create_png_pattern): Look for png + images in ${srcdir}/filename as well, so that make distcheck can + still find them. + + * test/Makefile.am (EXTRA_DIST): Add romedalen.png to EXTRA_DIST + so the tests can pass from the tar file. + + * doc/public/cairo-sections.txt: Fix typo: cairo-win3 -> + cairo-win32. + + * doc/public/cairo-docs.xml: Add cairo-win32.xml to the list, so + it gets generated as well. + + * NEWS (http): Add pointer to new win32 documentation. + + * configure.in: Increment CAIRO_VERSION to 0.4.0 + + * NEWS: Added notes for snapshot 0.4.0 + +2005-03-08 Carl Worth + + * test/cairo_test.c (xunlink): Shared function for checking unlink + errrors. + (cairo_test): Move all error messages to test-specific log files + for quieter test output. + + * test/Makefile.am (XFAIL_TESTS): Make pixman_rotate an expected + failure. + + * configure.in: Require libpixman >= 0.1.4. + +2005-03-08 Kristian Høgsberg + + * src/cairo_pdf_surface.c (_cairo_pdf_surface_composite): Return + CAIRO_STATUS_SUCCESS even if we don't implement masks yet, so we + don't set cr->status to CAIRO_INT_STATUS_UNSUPPORTED. + +2005-03-07 Carl Worth + + * src/cairo_traps.c: Disable the "new" intersection code so that + the incorrect fill problems (test/fill_rule) go away. + + * configure.in: Make configure fail if no font backend is + available. Point the user at freetype and fontconfig. + +2005-03-06 Owen Taylor + + * src/cairo_pattern.c (_cairo_image_data_set_linear): Comment + and clean up the gradient computation. + (_cairo_linear_pattern_classify): Determine if a linear + gradient is horizontal or vertical. + (_cairo_pattern_acquire_surface_for_gradient): Optimize + horizontal/vertical gradients with a repeating surface. + + * test/linear_gradient.c: Test case for linear gradients + at angles and with a rotated pattern matrix. + +2005-03-06 David Reveman + + * src/cairo_glitz_surface.c (_cairo_glitz_pattern_acquire_surface): + Do not allow acceleration of gradients when color stops have different + alpha. Add note about the current state of glitz's gradient + acceleration. CAIRO_FILTER_GOOD and CAIRO_FILTER_BEST is ok. + (_cairo_glitz_surface_composite_trapezoids): Use unsigned short for + alpha. + +2005-03-04 Owen Taylor + + * src/cairo_win32_font.c src/cairo_win32_surface.c: Update + for recent backend interface changes. + + * configure.in: Reenable win32 backend by default. + +2005-03-04 Carl Worth + + * src/cairo_glitz_surface.c + (_cairo_glitz_pattern_acquire_surface): Fix accidental reversal of + condition in previous patch. + +2005-03-04 Owen Taylor + + * src/cairoint.h src/cairo_pattern.c src/cairo_glitz_surface.c: + Add _cairo_pattern_is_opaque, use it rather than + pattern->alpha == 1.0. + +2005-03-04 David Reveman + + * configure.in: Enable xcb backend. + + * src/cairo_xcb_surface.c: Update xcb backend. + + * configure.in: Fixed variable assignments. + + * src/cairo_glitz_surface.c: Add overall alpha acceleration + to a few cases not covered by _cairo_pattern_acquire_surfaces but + possible to accelerate by glitz. + + * src/cairo_pattern.c: + (_cairo_pattern_acquire_surfaces): Add overall alpha acceleration + using mask surface. + + * src/cairoint.h: + Add convenience function _cairo_pattern_acquire_surfaces. + + * src/cairo_xlib_surface.c: + * src/cairo_surface.c: + * src/cairo_ps_surface.c: + * src/cairo_png_surface.c: + * src/cairo_pdf_surface.c: + * src/cairo_pattern.c: + * src/cairo_image_surface.c: + * src/cairo_gstate.c: + * src/cairo_glitz_surface.c: + * src/cairo_ft_font.c (_cairo_ft_font_show_glyphs): Mask to composite + operation is now passed as a pattern. + + * src/cairoint.h: + * src/cairo_xlib_surface.c: + (_cairo_xlib_surface_set_matrix): Setting identity transform should + always be successful. + + * src/cairo_surface.c: + * src/cairo_ps_surface.c: + * src/cairo_png_surface.c: + * src/cairo_pdf_surface.c: + * src/cairo_image_surface.c: + * src/cairo_glitz_surface.c: Removed surface backend functions + set_matrix, set_filter, set_repeat. + + * configure.in: Enabled glitz backend. + + * src/cairo_glitz_surface.c: Major update to glitz backend. The output + quality should now be just as good as the image and xlib backends. + + * configure.in: Disabled win32 and quartz backends as they are now + temporarily out of sync. + + * src/cairoint.h: Replaced old cairo_pattern_t struct with new + cairo_surface_t like structure of cairo_pattern_t. + Added new function prototypes for acquiring a source surface from + a pattern. + + * src/cairo_xlib_surface.c: + (_cairo_xlib_surface_composite): Removed fast path that used XCopyArea. + + * src/cairo_ps_surface.c: + * src/cairo_pdf_surface.c: + * src/cairo_image_surface.c: + * src/cairo_gstate.c: Switched to cairo_surface_t like structure + of cairo_pattern_t and new interface for acquiring a source + surface from a pattern. + + * src/cairo_pattern.c: New implementations of many functions. This was + necessary because of switch to cairo_surface_t like structure of + cairo_pattern_t. Includes new interface for acquiring a source + surface for a pattern. Things that didn't belong in cairoint.h have + been moved here. + + * src/cairo_gstate.c (_cairo_gstate_show_surface): Inherit surface + attributes while surface attribute functions still exist. + +2005-03-01 Carl Worth + + * TODO: Note that cairo_output_stream_t patch has been reviewed. + +2005-03-01 Carl Worth + + * src/cairo_gstate.c (_cairo_gstate_show_surface): Fix + uninitialized value for status, (reported by Manish Singh). + +2005-02-27 Kristian Høgsberg + + * src/cairo_gstate.c (_cairo_rectangle_intersect): Fix this + function again. Problem with signed/unsigned types reported by + Jeff Muizelaar . + +2005-02-27 Kristian Høgsberg + + * src/cairo.h (cairo_fill_rule_t): Remove newline in comment which + was confusing gtk-doc. + + * src/cairo_image_surface.c (cairo_image_surface_create_for_data) + (cairo_image_surface_create): Document these functions. + +2005-02-25 Carl Worth + + * TODO: Note that "user data" and "setters and getters" patches + have been reviewed. Remove a few more TODO notes: + cleanup cairo_snippets: DONE + cairo_surface_finish: Now in API Shakeup + snapping code: Decided against this + +2005-02-25 Carl Worth + + From David Reveman: + + * src/cairo_matrix.c (_cairo_matrix_is_integer_translation): + Rewrite to use cairo_bool_t for legibility. + +2005-02-25 Carl Worth + + From David Reveman: + + * src/cairo_gstate.c (_cairo_gstate_show_surface): Simplify code + to eliminate a goto. + +2005-02-25 Carl Worth + + From David Reveman: + + * src/cairo_gstate.c (_cairo_gstate_pattern_init_copy): + (_cairo_gstate_clip_and_composite_trapezoids) + (_cairo_gstate_clip_and_composite_trapezoids) + (_cairo_gstate_show_surface, _cairo_gstate_show_glyphs) + (_cairo_gstate_show_glyphs): Clean up the mess that was + the misnamed _cairo_gstate_create_pattern. + +2005-02-25 Carl Worth + + * src/cairo_pattern.c (_cairo_pattern_shader_init): Don't put an + off-by-one n_stops into cairo_shader_op_t. + (_cairo_shader_op_find_color_stops): Put search for two color + stops containing a given offset into its own function. Handle the + case of before first and after last stop by returning the nearest + stop twice. + (_cairo_pattern_calc_color_at_pixel): Handle case of no color + stops by returning a transparent pixel. + +2005-02-24 Owen Taylor + + * src/cairo_win32_surface.c: Remove a left-over debug printf. + +2005-02-24 Carl Worth + + * src/cairo_pattern.c (cairo_pattern_add_color_stop): Fix memory + leak when realloc fails due to out-of-memory. + +2005-02-24 Owen Taylor + + * src/cairo_win32_surface.[ch]: Instead of counting + on ordering deletion to work (apparently it didn't on + older Windows), save the initial bitmap created + with the DC and reselect that into the DC. (Based + on a patch by Hans Breuer) + +2005-02-24 Carl Worth + + * test/.cvsignore: Add pixman_rotate to ignore list. + +2005-02-24 Carl Worth + + Fixes from David Reveman with minor cleanups by Carl Worth: + + * src/cairo_gstate.c (_cairo_gstate_create): Handle new failure + possibility of _cairo_gstate_init. + (_cairo_gstate_init): Handle possible failure of + _cairo_pattern_create_solid. + (_cairo_gstate_set_pattern): Reference new pattern before + destroying existing pattern to handle the case where they are the + same. + (_cairo_gstate_set_rgb_color): Handle possible failure of + _cairo_pattern_create_solid. + +2005-02-24 Carl Worth + + * src/cairo.h: Fix typo (pointed out by Kristian Høgsberg). + +2005-02-24 Owen Taylor + + * src/cairo_win32_surface.c (_cairo_win32_surface_destroy): + When we created a DC/bitmap pair, delete the DC before + the Bitmap so that the Bitmap will be released from the + DC and can be destroyed. (Reported by Hans Breuer) + + * configure.in cairo.pc.in: Only require fontconfig + if building FreeType font backend. + + * configure.in: Fix output when reporting Win32 font backend. + +2005-02-24 Carl Worth c + + * TODO: Remove many TODO items that have now been absorbed by the + API shakeup. Remove comparison with PostScript as there's nothing + interesting there left unimplemented, (and cairo is already + establishing its own conventions in naming and behavior that + deviate from PostScript). + + * src/cairoint.h: Fix typo (pointed out by Mike Emmel) + +2005-02-23 Carl Worth + + * TODO: Add entries from API Shakeup. + +2005-02-22 Carl Worth + + * README: + * src/cairo-features.h.in: + * src/cairo-glitz.h: + * src/cairo-pdf.h: + * src/cairo-png.h: + * src/cairo-ps.h: + * src/cairo-quartz.h: + * src/cairo-xcb.h: + * src/cairo-xlib.h: + * src/cairo.c: + * src/cairo.h: + * src/cairo_color.c: + * src/cairo_fixed.c: + * src/cairo_font.c: + * src/cairo_gstate.c: + * src/cairo_hull.c: + * src/cairo_image_surface.c: + * src/cairo_matrix.c: + * src/cairo_path.c: + * src/cairo_path_bounds.c: + * src/cairo_path_fill.c: + * src/cairo_path_stroke.c: + * src/cairo_pen.c: + * src/cairo_png_surface.c: + * src/cairo_polygon.c: + * src/cairo_ps_surface.c: + * src/cairo_slope.c: + * src/cairo_spline.c: + * src/cairo_surface.c: + * src/cairo_traps.c: + * src/cairo_xcb_surface.c: + * src/cairo_xlib_surface.c: + * src/cairoint.h: Switch from broken cworth@isi.edu address to + canonical cworth@cworth.org address. + +2005-02-22 Carl Worth + + * test/write_png.c: + * src/cairo-atsui.h: + * src/cairo_atsui_font.c: Convert to utf-8 encoding. + +2005-02-22 Carl Worth + + * configure.in: Temporarily disable XCB backend by default. + +2005-02-21 Carl Worth + + * src/cairo_pattern.c (cairo_pattern_reference): + * src/cairo.h: Revert accidental commit. + +2005-02-21 Carl Worth + + * src/cairo_surface.c (_fallback_composite_trapezoids): Fix y + offset to use dst_y instead of dst_x, (caught by David Reveman). + +2005-02-20 Owen Taylor + + * src/cairo-win32.h: Fix line endings (reported by + Hans Breuer) + +2005-02-16 Kristian Høgsberg + + Patches from Mike Owens : + + * src/cairo_png_surface.c (_cairo_png_surface_copy_page): Free + rows if we fail early in this function. + + * src/cairo_path.c (_cairo_path_init_copy): Clean up path if we + run out of memory. + +2005-02-13 Kristian Høgsberg + + * src/cairo_pdf_surface.c + (_cairo_pdf_surface_create_for_document): Initialize array element + size correctly. + +2005-02-10 Kristian Høgsberg + + Patches from Owen Taylor: + + * src/cairo_pdf_surface.c + (_cairo_pdf_surface_show_glyphs): Emit text as octal escapes, + to avoid problems with \, \r, ), etc. + (_cairo_pdf_document_write_fonts): Change /Flags to be 4 (symbolic), + not 32 (non-symbolic), otherwise acroread gets confuse. + (cairo_pdf_ft_font_write_cmap_table): Use a 1,0 cmap subtable, + not a 0,0, to conform to the PDF spec. + +2005-02-13 Carl Worth + + * autogen.sh (LC_NUMERIC): Use LC_NUMERIC=C so that decimal + separator works in version checks. + +2005-02-12 Owen Taylor + + * src/cairo_gstate.c (_cairo_gstate_clip_and_composite_trapezoids): Fix + x2/x1 typo. + +2005-02-12 Carl Worth + + * src/cairo.c (cairo_text_extents): Return all-zero extents if + string is NULL. + +2005-02-12 Kristian Høgsberg + + * src/cairo_gstate.c + (_cairo_gstate_clip_and_composite_trapezoids): Make clipping fast + path fast. When we have a clipping region set, intersect it + against the drawing extents to determine the bounding box for the + visible drawing. + +2005-02-10 Carl Worth + + * BUGS: Add bug for cairo_show_surface under non-default CTM. + +2005-02-07 Kristian Høgsberg + + * test/pixman_rotate.c, test/pixman_rotate-ref.png: New test case + which exposes off-by-one rotation error in pixman. + +2005-02-06 Owen Taylor + + * src/cairo_gstate.c src/cairo.c: Allow cairo_set_font (cr, NULL) + to unset the current font and return the cairo_t to the the + "use the font from cairo_select_font() state". + +2005-02-06 Owen Taylor + + * src/cairo_win32_font.c (_cairo_win32_font_text_to_glyphs): + Return the right status. (Reported by Hans Breuer.) + +2005-02-06 Owen Taylor + + * src/cairo_win32_font.c (_cairo_win32_font_text_to_glyphs): Free + glyph_indices, not glyphs. (Reported by Hans Breuer.) + +2005-02-05 Carl Worth + + * configure.in: Add message stating why glitz backend is disabled. + +2005-02-05 Owen Taylor + + * src/cairo_ft_font.c (_cairo_ft_font_text_to_glyphs): + Don't free *glyphs when succeeding! (Reported by Øyvind Kolås) + + * configure.in: Temporarily disable glitz by default. + +2005-02-04 Carl Worth + + * src/Makefile.am: Generate an error during make install if old + cairo headers are found in includedir, (rather than + includedir/cairo where the new ones are going). + +2005-02-03 Owen Taylor + + * src/cairo_ft_font.c (_cairo_ft_font_text_to_glyphs, + _cairo_ft_font_create_glyph): Fix missing cairo_ft_font_unlock_face(). + + * src/cairo_cache.c (_cairo_cache_random_entry): Fix problem + when no entry could be found. + +2005-02-03 Owen Taylor + + * src/cairo_font.c src/cairo.h doc/public/cairo-sections.txt: + Add cairo_font_extents(). + + * src/cairo_win32_font.c src/cairo-win32.h doc/public/cairo-sections.txt: + Rename cairo_font_create_for_logfont() into + cairo_font_create_for_logfontw() to make clear what it takes. + Don't add cairo_font_create_for_logfonta() for now. + +2005-02-02 Owen Taylor + + * src/cairo_win32_font.c doc/public/cairo-sections.txt + doc/public/Makefile.am: Add windows functions to the docs. + +2005-02-02 Owen Taylor + + * src/cairo_win32_font.c (cairo_win32_font_select_font, + cairo_win32_release_font, cairo_win32_font_get_scale_factor): + Add some functions to select the font into a device context + with the intention to enable callers to use, e.g, Uniscribe. + + * src/cairo_win32_font.c: Use 'hdc' not 'dc' for param/variable + name. + +2005-02-02 Owen Taylor + + * src/cairo_win32_font.c (cairo_win32_font_select_font, + cairo_win32_release_font, cairo_win32_font_get_scale_factor): + Add some functions to select the font into a device context + with the intention to enable callers to use, e.g, Uniscribe. + + * src/cairo_win32_font.c: Use 'hdc' not 'dc' for param/variable + name. + + * src/cairo_win32_font.c (_cairo_win32_font_show_glyphs): Return + immediately if height or width is 0. + +2005-02-02 Owen Taylor + + * src/cairo_win32_font.c: Mostly-functioning Win32 font backend; + no glyph paths yet. + + * configure.in: Turn on building of the Win32 font backend. + + * src/cairo-win32-private.h src/Makefile.am: Private header for + the Win32 backend. + + * src/cairo-win32-private.h src/cairo_win32_surface.c: + Internally export _cairo_win32_print_gdi_error() for use + in the font code. + + * src/cairo-win32-private.h src/cairo_win32_surface.c: + Add _cairo_win32_surface_create_dib to create a DIB surface. + + src/cairo-win32-private.h src/cairo_win32_surface.c: + Add _cairo_surface_is_win32() + + * configure.in: Check for vasnprintf. + + * test/cairo_test.c (xasprintf): Add a simple fixed-buffer size + snprintf fallback in the absence of vasnprintf. + +2005-02-01 Kristian Høgsberg + + * src/cairo_pdf_surface.c (_cairo_pdf_surface_composite): Pretend + we support compositing of solid color or gradient patterns to + prevent image fallback. + (emit_pattern): New function, code factored out from + _cairo_pdf_surface_composite_trapezoids. + (_cairo_pdf_surface_show_glyphs): Use emit_pattern here so we get + pattern support for text. + + * src/cairo_ft_font.c (_cairo_ft_font_get_unscaled_font): Fix typo. + +2005-02-01 Owen Taylor + + * src/cairo_unicode.c src/cairoint.h src/Makefile.am: Add + _cairo_utf8_to_utf16(), _cairo_utf8_to_ucs4() based on code from GLib. + + * src/cairo.[ch]: Add CAIRO_STATUS_INVALID_STRING + + * src/cairo_ft_font.c: Use _cairo_utf8_to_ucs4(). + + * src/cairo.h: Add cairo_bool_t + + * src/cairoint.h: Add TRUE/FALSE definitions. + + * src/cairo.[ch] src/cairoint.h src/cairo_gstate.c: switch + cairo_in_stroke/cairo_in_fill and all the functions used to + implement them over to cairo_bool_t. + +2005-01-31 Owen Taylor + + * configure.in src/cairo-features.h.in: Add a check for the + Windows platform and --enable-win32. Also add some (currently + always off) stubs for native Win32 fonts. + + * configure.in: Make building the PDF backend conditional + on having FreeType. + + * src/Makefile.am src/cairo_win32_surface.c src/cairo_win32_font.c + src/cairo-win32.h: Add a Win32 backend using GDI and software + fallbacks Font code is not yet there yet, but it works with the + fontconfig backend. + + * src/cairo_gdip_font.cpp src/cairo_gdip_surface.cpp: Remove + remnants of a GDI+ based backend. + + * src/cairoint.h: Prefer platform-specific font backends + to the fontconfig backend. + +2005-01-31 Owen Taylor + + * src/cairoint.h src/cairo_image_surface.c + src/cairo_pdf_surface.c src/cairo_png_surface.c + src/cairo_surface.c src/cairo_xlib_surface.c: Replace + the get_image()/set_image() backend operations with + a more specific {acquire,release}_{source,dest}_image() + and clone_similar(). + + * src/cairoint.h src/cairo_pattern.c: Replace + _cairo_pattern_get_surface() with a + _cairo_pattern_begin_draw()/_cairo_pattern_end_draw() pair. + + * src/cairo_image_surface.c: Save the format for which + an image is created so we can access it later. (Needed + for the _cairo_xlib_surface_clone_similar()) + + * src/cairoint.h src/cairo_image_surface.c: + Add _cairo_surface_is_image(). + + * src/cairoint.h: Add CAIRO_OK(status) to check + for CAIRO_STATUS_SUCCESS. + + * src/cairo_xlib_surface.c: In the absence of of + RENDER, make cairo_xlib_surface_create_similar() + return an image surface. + + * src/cairo_xlib_surface.c: Don't try to use RENDER + to composite glyphs in the absence of the RENDER + extension. + +2005-01-30 Owen Taylor + + * src/cairo_ps_surface.c (_cairo_ps_surface_copy_page): Update + composite-over-white code to use a pattern, not a surface. + (to match _cairo_surface_composite API change.) + +2005-01-30 Owen Taylor + + Fixes from David Reveman: + + * src/cairo_pattern.c (_cairo_pattern_save/restore_surface): Don't + save to surface part of the union when the pattern isn't a surface + pattern. + (_cairo_pattern_get_surface): Create the new surface at the width + and height of the source. + + * src/Makefile.am (libcairo_ft_sources): Add cairo-ft-private.h + +2005-01-28 Kristian Høgsberg + + * src/cairo_png_surface.c (_cairo_png_surface_composite): Update + prototype to eliminate warning. + + * src/cairo_pattern.c (_cairo_pattern_init_copy): Remember to + reference surfaces when copying patterns. + + * src/cairo_gstate.c: (_cairo_rectangle_intersect), + (_cairo_gstate_clip_and_composite_trapezoids), + (_cairo_gstate_clip), (_cairo_gstate_show_glyphs): Don't call + _gstate_create_pattern for internally created patterns. + (_cairo_gstate_show_surface): Don't change the surface matrix + here, it's done later when we set it up as a pattern. + + * test/Makefile.am: Correct clip_twice-ref.png filename. + + * src/cairoint.h (MIN, MAX): Add these. + + * src/cairo_gstate.c (_cairo_rectangle_intersect): Fix broken + intersection code. + +2005-01-27 Kristian Høgsberg + + * src/cairo_pattern.c (_cairo_pattern_get_surface): Make sure we + always return a surface similar to dst in the gradient case. + + * src/cairo_pattern.c (_cairo_pattern_get_surface): Fold + _cairo_pattern_get_image into _cairo_pattern_get_surface and make + sure we always return a surface of the same type as dest. + + * src/cairo_glitz_surface.c (_cairo_glitz_composite), + (_cairo_glitz_surface_composite_trapezoids): Use + _cairo_pattern_get_surface instead of _cairo_pattern_get_image. + + * src/cairo_xlib_surface.c (_cairo_xlib_surface_show_glyphs), + (_cairo_xlib_surface_composite) + (_cairo_xlib_surface_composite_trapezoids): Remove use of + _cairo_xlib_surface_clone_similar since _cairo_pattern_get_surface + always gives us an xlib surface for the pattern. Clean up error + handling code in _cairo_xlib_surface_show_glyphs. + + * src/cairo_image_surface.c (_cairo_image_surface_composite): + (_cairo_image_surface_composite_trapezoids): Add missing + cairo_surface_destroy and tidy up offset calculations as suggested + by Owen. + + * src/cairoint.h (cairo_clip_rect_t): + * src/cairo_gstate.c (_cairo_gstate_clip_and_composite_trapezoids) + (_cairo_gstate_clip, _cairo_gstate_show_glyphs): Simplify code for + computing the extents of clipping area, by introducing a couple of + cairo_rectangle_t functions. + +2005-01-27 Owen Taylor + + * src/cairo.[ch] src/cairo_font.c src/cairo_ft_font.c + src/cairo_ps_surface.c src/cairo_xlib_surface.c: Move + docs from docs/reference, with a fair bit of addition + and rewriting. + + * doc/reference/: Remove old-format docs. + + * configure.in: Add a AC_PREREQ(2.54) (Jason Dorje Short) + +2005-01-27 Kristian Høgsberg + + * test/coverage-ref.png: + * test/clip_twice-ref.png: + Update these two once again, this time generated using + libpixman-0.1.3 without leaky circles. + +2005-01-27 Owen Taylor + + * configure.in Makefile.am docs/Makefile.am docs/public/*: + Add framework for doing docs via gtk-doc. + + * src/cairo.[ch] src/cairo-matrix.c: Add some inline docs + for arcs and matrices. + + * gtk-doc.m4 acinclude.m4: Check in files from gtk-doc + to make the dependency on gtk-doc optional. + + * autogen.sh (LANG): Add --enable-gtk-doc to the default + args. + +2005-01-27 Kristian Høgsberg + + * test/write_png.c (unpremultiply_data): + * test/read_png.c (premultiply_data): + Fix missing rounding in these two functions. + + * test/coverage-ref.png: + * test/clip_twice-ref.png: + Update these to versions with properly rounded alpha values. + + * test/Makefile.am: Move clip_twice out of XFAIL now that rounding + works. + + * test/.cvsignore: Add new test cases. + +2005-01-27 Kristian Høgsberg + + The overall idea of this rewrite is that we want to pass the + source pattern all the way down into the backends. The motivation + for this is that not all backends want a surface for the source + operand, and by passing the pattern down, backends can choose to + convert it to a surface if they need that. + + The patch removes the create_surface function pointer from the + surface vtable and moves much of that code into a couple of helper + functions. The composite, compsite_trapezoids, and show_glyphs + backend functions are updated to take a cairo_pattern_t instead of + a surface as the source. + + * src/cairo_font.c: (_cairo_font_show_glyphs): + * src/cairo_gstate.c: (_cairo_gstate_create_pattern), + (_cairo_gstate_clip_and_composite_trapezoids), + (_cairo_gstate_clip), (_cairo_gstate_show_surface), + (_cairo_gstate_show_glyphs): + Change these functions to not create a surface for the pattern and + just pass the pattern down to the backend functions. + + * src/cairo_gstate.c: (translate_traps): + New function to translate a set of trapezoids. + + * src/cairo_pattern.c: + (_cairo_pattern_init), + (_cairo_pattern_init_copy), + (_cairo_pattern_prepare_surface), + (_cairo_pattern_restore_surface): + Break out the code to adjust and restore surface transformation + and repeat settings into _cairo_pattern_prepare_surface and + _cairo_pattern_restore_surface. + + * src/cairo_pattern.c: (_cairo_pattern_fini), + (_cairo_pattern_init_for_surface), + (cairo_pattern_create_for_surface): + Split cairo_pattern_create_for_surface into an init function and a + create function. + + * src/cairo_pattern.c: (_cairo_pattern_get_image), + (_cairo_pattern_get_surface): + Utility functions to create a surface from a pattern. + + * src/cairo_ft_font.c: + * src/cairo_image_surface.c: + * src/cairo_pdf_surface.c: + * src/cairo_png_surface.c: + * src/cairo_ps_surface.c: + * src/cairo_xlib_surface.c: + * src/cairo_glitz_surface.c: + Update these backends to work with the new pattern API. Glitz + work by David Reveman. + + * src/cairo_surface.c: (_cairo_surface_composite), + (_cairo_surface_composite_trapezoids), + (_cairo_surface_set_clip_region): + Update these to pass through the new set of args. + + * test/coverage-ref.png: + Update this reference image as we now render it correctly. + +2005-01-26 Kristian Høgsberg + + * test/clip_twice.c, test/clip_twice-ref.png: New test case to + verify that the clip surface is correctly updated when extending + an existing clip path. + + * test/coverage.c (draw): Set alpha to 1 before setting clip mask. + + * test/coverage-ref.png: Added the right reference PNG. Running + test against stock 0.3.0 gives the expected results. + + * test/Makefile.am, test/coverage.c, test/coverage-ref.png: New + test case, covering various combinations of pattern types, drawing + operations and clipping. Currently fails, for some combinations, + coverage-ref.png is just a placeholder. + + * test/romedalen.png: Added this PNG from cairo-snippets to use + for pattern fills. + + * test/cairo_test.c, test/cairo_test.h: expose PNG loading to test + cases. + +2005-01-26 Alexander Larsson + + * src/cairo_ft_font.c: (_ft_unscaled_font_set_scale): + Fix access to uninitialized data + + * src/cairo_xlib_surface.c: + key must be first element in cache entry + +2005-01-25 David Reveman + + * AUTHORS: Update mail address. + + * src/cairo_glitz_surface.c: Update mail address. + + * configure.in: Require version 0.4.0 of glitz. + + * src/cairo_glitz_surface.c: Track changes to glitz. + + * src/cairo_xcb_surface.c: Add missing include directive so xcb + backend compile again. + +2005-01-25 Carl Worth + + * test/imagediff.c + * test/testsvg: Add new testsvg script and accompanying imagediff + program, (for interim SVG-based test suites while we wait for the + standard cairo test suite to mature). + + * test/buffer_diff.c: + * test/cairo_test.c: Split buffer_diff out into its own file for + the purpose of imagediff. + + * src/cairo_ft_font.c (_cairo_ft_font_show_glyphs): Fixed rounding + of glyph positioning. + +2005-01-25 Owen Taylor + + * src/cairo_pdf_surface.c (_cairo_pdf_document_get_font): Chec + pdf_font for NULL, not font. + +2005-01-25 Alexander Larsson + + * src/Makefile.am: + Fix typo that made cairo-ft.h not get installed + +2005-01-24 Carl Worth + + * AUTHORS: Add Shawn T. Amundson, Calum Robinson, and Owen Taylor. + + * src/Makefile.am: Conditionally install header files only for + backends that are compiled. Thanks to Shawn T. Amundson + . + + * src/cairoint.h: + * src/cairo_color.c (_cairo_color_get_rgb): Qualify color argument + as const. Closes bug #2336. + +2005-01-23 Dave Beckett + + * src/cairo_ft_font.c (_get_load_flags): Protect switch on + hintstyle with #ifdef FC_HINT_STYLE. + +2005-01-23 Carl Worth + + * RELEASING: Add instructions for handling the new "-head" suffix + of CAIRO_VERSION at release-time. + + * configure.in: Append "-head" to CAIRO_VERSION to indicate state + between snapshots. + + * src/cairo_gstate.c: Add missing prototype for _cairo_gstate_ensure_font. + (_cairo_gstate_current_font): Add missing declaration so things + compile again. + +2005-01-21 Owen Taylor + + * Call _cairo_gstate_ensure_font(). Don't reference + the returned font. + +2005-01-21 Owen Taylor + + * src/cairo_ft_font.c (_get_load_flags): Make dependence + on FC_HINT_STYLE conditional. (reported by Abraham Egnor) + + * src/cairo_ft_font.c: Use FT_LOAD_MONOCHROME if + FT_LOAD_TARGET_MONO isn't defined for compatibility + with older FreeType. + +2005-01-16 Owen Taylor + + Change cairo_font_t to refer to a font scaled to a particular + output device resolution. + + * src/cairoint.h src/cairo_font.c src/cairo_ft_font.c + src/cairo_xlib_surface.c src/cairo_pdf_surface.c src/cairo_gstate.c + src/cairo.c: Switch many internal methods from handling + cairo_unscaled_font_t and cairo_font_scale_t pairs to handling + cairo_font_t. + + * src/cairo-ft-private.h src/cairo_ft_fontc: Add some internal + interfaces for use by the FreeType backend. + + * src/cairo_gstate.c: Clear the gstate's current font when + the transform or target surface changes. + + * src/cairo.h src/cairo_ft_font.c: Rename cairo_ft_font_pattern + to cairo_ft_font_get_pattern(). + + * src/cairo.h src/cairo_ft_font.c: Make cairo_ft_font_create() + and cairo_ft_font_create_for_ft_face() take a font scale; + make the latter take load_flags for FT_Load_Glyph() as well. + Change cairo_ft_font_face() to Xft-style cairo_ft_font_lock_face, + cairo_ft_font_unlock_face. + + * src/cairo_font.c: Remove the name/slant/weight=>unscaled font + cache, it didn't work with the new cairo_font_t setup. If it turns + out to be needed, it can be added back in some other form. + + * src/cairoint.h src/cairo_font.c: Add a 'flags' field + to cairo_glyph_cache_key_t, we use it for load flags with + freetype backend. + + * src/cairo_ft_font.c: Switch the caching to be from + resolved fontconfig pattern => file; keep only a fixed number + of FT_Face objects open at once, similar to FreeType. + + * src/cairo_font.c (cairo_font_glyph_extents) src/cairo_gstate.c + src/cairoint.h: Add public cairo_font_glyph_extents, use it + to implement _cairo_gstate_glyph_extents(). + + * src/cairo_xlib_surface.c (_glyphset_cache_entry_reference): + Add refcounting for glyph cache elements; there was an + bug where elements got ejected from the cache and freed before + they could be used. + + * src/cairoint.h src/cairo_cache.c (_cairo_cache_random_entry()) + New function to return a random entry in the cache matching a predicate; + reuse the internals for the previous _random_live_entry(). + + * src/cairoint.h src/cairo_cache.c (_cairo_cache_lookup()): Add an + optional created_entry return value. + + * src/cairo_ft_font.c src/cairo_xlib_surface.c: Adapt to + _cairo_cache_lookup() change. + + * src/cairo_cache.c (_cairo_cache_lookup()): Support max_memory == 0 + to indicate an unbounded cache. + + * src/cairoint.h src/cairo_cache.c (_cairo_cache_remove()): Add a + function to manually remove entries from the cache. + + * doc/reference: Update for changes, document cairo_matrix_t, + cairo_glyph_t, etc. + + * src/cairo.h src/cairo-atsui.h src/cairo-ft.h src/cairo-glitz.h + src/cairo-pdf.h src/cairo-png.h src/cairo-ps.h src/cairo-quartz.h + src/cairo-xcb.h src/cairo-xlib.h: Add CAIRO_BEGIN/END_DECLS for + extern "C", use it on all public headers. Move header guards + outermost. + + * src/cairo_quartz_surface.c: Fix encoding. + 2005-01-21 Carl Worth * configure.in: Increment CAIRO_VERSION to 0.3.0 diff --git a/gfx/cairo/cairo/Makefile.am b/gfx/cairo/cairo/Makefile.am index 3a33e9a7cd40..8d0eac2ab63a 100644 --- a/gfx/cairo/cairo/Makefile.am +++ b/gfx/cairo/cairo/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = src test +SUBDIRS = src EXTRA_DIST = \ COPYING \ diff --git a/gfx/cairo/cairo/Makefile.in b/gfx/cairo/cairo/Makefile.in index d23757f2c071..7fecda0fa829 100644 --- a/gfx/cairo/cairo/Makefile.in +++ b/gfx/cairo/cairo/Makefile.in @@ -43,7 +43,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ install-sh ltmain.sh missing mkinstalldirs subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -107,6 +108,10 @@ CAIRO_HAS_PS_SURFACE_FALSE = @CAIRO_HAS_PS_SURFACE_FALSE@ CAIRO_HAS_PS_SURFACE_TRUE = @CAIRO_HAS_PS_SURFACE_TRUE@ CAIRO_HAS_QUARTZ_SURFACE_FALSE = @CAIRO_HAS_QUARTZ_SURFACE_FALSE@ CAIRO_HAS_QUARTZ_SURFACE_TRUE = @CAIRO_HAS_QUARTZ_SURFACE_TRUE@ +CAIRO_HAS_WIN32_FONT_FALSE = @CAIRO_HAS_WIN32_FONT_FALSE@ +CAIRO_HAS_WIN32_FONT_TRUE = @CAIRO_HAS_WIN32_FONT_TRUE@ +CAIRO_HAS_WIN32_SURFACE_FALSE = @CAIRO_HAS_WIN32_SURFACE_FALSE@ +CAIRO_HAS_WIN32_SURFACE_TRUE = @CAIRO_HAS_WIN32_SURFACE_TRUE@ CAIRO_HAS_XCB_SURFACE_FALSE = @CAIRO_HAS_XCB_SURFACE_FALSE@ CAIRO_HAS_XCB_SURFACE_TRUE = @CAIRO_HAS_XCB_SURFACE_TRUE@ CAIRO_HAS_XLIB_SURFACE_FALSE = @CAIRO_HAS_XLIB_SURFACE_FALSE@ @@ -129,6 +134,8 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ @@ -137,11 +144,15 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ FT_FONT_FEATURE = @FT_FONT_FEATURE@ GLITZ_CFLAGS = @GLITZ_CFLAGS@ GLITZ_LIBS = @GLITZ_LIBS@ GLITZ_REQUIRES = @GLITZ_REQUIRES@ GLITZ_SURFACE_FEATURE = @GLITZ_SURFACE_FEATURE@ +GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +HTML_DIR = @HTML_DIR@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -183,6 +194,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ VERSION_INFO = @VERSION_INFO@ +WIN32_FONT_FEATURE = @WIN32_FONT_FEATURE@ +WIN32_SURFACE_FEATURE = @WIN32_SURFACE_FEATURE@ XCB_CFLAGS = @XCB_CFLAGS@ XCB_LIBS = @XCB_LIBS@ XCB_SURFACE_FEATURE = @XCB_SURFACE_FEATURE@ @@ -237,7 +250,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUBDIRS = src test +SUBDIRS = src EXTRA_DIST = \ COPYING \ COPYING-LGPL-2.1 \ diff --git a/gfx/cairo/cairo/NEWS b/gfx/cairo/cairo/NEWS index 6bb4c13c7f41..62a1b1829c48 100644 --- a/gfx/cairo/cairo/NEWS +++ b/gfx/cairo/cairo/NEWS @@ -1,3 +1,129 @@ +Snapshot 0.4.0 (2005-03-08 Carl Worth ) +========================================================== +New documentation +----------------- +Owen Taylor has converted cairo's documentation system to gtk-doc and +has begun some long-needed work on the documentation, which can now be +viewed online here: + + http://cairographics.org/manual/ + +New backend: win32 +------------------ +This is the first snapshot to include a functional win32 backend, +(thanks to Owen Taylor). The interface is as follows: + + #include + + void + cairo_set_target_win32 (cairo_t *cr, + HDC hdc); + + cairo_surface_t * + cairo_win32_surface_create (HDC hdc); + + cairo_font_t * + cairo_win32_font_create_for_logfontw (LOGFONTW *logfont, + cairo_matrix_t *scale); + + cairo_status_t + cairo_win32_font_select_font (cairo_font_t *font, + HDC hdc); + + void + cairo_win32_font_done_font (cairo_font_t *font); + + double + cairo_win32_font_get_scale_factor (cairo_font_t *font); + +And see also the documentation at: + +http://cairographics.org/manual/cairo-Microsoft-Windows-Backend.html + +Disabled backend: quartz +------------------------ +Unfortunately, the quartz backend code is currently out of date with +respect to some recent backend interface changes. So, the quartz +backend is disabled in this snapshot. + +If the quartz backend is brought up-to-date before the next snapshot, +we would be glad to make a 0.4.1 snapshot that re-enables it, (we do +not expect many more big backend interface changes). + +API Changes +----------- +The font system has been revamped, (as Owen Taylor's work with +integrating pango and cairo gave us the first serious usage of the +non-toy font API). + +One fundamental, user-visible change is that the cairo_font_t object +now represents a font that is scaled to a particular device +resolution. Further changes are described below. + + cairo.h + ------- + Removed cairo_font_set_transform and cairo_font_current_transform. + + Added cairo_font_extents and cairo_font_glyph_extents. See + documentation for details: + + http://cairographics.org/manual/cairo-cairo-t.html#cairo-font-extents + + cairo-ft.h + ---------- + The cairo_ft_font API changed considerably. Please see the + documentation for details: + + http://cairographics.org/manual/cairo-FreeType-Fonts.html + +Performance +----------- +Make the fast-path clipping (pixel-aligned rectangles) faster. + +Add optimization for applying a constant alpha to a pattern. + +Optimize gradients that are horizontal or vertical in device space. + +Xlib: When RENDER is not available, use image surfaces for +intermediate surfaces rather than xlib surfaces. + +Backend-specific changes +------------------------ + Glitz + ----- + Major update to glitz backend. The output quality should now be just + as good as the image and xlib backends. + + Track changes to glitz 0.4.0. + + PDF + --- + Various improvements to produce more conformant output. + +Internals +--------- +David Reveman contributed a large re-work of the cairo_pattern_t +implementation, providing cleaner code and more optimization +opportunities. + + Backend interface changes + ------------------------- + Rework backend interface to accept patterns, not surfaces for source + and mask. + + Remove set_matrix, set_filter, and set_repeat functions. + + More sophisticated backend interface for image fallbacks, + ({acquire,release}_{source,dest}_image() and clone_similar). + +Bug fixes +--------- +Only install header files for backends that have been compiled. + +Fixed some rounding errors leading to incorrectly placed glyphs. + +Many other minor fixes. + Snapshot 0.3.0 (2005-01-21 Carl Worth ) ========================================================== Major API changes diff --git a/gfx/cairo/cairo/README b/gfx/cairo/cairo/README index 47f7ff9bf34e..5649c4bbc4a0 100644 --- a/gfx/cairo/cairo/README +++ b/gfx/cairo/cairo/README @@ -43,7 +43,7 @@ model will help in understanding cairo. History ------- -Cairo was originally developed by Carl Worth and +Cairo was originally developed by Carl Worth and Keith Packard . Many thanks are due to Lyle Ramshaw without whose patient help our ignorance would be much more apparent. diff --git a/gfx/cairo/cairo/TODO b/gfx/cairo/cairo/TODO index bbd549f99ea6..f0edbc309cd9 100644 --- a/gfx/cairo/cairo/TODO +++ b/gfx/cairo/cairo/TODO @@ -1,51 +1,47 @@ +API Shakeup work +---------------- +Patch? Reviewed? +yes yes user data (was Re: [cairo] Patch improving fallbacks) + cairo_paint +yes yes setters and getters + cairo_current_matrix + Renaming the terms of the rendering equation + Making set_source consistent + Eliminating cairo_show_surface + cairo_mask + cairo_begin_group, cairo_end_group, cairo_get_group +yes yes cairo_output_stream_t and cairo_surface_finish() + cairo_create and eliminating cairo_set_target_surface + cairo_fill_preserve, cairo_stroke_preserve, cairo_clip_preserve + default matrix + cairo_current_path -> cairo_copy_path_data + cairo_surface_finish, cairo_surface_flush + cairo__surface_mark_dirty + Eliminating cairo_copy + Eliminating cairo_surface_set_repeat/matrix/filter + A hidden offset for the xlib backend + cairo_stroke_path -> cairo_stroke_to_path + Simplifying the operator set + Abbreviation hunt: cairo_init_clip and cairo_concat_matrix + Consistent error handling for all objects + * Add support for non-antialiased rendering. API ? -* Cleanup cairo_snippets so they operate in a more default cairo - environment, (particularly with a default CTM). - -* Add one of cairo_surface_finish/_finalize/_close to resolve the - "reference counting vs garbage collection" thread. - -* Shove experimental snapping code from libsvg-cairo down int cairo - proper. - * Clean up the cache code a bit, (there is at least one redundant level of cacheing, and there are some minor style issues). -* Implement the parallel install stuff, (most importantly, push - cairo.h down into into one directory below $(includedir)). - * Add CAIRO_FILL_RULE_INVERSE_WINDING and CAIRO_FILL_RULE_INVERSE_EVEN_ODD -* Simplifying the operator set? - * Fix clipping to work for all operators. The equation we have come up with is: ((src Op dest) In clip) Add (dest Out clip) -* Resolve the rest of the rendering equation. We need a fundamental - equation upon which more convenient operations are based, (at least - formally). Some of the common operations that should be convenient: - - * display surface - * display surface multiplied by constant alpha - * display pattern masked by surface - - So this involves deciding whether to expose a new mask object in the - graphics state, and deciding exactly what set_alpha means. It almost - certainly means adding cairo_show_surface_mask. - -* Implement a hidden transform, (as per the result of the hidden - offset thread on the mailing list). - * Replace PNG backend with an image_surface function to save a PNG image. * Clean up the API in preparation for freezing and release. -* Implement a PDF backend. - * Make a more interesting PS backend, (other than the current "giant-image for every page" approach). @@ -54,9 +50,6 @@ * Change stroke code to go through one giant polygon. This will fix problems with stroking self-intersecting paths. -* Implement cairo_stroke_path, (very easy to do after the above change -is done). - * Re-work the backend clipping interface to use geometry rather than images. @@ -90,17 +83,6 @@ do gradients the Right Way). * Implement cairo_arc_to. -* Fix support for old X servers so that it is not swamped with image -transport. The key idea is to assume that nothing external to cairo -will be drawing to the same drawable after it is handed to -cairo. Beyond that, we might actually provide support for cooperating -with external entities by adding one or more of the following -functions: - - cairo_flush - cairo_erase - cairo_mark_dirty - * Re-implement the trapezoid rasterization algorithm according to the new "specification". @@ -146,134 +128,3 @@ functions: * Verification, profiling, optimization. centi_unfinished.svg may provide a good test case. - -A comparison with PostScript -============================ - -Here's a list of several classes of PostScript operators indicating -which operators have rough equivalents in cairo and which do not. In -general, the name of a cairo function corresponding to a PostScript -operator can be obtained by inserting a '_' between each word and -prefixing it with "cairo_". For example, "cairo_move_to" corresponds -to the PostScript "moveto". - -In cases where the name of the cairo function deviates from this -convention, or when the behavior of the cairo function is -significantly different, the change is noted in parentheses below. - -This list is not exhaustive, (there are definitely some minor (major?) -semantic deviations that are not noted below). Also, this list is -almost certainly out of date with respect to the current cairo -implementation. Caveat lector. - -Operators that are not yet in cairo, but probably should be: arcto, -strokepath, rectclip?, clipsave/restore?, setstrokeadjust?, -currentdash, grestoreall?, initgraphics?, currentgstate?, setgstate?, -erasepage?, setsmoothness? - -Painting operators ------------------- -in cairo: stroke, fill, eofill (set_fill_rule/fill), image -(show_surface) - -not in cairo: erasepage, rectstroke, rectfill, shfill, colorimage, -imagemask - -Path construction operators ---------------------------- -in cairo: arc, arcn (arc_negative), newpath, moveto, rmoveto -(rel_move_to), lineto, rlineto (rel_line_to), curveto, rcurveto -(rel_curve_to), closepath, currentpoint, charpath (text_path), -pathforall (current_path), flattenpath (current_path_flat) - -not in cairo: arct, arcto, reversepath, strokepath, clippath, pathbbox - -Clipping --------- -in cairo: clip, eoclip (set_fill_rule/clip) - -not in cairo: initclip, rectclip, clipsave, cliprestore - -Graphics state operators ------------------------- -in cairo: setlinewidth, currentlinewidth, setlinecap, currentlinecap, -setlinejoin, currentlinejoin, setmiterlimit, currentmiterlimit, -setdash - -not in cairo: setstrokeadjust, currentstrokeadjust, currentdash - -Color specification operators ------------------------------ -in cairo: setrgbcolor, currentcolor - -not in cairo: setcolor, setgray, currentgray, currentrgbcolor, -sethsbcolor, currenthsbcolor, setcmykcolor, currentcmykcolor, -setcolorspace, currentcolorspace - -Form and pattern operators --------------------------- -in cairo: setpattern, makepattern (lock_pattern) - -not in cairo: execform - -Whole-state manipulation ------------------------- -in cairo: gsave (save), grestore (restore) - -not in cairo: grestoreall, initgraphics, gstate, currentgstate, -setgstate - -Coordinate system and matrix operators --------------------------------------- -in cairo: identmatrix (identity_matrix), initmatrix (default_matrix), -setmatrix, translate, scale, rotate, concatmatrix, currentmatrix, -transform (transform_point), dtransform (transform_distance) - -not in cairo: matrix, defaultmatrix, concat, itransform, idtransform, -invertmatrix - -Insideness testing ------------------- -in cairo: infill, instroke, ineofill (set_fill_rule/in_fill) - -not in cairo: inufill, inustroke, inueofill - -Device setup ------------- -in cairo: showpage, copypage - -not in cairo: setpagedevice, currentpagedevice, nulldevice - -Glyph and font operators ------------------------- -in cairo: currentfont, definefont (font_create_for_ft_face), -undefine_font (font_destroy), findfont (font_create), makefont -(transform_font), setfont, scalefont, selectfont, show (show_text), -stringwidth (x/y in text_extents), xyshow (glyph_show -- but ignoring -current_point and using absolute positions) - -not in cairo, (and likely not needed): composefont, rootfont, ashow, -widthshow, awidthshow, xshow, xyshow, yshow, glyphshow, cshow, kshow, -FontDirectory, GlobalFontDirectory, StandardEncoding, -ISOLatin1Encoding, findencoding, setcachedevice, setcachedevice2, -setcharwidth - -Graphics state operators (device-dependent) -------------------------------------------- -in cairo: setflat (set_tolerance), currentflat (current_tolerance) - -not in cairo: sethalftone, currenthalftone, setscreen, currentscreen, -setcolorscreen, currentcolorscreen, settransfer, currenttransfer, -setcolortransfer, currentcolortransfer, setblackgeneration, -currentblackgeneration, setundercolorremoval, -currentundercolorremoval, setcolorrendering, currentcolorrendering, -setoverprint, currentoverprint, setsmoothness, currentsmoothness - -PostScript operators never to be in cairo ------------------------------------------ -Operator Stack Manipulation Operators, Arithmetic and Math Operators, -Array Operators, Packed Array Operators, Dictionary Operators, String -Operators, Rational,Boolean,and Bitwise Operators, Control Operators, -Type,Attribute,and Conversion Operators, File Operators, Resource -Operators, Virtual Memory Operators, Miscellaneous Operators, -Interpreter Parameter Operators, Errors, User Path Operators diff --git a/gfx/cairo/cairo/acinclude.m4 b/gfx/cairo/cairo/acinclude.m4 new file mode 100644 index 000000000000..af73800bf242 --- /dev/null +++ b/gfx/cairo/cairo/acinclude.m4 @@ -0,0 +1,53 @@ +dnl -*- mode: autoconf -*- + +# serial 1 + +dnl Usage: +dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) +AC_DEFUN([GTK_DOC_CHECK], +[ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + dnl for overriding the documentation installation directory + AC_ARG_WITH(html-dir, + AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, + [with_html_dir='${datadir}/gtk-doc/html']) + HTML_DIR="$with_html_dir" + AC_SUBST(HTML_DIR) + + dnl enable/disable documentation building + AC_ARG_ENABLE(gtk-doc, + AC_HELP_STRING([--enable-gtk-doc], + [use gtk-doc to build documentation [default=no]]),, + enable_gtk_doc=no) + + have_gtk_doc=no + if test x$enable_gtk_doc = xyes; then + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then + have_gtk_doc=yes + fi + + dnl do we want to do a version check? +ifelse([$1],[],, + [gtk_doc_min_version=$1 + if test "$have_gtk_doc" = yes; then + AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) + if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + have_gtk_doc=no + fi + fi +]) + if test "$have_gtk_doc" != yes; then + enable_gtk_doc=no + fi + fi + + AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) + AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") +]) diff --git a/gfx/cairo/cairo/aclocal.m4 b/gfx/cairo/cairo/aclocal.m4 index b2e73d9bdc3c..58ca6c7a161e 100644 --- a/gfx/cairo/cairo/aclocal.m4 +++ b/gfx/cairo/cairo/aclocal.m4 @@ -11,6 +11,1077 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +# -*- Autoconf -*- +# Copyright (C) 2002, 2003 Free Software Foundation, Inc. +# Generated from amversion.in; do not edit by hand. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION so it can be traced. +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], + [AM_AUTOMAKE_VERSION([1.9.2])]) + +# AM_AUX_DIR_EXPAND + +# Copyright (C) 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` +]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 6 + +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE]) +AC_SUBST([$1_FALSE]) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) + +# serial 7 -*- Autoconf -*- + +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 +# Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + + +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + + +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "GCJ", or "OBJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl + +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH]) +]) + +# Generate code to set up dependency tracking. -*- Autoconf -*- + +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 +# Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +#serial 2 + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +done +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) + +# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 7 + +# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) + +# Do all the work for Automake. -*- Autoconf -*- + +# This macro actually does too much some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +# Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 11 + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.58])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +# test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_PROG_INSTALL_SH +AM_PROG_INSTALL_STRIP +AC_REQUIRE([AM_PROG_MKDIR_P])dnl +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +]) +]) + + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $1 | $1:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. + +# Copyright (C) 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +install_sh=${install_sh-"$am_aux_dir/install-sh"} +AC_SUBST(install_sh)]) + +# -*- Autoconf -*- +# Copyright (C) 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 1 + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Add --enable-maintainer-mode option to configure. +# From Jim Meyering + +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004 +# Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 3 + +AC_DEFUN([AM_MAINTAINER_MODE], +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST(MAINT)dnl +] +) + +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 2 + +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo done +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# In particular we don't look at `^make:' because GNU make might +# be invoked under some other name (usually "gmake"), in which +# case it prints its new name instead of `make'. +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then + am__include=include + am__quote= + _am_result=GNU +fi +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote="\"" + _am_result=BSD + fi +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) + +# -*- Autoconf -*- + + +# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 3 + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) +fi +]) + +# AM_PROG_MKDIR_P +# --------------- +# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. + +# Copyright (C) 2003, 2004 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories +# created by `make install' are always world readable, even if the +# installer happens to have an overly restrictive umask (e.g. 077). +# This was a mistake. There are at least two reasons why we must not +# use `-m 0755': +# - it causes special bits like SGID to be ignored, +# - it may be too restrictive (some setups expect 775 directories). +# +# Do not use -m 0755 and let people choose whatever they expect by +# setting umask. +# +# We cannot accept any implementation of `mkdir' that recognizes `-p'. +# Some implementations (such as Solaris 8's) are not thread-safe: if a +# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' +# concurrently, both version can detect that a/ is missing, but only +# one can create it and the other will error out. Consequently we +# restrict ourselves to GNU make (using the --version option ensures +# this.) +AC_DEFUN([AM_PROG_MKDIR_P], +[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' +else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + for d in ./-p ./--version; + do + test -d $d && rmdir $d + done + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. + if test -f "$ac_aux_dir/mkinstalldirs"; then + mkdir_p='$(mkinstalldirs)' + else + mkdir_p='$(install_sh) -d' + fi +fi +AC_SUBST([mkdir_p])]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 2 + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# +# Check to make sure that the build environment is sane. +# + +# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 3 + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +echo timestamp > conftest.file +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi + + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT(yes)]) + +# AM_PROG_INSTALL_STRIP + +# Copyright (C) 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 1 + + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir + +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # serial 47 AC_PROG_LIBTOOL @@ -5994,1074 +7065,4 @@ AC_DEFUN([PKG_CHECK_MODULES], [ -# -*- Autoconf -*- -# Copyright (C) 2002, 2003 Free Software Foundation, Inc. -# Generated from amversion.in; do not edit by hand. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.2])]) - -# AM_AUX_DIR_EXPAND - -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 6 - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) - -# serial 7 -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - - -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - - -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) - - -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) - - -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH]) -]) - -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -#serial 2 - -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -done -])# _AM_OUTPUT_DEPENDENCY_COMMANDS - - -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) - -# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 7 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - -# Do all the work for Automake. -*- Autoconf -*- - -# This macro actually does too much some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 11 - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.58])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -]) -]) - - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $1 | $1:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) - -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. - -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} -AC_SUBST(install_sh)]) - -# -*- Autoconf -*- -# Copyright (C) 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 1 - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - -# Add --enable-maintainer-mode option to configure. -# From Jim Meyering - -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 3 - -AC_DEFUN([AM_MAINTAINER_MODE], -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode is disabled by default - AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST(MAINT)dnl -] -) - -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 2 - -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo done -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) - -# -*- Autoconf -*- - - -# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 3 - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) - - -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) - -# AM_PROG_MKDIR_P -# --------------- -# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. - -# Copyright (C) 2003, 2004 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories -# created by `make install' are always world readable, even if the -# installer happens to have an overly restrictive umask (e.g. 077). -# This was a mistake. There are at least two reasons why we must not -# use `-m 0755': -# - it causes special bits like SGID to be ignored, -# - it may be too restrictive (some setups expect 775 directories). -# -# Do not use -m 0755 and let people choose whatever they expect by -# setting umask. -# -# We cannot accept any implementation of `mkdir' that recognizes `-p'. -# Some implementations (such as Solaris 8's) are not thread-safe: if a -# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' -# concurrently, both version can detect that a/ is missing, but only -# one can create it and the other will error out. Consequently we -# restrict ourselves to GNU make (using the --version option ensures -# this.) -AC_DEFUN([AM_PROG_MKDIR_P], -[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi -fi -AC_SUBST([mkdir_p])]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 2 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - -# -# Check to make sure that the build environment is sane. -# - -# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 3 - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) - -# AM_PROG_INSTALL_STRIP - -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -# Check how to create a tarball. -*- Autoconf -*- - -# Copyright (C) 2004 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 1 - - -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break - - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir - -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR - +m4_include([acinclude.m4]) diff --git a/gfx/cairo/cairo/cairo.pc.in b/gfx/cairo/cairo/cairo.pc.in index 4e420b20220c..2cd0ff182861 100644 --- a/gfx/cairo/cairo/cairo.pc.in +++ b/gfx/cairo/cairo/cairo.pc.in @@ -7,6 +7,6 @@ Name: cairo Description: Multi-platform 2D graphics library Version: @VERSION@ -Requires: fontconfig libpixman @XRENDER_REQUIRES@ @PNG_REQUIRES@ @GLITZ_REQUIRES@ +Requires: @FREETYPE_REQUIRES@ libpixman @XRENDER_REQUIRES@ @PNG_REQUIRES@ @GLITZ_REQUIRES@ Libs: @FREETYPE_LIBS@ -L${libdir} -lcairo Cflags: @FREETYPE_CFLAGS@ -I${includedir}/cairo diff --git a/gfx/cairo/cairo/config.h.in b/gfx/cairo/cairo/config.h.in index 70c9217a4ddc..9b8529c478f7 100644 --- a/gfx/cairo/cairo/config.h.in +++ b/gfx/cairo/cairo/config.h.in @@ -39,6 +39,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the `vasnprintf' function. */ +#undef HAVE_VASNPRINTF + /* Name of package */ #undef PACKAGE diff --git a/gfx/cairo/cairo/configure b/gfx/cairo/cairo/configure index 451bcebbdd12..676f7f294688 100755 --- a/gfx/cairo/cairo/configure +++ b/gfx/cairo/cairo/configure @@ -463,7 +463,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION_INFO INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG XRENDER_CFLAGS XRENDER_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS CAIRO_HAS_XLIB_SURFACE_TRUE CAIRO_HAS_XLIB_SURFACE_FALSE XLIB_SURFACE_FEATURE XRENDER_REQUIRES CAIRO_HAS_QUARTZ_SURFACE_TRUE CAIRO_HAS_QUARTZ_SURFACE_FALSE QUARTZ_SURFACE_FEATURE XCB_CFLAGS XCB_LIBS CAIRO_HAS_XCB_SURFACE_TRUE CAIRO_HAS_XCB_SURFACE_FALSE XCB_SURFACE_FEATURE CAIRO_HAS_PS_SURFACE_TRUE CAIRO_HAS_PS_SURFACE_FALSE PS_SURFACE_FEATURE PS_LIBS CAIRO_HAS_PDF_SURFACE_TRUE CAIRO_HAS_PDF_SURFACE_FALSE PDF_SURFACE_FEATURE PDF_LIBS PNG_CFLAGS PNG_LIBS CAIRO_HAS_PNG_SURFACE_TRUE CAIRO_HAS_PNG_SURFACE_FALSE PNG_SURFACE_FEATURE PNG_REQUIRES GLITZ_CFLAGS GLITZ_LIBS CAIRO_HAS_GLITZ_SURFACE_TRUE CAIRO_HAS_GLITZ_SURFACE_FALSE GLITZ_SURFACE_FEATURE GLITZ_REQUIRES SANITY_CHECKING_FEATURE PIXMAN_CFLAGS PIXMAN_LIBS FONTCONFIG_CFLAGS FONTCONFIG_LIBS FREETYPE_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS CAIRO_HAS_FT_FONT_TRUE CAIRO_HAS_FT_FONT_FALSE FT_FONT_FEATURE CAIRO_HAS_ATSUI_FONT_TRUE CAIRO_HAS_ATSUI_FONT_FALSE ATSUI_FONT_FEATURE CAIRO_CFLAGS CAIRO_LIBS LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION_INFO INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG XRENDER_CFLAGS XRENDER_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS CAIRO_HAS_XLIB_SURFACE_TRUE CAIRO_HAS_XLIB_SURFACE_FALSE XLIB_SURFACE_FEATURE XRENDER_REQUIRES CAIRO_HAS_QUARTZ_SURFACE_TRUE CAIRO_HAS_QUARTZ_SURFACE_FALSE QUARTZ_SURFACE_FEATURE XCB_CFLAGS XCB_LIBS CAIRO_HAS_XCB_SURFACE_TRUE CAIRO_HAS_XCB_SURFACE_FALSE XCB_SURFACE_FEATURE CAIRO_HAS_WIN32_SURFACE_TRUE CAIRO_HAS_WIN32_SURFACE_FALSE CAIRO_HAS_WIN32_FONT_TRUE CAIRO_HAS_WIN32_FONT_FALSE WIN32_SURFACE_FEATURE WIN32_FONT_FEATURE CAIRO_HAS_PS_SURFACE_TRUE CAIRO_HAS_PS_SURFACE_FALSE PS_SURFACE_FEATURE PS_LIBS PNG_CFLAGS PNG_LIBS CAIRO_HAS_PNG_SURFACE_TRUE CAIRO_HAS_PNG_SURFACE_FALSE PNG_SURFACE_FEATURE PNG_REQUIRES GLITZ_CFLAGS GLITZ_LIBS CAIRO_HAS_GLITZ_SURFACE_TRUE CAIRO_HAS_GLITZ_SURFACE_FALSE GLITZ_SURFACE_FEATURE GLITZ_REQUIRES SANITY_CHECKING_FEATURE PIXMAN_CFLAGS PIXMAN_LIBS FONTCONFIG_CFLAGS FONTCONFIG_LIBS FREETYPE_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS FREETYPE_REQUIRES CAIRO_HAS_FT_FONT_TRUE CAIRO_HAS_FT_FONT_FALSE FT_FONT_FEATURE CAIRO_HAS_PDF_SURFACE_TRUE CAIRO_HAS_PDF_SURFACE_FALSE PDF_SURFACE_FEATURE PDF_LIBS CAIRO_HAS_ATSUI_FONT_TRUE CAIRO_HAS_ATSUI_FONT_FALSE ATSUI_FONT_FEATURE CAIRO_CFLAGS CAIRO_LIBS HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1041,13 +1041,15 @@ Optional Features: --disable-xlib Disable cairo's Xlib backend --disable-quartz Disable cairo's quartz backend --disable-xcb Disable cairo's XCB backend + --disable-win32 Disable cairo's Microsoft Windows backend --disable-ps Disable cairo's PostScript backend - --disable-pdf Disable cairo's PDF backend --disable-png Disable cairo's PNG backend --disable-glitz Disable cairo's glitz backend --disable-sanity Disable cairo's sanity checking routines --disable-freetype Disable cairo's freetype font backend + --disable-pdf Disable cairo's PDF backend --disable-atsui Disable cairo's atsui font backend + --enable-gtk-doc use gtk-doc to build documentation default=no Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1058,6 +1060,7 @@ Optional Packages: --with-tags[=TAGS] include additional configurations [automatic] --with-x use the X Window System + --with-html-dir=PATH path to installed docs Some influential environment variables: CC C compiler command @@ -1514,7 +1517,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Package version number, (as distinct from shared library version) -CAIRO_VERSION=0.3.0 +CAIRO_VERSION=0.4.0 # libtool shared library version @@ -3945,7 +3948,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3948 "configure"' > conftest.$ac_ext + echo '#line 3951 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5283,7 +5286,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5286:" \ +echo "$as_me:5289:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6317,11 +6320,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6320: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6323: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6324: \$? = $ac_status" >&5 + echo "$as_me:6327: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6550,11 +6553,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6553: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6556: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6557: \$? = $ac_status" >&5 + echo "$as_me:6560: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6610,11 +6613,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6613: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6616: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6617: \$? = $ac_status" >&5 + echo "$as_me:6620: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7944,7 +7947,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 7947 "configure"' > conftest.$ac_ext + echo '#line 7950 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8815,7 +8818,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11098: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11099: \$? = $ac_status" >&5 + echo "$as_me:11102: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -11152,11 +11155,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11155: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11158: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11159: \$? = $ac_status" >&5 + echo "$as_me:11162: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11663,7 +11666,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 11666 "configure"' > conftest.$ac_ext + echo '#line 11669 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -12534,7 +12537,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13465: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13466: \$? = $ac_status" >&5 + echo "$as_me:13469: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13519,11 +13522,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13522: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13525: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13526: \$? = $ac_status" >&5 + echo "$as_me:13529: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14833,7 +14836,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 14836 "configure"' > conftest.$ac_ext + echo '#line 14839 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -15574,11 +15577,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15577: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15580: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15581: \$? = $ac_status" >&5 + echo "$as_me:15584: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15807,11 +15810,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15810: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15813: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15814: \$? = $ac_status" >&5 + echo "$as_me:15817: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15867,11 +15870,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15870: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15873: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15874: \$? = $ac_status" >&5 + echo "$as_me:15877: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17201,7 +17204,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 17204 "configure"' > conftest.$ac_ext + echo '#line 17207 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -18072,7 +18075,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&2;} esac + +for ac_func in vasnprintf +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_var=no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + LIBM= case $host in *-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) @@ -21905,6 +22011,91 @@ CAIRO_LIBS="$CAIRO_LIBS $XCB_LIBS" +echo "$as_me:$LINENO: checking for some Win32 platform" >&5 +echo $ECHO_N "checking for some Win32 platform... $ECHO_C" >&6 +case "$host" in + *-*-mingw*|*-*-cygwin*) + cairo_platform_win32=yes + ;; + *) + cairo_platform_win32=no + ;; +esac +echo "$as_me:$LINENO: result: $cairo_platform_win32" >&5 +echo "${ECHO_T}$cairo_platform_win32" >&6 + +# Check whether --enable-win32 or --disable-win32 was given. +if test "${enable_win32+set}" = set; then + enableval="$enable_win32" + use_win32=$enableval +else + use_win32="yes" +fi; + +if test "x$cairo_platform_win32" != "xyes" ; then + use_win32=no +fi + +if test "x$use_win32" = "xyes"; then + CAIRO_LIBS="$CAIRO_LIBS -lgdi32 -lmsimg32" +fi + +if test "x$use_win32" != "xyes"; then + WIN32_SURFACE_FEATURE=CAIRO_HAS_NO_WIN32_SURFACE + + +if false; then + CAIRO_HAS_WIN32_SURFACE_TRUE= + CAIRO_HAS_WIN32_SURFACE_FALSE='#' +else + CAIRO_HAS_WIN32_SURFACE_TRUE='#' + CAIRO_HAS_WIN32_SURFACE_FALSE= +fi + +else + WIN32_SURFACE_FEATURE=CAIRO_HAS_WIN32_SURFACE + + +if true; then + CAIRO_HAS_WIN32_SURFACE_TRUE= + CAIRO_HAS_WIN32_SURFACE_FALSE='#' +else + CAIRO_HAS_WIN32_SURFACE_TRUE='#' + CAIRO_HAS_WIN32_SURFACE_FALSE= +fi + +fi + +if test "x$use_win32" != "xyes"; then + WIN32_FONT_FEATURE=CAIRO_HAS_NO_WIN32_FONT + + +if false; then + CAIRO_HAS_WIN32_FONT_TRUE= + CAIRO_HAS_WIN32_FONT_FALSE='#' +else + CAIRO_HAS_WIN32_FONT_TRUE='#' + CAIRO_HAS_WIN32_FONT_FALSE= +fi + +else + WIN32_FONT_FEATURE=CAIRO_HAS_WIN32_FONT + + +if true; then + CAIRO_HAS_WIN32_FONT_TRUE= + CAIRO_HAS_WIN32_FONT_FALSE='#' +else + CAIRO_HAS_WIN32_FONT_TRUE='#' + CAIRO_HAS_WIN32_FONT_FALSE= +fi + +fi + + + + + # Check whether --enable-ps or --disable-ps was given. if test "${enable_ps+set}" = set; then enableval="$enable_ps" @@ -21946,47 +22137,6 @@ CAIRO_LIBS="$CAIRO_LIBS $PS_LIBS" -# Check whether --enable-pdf or --disable-pdf was given. -if test "${enable_pdf+set}" = set; then - enableval="$enable_pdf" - use_pdf=$enableval -else - use_pdf=yes -fi; - -if test "x$use_pdf" != "xyes"; then - PDF_SURFACE_FEATURE=CAIRO_HAS_NO_PDF_SURFACE - - -if false; then - CAIRO_HAS_PDF_SURFACE_TRUE= - CAIRO_HAS_PDF_SURFACE_FALSE='#' -else - CAIRO_HAS_PDF_SURFACE_TRUE='#' - CAIRO_HAS_PDF_SURFACE_FALSE= -fi - -else - PDF_SURFACE_FEATURE=CAIRO_HAS_PDF_SURFACE - PDF_LIBS=-lz - - -if true; then - CAIRO_HAS_PDF_SURFACE_TRUE= - CAIRO_HAS_PDF_SURFACE_FALSE='#' -else - CAIRO_HAS_PDF_SURFACE_TRUE='#' - CAIRO_HAS_PDF_SURFACE_FALSE= -fi - -fi - -CAIRO_LIBS="$CAIRO_LIBS $PDF_LIBS" - - - - - # Check whether --enable-png or --disable-png was given. if test "${enable_png+set}" = set; then enableval="$enable_png" @@ -21996,202 +22146,120 @@ else fi; if test "x$use_png" = "xyes"; then - - succeeded=no - - if test -z "$PKG_CONFIG"; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG - -if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for libpng12" >&5 -echo $ECHO_N "checking for libpng12... $ECHO_C" >&6 - - if $PKG_CONFIG --exists "libpng12" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - succeeded=yes - - echo "$as_me:$LINENO: checking PNG_CFLAGS" >&5 -echo $ECHO_N "checking PNG_CFLAGS... $ECHO_C" >&6 - PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng12"` - echo "$as_me:$LINENO: result: $PNG_CFLAGS" >&5 -echo "${ECHO_T}$PNG_CFLAGS" >&6 - - echo "$as_me:$LINENO: checking PNG_LIBS" >&5 -echo $ECHO_N "checking PNG_LIBS... $ECHO_C" >&6 - PNG_LIBS=`$PKG_CONFIG --libs "libpng12"` - echo "$as_me:$LINENO: result: $PNG_LIBS" >&5 -echo "${ECHO_T}$PNG_LIBS" >&6 - else - PNG_CFLAGS="" - PNG_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - PNG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpng12"` - - fi - - - - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi - - if test $succeeded = yes; then - - PNG_REQUIRES=libpng12 - use_png=yes - else - - - succeeded=no - - if test -z "$PKG_CONFIG"; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG - -if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for libpng10" >&5 -echo $ECHO_N "checking for libpng10... $ECHO_C" >&6 - - if $PKG_CONFIG --exists "libpng10" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - succeeded=yes - - echo "$as_me:$LINENO: checking PNG_CFLAGS" >&5 -echo $ECHO_N "checking PNG_CFLAGS... $ECHO_C" >&6 - PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng10"` - echo "$as_me:$LINENO: result: $PNG_CFLAGS" >&5 -echo "${ECHO_T}$PNG_CFLAGS" >&6 - - echo "$as_me:$LINENO: checking PNG_LIBS" >&5 -echo $ECHO_N "checking PNG_LIBS... $ECHO_C" >&6 - PNG_LIBS=`$PKG_CONFIG --libs "libpng10"` - echo "$as_me:$LINENO: result: $PNG_LIBS" >&5 -echo "${ECHO_T}$PNG_LIBS" >&6 - else - PNG_CFLAGS="" - PNG_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - PNG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpng10"` - - fi - - - - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi - - if test $succeeded = yes; then - - PNG_REQUIRES=libpng10 + use_png=no + # libpng13 is GnuWin32's libpng-1.2.8 :-( + for l in libpng12 libpng13 libpng10 ; do + if $PKG_CONFIG --exists $l ; then + PNG_REQUIRES=$l use_png=yes + break + fi + done + + if test "x$use_png" = "xyes" ; then + # Sets PNG_CFLAGS, PNG_LIBS + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG + +if test -n "$PKG_CONFIG"; then + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." else - use_png="no (requires libpng http://www.libpng.org)" + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo "$as_me:$LINENO: checking for $PNG_REQUIRES" >&5 +echo $ECHO_N "checking for $PNG_REQUIRES... $ECHO_C" >&6 + + if $PKG_CONFIG --exists "$PNG_REQUIRES" ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + succeeded=yes + + echo "$as_me:$LINENO: checking PNG_CFLAGS" >&5 +echo $ECHO_N "checking PNG_CFLAGS... $ECHO_C" >&6 + PNG_CFLAGS=`$PKG_CONFIG --cflags "$PNG_REQUIRES"` + echo "$as_me:$LINENO: result: $PNG_CFLAGS" >&5 +echo "${ECHO_T}$PNG_CFLAGS" >&6 + + echo "$as_me:$LINENO: checking PNG_LIBS" >&5 +echo $ECHO_N "checking PNG_LIBS... $ECHO_C" >&6 + PNG_LIBS=`$PKG_CONFIG --libs "$PNG_REQUIRES"` + echo "$as_me:$LINENO: result: $PNG_LIBS" >&5 +echo "${ECHO_T}$PNG_LIBS" >&6 + else + PNG_CFLAGS="" + PNG_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + PNG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$PNG_REQUIRES"` + echo $PNG_PKG_ERRORS + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi fi + if test $succeeded = yes; then + : + else + { { echo "$as_me:$LINENO: error: Library requirements ($PNG_REQUIRES) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements ($PNG_REQUIRES) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } fi + else + { echo "$as_me:$LINENO: WARNING: Could not find libpng in the pkg-config search path" >&5 +echo "$as_me: WARNING: Could not find libpng in the pkg-config search path" >&2;} + fi fi if test "x$use_png" != "xyes"; then @@ -22290,23 +22358,23 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for glitz >= 0.3.0" >&5 -echo $ECHO_N "checking for glitz >= 0.3.0... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for glitz >= 0.4.0" >&5 +echo $ECHO_N "checking for glitz >= 0.4.0... $ECHO_C" >&6 - if $PKG_CONFIG --exists "glitz >= 0.3.0" ; then + if $PKG_CONFIG --exists "glitz >= 0.4.0" ; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 succeeded=yes echo "$as_me:$LINENO: checking GLITZ_CFLAGS" >&5 echo $ECHO_N "checking GLITZ_CFLAGS... $ECHO_C" >&6 - GLITZ_CFLAGS=`$PKG_CONFIG --cflags "glitz >= 0.3.0"` + GLITZ_CFLAGS=`$PKG_CONFIG --cflags "glitz >= 0.4.0"` echo "$as_me:$LINENO: result: $GLITZ_CFLAGS" >&5 echo "${ECHO_T}$GLITZ_CFLAGS" >&6 echo "$as_me:$LINENO: checking GLITZ_LIBS" >&5 echo $ECHO_N "checking GLITZ_LIBS... $ECHO_C" >&6 - GLITZ_LIBS=`$PKG_CONFIG --libs "glitz >= 0.3.0"` + GLITZ_LIBS=`$PKG_CONFIG --libs "glitz >= 0.4.0"` echo "$as_me:$LINENO: result: $GLITZ_LIBS" >&5 echo "${ECHO_T}$GLITZ_LIBS" >&6 else @@ -22314,7 +22382,7 @@ echo "${ECHO_T}$GLITZ_LIBS" >&6 GLITZ_LIBS="" ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. - GLITZ_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glitz >= 0.3.0"` + GLITZ_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glitz >= 0.4.0"` fi @@ -22440,23 +22508,23 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for libpixman >= 0.1.2" >&5 -echo $ECHO_N "checking for libpixman >= 0.1.2... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for libpixman >= 0.1.4" >&5 +echo $ECHO_N "checking for libpixman >= 0.1.4... $ECHO_C" >&6 - if $PKG_CONFIG --exists "libpixman >= 0.1.2" ; then + if $PKG_CONFIG --exists "libpixman >= 0.1.4" ; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 succeeded=yes echo "$as_me:$LINENO: checking PIXMAN_CFLAGS" >&5 echo $ECHO_N "checking PIXMAN_CFLAGS... $ECHO_C" >&6 - PIXMAN_CFLAGS=`$PKG_CONFIG --cflags "libpixman >= 0.1.2"` + PIXMAN_CFLAGS=`$PKG_CONFIG --cflags "libpixman >= 0.1.4"` echo "$as_me:$LINENO: result: $PIXMAN_CFLAGS" >&5 echo "${ECHO_T}$PIXMAN_CFLAGS" >&6 echo "$as_me:$LINENO: checking PIXMAN_LIBS" >&5 echo $ECHO_N "checking PIXMAN_LIBS... $ECHO_C" >&6 - PIXMAN_LIBS=`$PKG_CONFIG --libs "libpixman >= 0.1.2"` + PIXMAN_LIBS=`$PKG_CONFIG --libs "libpixman >= 0.1.4"` echo "$as_me:$LINENO: result: $PIXMAN_LIBS" >&5 echo "${ECHO_T}$PIXMAN_LIBS" >&6 else @@ -22464,7 +22532,7 @@ echo "${ECHO_T}$PIXMAN_LIBS" >&6 PIXMAN_LIBS="" ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. - PIXMAN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpixman >= 0.1.2"` + PIXMAN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpixman >= 0.1.4"` echo $PIXMAN_PKG_ERRORS fi @@ -22479,8 +22547,8 @@ echo "${ECHO_T}$PIXMAN_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: Library requirements (libpixman >= 0.1.2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements (libpixman >= 0.1.2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { echo "$as_me:$LINENO: error: Library requirements (libpixman >= 0.1.4) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (libpixman >= 0.1.4) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi @@ -22682,6 +22750,8 @@ echo "${ECHO_T}$FREETYPE_VERSION - OK" >&6 FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags` FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` + FREETYPE_REQUIRES=fontconfig + fi @@ -22717,6 +22787,53 @@ fi +# Check whether --enable-pdf or --disable-pdf was given. +if test "${enable_pdf+set}" = set; then + enableval="$enable_pdf" + use_pdf=$enableval +else + use_pdf=yes +fi; + +if test x"$use_freetype" != "xyes" ; then + { echo "$as_me:$LINENO: WARNING: PDF backend requires FreeType, disabling" >&5 +echo "$as_me: WARNING: PDF backend requires FreeType, disabling" >&2;} + use_pdf=no +fi + +if test "x$use_pdf" != "xyes"; then + PDF_SURFACE_FEATURE=CAIRO_HAS_NO_PDF_SURFACE + + +if false; then + CAIRO_HAS_PDF_SURFACE_TRUE= + CAIRO_HAS_PDF_SURFACE_FALSE='#' +else + CAIRO_HAS_PDF_SURFACE_TRUE='#' + CAIRO_HAS_PDF_SURFACE_FALSE= +fi + +else + PDF_SURFACE_FEATURE=CAIRO_HAS_PDF_SURFACE + PDF_LIBS=-lz + + +if true; then + CAIRO_HAS_PDF_SURFACE_TRUE= + CAIRO_HAS_PDF_SURFACE_FALSE='#' +else + CAIRO_HAS_PDF_SURFACE_TRUE='#' + CAIRO_HAS_PDF_SURFACE_FALSE= +fi + +fi + +CAIRO_LIBS="$CAIRO_LIBS $PDF_LIBS" + + + + + # Check whether --enable-atsui or --disable-atsui was given. if test "${enable_atsui+set}" = set; then @@ -23046,7 +23163,116 @@ CAIRO_LIBS="$CAIRO_LIBS" - ac_config_files="$ac_config_files cairo.pc Makefile src/Makefile src/cairo-features.h test/Makefile" + + +# Check whether --with-html-dir or --without-html-dir was given. +if test "${with_html_dir+set}" = set; then + withval="$with_html_dir" + +else + with_html_dir='${datadir}/gtk-doc/html' +fi; + HTML_DIR="$with_html_dir" + + + # Check whether --enable-gtk-doc or --disable-gtk-doc was given. +if test "${enable_gtk_doc+set}" = set; then + enableval="$enable_gtk_doc" + +else + enable_gtk_doc=no +fi; + + have_gtk_doc=no + if test x$enable_gtk_doc = xyes; then + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG + +if test -n "$PKG_CONFIG"; then + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + fi + if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then + have_gtk_doc=yes + fi + + gtk_doc_min_version=1.3 + if test "$have_gtk_doc" = yes; then + echo "$as_me:$LINENO: checking gtk-doc version >= $gtk_doc_min_version" >&5 +echo $ECHO_N "checking gtk-doc version >= $gtk_doc_min_version... $ECHO_C" >&6 + if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + have_gtk_doc=no + fi + fi + + if test "$have_gtk_doc" != yes; then + enable_gtk_doc=no + fi + fi + + + +if test x$enable_gtk_doc = xyes; then + ENABLE_GTK_DOC_TRUE= + ENABLE_GTK_DOC_FALSE='#' +else + ENABLE_GTK_DOC_TRUE='#' + ENABLE_GTK_DOC_FALSE= +fi + + + +if test -n "$LIBTOOL"; then + GTK_DOC_USE_LIBTOOL_TRUE= + GTK_DOC_USE_LIBTOOL_FALSE='#' +else + GTK_DOC_USE_LIBTOOL_TRUE='#' + GTK_DOC_USE_LIBTOOL_FALSE= +fi + + + + ac_config_files="$ac_config_files cairo.pc Makefile src/Makefile src/cairo-features.h test/Makefile doc/Makefile doc/public/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -23208,6 +23434,34 @@ echo "$as_me: error: conditional \"CAIRO_HAS_XCB_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${CAIRO_HAS_WIN32_SURFACE_TRUE}" && test -z "${CAIRO_HAS_WIN32_SURFACE_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"CAIRO_HAS_WIN32_SURFACE\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"CAIRO_HAS_WIN32_SURFACE\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${CAIRO_HAS_WIN32_SURFACE_TRUE}" && test -z "${CAIRO_HAS_WIN32_SURFACE_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"CAIRO_HAS_WIN32_SURFACE\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"CAIRO_HAS_WIN32_SURFACE\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${CAIRO_HAS_WIN32_FONT_TRUE}" && test -z "${CAIRO_HAS_WIN32_FONT_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"CAIRO_HAS_WIN32_FONT\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"CAIRO_HAS_WIN32_FONT\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${CAIRO_HAS_WIN32_FONT_TRUE}" && test -z "${CAIRO_HAS_WIN32_FONT_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"CAIRO_HAS_WIN32_FONT\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"CAIRO_HAS_WIN32_FONT\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${CAIRO_HAS_PS_SURFACE_TRUE}" && test -z "${CAIRO_HAS_PS_SURFACE_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"CAIRO_HAS_PS_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -23222,20 +23476,6 @@ echo "$as_me: error: conditional \"CAIRO_HAS_PS_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${CAIRO_HAS_PDF_SURFACE_TRUE}" && test -z "${CAIRO_HAS_PDF_SURFACE_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"CAIRO_HAS_PDF_SURFACE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"CAIRO_HAS_PDF_SURFACE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${CAIRO_HAS_PDF_SURFACE_TRUE}" && test -z "${CAIRO_HAS_PDF_SURFACE_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"CAIRO_HAS_PDF_SURFACE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"CAIRO_HAS_PDF_SURFACE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi if test -z "${CAIRO_HAS_PNG_SURFACE_TRUE}" && test -z "${CAIRO_HAS_PNG_SURFACE_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"CAIRO_HAS_PNG_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -23278,6 +23518,20 @@ echo "$as_me: error: conditional \"CAIRO_HAS_FT_FONT\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${CAIRO_HAS_PDF_SURFACE_TRUE}" && test -z "${CAIRO_HAS_PDF_SURFACE_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"CAIRO_HAS_PDF_SURFACE\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"CAIRO_HAS_PDF_SURFACE\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${CAIRO_HAS_PDF_SURFACE_TRUE}" && test -z "${CAIRO_HAS_PDF_SURFACE_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"CAIRO_HAS_PDF_SURFACE\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"CAIRO_HAS_PDF_SURFACE\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${CAIRO_HAS_ATSUI_FONT_TRUE}" && test -z "${CAIRO_HAS_ATSUI_FONT_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"CAIRO_HAS_ATSUI_FONT\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -23292,6 +23546,20 @@ echo "$as_me: error: conditional \"CAIRO_HAS_ATSUI_FONT\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -23741,6 +24009,8 @@ do "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/cairo-features.h" ) CONFIG_FILES="$CONFIG_FILES src/cairo-features.h" ;; "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; + "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; + "doc/public/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/public/Makefile" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 @@ -23916,14 +24186,16 @@ s,@XCB_LIBS@,$XCB_LIBS,;t t s,@CAIRO_HAS_XCB_SURFACE_TRUE@,$CAIRO_HAS_XCB_SURFACE_TRUE,;t t s,@CAIRO_HAS_XCB_SURFACE_FALSE@,$CAIRO_HAS_XCB_SURFACE_FALSE,;t t s,@XCB_SURFACE_FEATURE@,$XCB_SURFACE_FEATURE,;t t +s,@CAIRO_HAS_WIN32_SURFACE_TRUE@,$CAIRO_HAS_WIN32_SURFACE_TRUE,;t t +s,@CAIRO_HAS_WIN32_SURFACE_FALSE@,$CAIRO_HAS_WIN32_SURFACE_FALSE,;t t +s,@CAIRO_HAS_WIN32_FONT_TRUE@,$CAIRO_HAS_WIN32_FONT_TRUE,;t t +s,@CAIRO_HAS_WIN32_FONT_FALSE@,$CAIRO_HAS_WIN32_FONT_FALSE,;t t +s,@WIN32_SURFACE_FEATURE@,$WIN32_SURFACE_FEATURE,;t t +s,@WIN32_FONT_FEATURE@,$WIN32_FONT_FEATURE,;t t s,@CAIRO_HAS_PS_SURFACE_TRUE@,$CAIRO_HAS_PS_SURFACE_TRUE,;t t s,@CAIRO_HAS_PS_SURFACE_FALSE@,$CAIRO_HAS_PS_SURFACE_FALSE,;t t s,@PS_SURFACE_FEATURE@,$PS_SURFACE_FEATURE,;t t s,@PS_LIBS@,$PS_LIBS,;t t -s,@CAIRO_HAS_PDF_SURFACE_TRUE@,$CAIRO_HAS_PDF_SURFACE_TRUE,;t t -s,@CAIRO_HAS_PDF_SURFACE_FALSE@,$CAIRO_HAS_PDF_SURFACE_FALSE,;t t -s,@PDF_SURFACE_FEATURE@,$PDF_SURFACE_FEATURE,;t t -s,@PDF_LIBS@,$PDF_LIBS,;t t s,@PNG_CFLAGS@,$PNG_CFLAGS,;t t s,@PNG_LIBS@,$PNG_LIBS,;t t s,@CAIRO_HAS_PNG_SURFACE_TRUE@,$CAIRO_HAS_PNG_SURFACE_TRUE,;t t @@ -23944,14 +24216,24 @@ s,@FONTCONFIG_LIBS@,$FONTCONFIG_LIBS,;t t s,@FREETYPE_CONFIG@,$FREETYPE_CONFIG,;t t s,@FREETYPE_CFLAGS@,$FREETYPE_CFLAGS,;t t s,@FREETYPE_LIBS@,$FREETYPE_LIBS,;t t +s,@FREETYPE_REQUIRES@,$FREETYPE_REQUIRES,;t t s,@CAIRO_HAS_FT_FONT_TRUE@,$CAIRO_HAS_FT_FONT_TRUE,;t t s,@CAIRO_HAS_FT_FONT_FALSE@,$CAIRO_HAS_FT_FONT_FALSE,;t t s,@FT_FONT_FEATURE@,$FT_FONT_FEATURE,;t t +s,@CAIRO_HAS_PDF_SURFACE_TRUE@,$CAIRO_HAS_PDF_SURFACE_TRUE,;t t +s,@CAIRO_HAS_PDF_SURFACE_FALSE@,$CAIRO_HAS_PDF_SURFACE_FALSE,;t t +s,@PDF_SURFACE_FEATURE@,$PDF_SURFACE_FEATURE,;t t +s,@PDF_LIBS@,$PDF_LIBS,;t t s,@CAIRO_HAS_ATSUI_FONT_TRUE@,$CAIRO_HAS_ATSUI_FONT_TRUE,;t t s,@CAIRO_HAS_ATSUI_FONT_FALSE@,$CAIRO_HAS_ATSUI_FONT_FALSE,;t t s,@ATSUI_FONT_FEATURE@,$ATSUI_FONT_FEATURE,;t t s,@CAIRO_CFLAGS@,$CAIRO_CFLAGS,;t t s,@CAIRO_LIBS@,$CAIRO_LIBS,;t t +s,@HTML_DIR@,$HTML_DIR,;t t +s,@ENABLE_GTK_DOC_TRUE@,$ENABLE_GTK_DOC_TRUE,;t t +s,@ENABLE_GTK_DOC_FALSE@,$ENABLE_GTK_DOC_FALSE,;t t +s,@GTK_DOC_USE_LIBTOOL_TRUE@,$GTK_DOC_USE_LIBTOOL_TRUE,;t t +s,@GTK_DOC_USE_LIBTOOL_FALSE@,$GTK_DOC_USE_LIBTOOL_FALSE,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF @@ -24676,26 +24958,30 @@ echo "cairo will be compiled with the following surface backends:" echo " Xlib: $use_xlib" echo " Quartz: $use_quartz" echo " XCB: $use_xcb" +echo " Win32: $use_win32" echo " PostScript: $use_ps" echo " PDF: $use_pdf" echo " PNG: $use_png" echo " glitz: $use_glitz" echo "" echo "and the following font backends:" -echo " freetype: $use_freetype" -echo " atsui: $use_atsui" +echo " FreeType: $use_freetype" +echo " Win32: $use_win32" +echo " ATSUI: $use_atsui" echo "" if test x"$use_freetype" != "xyes" && \ + test x"$use_win32" != "xyes" && \ test x"$use_atsui" != "xyes" ; then { { echo "$as_me:$LINENO: error: Cairo requires at least one font backend. - Please install freetype and fontconfig, then try again: - http://freetype.org/ http://fontconfig.org/ - " >&5 + Please install freetype and fontconfig, then try again: + http://freetype.org/ http://fontconfig.org/ + " >&5 echo "$as_me: error: Cairo requires at least one font backend. - Please install freetype and fontconfig, then try again: - http://freetype.org/ http://fontconfig.org/ - " >&2;} + Please install freetype and fontconfig, then try again: + http://freetype.org/ http://fontconfig.org/ + " >&2;} { (exit 1); exit 1; }; } fi + diff --git a/gfx/cairo/cairo/configure.in b/gfx/cairo/cairo/configure.in index 2aa6073e2e6f..6fd87280db3c 100644 --- a/gfx/cairo/cairo/configure.in +++ b/gfx/cairo/cairo/configure.in @@ -1,9 +1,11 @@ +AC_PREREQ(2.54) + AC_INIT(src/cairo.h) dnl =========================================================================== # Package version number, (as distinct from shared library version) -CAIRO_VERSION=0.3.0 +CAIRO_VERSION=0.4.0 # libtool shared library version @@ -35,6 +37,8 @@ AM_PROG_LIBTOOL AC_STDC_HEADERS AC_C_BIGENDIAN +AC_CHECK_FUNCS(vasnprintf) + AC_CHECK_LIBM LIBS="$LIBS $LIBM" @@ -120,6 +124,50 @@ AC_SUBST(XCB_SURFACE_FEATURE) dnl =========================================================================== +AC_MSG_CHECKING([for some Win32 platform]) +case "$host" in + *-*-mingw*|*-*-cygwin*) + cairo_platform_win32=yes + ;; + *) + cairo_platform_win32=no + ;; +esac +AC_MSG_RESULT([$cairo_platform_win32]) + +AC_ARG_ENABLE(win32, + [ --disable-win32 Disable cairo's Microsoft Windows backend], + [use_win32=$enableval], [use_win32="yes"]) + +if test "x$cairo_platform_win32" != "xyes" ; then + use_win32=no +fi + +if test "x$use_win32" = "xyes"; then + CAIRO_LIBS="$CAIRO_LIBS -lgdi32 -lmsimg32" +fi + +if test "x$use_win32" != "xyes"; then + WIN32_SURFACE_FEATURE=CAIRO_HAS_NO_WIN32_SURFACE + AM_CONDITIONAL(CAIRO_HAS_WIN32_SURFACE, false) +else + WIN32_SURFACE_FEATURE=CAIRO_HAS_WIN32_SURFACE + AM_CONDITIONAL(CAIRO_HAS_WIN32_SURFACE, true) +fi + +if test "x$use_win32" != "xyes"; then + WIN32_FONT_FEATURE=CAIRO_HAS_NO_WIN32_FONT + AM_CONDITIONAL(CAIRO_HAS_WIN32_FONT, false) +else + WIN32_FONT_FEATURE=CAIRO_HAS_WIN32_FONT + AM_CONDITIONAL(CAIRO_HAS_WIN32_FONT, true) +fi + +AC_SUBST(WIN32_SURFACE_FEATURE) +AC_SUBST(WIN32_FONT_FEATURE) + +dnl =========================================================================== + AC_ARG_ENABLE(ps, [ --disable-ps Disable cairo's PostScript backend], [use_ps=$enableval], [use_ps=yes]) @@ -140,37 +188,27 @@ AC_SUBST(PS_LIBS) dnl =========================================================================== -AC_ARG_ENABLE(pdf, - [ --disable-pdf Disable cairo's PDF backend], - [use_pdf=$enableval], [use_pdf=yes]) - -if test "x$use_pdf" != "xyes"; then - PDF_SURFACE_FEATURE=CAIRO_HAS_NO_PDF_SURFACE - AM_CONDITIONAL(CAIRO_HAS_PDF_SURFACE, false) -else - PDF_SURFACE_FEATURE=CAIRO_HAS_PDF_SURFACE - PDF_LIBS=-lz - AM_CONDITIONAL(CAIRO_HAS_PDF_SURFACE, true) -fi - -CAIRO_LIBS="$CAIRO_LIBS $PDF_LIBS" - -AC_SUBST(PDF_SURFACE_FEATURE) -AC_SUBST(PDF_LIBS) - -dnl =========================================================================== - AC_ARG_ENABLE(png, [ --disable-png Disable cairo's PNG backend], [use_png=$enableval], [use_png=yes]) if test "x$use_png" = "xyes"; then - PKG_CHECK_MODULES(PNG, libpng12, [ - PNG_REQUIRES=libpng12 - use_png=yes], [ - PKG_CHECK_MODULES(PNG, libpng10, [ - PNG_REQUIRES=libpng10 - use_png=yes], [use_png="no (requires libpng http://www.libpng.org)"])]) + use_png=no + # libpng13 is GnuWin32's libpng-1.2.8 :-( + for l in libpng12 libpng13 libpng10 ; do + if $PKG_CONFIG --exists $l ; then + PNG_REQUIRES=$l + use_png=yes + break + fi + done + + if test "x$use_png" = "xyes" ; then + # Sets PNG_CFLAGS, PNG_LIBS + PKG_CHECK_MODULES(PNG, $PNG_REQUIRES) + else + AC_MSG_WARN([Could not find libpng in the pkg-config search path]) + fi fi if test "x$use_png" != "xyes"; then @@ -194,7 +232,7 @@ AC_ARG_ENABLE(glitz, [use_glitz=$enableval], [use_glitz=yes]) if test "x$use_glitz" = "xyes"; then - PKG_CHECK_MODULES(GLITZ, glitz >= 0.3.0, [ + PKG_CHECK_MODULES(GLITZ, glitz >= 0.4.0, [ GLITZ_REQUIRES=glitz use_glitz=yes], [use_glitz="no (requires glitz http://freedesktop.org/software/glitz)"]) fi @@ -229,7 +267,7 @@ AC_SUBST(SANITY_CHECKING_FEATURE) dnl =========================================================================== -PKG_CHECK_MODULES(PIXMAN, libpixman >= 0.1.2) +PKG_CHECK_MODULES(PIXMAN, libpixman >= 0.1.4) CAIRO_CFLAGS="$CAIRO_CFLAGS $PIXMAN_CFLAGS" CAIRO_LIBS="$CAIRO_LIBS $PIXMAN_LIBS" @@ -285,9 +323,11 @@ if test "x$use_freetype" = "xyes"; then AC_MSG_RESULT($FREETYPE_VERSION - OK) FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags` - FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` + FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` + FREETYPE_REQUIRES=fontconfig AC_SUBST(FREETYPE_CFLAGS) AC_SUBST(FREETYPE_LIBS) + AC_SUBST(FREETYPE_REQUIRES) fi CAIRO_CFLAGS="$CAIRO_CFLAGS $FREETYPE_CFLAGS" @@ -304,6 +344,31 @@ AC_SUBST(FT_FONT_FEATURE) dnl =========================================================================== +AC_ARG_ENABLE(pdf, + [ --disable-pdf Disable cairo's PDF backend], + [use_pdf=$enableval], [use_pdf=yes]) + +if test x"$use_freetype" != "xyes" ; then + AC_MSG_WARN([PDF backend requires FreeType, disabling]) + use_pdf=no +fi + +if test "x$use_pdf" != "xyes"; then + PDF_SURFACE_FEATURE=CAIRO_HAS_NO_PDF_SURFACE + AM_CONDITIONAL(CAIRO_HAS_PDF_SURFACE, false) +else + PDF_SURFACE_FEATURE=CAIRO_HAS_PDF_SURFACE + PDF_LIBS=-lz + AM_CONDITIONAL(CAIRO_HAS_PDF_SURFACE, true) +fi + +CAIRO_LIBS="$CAIRO_LIBS $PDF_LIBS" + +AC_SUBST(PDF_SURFACE_FEATURE) +AC_SUBST(PDF_LIBS) + +dnl =========================================================================== + dnl This check should default to 'yes' once we have code to actually dnl check for the atsui font backend. @@ -346,6 +411,9 @@ AC_SUBST(CAIRO_CFLAGS) AC_SUBST(CAIRO_LIBS) dnl =========================================================================== +dnl Check for gtk-doc and docbook + +GTK_DOC_CHECK([1.3]) AC_OUTPUT([ cairo.pc @@ -353,6 +421,8 @@ Makefile src/Makefile src/cairo-features.h test/Makefile +doc/Makefile +doc/public/Makefile ]) dnl =========================================================================== @@ -362,21 +432,25 @@ echo "cairo will be compiled with the following surface backends:" echo " Xlib: $use_xlib" echo " Quartz: $use_quartz" echo " XCB: $use_xcb" +echo " Win32: $use_win32" echo " PostScript: $use_ps" echo " PDF: $use_pdf" echo " PNG: $use_png" echo " glitz: $use_glitz" echo "" echo "and the following font backends:" -echo " freetype: $use_freetype" -echo " atsui: $use_atsui" +echo " FreeType: $use_freetype" +echo " Win32: $use_win32" +echo " ATSUI: $use_atsui" echo "" if test x"$use_freetype" != "xyes" && \ + test x"$use_win32" != "xyes" && \ test x"$use_atsui" != "xyes" ; then AC_MSG_ERROR([Cairo requires at least one font backend. - Please install freetype and fontconfig, then try again: - http://freetype.org/ http://fontconfig.org/ - ]) + Please install freetype and fontconfig, then try again: + http://freetype.org/ http://fontconfig.org/ + ]) fi + diff --git a/gfx/cairo/cairo/doc/Makefile.am b/gfx/cairo/cairo/doc/Makefile.am new file mode 100644 index 000000000000..411ad5c930a8 --- /dev/null +++ b/gfx/cairo/cairo/doc/Makefile.am @@ -0,0 +1,2 @@ +SUBDIRS=public + diff --git a/gfx/cairo/cairo/doc/Makefile.in b/gfx/cairo/cairo/doc/Makefile.in new file mode 100644 index 000000000000..dd16f9caf1db --- /dev/null +++ b/gfx/cairo/cairo/doc/Makefile.in @@ -0,0 +1,526 @@ +# Makefile.in generated by automake 1.9.2 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = doc +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +ATSUI_FONT_FEATURE = @ATSUI_FONT_FEATURE@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CAIRO_CFLAGS = @CAIRO_CFLAGS@ +CAIRO_HAS_ATSUI_FONT_FALSE = @CAIRO_HAS_ATSUI_FONT_FALSE@ +CAIRO_HAS_ATSUI_FONT_TRUE = @CAIRO_HAS_ATSUI_FONT_TRUE@ +CAIRO_HAS_FT_FONT_FALSE = @CAIRO_HAS_FT_FONT_FALSE@ +CAIRO_HAS_FT_FONT_TRUE = @CAIRO_HAS_FT_FONT_TRUE@ +CAIRO_HAS_GLITZ_SURFACE_FALSE = @CAIRO_HAS_GLITZ_SURFACE_FALSE@ +CAIRO_HAS_GLITZ_SURFACE_TRUE = @CAIRO_HAS_GLITZ_SURFACE_TRUE@ +CAIRO_HAS_PDF_SURFACE_FALSE = @CAIRO_HAS_PDF_SURFACE_FALSE@ +CAIRO_HAS_PDF_SURFACE_TRUE = @CAIRO_HAS_PDF_SURFACE_TRUE@ +CAIRO_HAS_PNG_SURFACE_FALSE = @CAIRO_HAS_PNG_SURFACE_FALSE@ +CAIRO_HAS_PNG_SURFACE_TRUE = @CAIRO_HAS_PNG_SURFACE_TRUE@ +CAIRO_HAS_PS_SURFACE_FALSE = @CAIRO_HAS_PS_SURFACE_FALSE@ +CAIRO_HAS_PS_SURFACE_TRUE = @CAIRO_HAS_PS_SURFACE_TRUE@ +CAIRO_HAS_QUARTZ_SURFACE_FALSE = @CAIRO_HAS_QUARTZ_SURFACE_FALSE@ +CAIRO_HAS_QUARTZ_SURFACE_TRUE = @CAIRO_HAS_QUARTZ_SURFACE_TRUE@ +CAIRO_HAS_WIN32_FONT_FALSE = @CAIRO_HAS_WIN32_FONT_FALSE@ +CAIRO_HAS_WIN32_FONT_TRUE = @CAIRO_HAS_WIN32_FONT_TRUE@ +CAIRO_HAS_WIN32_SURFACE_FALSE = @CAIRO_HAS_WIN32_SURFACE_FALSE@ +CAIRO_HAS_WIN32_SURFACE_TRUE = @CAIRO_HAS_WIN32_SURFACE_TRUE@ +CAIRO_HAS_XCB_SURFACE_FALSE = @CAIRO_HAS_XCB_SURFACE_FALSE@ +CAIRO_HAS_XCB_SURFACE_TRUE = @CAIRO_HAS_XCB_SURFACE_TRUE@ +CAIRO_HAS_XLIB_SURFACE_FALSE = @CAIRO_HAS_XLIB_SURFACE_FALSE@ +CAIRO_HAS_XLIB_SURFACE_TRUE = @CAIRO_HAS_XLIB_SURFACE_TRUE@ +CAIRO_LIBS = @CAIRO_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ +FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ +FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_LIBS = @FREETYPE_LIBS@ +FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +FT_FONT_FEATURE = @FT_FONT_FEATURE@ +GLITZ_CFLAGS = @GLITZ_CFLAGS@ +GLITZ_LIBS = @GLITZ_LIBS@ +GLITZ_REQUIRES = @GLITZ_REQUIRES@ +GLITZ_SURFACE_FEATURE = @GLITZ_SURFACE_FEATURE@ +GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +HTML_DIR = @HTML_DIR@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PDF_LIBS = @PDF_LIBS@ +PDF_SURFACE_FEATURE = @PDF_SURFACE_FEATURE@ +PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ +PIXMAN_LIBS = @PIXMAN_LIBS@ +PKG_CONFIG = @PKG_CONFIG@ +PNG_CFLAGS = @PNG_CFLAGS@ +PNG_LIBS = @PNG_LIBS@ +PNG_REQUIRES = @PNG_REQUIRES@ +PNG_SURFACE_FEATURE = @PNG_SURFACE_FEATURE@ +PS_LIBS = @PS_LIBS@ +PS_SURFACE_FEATURE = @PS_SURFACE_FEATURE@ +QUARTZ_SURFACE_FEATURE = @QUARTZ_SURFACE_FEATURE@ +RANLIB = @RANLIB@ +SANITY_CHECKING_FEATURE = @SANITY_CHECKING_FEATURE@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +VERSION_INFO = @VERSION_INFO@ +WIN32_FONT_FEATURE = @WIN32_FONT_FEATURE@ +WIN32_SURFACE_FEATURE = @WIN32_SURFACE_FEATURE@ +XCB_CFLAGS = @XCB_CFLAGS@ +XCB_LIBS = @XCB_LIBS@ +XCB_SURFACE_FEATURE = @XCB_SURFACE_FEATURE@ +XLIB_SURFACE_FEATURE = @XLIB_SURFACE_FEATURE@ +XRENDER_CFLAGS = @XRENDER_CFLAGS@ +XRENDER_LIBS = @XRENDER_LIBS@ +XRENDER_REQUIRES = @XRENDER_REQUIRES@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +SUBDIRS = public +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu doc/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool \ + distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +info: info-recursive + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-recursive + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-info-am + +uninstall-info: uninstall-info-recursive + +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ + clean clean-generic clean-libtool clean-recursive ctags \ + ctags-recursive distclean distclean-generic distclean-libtool \ + distclean-recursive distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-generic mostlyclean-libtool \ + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-info-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/gfx/cairo/cairo/doc/public/Makefile.am b/gfx/cairo/cairo/doc/public/Makefile.am new file mode 100644 index 000000000000..b993bb9787ca --- /dev/null +++ b/gfx/cairo/cairo/doc/public/Makefile.am @@ -0,0 +1,46 @@ +## Process this file with automake to create Makefile.in. + +AUTOMAKE_OPTIONS = 1.7 + +# The name of the module. +DOC_MODULE=cairo + +# The top-level SGML file. +DOC_MAIN_SGML_FILE=cairo-docs.xml + +# Extra options to supply to gtkdoc-scan +SCAN_OPTIONS=--deprecated-guards="CAIRO_DISABLE_DEPRECATED" + +# The directory containing the source code. Relative to $(srcdir) +DOC_SOURCE_DIR=../../src + +# Used for dependencies +HFILE_GLOB=$(top_srcdir)/src/*.h +CFILE_GLOB=$(top_srcdir)/src/*.c $(top_srcdir)/src/*.h + +# Headers to ignore +IGNORE_HFILES= \ + cairo-features.h \ + cairo-ft-private.h \ + cairo-win32-private.h \ + cairoint.h \ + cairo-wideint.h + +# CFLAGS and LDFLAGS for compiling scan program. Only needed +# if $(DOC_MODULE).types is non-empty. +INCLUDES = +GTKDOC_LIBS = + +# Extra options to supply to gtkdoc-mkdb +MKDB_OPTIONS=--sgml-mode --output-format=xml + +# Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE) +content_files = + +# Images to copy into HTML directory +HTML_IMAGES = + +# Extra options to supply to gtkdoc-fixref +FIXXREF_OPTIONS= + +include $(top_srcdir)/gtk-doc.make diff --git a/gfx/cairo/cairo/doc/public/Makefile.in b/gfx/cairo/cairo/doc/public/Makefile.in new file mode 100644 index 000000000000..7d3f8dc07707 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/Makefile.in @@ -0,0 +1,584 @@ +# Makefile.in generated by automake 1.9.2 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# +# *** NOTE *** this file is checked into CVS for convenience only. +# DO NOT EDIT. Rather get changes into upstream gtk-doc and then +# update this version from the gtk-doc version. +# + +# -*- mode: makefile -*- + +#################################### +# Everything below here is generic # +#################################### +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/gtk-doc.make +subdir = doc/public +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +ATSUI_FONT_FEATURE = @ATSUI_FONT_FEATURE@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CAIRO_CFLAGS = @CAIRO_CFLAGS@ +CAIRO_HAS_ATSUI_FONT_FALSE = @CAIRO_HAS_ATSUI_FONT_FALSE@ +CAIRO_HAS_ATSUI_FONT_TRUE = @CAIRO_HAS_ATSUI_FONT_TRUE@ +CAIRO_HAS_FT_FONT_FALSE = @CAIRO_HAS_FT_FONT_FALSE@ +CAIRO_HAS_FT_FONT_TRUE = @CAIRO_HAS_FT_FONT_TRUE@ +CAIRO_HAS_GLITZ_SURFACE_FALSE = @CAIRO_HAS_GLITZ_SURFACE_FALSE@ +CAIRO_HAS_GLITZ_SURFACE_TRUE = @CAIRO_HAS_GLITZ_SURFACE_TRUE@ +CAIRO_HAS_PDF_SURFACE_FALSE = @CAIRO_HAS_PDF_SURFACE_FALSE@ +CAIRO_HAS_PDF_SURFACE_TRUE = @CAIRO_HAS_PDF_SURFACE_TRUE@ +CAIRO_HAS_PNG_SURFACE_FALSE = @CAIRO_HAS_PNG_SURFACE_FALSE@ +CAIRO_HAS_PNG_SURFACE_TRUE = @CAIRO_HAS_PNG_SURFACE_TRUE@ +CAIRO_HAS_PS_SURFACE_FALSE = @CAIRO_HAS_PS_SURFACE_FALSE@ +CAIRO_HAS_PS_SURFACE_TRUE = @CAIRO_HAS_PS_SURFACE_TRUE@ +CAIRO_HAS_QUARTZ_SURFACE_FALSE = @CAIRO_HAS_QUARTZ_SURFACE_FALSE@ +CAIRO_HAS_QUARTZ_SURFACE_TRUE = @CAIRO_HAS_QUARTZ_SURFACE_TRUE@ +CAIRO_HAS_WIN32_FONT_FALSE = @CAIRO_HAS_WIN32_FONT_FALSE@ +CAIRO_HAS_WIN32_FONT_TRUE = @CAIRO_HAS_WIN32_FONT_TRUE@ +CAIRO_HAS_WIN32_SURFACE_FALSE = @CAIRO_HAS_WIN32_SURFACE_FALSE@ +CAIRO_HAS_WIN32_SURFACE_TRUE = @CAIRO_HAS_WIN32_SURFACE_TRUE@ +CAIRO_HAS_XCB_SURFACE_FALSE = @CAIRO_HAS_XCB_SURFACE_FALSE@ +CAIRO_HAS_XCB_SURFACE_TRUE = @CAIRO_HAS_XCB_SURFACE_TRUE@ +CAIRO_HAS_XLIB_SURFACE_FALSE = @CAIRO_HAS_XLIB_SURFACE_FALSE@ +CAIRO_HAS_XLIB_SURFACE_TRUE = @CAIRO_HAS_XLIB_SURFACE_TRUE@ +CAIRO_LIBS = @CAIRO_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ +FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ +FREETYPE_CONFIG = @FREETYPE_CONFIG@ +FREETYPE_LIBS = @FREETYPE_LIBS@ +FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +FT_FONT_FEATURE = @FT_FONT_FEATURE@ +GLITZ_CFLAGS = @GLITZ_CFLAGS@ +GLITZ_LIBS = @GLITZ_LIBS@ +GLITZ_REQUIRES = @GLITZ_REQUIRES@ +GLITZ_SURFACE_FEATURE = @GLITZ_SURFACE_FEATURE@ +GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +HTML_DIR = @HTML_DIR@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PDF_LIBS = @PDF_LIBS@ +PDF_SURFACE_FEATURE = @PDF_SURFACE_FEATURE@ +PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ +PIXMAN_LIBS = @PIXMAN_LIBS@ +PKG_CONFIG = @PKG_CONFIG@ +PNG_CFLAGS = @PNG_CFLAGS@ +PNG_LIBS = @PNG_LIBS@ +PNG_REQUIRES = @PNG_REQUIRES@ +PNG_SURFACE_FEATURE = @PNG_SURFACE_FEATURE@ +PS_LIBS = @PS_LIBS@ +PS_SURFACE_FEATURE = @PS_SURFACE_FEATURE@ +QUARTZ_SURFACE_FEATURE = @QUARTZ_SURFACE_FEATURE@ +RANLIB = @RANLIB@ +SANITY_CHECKING_FEATURE = @SANITY_CHECKING_FEATURE@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +VERSION_INFO = @VERSION_INFO@ +WIN32_FONT_FEATURE = @WIN32_FONT_FEATURE@ +WIN32_SURFACE_FEATURE = @WIN32_SURFACE_FEATURE@ +XCB_CFLAGS = @XCB_CFLAGS@ +XCB_LIBS = @XCB_LIBS@ +XCB_SURFACE_FEATURE = @XCB_SURFACE_FEATURE@ +XLIB_SURFACE_FEATURE = @XLIB_SURFACE_FEATURE@ +XRENDER_CFLAGS = @XRENDER_CFLAGS@ +XRENDER_LIBS = @XRENDER_LIBS@ +XRENDER_REQUIRES = @XRENDER_REQUIRES@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +AUTOMAKE_OPTIONS = 1.7 + +# The name of the module. +DOC_MODULE = cairo + +# The top-level SGML file. +DOC_MAIN_SGML_FILE = cairo-docs.xml + +# Extra options to supply to gtkdoc-scan +SCAN_OPTIONS = --deprecated-guards="CAIRO_DISABLE_DEPRECATED" + +# The directory containing the source code. Relative to $(srcdir) +DOC_SOURCE_DIR = ../../src + +# Used for dependencies +HFILE_GLOB = $(top_srcdir)/src/*.h +CFILE_GLOB = $(top_srcdir)/src/*.c $(top_srcdir)/src/*.h + +# Headers to ignore +IGNORE_HFILES = \ + cairo-features.h \ + cairo-ft-private.h \ + cairo-win32-private.h \ + cairoint.h \ + cairo-wideint.h + + +# CFLAGS and LDFLAGS for compiling scan program. Only needed +# if $(DOC_MODULE).types is non-empty. +INCLUDES = +GTKDOC_LIBS = + +# Extra options to supply to gtkdoc-mkdb +MKDB_OPTIONS = --sgml-mode --output-format=xml + +# Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE) +content_files = + +# Images to copy into HTML directory +HTML_IMAGES = + +# Extra options to supply to gtkdoc-fixref +FIXXREF_OPTIONS = +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) + +# We set GPATH here; this gives us semantics for GNU make +# which are more like other make's VPATH, when it comes to +# whether a source that is a target of one rule is then +# searched for in VPATH/GPATH. +# +GPATH = $(srcdir) +TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) +EXTRA_DIST = \ + $(content_files) \ + $(HTML_IMAGES) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE).types \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt + +DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ + $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + +SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ + $(DOC_MODULE).interfaces \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/gtk-doc.make $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/public/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu doc/public/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + $(mkdir_p) $(distdir)/../.. + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook +check-am: all-am +check: check-am +all-am: Makefile all-local +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-local mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-data-local + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic \ + maintainer-clean-local + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am uninstall-local + +.PHONY: all all-am all-local check check-am clean clean-generic \ + clean-libtool clean-local dist-hook distclean \ + distclean-generic distclean-libtool distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-data-local install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic \ + maintainer-clean-local mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am uninstall-local + + +@ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp + +#### scan #### + +@ENABLE_GTK_DOC_TRUE@scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) +@ENABLE_GTK_DOC_TRUE@ @echo '*** Scanning header files ***' +@ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) +@ENABLE_GTK_DOC_TRUE@ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \ +@ENABLE_GTK_DOC_TRUE@ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ +@ENABLE_GTK_DOC_TRUE@ else \ +@ENABLE_GTK_DOC_TRUE@ cd $(srcdir) ; \ +@ENABLE_GTK_DOC_TRUE@ for i in $(SCANOBJ_FILES) ; do \ +@ENABLE_GTK_DOC_TRUE@ test -f $$i || touch $$i ; \ +@ENABLE_GTK_DOC_TRUE@ done \ +@ENABLE_GTK_DOC_TRUE@ fi +@ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && \ +@ENABLE_GTK_DOC_TRUE@ gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) +@ENABLE_GTK_DOC_TRUE@ touch scan-build.stamp + +@ENABLE_GTK_DOC_TRUE@$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp +@ENABLE_GTK_DOC_TRUE@ @true + +#### templates #### + +@ENABLE_GTK_DOC_TRUE@tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt +@ENABLE_GTK_DOC_TRUE@ @echo '*** Rebuilding template files ***' +@ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) +@ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) +@ENABLE_GTK_DOC_TRUE@ touch tmpl-build.stamp + +@ENABLE_GTK_DOC_TRUE@tmpl.stamp: tmpl-build.stamp +@ENABLE_GTK_DOC_TRUE@ @true + +#### xml #### + +@ENABLE_GTK_DOC_TRUE@sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml +@ENABLE_GTK_DOC_TRUE@ @echo '*** Building XML ***' +@ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) +@ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && \ +@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml $(MKDB_OPTIONS) +@ENABLE_GTK_DOC_TRUE@ touch sgml-build.stamp + +@ENABLE_GTK_DOC_TRUE@sgml.stamp: sgml-build.stamp +@ENABLE_GTK_DOC_TRUE@ @true + +#### html #### + +@ENABLE_GTK_DOC_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +@ENABLE_GTK_DOC_TRUE@ @echo '*** Building HTML ***' +@ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) +@ENABLE_GTK_DOC_TRUE@ rm -rf $(srcdir)/html +@ENABLE_GTK_DOC_TRUE@ mkdir $(srcdir)/html +@ENABLE_GTK_DOC_TRUE@ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) +@ENABLE_GTK_DOC_TRUE@ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) +@ENABLE_GTK_DOC_TRUE@ @echo '-- Fixing Crossreferences' +@ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +@ENABLE_GTK_DOC_TRUE@ touch html-build.stamp +@ENABLE_GTK_DOC_FALSE@all-local: + +############## + +clean-local: + rm -f *~ *.bak + rm -rf .libs + +maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + +install-data-local: + installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ + $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ + for i in $$installfiles; do \ + echo '-- Installing '$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ + echo '-- Installing $(srcdir)/html/index.sgml' ; \ + $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ + fi + +uninstall-local: + rm -f $(DESTDIR)$(TARGET_DIR)/* + +# +# Require gtk-doc when making dist +# +@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: +@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: +@ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" +@ENABLE_GTK_DOC_FALSE@ @false + +# XXX: Before this was: +# dist-hook: dist-check-gtkdoc dist-hook-local +# which seems reasonable, but for some reason the dist-check-gtkdoc +# was always failing on me, even though I do have gtk-doc installed +# and it is successfully building the documentation. + +dist-hook: dist-hook-local + mkdir $(distdir)/tmpl + mkdir $(distdir)/xml + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl + -cp $(srcdir)/xml/*.xml $(distdir)/xml + -cp $(srcdir)/html/* $(distdir)/html + +.PHONY : dist-hook-local +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/gfx/cairo/cairo/doc/public/cairo-docs.xml b/gfx/cairo/cairo/doc/public/cairo-docs.xml new file mode 100644 index 000000000000..2a4cdae8a693 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/cairo-docs.xml @@ -0,0 +1,31 @@ + + + +Cairo: A Vector Graphics Library + + Tutorial + + + Reference + + + + + + + + + + + + + + + + + + + + + diff --git a/gfx/cairo/cairo/doc/public/cairo-overrides.txt b/gfx/cairo/cairo/doc/public/cairo-overrides.txt new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/gfx/cairo/cairo/doc/public/cairo-sections.txt b/gfx/cairo/cairo/doc/public/cairo-sections.txt new file mode 100644 index 000000000000..3da0fa8018cb --- /dev/null +++ b/gfx/cairo/cairo/doc/public/cairo-sections.txt @@ -0,0 +1,251 @@ +
+cairo-atsui +ATSUI Fonts +cairo_atsui_font_create +
+ +
+cairo-ft +FreeType Fonts +cairo_ft_font_create +cairo_ft_font_create_for_ft_face +cairo_ft_font_lock_face +cairo_ft_font_unlock_face +cairo_ft_font_get_pattern +
+ +
+cairo-glitz +Glitz backend +cairo_set_target_glitz +cairo_glitz_surface_create +
+ +
+cairo-pdf +PDF Backend +cairo_set_target_pdf +cairo_pdf_surface_create +
+ +
+cairo-png +PNG Backend +cairo_set_target_png +cairo_png_surface_create +
+ +
+cairo-ps +PS Backend +cairo_set_target_ps +cairo_ps_surface_create +
+ +
+cairo-quartz +Quartz Backend +cairo_set_target_quartz_context +cairo_quartz_surface_create +
+ +
+cairo-win32 +Microsoft Windows Backend +cairo_set_target_win32 +cairo_win32_surface_create +cairo_win32_font_create_for_logfontw +cairo_win32_font_select_font +cairo_win32_font_done_font +cairo_win32_font_get_scale_factor +
+ +
+cairo-xcb +XCB Backend +cairo_set_target_xcb +
+ +
+cairo-xlib +XLib Backend +cairo_set_target_drawable +cairo_xlib_surface_create +
+ +
+cairo-surface +cairo_surface_t +cairo_surface_t +cairo_surface_create_for_image +cairo_surface_create_similar +cairo_surface_reference +cairo_surface_destroy +cairo_surface_set_repeat +cairo_surface_set_matrix +cairo_surface_get_matrix +cairo_surface_set_filter +cairo_surface_get_filter +
+ +
+cairo-pattern +cairo_pattern_t +cairo_pattern_t +cairo_pattern_create_for_surface +cairo_pattern_create_linear +cairo_pattern_create_radial +cairo_pattern_reference +cairo_pattern_destroy +cairo_pattern_add_color_stop +cairo_pattern_set_matrix +cairo_pattern_get_matrix +cairo_extend_t +cairo_pattern_set_extend +cairo_pattern_get_extend +cairo_pattern_set_filter +cairo_pattern_get_filter +
+ +
+cairo-matrix +cairo_matrix_t +cairo_matrix_t +cairo_matrix_create +cairo_matrix_destroy +cairo_matrix_copy +cairo_matrix_set_identity +cairo_matrix_set_affine +cairo_matrix_get_affine +cairo_matrix_translate +cairo_matrix_scale +cairo_matrix_rotate +cairo_matrix_invert +cairo_matrix_multiply +cairo_matrix_transform_distance +cairo_matrix_transform_point +
+ +
+cairo +cairo_t +cairo_t +cairo_create +cairo_reference +cairo_destroy +cairo_save +cairo_restore +cairo_copy +cairo_set_target_surface +cairo_format_t +cairo_set_target_image +cairo_operator_t +cairo_set_operator +cairo_set_rgb_color +cairo_set_pattern +cairo_set_alpha +cairo_set_tolerance +cairo_fill_rule_t +cairo_set_fill_rule +cairo_set_line_width +cairo_line_cap_t +cairo_set_line_cap +cairo_line_join_t +cairo_set_line_join +cairo_set_dash +cairo_set_miter_limit +cairo_translate +cairo_scale +cairo_rotate +cairo_concat_matrix +cairo_set_matrix +cairo_default_matrix +cairo_identity_matrix +cairo_transform_point +cairo_transform_distance +cairo_inverse_transform_point +cairo_inverse_transform_distance +cairo_new_path +cairo_move_to +cairo_line_to +cairo_curve_to +cairo_arc +cairo_arc_negative +cairo_rel_move_to +cairo_rel_line_to +cairo_rel_curve_to +cairo_rectangle +cairo_close_path +cairo_stroke +cairo_fill +cairo_copy_page +cairo_show_page +cairo_in_stroke +cairo_in_fill +cairo_bool_t +cairo_stroke_extents +cairo_fill_extents +cairo_init_clip +cairo_clip +cairo_font_t +cairo_glyph_t +cairo_text_extents_t +cairo_font_extents_t +cairo_font_slant_t +cairo_font_weight_t +cairo_select_font +cairo_scale_font +cairo_transform_font +cairo_show_text +cairo_show_glyphs +cairo_current_font +cairo_current_font_extents +cairo_set_font +cairo_text_extents +cairo_glyph_extents +cairo_text_path +cairo_glyph_path +cairo_font_reference +cairo_font_destroy +cairo_font_extents +cairo_font_glyph_extents +cairo_show_surface +cairo_current_operator +cairo_current_rgb_color +cairo_current_pattern +cairo_current_alpha +cairo_current_tolerance +cairo_current_point +cairo_current_fill_rule +cairo_current_line_width +cairo_current_line_cap +cairo_current_line_join +cairo_current_miter_limit +cairo_current_matrix +cairo_current_target_surface +cairo_current_path +cairo_current_path_flat +cairo_status_t +cairo_status +cairo_status_string +cairo_filter_t +cairo_image_surface_create +cairo_image_surface_create_for_data + +CAIRO_BEGIN_DECLS +CAIRO_END_DECLS +cairo_get_operator +cairo_get_rgb_color +cairo_get_alpha +cairo_get_tolerance +cairo_get_current_point +cairo_get_fill_rule +cairo_get_line_width +cairo_get_line_cap +cairo_get_line_join +cairo_get_miter_limit +cairo_get_matrix +cairo_get_target_surface +cairo_get_status +cairo_get_status_string +
diff --git a/gfx/cairo/cairo/doc/public/cairo.types b/gfx/cairo/cairo/doc/public/cairo.types new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/gfx/cairo/cairo/doc/public/html/cairo-ATSUI-Fonts.html b/gfx/cairo/cairo/doc/public/html/cairo-ATSUI-Fonts.html new file mode 100644 index 000000000000..50af682633cf --- /dev/null +++ b/gfx/cairo/cairo/doc/public/html/cairo-ATSUI-Fonts.html @@ -0,0 +1,14 @@ +ATSUI Fonts
PrevUpHomeCairo: A Vector Graphics LibraryNext

ATSUI Fonts

ATSUI Fonts —

Synopsis

+
+
+
+cairo_font_t* cairo_atsui_font_create       (ATSUStyle style);
+

Description

+ +

Details

cairo_atsui_font_create ()

cairo_font_t* cairo_atsui_font_create       (ATSUStyle style);

+ +

style: +
Returns: + + +
<<cairo_matrix_tFreeType Fonts>>
diff --git a/gfx/cairo/cairo/doc/public/html/cairo-FreeType-Fonts.html b/gfx/cairo/cairo/doc/public/html/cairo-FreeType-Fonts.html new file mode 100644 index 000000000000..92df2ba6f6b0 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/html/cairo-FreeType-Fonts.html @@ -0,0 +1,114 @@ +FreeType Fonts
PrevUpHomeCairo: A Vector Graphics LibraryNext

FreeType Fonts

FreeType Fonts —

Synopsis

+
+
+
+cairo_font_t* cairo_ft_font_create          (FcPattern *pattern,
+                                             cairo_matrix_t *scale);
+cairo_font_t* cairo_ft_font_create_for_ft_face
+                                            (FT_Face face,
+                                             int load_flags,
+                                             cairo_matrix_t *scale);
+FT_Face     cairo_ft_font_lock_face         (cairo_font_t *ft_font);
+void        cairo_ft_font_unlock_face       (cairo_font_t *ft_font);
+FcPattern*  cairo_ft_font_get_pattern       (cairo_font_t *ft_font);
+

Description

+ +

Details

cairo_ft_font_create ()

cairo_font_t* cairo_ft_font_create          (FcPattern *pattern,
+                                             cairo_matrix_t *scale);

+Creates a new font for the FreeType font backend based on a +fontconfig pattern. This font can then be used with +cairo_set_font(), cairo_font_glyph_extents(), or FreeType backend +specific functions like cairo_ft_font_lock_face().

+ +

pattern: A fully resolved fontconfig + pattern. A pattern can be resolved, by, among other things, calling + FcConfigSubstitute(), FcDefaultSubstitute(), then + FcFontMatch(). Cairo will call FcPatternReference() on this + pattern, so you should not further modify the pattern, but you can + release your reference to the pattern with FcPatternDestroy() if + you no longer need to access it. +
scale: The scale at which this font will be used. The + scale is given by multiplying the font matrix (see + cairo_transform_font()) by the current transformation matrix. + The translation elements of the resulting matrix are ignored. +
Returns: a newly created cairo_font_t. Free with + cairo_font_destroy() when you are done using it. +

cairo_ft_font_create_for_ft_face ()

cairo_font_t* cairo_ft_font_create_for_ft_face
+                                            (FT_Face face,
+                                             int load_flags,
+                                             cairo_matrix_t *scale);

+Creates a new font forthe FreeType font backend from a pre-opened +FreeType face. This font can then be used with cairo_set_font(), +cairo_font_glyph_extents(), or FreeType backend specific +functions like cairo_ft_font_lock_face() Cairo will determine the +pixel size and transformation from the scale parameter and call +FT_Set_Transform() and FT_Set_Pixel_Sizes().

+ +

face: A FreeType face object, already opened. This must + be kept around until the font object's refcount drops to + zero and it is freed. The font object can be kept alive by + internal caching, so it's safest to keep the face object + around forever. +
load_flags: The flags to pass to FT_Load_Glyph when loading + glyphs from the font. These flags control aspects of + rendering such as hinting and antialiasing. See the FreeType + docs for full information. +
scale: The scale at which this font will be used. The + scale is given by multiplying the font matrix (see + cairo_transform_font()) by the current transformation matrix. + The translation elements of the resulting matrix are ignored. +
Returns: a newly created cairo_font_t. Free with + cairo_font_destroy() when you are done using it. +

cairo_ft_font_lock_face ()

FT_Face     cairo_ft_font_lock_face         (cairo_font_t *ft_font);

+cairo_ft_font_lock_face() gets the FT_Face object from a FreeType +backend font and scales it appropriately for the font. You must +release the face with cairo_ft_font_unlock_face() +when you are done using it. Since the FT_Face object can be +shared between multiple cairo_font_t objects, you must not +lock any other font objects until you unlock this one. A count is +kept of the number of times cairo_ft_font_lock_face() is +called. cairo_ft_font_unlock_face() must be called the same number +of times. +

+You must be careful when using this function in a library or in a +threaded application, because other threads may lock faces that +share the same FT_Face object. For this reason, you must call +cairo_ft_lock() before locking any face objects, and +cairo_ft_unlock() after you are done. (These functions are not yet +implemented, so this function cannot be currently safely used in a +threaded application.)

+ +

ft_font: A cairo_font_t from the FreeType font backend. Such an + object can be created with cairo_ft_font_create() or + cairo_ft_font_create_for_ft_face(). On some platforms the font from + cairo_current_font() will also be a FreeType font, but using this + functionality with fonts you don't create yourself is not + recommended. +
Returns: The FT_Face object for font, scaled appropriately. +

cairo_ft_font_unlock_face ()

void        cairo_ft_font_unlock_face       (cairo_font_t *ft_font);

+Releases a face obtained with cairo_ft_font_lock_face(). See the +documentation for that function for full details.

+ +

ft_font: A cairo_font_t from the FreeType font backend. Such an + object can be created with cairo_ft_font_create() or + cairo_ft_font_create_for_ft_face(). On some platforms the font from + cairo_current_font() will also be a FreeType font, but using this + functionality with fonts you don't create yourself is not + recommended. +

cairo_ft_font_get_pattern ()

FcPattern*  cairo_ft_font_get_pattern       (cairo_font_t *ft_font);

+cairo_ft_font_get_pattern() gets the FcPattern for a FreeType +backend font. +

+Return value: The FcPattenr for font. The return value is owned + by the font, so you must not modify it, and must call + FcPatternReference() to keep a persistant reference to the + pattern. If the font was created with cairo_ft_font_create_for_ft_face()

+ +

ft_font: A cairo_font_t from the FreeType font backend. Such an + object can be created with cairo_ft_font_create() or + cairo_ft_font_create_for_ft_face(). On some platforms the font from + cairo_current_font() will also be a FreeType font, but using this + functionality with fonts you don't create yourself is not + recommended. +
Returns:NULL. +
<<ATSUI FontsGlitz backend>>
diff --git a/gfx/cairo/cairo/doc/public/html/cairo-Glitz-backend.html b/gfx/cairo/cairo/doc/public/html/cairo-Glitz-backend.html new file mode 100644 index 000000000000..7ebeb0963fe4 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/html/cairo-Glitz-backend.html @@ -0,0 +1,23 @@ +Glitz backend
PrevUpHomeCairo: A Vector Graphics LibraryNext

Glitz backend

Glitz backend —

Synopsis

+
+
+
+void        cairo_set_target_glitz          (cairo_t *cr,
+                                             glitz_surface_t *surface);
+cairo_surface_t* cairo_glitz_surface_create (glitz_surface_t *surface);
+

Description

+ +

Details

cairo_set_target_glitz ()

void        cairo_set_target_glitz          (cairo_t *cr,
+                                             glitz_surface_t *surface);

+ +

cr: +
surface: + + +

cairo_glitz_surface_create ()

cairo_surface_t* cairo_glitz_surface_create (glitz_surface_t *surface);

+ +

surface: +
Returns: + + +
<<FreeType FontsPDF Backend>>
diff --git a/gfx/cairo/cairo/doc/public/html/cairo-Microsoft-Windows-Backend.html b/gfx/cairo/cairo/doc/public/html/cairo-Microsoft-Windows-Backend.html new file mode 100644 index 000000000000..63e69ec6fb86 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/html/cairo-Microsoft-Windows-Backend.html @@ -0,0 +1,83 @@ +Microsoft Windows Backend
PrevUpHomeCairo: A Vector Graphics LibraryNext

Microsoft Windows Backend

Microsoft Windows Backend —

Synopsis

+
+
+
+void        cairo_set_target_win32          (cairo_t *cr,
+                                             HDC hdc);
+cairo_surface_t* cairo_win32_surface_create (HDC hdc);
+cairo_font_t* cairo_win32_font_create_for_logfontw
+                                            (LOGFONTW *logfont,
+                                             cairo_matrix_t *scale);
+cairo_status_t cairo_win32_font_select_font (cairo_font_t *font,
+                                             HDC hdc);
+void        cairo_win32_font_done_font      (cairo_font_t *font);
+double      cairo_win32_font_get_scale_factor
+                                            (cairo_font_t *font);
+

Description

+ +

Details

cairo_set_target_win32 ()

void        cairo_set_target_win32          (cairo_t *cr,
+                                             HDC hdc);

+ +

cr: +
hdc: + + +

cairo_win32_surface_create ()

cairo_surface_t* cairo_win32_surface_create (HDC hdc);

+ +

hdc: +
Returns: + + +

cairo_win32_font_create_for_logfontw ()

cairo_font_t* cairo_win32_font_create_for_logfontw
+                                            (LOGFONTW *logfont,
+                                             cairo_matrix_t *scale);

+Creates a new font for the Win32 font backend based on a +LOGFONT. This font can then be used with +cairo_set_font(), cairo_font_glyph_extents(), or FreeType backend +specific functions like cairo_win32_font_select_font().

+ +

logfont: A LOGFONTW structure specifying the font to use. + The lfHeight, lfWidth, lfOrientation and lfEscapement + fields of this structure are ignored; information from + scale will be used instead. +
scale: The scale at which this font will be used. The + scale is given by multiplying the font matrix (see + cairo_transform_font()) by the current transformation matrix. + The translation elements of the resulting matrix are ignored. +
Returns: a newly created cairo_font_t. Free with + cairo_font_destroy() when you are done using it. +

cairo_win32_font_select_font ()

cairo_status_t cairo_win32_font_select_font (cairo_font_t *font,
+                                             HDC hdc);

+Selects the font into the given device context and changes the +map mode and world transformation of the device context to match +that of the font. This function is intended for use when using +layout APIs such as Uniscribe to do text layout with the +Cairo font. After finishing using the device context, you must call +cairo_win32_font_done_font() to release any resources allocated +by this function. +

+See cairo_win32_font_get_scale_factor() for converting logical +coordinates from the device context to font space. +

+Normally, calls to SaveDC() and RestoreDC() would be made around +the use of this function to preserve the original graphics state.

+ +

font: A cairo_font_t from the Win32 font backend. Such an + object can be created with cairo_win32_font_create_for_logfontw(). +
hdc: a device context +
Returns: CAIRO_STATUS_SUCCESS if the operation succeeded. + otherwise an error such as CAIRO_STATUS_NO_MEMORY and + the device context is unchanged. +

cairo_win32_font_done_font ()

void        cairo_win32_font_done_font      (cairo_font_t *font);

+Releases any resources allocated by cairo_win32_font_select_font()

+ +

font: A cairo_font_t from the Win32 font backend. +

cairo_win32_font_get_scale_factor ()

double      cairo_win32_font_get_scale_factor
+                                            (cairo_font_t *font);

+Gets a scale factor between logical coordinates in the coordinate +space used by cairo_win32_font_select_font() and font space coordinates.

+ +

font: a cairo_font_t from the Win32 font backend +
Returns: factor to multiply logical units by to get font space + coordinates. +
<<Quartz BackendXCB Backend>>
diff --git a/gfx/cairo/cairo/doc/public/html/cairo-PDF-Backend.html b/gfx/cairo/cairo/doc/public/html/cairo-PDF-Backend.html new file mode 100644 index 000000000000..2824b74dd20e --- /dev/null +++ b/gfx/cairo/cairo/doc/public/html/cairo-PDF-Backend.html @@ -0,0 +1,47 @@ +PDF Backend
PrevUpHomeCairo: A Vector Graphics LibraryNext

PDF Backend

PDF Backend —

Synopsis

+
+
+
+void        cairo_set_target_pdf            (cairo_t *cr,
+                                             FILE *file,
+                                             double width_inches,
+                                             double height_inches,
+                                             double x_pixels_per_inch,
+                                             double y_pixels_per_inch);
+cairo_surface_t* cairo_pdf_surface_create   (FILE *file,
+                                             double width_inches,
+                                             double height_inches,
+                                             double x_pixels_per_inch,
+                                             double y_pixels_per_inch);
+

Description

+ +

Details

cairo_set_target_pdf ()

void        cairo_set_target_pdf            (cairo_t *cr,
+                                             FILE *file,
+                                             double width_inches,
+                                             double height_inches,
+                                             double x_pixels_per_inch,
+                                             double y_pixels_per_inch);

+ +

cr: +
file: +
width_inches: +
height_inches: +
x_pixels_per_inch: +
y_pixels_per_inch: + + +

cairo_pdf_surface_create ()

cairo_surface_t* cairo_pdf_surface_create   (FILE *file,
+                                             double width_inches,
+                                             double height_inches,
+                                             double x_pixels_per_inch,
+                                             double y_pixels_per_inch);

+ +

file: +
width_inches: +
height_inches: +
x_pixels_per_inch: +
y_pixels_per_inch: +
Returns: + + +
<<Glitz backendPNG Backend>>
diff --git a/gfx/cairo/cairo/doc/public/html/cairo-PNG-Backend.html b/gfx/cairo/cairo/doc/public/html/cairo-PNG-Backend.html new file mode 100644 index 000000000000..aea978cc5125 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/html/cairo-PNG-Backend.html @@ -0,0 +1,41 @@ +PNG Backend
PrevUpHomeCairo: A Vector Graphics LibraryNext

PNG Backend

PNG Backend —

Synopsis

+
+
+
+void        cairo_set_target_png            (cairo_t *cr,
+                                             FILE *file,
+                                             cairo_format_t format,
+                                             int width,
+                                             int height);
+cairo_surface_t* cairo_png_surface_create   (FILE *file,
+                                             cairo_format_t format,
+                                             int width,
+                                             int height);
+

Description

+ +

Details

cairo_set_target_png ()

void        cairo_set_target_png            (cairo_t *cr,
+                                             FILE *file,
+                                             cairo_format_t format,
+                                             int width,
+                                             int height);

+ +

cr: +
file: +
format: +
width: +
height: + + +

cairo_png_surface_create ()

cairo_surface_t* cairo_png_surface_create   (FILE *file,
+                                             cairo_format_t format,
+                                             int width,
+                                             int height);

+ +

file: +
format: +
width: +
height: +
Returns: + + +
<<PDF BackendPS Backend>>
diff --git a/gfx/cairo/cairo/doc/public/html/cairo-PS-Backend.html b/gfx/cairo/cairo/doc/public/html/cairo-PS-Backend.html new file mode 100644 index 000000000000..cf2c53c9dc92 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/html/cairo-PS-Backend.html @@ -0,0 +1,51 @@ +PS Backend
PrevUpHomeCairo: A Vector Graphics LibraryNext

PS Backend

PS Backend —

Synopsis

+
+
+
+void        cairo_set_target_ps             (cairo_t *cr,
+                                             FILE *file,
+                                             double width_inches,
+                                             double height_inches,
+                                             double x_pixels_per_inch,
+                                             double y_pixels_per_inch);
+cairo_surface_t* cairo_ps_surface_create    (FILE *file,
+                                             double width_inches,
+                                             double height_inches,
+                                             double x_pixels_per_inch,
+                                             double y_pixels_per_inch);
+

Description

+ +

Details

cairo_set_target_ps ()

void        cairo_set_target_ps             (cairo_t *cr,
+                                             FILE *file,
+                                             double width_inches,
+                                             double height_inches,
+                                             double x_pixels_per_inch,
+                                             double y_pixels_per_inch);

+Directs output for a cairo_t to a postscript file. The file must +be kept open until the cairo_t is destroyed or set to have a +different target, and then must be closed by the application.

+ +

cr: a cairo_t +
file: an open, writeable file +
width_inches: width of the output page, in inches +
height_inches: height of the output page, in inches +
x_pixels_per_inch: X resolution to use for image fallbacks; + not all Cairo drawing can be represented in a postscript + file, so Cairo will write out images for some portions + of the output. +
y_pixels_per_inch: Y resolution to use for image fallbacks. +

cairo_ps_surface_create ()

cairo_surface_t* cairo_ps_surface_create    (FILE *file,
+                                             double width_inches,
+                                             double height_inches,
+                                             double x_pixels_per_inch,
+                                             double y_pixels_per_inch);

+ +

file: +
width_inches: +
height_inches: +
x_pixels_per_inch: +
y_pixels_per_inch: +
Returns: + + +
<<PNG BackendQuartz Backend>>
diff --git a/gfx/cairo/cairo/doc/public/html/cairo-Quartz-Backend.html b/gfx/cairo/cairo/doc/public/html/cairo-Quartz-Backend.html new file mode 100644 index 000000000000..6c45f77b59ec --- /dev/null +++ b/gfx/cairo/cairo/doc/public/html/cairo-Quartz-Backend.html @@ -0,0 +1,37 @@ +Quartz Backend
PrevUpHomeCairo: A Vector Graphics LibraryNext

Quartz Backend

Quartz Backend —

Synopsis

+
+
+
+void        cairo_set_target_quartz_context (cairo_t *cr,
+                                             CGContextRef context,
+                                             int width,
+                                             int height);
+cairo_surface_t* cairo_quartz_surface_create
+                                            (CGContextRef context,
+                                             int width,
+                                             int height);
+

Description

+ +

Details

cairo_set_target_quartz_context ()

void        cairo_set_target_quartz_context (cairo_t *cr,
+                                             CGContextRef context,
+                                             int width,
+                                             int height);

+ +

cr: +
context: +
width: +
height: + + +

cairo_quartz_surface_create ()

cairo_surface_t* cairo_quartz_surface_create
+                                            (CGContextRef context,
+                                             int width,
+                                             int height);

+ +

context: +
width: +
height: +
Returns: + + +
<<PS BackendMicrosoft Windows Backend>>
diff --git a/gfx/cairo/cairo/doc/public/html/cairo-XCB-Backend.html b/gfx/cairo/cairo/doc/public/html/cairo-XCB-Backend.html new file mode 100644 index 000000000000..73c039756a26 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/html/cairo-XCB-Backend.html @@ -0,0 +1,25 @@ +XCB Backend
PrevUpHomeCairo: A Vector Graphics LibraryNext

XCB Backend

XCB Backend —

Synopsis

+
+
+
+void        cairo_set_target_xcb            (cairo_t *cr,
+                                             XCBConnection *dpy,
+                                             XCBDRAWABLE drawable,
+                                             XCBVISUALTYPE *visual,
+                                             cairo_format_t format);
+

Description

+ +

Details

cairo_set_target_xcb ()

void        cairo_set_target_xcb            (cairo_t *cr,
+                                             XCBConnection *dpy,
+                                             XCBDRAWABLE drawable,
+                                             XCBVISUALTYPE *visual,
+                                             cairo_format_t format);

+ +

cr: +
dpy: +
drawable: +
visual: +
format: + + +
<<Microsoft Windows BackendXLib Backend>>
diff --git a/gfx/cairo/cairo/doc/public/html/cairo-XLib-Backend.html b/gfx/cairo/cairo/doc/public/html/cairo-XLib-Backend.html new file mode 100644 index 000000000000..bbfcf0dec80c --- /dev/null +++ b/gfx/cairo/cairo/doc/public/html/cairo-XLib-Backend.html @@ -0,0 +1,45 @@ +XLib Backend
PrevUpHomeCairo: A Vector Graphics Library

XLib Backend

XLib Backend —

Synopsis

+
+
+
+void        cairo_set_target_drawable       (cairo_t *cr,
+                                             Display *dpy,
+                                             Drawable drawable);
+cairo_surface_t* cairo_xlib_surface_create  (Display *dpy,
+                                             Drawable drawable,
+                                             Visual *visual,
+                                             cairo_format_t format,
+                                             Colormap colormap);
+

Description

+ +

Details

cairo_set_target_drawable ()

void        cairo_set_target_drawable       (cairo_t *cr,
+                                             Display *dpy,
+                                             Drawable drawable);

+Directs output for a cairo_t to an Xlib drawable. drawable must +be a Window or Pixmap on the default screen of dpy using the +default colormap and visual. Using this function is slow because +the function must retrieve information about drawable from the X +server. + +The combination of cairo_xlib_surface_create() and +cairo_set_target_surface() is somewhat more flexible, although +it still is slow.

+ +

cr: a cairo_t +
dpy: an X display +
drawable: a window or pixmap on the default screen of dpy +

cairo_xlib_surface_create ()

cairo_surface_t* cairo_xlib_surface_create  (Display *dpy,
+                                             Drawable drawable,
+                                             Visual *visual,
+                                             cairo_format_t format,
+                                             Colormap colormap);

+ +

dpy: +
drawable: +
visual: +
format: +
colormap: +
Returns: + + +
<<XCB Backend
diff --git a/gfx/cairo/cairo/doc/public/html/cairo-cairo-matrix-t.html b/gfx/cairo/cairo/doc/public/html/cairo-cairo-matrix-t.html new file mode 100644 index 000000000000..84aacff93997 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/html/cairo-cairo-matrix-t.html @@ -0,0 +1,220 @@ +cairo_matrix_t
PrevUpHomeCairo: A Vector Graphics LibraryNext

cairo_matrix_t

cairo_matrix_t — + Transformation matrices

Synopsis

+
+
+
+typedef     cairo_matrix_t;
+cairo_matrix_t* cairo_matrix_create         (void);
+void        cairo_matrix_destroy            (cairo_matrix_t *matrix);
+cairo_status_t cairo_matrix_copy            (cairo_matrix_t *matrix,
+                                             const cairo_matrix_t *other);
+cairo_status_t cairo_matrix_set_identity    (cairo_matrix_t *matrix);
+cairo_status_t cairo_matrix_set_affine      (cairo_matrix_t *matrix,
+                                             double a,
+                                             double b,
+                                             double c,
+                                             double d,
+                                             double tx,
+                                             double ty);
+cairo_status_t cairo_matrix_get_affine      (cairo_matrix_t *matrix,
+                                             double *a,
+                                             double *b,
+                                             double *c,
+                                             double *d,
+                                             double *tx,
+                                             double *ty);
+cairo_status_t cairo_matrix_translate       (cairo_matrix_t *matrix,
+                                             double tx,
+                                             double ty);
+cairo_status_t cairo_matrix_scale           (cairo_matrix_t *matrix,
+                                             double sx,
+                                             double sy);
+cairo_status_t cairo_matrix_rotate          (cairo_matrix_t *matrix,
+                                             double radians);
+cairo_status_t cairo_matrix_invert          (cairo_matrix_t *matrix);
+cairo_status_t cairo_matrix_multiply        (cairo_matrix_t *result,
+                                             const cairo_matrix_t *a,
+                                             const cairo_matrix_t *b);
+cairo_status_t cairo_matrix_transform_distance
+                                            (cairo_matrix_t *matrix,
+                                             double *dx,
+                                             double *dy);
+cairo_status_t cairo_matrix_transform_point (cairo_matrix_t *matrix,
+                                             double *x,
+                                             double *y);
+

Description

+ cairo_matrix_t is used throughout + Cairo to represents between different coordinates spaces. + A cairo_matrix holds an affine + transformation, such as a scale, rotation, or shear, or a + combination of those. Mathematically, the effect of an affine + transformation on a point (x,y) is given by: + 

+    x_new = x * a + y * c + tx;
+    y_new = x * b + y * d + ty;
+

+ The parameters a, b, + c, d, tx, + ty can be retrieved with + cairo_matrix_get_affine() and set with cairo_matrix_get_affine(). +

+ The primary use of transformation matrices in Cairo is as the + current transformation matrix in a cairo_t. The current + transformation matrix gives the transformation from user space + coordinates to device coordinates. See cairo_set_matrix(), + cairo_current_matrix(). +

Details

cairo_matrix_t

typedef struct _cairo_matrix cairo_matrix_t;
+

+A cairo_matrix_t holds an affine transformation, such as a scale, +rotation, or shear, or a combination of those.

+ +

cairo_matrix_create ()

cairo_matrix_t* cairo_matrix_create         (void);

+Creates a new identity matrix.

+ +

Returns: a newly created matrix; free with cairo_matrix_destroy(), + or NULL if memory couldn't be allocated. +

cairo_matrix_destroy ()

void        cairo_matrix_destroy            (cairo_matrix_t *matrix);

+Frees a matrix created with cairo_matrix_create.

+ +

matrix: a cairo_matrix_t +

cairo_matrix_copy ()

cairo_status_t cairo_matrix_copy            (cairo_matrix_t *matrix,
+                                             const cairo_matrix_t *other);

+Modifies matrix to be identical to other.

+ +

matrix: a cairo_matrix_t +
other: another cairo_ +
Returns: CAIRO_STATUS_SUCCESS, always. +

cairo_matrix_set_identity ()

cairo_status_t cairo_matrix_set_identity    (cairo_matrix_t *matrix);

+Modifies matrix to be an identity transformation.

+ +

matrix: a cairo_matrix_t +
Returns: CAIRO_STATUS_SUCCESS, always. +

cairo_matrix_set_affine ()

cairo_status_t cairo_matrix_set_affine      (cairo_matrix_t *matrix,
+                                             double a,
+                                             double b,
+                                             double c,
+                                             double d,
+                                             double tx,
+                                             double ty);

+Sets matrix to be the affine transformation given by +a, b, c, d, tx, ty. The transformation is given +by: +

+ x_new = x * a + y * c + tx;
+ y_new = x * b + y * d + ty;
+

+ +

matrix: a cairo_matrix_t +
a: a component of the affine transformation +
b: b component of the affine transformation +
c: c component of the affine transformation +
d: d component of the affine transformation +
tx: X translation component of the affine transformation +
ty: Y translation component of the affine transformation +
Returns: CAIRO_STATUS_SUCCESS, always. +

cairo_matrix_get_affine ()

cairo_status_t cairo_matrix_get_affine      (cairo_matrix_t *matrix,
+                                             double *a,
+                                             double *b,
+                                             double *c,
+                                             double *d,
+                                             double *tx,
+                                             double *ty);

+Gets the matrix values for the affine tranformation that matrix represents. +See cairo_matrix_set_affine().

+ +

matrix: a cairo_matrix_t +
a: location to store a component of affine transformation, or NULL +
b: location to store b component of affine transformation, or NULL +
c: location to store c component of affine transformation, or NULL +
d: location to store d component of affine transformation, or NULL +
tx: location to store X-translation component of affine transformation, or NULL +
ty: location to store Y-translation component of affine transformation, or NULL +
Returns: CAIRO_STATUS_SUCCESS, always. +

cairo_matrix_translate ()

cairo_status_t cairo_matrix_translate       (cairo_matrix_t *matrix,
+                                             double tx,
+                                             double ty);

+Applies a translation by tx, ty to the transformation in +matrix. The new transformation is given by first translating by +tx, ty then applying the original transformation

+ +

matrix: a cairo_matrix_t +
tx: amount to rotate in the X direction +
ty: amount to rotate in the Y direction +
Returns: CAIRO_STATUS_SUCCESS, always. +

cairo_matrix_scale ()

cairo_status_t cairo_matrix_scale           (cairo_matrix_t *matrix,
+                                             double sx,
+                                             double sy);

+Applies scaling by tx, ty to the transformation in +matrix. The new transformation is given by first scaling by sx +and sy then applying the original transformation

+ +

matrix: a cairo_matrix_t +
sx: Scale factor in the X direction +
sy: Scale factor in the Y direction +
Returns: CAIRO_STATUS_SUCCESS, always. +

cairo_matrix_rotate ()

cairo_status_t cairo_matrix_rotate          (cairo_matrix_t *matrix,
+                                             double radians);

+Applies rotation by radians to the transformation in +matrix. The new transformation is given by first rotating by +radians then applying the original transformation

+ +

matrix: a cairo_matrix_t +
radians: angle of rotation, in radians. Angles are defined + so that an angle of 90 degrees (M_PI radians) rotates the + positive X axis into the positive Y axis. With the default + Cairo choice of axis orientation, positive rotations are + clockwise. +
Returns: CAIRO_STATUS_SUCCESS, always. +

cairo_matrix_invert ()

cairo_status_t cairo_matrix_invert          (cairo_matrix_t *matrix);

+Changes matrix to be the inverse of it's original value. Not +all transformation matrices have inverses; if the matrix +collapses points together (it is degenerate), +then it has no inverse and this function will fail. +

+Returns: If matrix has an inverse, modifies matrix to + be the inverse matrix and returns CAIRO_STATUS_SUCCESS. Otherwise,

+ +

matrix: a cairo_matrix_t +
Returns:CAIRO_STATUS_INVALID_MATRIX. +

cairo_matrix_multiply ()

cairo_status_t cairo_matrix_multiply        (cairo_matrix_t *result,
+                                             const cairo_matrix_t *a,
+                                             const cairo_matrix_t *b);

+Multiplies the affine transformations in a and b together +and stores the result in result. The resulting transformation +is given by first applying the transformation in b then +applying the transformation in a.

+ +

result: a cairo_matrix_t in which to store the result +
a: a cairo_matrix_t +
b: a cairo_matrix_t +
Returns: CAIRO_STATUS_SUCCESS, always. +

cairo_matrix_transform_distance ()

cairo_status_t cairo_matrix_transform_distance
+                                            (cairo_matrix_t *matrix,
+                                             double *dx,
+                                             double *dy);

+Transforms the vector (dx,dy) by matrix. Translation is +ignored. In terms of the components of the affine transformation: +

+

+dx2 = dx1 * a + dy1 * c;
+dy2 = dx1 * b + dy1 * d;
+

+

+Affine transformations are position invariant, so the same vector +always transforms to the same vector. If (x1,y1) transforms +to (x2,y2) then (x1+dx1,y1+dy1) will transform to +(x1+dx2,y1+dy2) for all values of x1 and x2.

+ +

matrix: a cairo_matrix_t +
dx: a distance in the X direction. An in/out parameter +
dy: a distance in the Y direction. An in/out parameter +
Returns: CAIRO_STATUS_SUCCESS, always. +

cairo_matrix_transform_point ()

cairo_status_t cairo_matrix_transform_point (cairo_matrix_t *matrix,
+                                             double *x,
+                                             double *y);

+Transforms the point (x, y) by matrix.

+

matrix: a cairo_matrix_t +
x: X position. An in/out parameter +
y: Y position. An in/out parameter +
Returns: CAIRO_STATUS_SUCCESS, always. +
<<cairo_pattern_tATSUI Fonts>>
diff --git a/gfx/cairo/cairo/doc/public/html/cairo-cairo-pattern-t.html b/gfx/cairo/cairo/doc/public/html/cairo-cairo-pattern-t.html new file mode 100644 index 000000000000..9a48f3ec8490 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/html/cairo-cairo-pattern-t.html @@ -0,0 +1,158 @@ +cairo_pattern_t
PrevUpHomeCairo: A Vector Graphics LibraryNext

cairo_pattern_t

cairo_pattern_t —

Synopsis

+
+
+
+typedef     cairo_pattern_t;
+cairo_pattern_t* cairo_pattern_create_for_surface
+                                            (cairo_surface_t *surface);
+cairo_pattern_t* cairo_pattern_create_linear
+                                            (double x0,
+                                             double y0,
+                                             double x1,
+                                             double y1);
+cairo_pattern_t* cairo_pattern_create_radial
+                                            (double cx0,
+                                             double cy0,
+                                             double radius0,
+                                             double cx1,
+                                             double cy1,
+                                             double radius1);
+void        cairo_pattern_reference         (cairo_pattern_t *pattern);
+void        cairo_pattern_destroy           (cairo_pattern_t *pattern);
+cairo_status_t cairo_pattern_add_color_stop (cairo_pattern_t *pattern,
+                                             double offset,
+                                             double red,
+                                             double green,
+                                             double blue,
+                                             double alpha);
+cairo_status_t cairo_pattern_set_matrix     (cairo_pattern_t *pattern,
+                                             cairo_matrix_t *matrix);
+cairo_status_t cairo_pattern_get_matrix     (cairo_pattern_t *pattern,
+                                             cairo_matrix_t *matrix);
+enum        cairo_extend_t;
+cairo_status_t cairo_pattern_set_extend     (cairo_pattern_t *pattern,
+                                             cairo_extend_t extend);
+cairo_extend_t cairo_pattern_get_extend     (cairo_pattern_t *pattern);
+cairo_status_t cairo_pattern_set_filter     (cairo_pattern_t *pattern,
+                                             cairo_filter_t filter);
+cairo_filter_t cairo_pattern_get_filter     (cairo_pattern_t *pattern);
+

Description

+ +

Details

cairo_pattern_t

typedef struct _cairo_pattern cairo_pattern_t;
+

+ +

cairo_pattern_create_for_surface ()

cairo_pattern_t* cairo_pattern_create_for_surface
+                                            (cairo_surface_t *surface);

+ +

surface: +
Returns: + + +

cairo_pattern_create_linear ()

cairo_pattern_t* cairo_pattern_create_linear
+                                            (double x0,
+                                             double y0,
+                                             double x1,
+                                             double y1);

+ +

x0: +
y0: +
x1: +
y1: +
Returns: + + +

cairo_pattern_create_radial ()

cairo_pattern_t* cairo_pattern_create_radial
+                                            (double cx0,
+                                             double cy0,
+                                             double radius0,
+                                             double cx1,
+                                             double cy1,
+                                             double radius1);

+ +

cx0: +
cy0: +
radius0: +
cx1: +
cy1: +
radius1: +
Returns: + + +

cairo_pattern_reference ()

void        cairo_pattern_reference         (cairo_pattern_t *pattern);

+ +

pattern: + + +

cairo_pattern_destroy ()

void        cairo_pattern_destroy           (cairo_pattern_t *pattern);

+ +

pattern: + + +

cairo_pattern_add_color_stop ()

cairo_status_t cairo_pattern_add_color_stop (cairo_pattern_t *pattern,
+                                             double offset,
+                                             double red,
+                                             double green,
+                                             double blue,
+                                             double alpha);

+ +

pattern: +
offset: +
red: +
green: +
blue: +
alpha: +
Returns: + + +

cairo_pattern_set_matrix ()

cairo_status_t cairo_pattern_set_matrix     (cairo_pattern_t *pattern,
+                                             cairo_matrix_t *matrix);

+ +

pattern: +
matrix: +
Returns: + + +

cairo_pattern_get_matrix ()

cairo_status_t cairo_pattern_get_matrix     (cairo_pattern_t *pattern,
+                                             cairo_matrix_t *matrix);

+ +

pattern: +
matrix: +
Returns: + + +

enum cairo_extend_t

typedef enum {
+    CAIRO_EXTEND_NONE,
+    CAIRO_EXTEND_REPEAT,
+    CAIRO_EXTEND_REFLECT
+} cairo_extend_t;
+

+ +

cairo_pattern_set_extend ()

cairo_status_t cairo_pattern_set_extend     (cairo_pattern_t *pattern,
+                                             cairo_extend_t extend);

+ +

pattern: +
extend: +
Returns: + + +

cairo_pattern_get_extend ()

cairo_extend_t cairo_pattern_get_extend     (cairo_pattern_t *pattern);

+ +

pattern: +
Returns: + + +

cairo_pattern_set_filter ()

cairo_status_t cairo_pattern_set_filter     (cairo_pattern_t *pattern,
+                                             cairo_filter_t filter);

+ +

pattern: +
filter: +
Returns: + + +

cairo_pattern_get_filter ()

cairo_filter_t cairo_pattern_get_filter     (cairo_pattern_t *pattern);

+ +

pattern: +
Returns: + + +
<<cairo_surface_tcairo_matrix_t>>
diff --git a/gfx/cairo/cairo/doc/public/html/cairo-cairo-surface-t.html b/gfx/cairo/cairo/doc/public/html/cairo-cairo-surface-t.html new file mode 100644 index 000000000000..9d13be9c8421 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/html/cairo-cairo-surface-t.html @@ -0,0 +1,117 @@ +cairo_surface_t
PrevUpHomeCairo: A Vector Graphics LibraryNext

cairo_surface_t

cairo_surface_t —

Synopsis

+
+
+
+typedef     cairo_surface_t;
+cairo_surface_t* cairo_surface_create_for_image
+                                            (char *data,
+                                             cairo_format_t format,
+                                             int width,
+                                             int height,
+                                             int stride);
+cairo_surface_t* cairo_surface_create_similar
+                                            (cairo_surface_t *other,
+                                             cairo_format_t format,
+                                             int width,
+                                             int height);
+void        cairo_surface_reference         (cairo_surface_t *surface);
+void        cairo_surface_destroy           (cairo_surface_t *surface);
+cairo_status_t cairo_surface_set_repeat     (cairo_surface_t *surface,
+                                             int repeat);
+cairo_status_t cairo_surface_set_matrix     (cairo_surface_t *surface,
+                                             cairo_matrix_t *matrix);
+cairo_status_t cairo_surface_get_matrix     (cairo_surface_t *surface,
+                                             cairo_matrix_t *matrix);
+cairo_status_t cairo_surface_set_filter     (cairo_surface_t *surface,
+                                             cairo_filter_t filter);
+cairo_filter_t cairo_surface_get_filter     (cairo_surface_t *surface);
+

Description

+ +

Details

cairo_surface_t

typedef struct _cairo_surface cairo_surface_t;
+

+A cairo_surface_t represents an image, either as the destination +of a drawing operation or as source when drawing onto another +surface. There are different subtypes of cairo_surface_t for +different drawing backends; for example, cairo_image_surface_create() +creates a bitmap image in memory. +

+Memory management of cairo_surface_t is done with +cairo_surface_reference() and cairo_surface_destroy().

+ +

cairo_surface_create_for_image ()

cairo_surface_t* cairo_surface_create_for_image
+                                            (char *data,
+                                             cairo_format_t format,
+                                             int width,
+                                             int height,
+                                             int stride);

+ +

data: +
format: +
width: +
height: +
stride: +
Returns: + + +

cairo_surface_create_similar ()

cairo_surface_t* cairo_surface_create_similar
+                                            (cairo_surface_t *other,
+                                             cairo_format_t format,
+                                             int width,
+                                             int height);

+ +

other: +
format: +
width: +
height: +
Returns: + + +

cairo_surface_reference ()

void        cairo_surface_reference         (cairo_surface_t *surface);

+ +

surface: + + +

cairo_surface_destroy ()

void        cairo_surface_destroy           (cairo_surface_t *surface);

+ +

surface: + + +

cairo_surface_set_repeat ()

cairo_status_t cairo_surface_set_repeat     (cairo_surface_t *surface,
+                                             int repeat);

+ +

surface: +
repeat: +
Returns: + + +

cairo_surface_set_matrix ()

cairo_status_t cairo_surface_set_matrix     (cairo_surface_t *surface,
+                                             cairo_matrix_t *matrix);

+ +

surface: +
matrix: +
Returns: + + +

cairo_surface_get_matrix ()

cairo_status_t cairo_surface_get_matrix     (cairo_surface_t *surface,
+                                             cairo_matrix_t *matrix);

+ +

surface: +
matrix: +
Returns: + + +

cairo_surface_set_filter ()

cairo_status_t cairo_surface_set_filter     (cairo_surface_t *surface,
+                                             cairo_filter_t filter);

+ +

surface: +
filter: +
Returns: + + +

cairo_surface_get_filter ()

cairo_filter_t cairo_surface_get_filter     (cairo_surface_t *surface);

+ +

surface: +
Returns: + + +
<<cairo_tcairo_pattern_t>>
diff --git a/gfx/cairo/cairo/doc/public/html/cairo-cairo-t.html b/gfx/cairo/cairo/doc/public/html/cairo-cairo-t.html new file mode 100644 index 000000000000..865aed776195 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/html/cairo-cairo-t.html @@ -0,0 +1,1281 @@ +cairo_t
PrevUpHomeCairo: A Vector Graphics LibraryNext

cairo_t

cairo_t — Drawing contexts.

Synopsis

+
+
+
+typedef     cairo_t;
+cairo_t*    cairo_create                    (void);
+void        cairo_reference                 (cairo_t *cr);
+void        cairo_destroy                   (cairo_t *cr);
+void        cairo_save                      (cairo_t *cr);
+void        cairo_restore                   (cairo_t *cr);
+void        cairo_copy                      (cairo_t *dest,
+                                             cairo_t *src);
+void        cairo_set_target_surface        (cairo_t *cr,
+                                             cairo_surface_t *surface);
+enum        cairo_format_t;
+void        cairo_set_target_image          (cairo_t *cr,
+                                             char *data,
+                                             cairo_format_t format,
+                                             int width,
+                                             int height,
+                                             int stride);
+enum        cairo_operator_t;
+void        cairo_set_operator              (cairo_t *cr,
+                                             cairo_operator_t op);
+void        cairo_set_rgb_color             (cairo_t *cr,
+                                             double red,
+                                             double green,
+                                             double blue);
+void        cairo_set_pattern               (cairo_t *cr,
+                                             cairo_pattern_t *pattern);
+void        cairo_set_alpha                 (cairo_t *cr,
+                                             double alpha);
+void        cairo_set_tolerance             (cairo_t *cr,
+                                             double tolerance);
+enum        cairo_fill_rule_t;
+void        cairo_set_fill_rule             (cairo_t *cr,
+                                             cairo_fill_rule_t fill_rule);
+void        cairo_set_line_width            (cairo_t *cr,
+                                             double width);
+enum        cairo_line_cap_t;
+void        cairo_set_line_cap              (cairo_t *cr,
+                                             cairo_line_cap_t line_cap);
+enum        cairo_line_join_t;
+void        cairo_set_line_join             (cairo_t *cr,
+                                             cairo_line_join_t line_join);
+void        cairo_set_dash                  (cairo_t *cr,
+                                             double *dashes,
+                                             int ndash,
+                                             double offset);
+void        cairo_set_miter_limit           (cairo_t *cr,
+                                             double limit);
+void        cairo_translate                 (cairo_t *cr,
+                                             double tx,
+                                             double ty);
+void        cairo_scale                     (cairo_t *cr,
+                                             double sx,
+                                             double sy);
+void        cairo_rotate                    (cairo_t *cr,
+                                             double angle);
+void        cairo_concat_matrix             (cairo_t *cr,
+                                             cairo_matrix_t *matrix);
+void        cairo_set_matrix                (cairo_t *cr,
+                                             cairo_matrix_t *matrix);
+void        cairo_default_matrix            (cairo_t *cr);
+void        cairo_identity_matrix           (cairo_t *cr);
+void        cairo_transform_point           (cairo_t *cr,
+                                             double *x,
+                                             double *y);
+void        cairo_transform_distance        (cairo_t *cr,
+                                             double *dx,
+                                             double *dy);
+void        cairo_inverse_transform_point   (cairo_t *cr,
+                                             double *x,
+                                             double *y);
+void        cairo_inverse_transform_distance
+                                            (cairo_t *cr,
+                                             double *dx,
+                                             double *dy);
+void        cairo_new_path                  (cairo_t *cr);
+void        cairo_move_to                   (cairo_t *cr,
+                                             double x,
+                                             double y);
+void        cairo_line_to                   (cairo_t *cr,
+                                             double x,
+                                             double y);
+void        cairo_curve_to                  (cairo_t *cr,
+                                             double x1,
+                                             double y1,
+                                             double x2,
+                                             double y2,
+                                             double x3,
+                                             double y3);
+void        cairo_arc                       (cairo_t *cr,
+                                             double xc,
+                                             double yc,
+                                             double radius,
+                                             double angle1,
+                                             double angle2);
+void        cairo_arc_negative              (cairo_t *cr,
+                                             double xc,
+                                             double yc,
+                                             double radius,
+                                             double angle1,
+                                             double angle2);
+void        cairo_rel_move_to               (cairo_t *cr,
+                                             double dx,
+                                             double dy);
+void        cairo_rel_line_to               (cairo_t *cr,
+                                             double dx,
+                                             double dy);
+void        cairo_rel_curve_to              (cairo_t *cr,
+                                             double dx1,
+                                             double dy1,
+                                             double dx2,
+                                             double dy2,
+                                             double dx3,
+                                             double dy3);
+void        cairo_rectangle                 (cairo_t *cr,
+                                             double x,
+                                             double y,
+                                             double width,
+                                             double height);
+void        cairo_close_path                (cairo_t *cr);
+void        cairo_stroke                    (cairo_t *cr);
+void        cairo_fill                      (cairo_t *cr);
+void        cairo_copy_page                 (cairo_t *cr);
+void        cairo_show_page                 (cairo_t *cr);
+cairo_bool_t cairo_in_stroke                (cairo_t *cr,
+                                             double x,
+                                             double y);
+cairo_bool_t cairo_in_fill                  (cairo_t *cr,
+                                             double x,
+                                             double y);
+typedef     cairo_bool_t;
+void        cairo_stroke_extents            (cairo_t *cr,
+                                             double *x1,
+                                             double *y1,
+                                             double *x2,
+                                             double *y2);
+void        cairo_fill_extents              (cairo_t *cr,
+                                             double *x1,
+                                             double *y1,
+                                             double *x2,
+                                             double *y2);
+void        cairo_init_clip                 (cairo_t *cr);
+void        cairo_clip                      (cairo_t *cr);
+typedef     cairo_font_t;
+            cairo_glyph_t;
+            cairo_text_extents_t;
+            cairo_font_extents_t;
+enum        cairo_font_slant_t;
+enum        cairo_font_weight_t;
+void        cairo_select_font               (cairo_t *cr,
+                                             const char *family,
+                                             cairo_font_slant_t slant,
+                                             cairo_font_weight_t weight);
+void        cairo_scale_font                (cairo_t *cr,
+                                             double scale);
+void        cairo_transform_font            (cairo_t *cr,
+                                             cairo_matrix_t *matrix);
+void        cairo_show_text                 (cairo_t *cr,
+                                             unsigned char *utf8);
+void        cairo_show_glyphs               (cairo_t *cr,
+                                             cairo_glyph_t *glyphs,
+                                             int num_glyphs);
+cairo_font_t* cairo_current_font            (cairo_t *cr);
+void        cairo_current_font_extents      (cairo_t *cr,
+                                             cairo_font_extents_t *extents);
+void        cairo_set_font                  (cairo_t *cr,
+                                             cairo_font_t *font);
+void        cairo_text_extents              (cairo_t *cr,
+                                             unsigned char *utf8,
+                                             cairo_text_extents_t *extents);
+void        cairo_glyph_extents             (cairo_t *cr,
+                                             cairo_glyph_t *glyphs,
+                                             int num_glyphs,
+                                             cairo_text_extents_t *extents);
+void        cairo_text_path                 (cairo_t *cr,
+                                             unsigned char *utf8);
+void        cairo_glyph_path                (cairo_t *cr,
+                                             cairo_glyph_t *glyphs,
+                                             int num_glyphs);
+void        cairo_font_reference            (cairo_font_t *font);
+void        cairo_font_destroy              (cairo_font_t *font);
+cairo_status_t cairo_font_extents           (cairo_font_t *font,
+                                             cairo_matrix_t *font_matrix,
+                                             cairo_font_extents_t *extents);
+void        cairo_font_glyph_extents        (cairo_font_t *font,
+                                             cairo_matrix_t *font_matrix,
+                                             cairo_glyph_t *glyphs,
+                                             int num_glyphs,
+                                             cairo_text_extents_t *extents);
+void        cairo_show_surface              (cairo_t *cr,
+                                             cairo_surface_t *surface,
+                                             int width,
+                                             int height);
+cairo_operator_t cairo_current_operator     (cairo_t *cr);
+void        cairo_current_rgb_color         (cairo_t *cr,
+                                             double *red,
+                                             double *green,
+                                             double *blue);
+cairo_pattern_t* cairo_current_pattern      (cairo_t *cr);
+double      cairo_current_alpha             (cairo_t *cr);
+double      cairo_current_tolerance         (cairo_t *cr);
+void        cairo_current_point             (cairo_t *cr,
+                                             double *x,
+                                             double *y);
+cairo_fill_rule_t cairo_current_fill_rule   (cairo_t *cr);
+double      cairo_current_line_width        (cairo_t *cr);
+cairo_line_cap_t cairo_current_line_cap     (cairo_t *cr);
+cairo_line_join_t cairo_current_line_join   (cairo_t *cr);
+double      cairo_current_miter_limit       (cairo_t *cr);
+void        cairo_current_matrix            (cairo_t *cr,
+                                             cairo_matrix_t *matrix);
+cairo_surface_t* cairo_current_target_surface
+                                            (cairo_t *cr);
+void        cairo_current_path              (cairo_t *cr,
+                                             cairo_move_to_func_t *move_to,
+                                             cairo_line_to_func_t *line_to,
+                                             cairo_curve_to_func_t *curve_to,
+                                             cairo_close_path_func_t *close_path,
+                                             void *closure);
+void        cairo_current_path_flat         (cairo_t *cr,
+                                             cairo_move_to_func_t *move_to,
+                                             cairo_line_to_func_t *line_to,
+                                             cairo_close_path_func_t *close_path,
+                                             void *closure);
+enum        cairo_status_t;
+cairo_status_t cairo_status                 (cairo_t *cr);
+const char* cairo_status_string             (cairo_t *cr);
+enum        cairo_filter_t;
+cairo_surface_t* cairo_image_surface_create (cairo_format_t format,
+                                             int width,
+                                             int height);
+cairo_surface_t* cairo_image_surface_create_for_data
+                                            (char *data,
+                                             cairo_format_t format,
+                                             int width,
+                                             int height,
+                                             int stride);
+
+

Description

+ cairo_t is the main object used when drawing with Cairo. To + draw with Cairo, you create a cairo_t, set the target surface, + and drawing options for the cairo_t, create shapes with + functions like cairo_move_to() and cairo_line_to(), and then + draw ships with cairo_stroke() or cairo_fill(). +

+ cairo_t's can be pushed to a stack via cairo_save(). + They may then safely be changed, without loosing the current state. + Use cairo_restore() to restore to the saved state. +

Details

cairo_t

typedef struct _cairo cairo_t;
+

+A cairo_t contains the current state of the rendering device, +including coordinates of yet to be drawn shapes.

+ +

cairo_create ()

cairo_t*    cairo_create                    (void);

+Creates a new cairo_t with default values. The target +surface must be set on the cairo_t with cairo_set_target_surface(), +or a backend-specific function like cairo_set_target_image() before +drawing with the cairo_t.

+ +

Returns: a newly allocated cairo_t with a reference + count of 1. The initial reference count should be released + with cairo_destroy() when you are done using the cairo_t. +

cairo_reference ()

void        cairo_reference                 (cairo_t *cr);

+Increases the reference count on cr by one. This prevents +cr from being destroyed until a matching call to cairo_destroy() +is made.

+ +

cr: a cairo_t +

cairo_destroy ()

void        cairo_destroy                   (cairo_t *cr);

+Decreases the reference count on cr by one. If the result +is zero, then cr and all associated resources are freed. +See cairo_destroy().

+ +

cr: a cairo_t +

cairo_save ()

void        cairo_save                      (cairo_t *cr);

+Makes a copy of the current state of cr and saves it +on an internal stack of saved states for cr. When +cairo_restore() is called, cr will be restored to +the saved state. Multiple calls to cairo_save() and +cairo_restore() can be nested; each call to cairo_restore() +restores the state from the matching paired cairo_save(). +

+It isn't necessary to clear all saved states before +a cairo_t is freed. If the reference count of a cairo_t +drops to zero in response to a call to cairo_destroy(), +any saved states will be freed along with the cairo_t.

+ +

cr: a cairo_t +

cairo_restore ()

void        cairo_restore                   (cairo_t *cr);

+Restores cr to the state saved by a preceding call to +cairo_save() and removes that state from the stack of +saved states.

+ +

cr: a cairo_t +

cairo_copy ()

void        cairo_copy                      (cairo_t *dest,
+                                             cairo_t *src);

+This function copies all current state information from src to +dest. This includes the current point and path, the target surface, +the transformation matrix, and so forth. +

+The stack of states saved with cairo_save() is not +not copied; nor are any saved states on dest cleared. The +operation only copies the current state of src to the current +state of dest.

+ +

dest: a cairo_t +
src: another cairo_t +

cairo_set_target_surface ()

void        cairo_set_target_surface        (cairo_t *cr,
+                                             cairo_surface_t *surface);

+Directs output for a cairo_t to a given surface. The surface +will be referenced by the cairo_t, so you can immediately +call cairo_surface_destroy() on it if you don't need to +keep a reference to it around.

+ +

cr: a cairo_t +
surface: a cairo_surface_t +

enum cairo_format_t

typedef enum cairo_format {
+    CAIRO_FORMAT_ARGB32,
+    CAIRO_FORMAT_RGB24,
+    CAIRO_FORMAT_A8,
+    CAIRO_FORMAT_A1
+} cairo_format_t;
+

+cairo_format_t is used to identify the memory format of +image data.

+ +

CAIRO_FORMAT_ARGB32 each pixel is a 32-bit quantity, with + alpha in the upper 8 bits, then red, then green, then blue. + The 32-bit quanties are stored native-endian. Pre-multiplied + alpha is used. (That is, 50% transparent red is 0x80800000, + not 0x80ff0000.) +
CAIRO_FORMAT_RGB24 each pixel is a 32-bit quantity, with + the upper 8 bits unused. Red, Green, and Blue are stored + in the remaining 24 bits in that order. +
CAIRO_FORMAT_A8 each pixel is a 8-bit quantity holding + an alpha value. +
CAIRO_FORMAT_A1 each pixel is a 1-bit quantity holding + an alpha value. Pixels are packed together into 32-bit + quantities. The ordering of the bits matches the + endianess of the platform. On a big-endian machine, the + first pixel is in the uppermost bit, on a little-endian + machine the first pixel is in the least-significant bit. +

cairo_set_target_image ()

void        cairo_set_target_image          (cairo_t *cr,
+                                             char *data,
+                                             cairo_format_t format,
+                                             int width,
+                                             int height,
+                                             int stride);

+Directs output for a cairo_t to an in-memory image. The output +buffer must be kept around until the cairo_t is destroyed or set +to to have a different target. The initial contents of buffer +will be used as the inital image contents; you must explicitely +clear the buffer, using, for example, cairo_rectangle() and +cairo_fill() if you want it cleared.

+ +

cr: a cairo_t +
data: a pointer to a buffer supplied by the application + in which to write contents. +
format: the format of pixels in the buffer +
width: the width of the image to be stored in the buffer +
height: the eight of the image to be stored in the buffer +
stride: the number of bytes between the start of rows + in the buffer. Having this be specified separate from width + allows for padding at the end of rows, or for writing + to a subportion of a larger image. +

enum cairo_operator_t

typedef enum cairo_operator { 
+    CAIRO_OPERATOR_CLEAR,
+    CAIRO_OPERATOR_SRC,
+    CAIRO_OPERATOR_DST,
+    CAIRO_OPERATOR_OVER,
+    CAIRO_OPERATOR_OVER_REVERSE,
+    CAIRO_OPERATOR_IN,
+    CAIRO_OPERATOR_IN_REVERSE,
+    CAIRO_OPERATOR_OUT,
+    CAIRO_OPERATOR_OUT_REVERSE,
+    CAIRO_OPERATOR_ATOP,
+    CAIRO_OPERATOR_ATOP_REVERSE,
+    CAIRO_OPERATOR_XOR,
+    CAIRO_OPERATOR_ADD,
+    CAIRO_OPERATOR_SATURATE
+} cairo_operator_t;
+

+ +

cairo_set_operator ()

void        cairo_set_operator              (cairo_t *cr,
+                                             cairo_operator_t op);

+ +

cr: +
op: + + +

cairo_set_rgb_color ()

void        cairo_set_rgb_color             (cairo_t *cr,
+                                             double red,
+                                             double green,
+                                             double blue);

+Sets a constant color for filling and stroking. This replaces any +pattern set with cairo_set_pattern(). The color components are +floating point numbers in the range 0 to 1. If the values passed in +are outside that range, they will be clamped.

+ +

cr: a cairo_t +
red: red component of color +
green: green component of color +
blue: blue component of color +

cairo_set_pattern ()

void        cairo_set_pattern               (cairo_t *cr,
+                                             cairo_pattern_t *pattern);

+ +

cr: +
pattern: + + +

cairo_set_alpha ()

void        cairo_set_alpha                 (cairo_t *cr,
+                                             double alpha);

+Sets an overall alpha value used for stroking and filling. This +value is multiplied with any alpha value coming from a gradient or +image pattern.

+ +

cr: a cairo_t +
alpha: the alpha value. 0 is transparent, 1 fully opaque. + if the value is outside the range 0 to 1, it will be + clamped to that range. +

cairo_set_tolerance ()

void        cairo_set_tolerance             (cairo_t *cr,
+                                             double tolerance);

+Sets the tolerance used when converting paths into trapezoids. +Curved segments of the path will be subdivided until the maximum +deviation between the original path and the polygonal approximation +is less than tolerance. The default value is 0.1. A larger +value will give better performance, a smaller value, better +appearance. (Reducing the value from the default value of 0.1 +is unlikely to improve appearance significantly.)

+ +

cr: a cairo_t +
tolerance: the tolerance, in device units (typically pixels) +

enum cairo_fill_rule_t

typedef enum cairo_fill_rule {
+    CAIRO_FILL_RULE_WINDING,
+    CAIRO_FILL_RULE_EVEN_ODD
+} cairo_fill_rule_t;
+

+cairo_fill_rule_t is used to select how paths are filled. For both +fill rules, whether or not a point is included in the fill is +determined by taking a ray from that point to infinity and looking +at intersections with the path. The ray can be in any direction, +as long as it doesn't pass through the end point of a segment +or have a tricky intersection such as intersecting tangent to the path. +(Note that filling is not actually implemented in this way. This +is just a description of the rule that is applied.)

+ +

CAIRO_FILL_RULE_WINDING If the path crosses the ray from +left-to-right, counts +1. If the path crosses the ray +from right to left, counts -1. (Left and right are determined +from the perspective of looking along the ray from the starting +point.) If the total count is non-zero, the point will be filled. +
CAIRO_FILL_RULE_EVEN_ODD Counts the total number of +intersections, without regard to the orientation of the contour. If +the total number of intersections is odd, the point will be +filled. +

cairo_set_fill_rule ()

void        cairo_set_fill_rule             (cairo_t *cr,
+                                             cairo_fill_rule_t fill_rule);

+ +

cr: +
fill_rule: + + +

cairo_set_line_width ()

void        cairo_set_line_width            (cairo_t *cr,
+                                             double width);

+ +

cr: +
width: + + +

enum cairo_line_cap_t

typedef enum cairo_line_cap {
+    CAIRO_LINE_CAP_BUTT,
+    CAIRO_LINE_CAP_ROUND,
+    CAIRO_LINE_CAP_SQUARE
+} cairo_line_cap_t;
+

+enumeration for style of line-endings

+ +

CAIRO_LINE_CAP_BUTT start(stop) the line exactly at the start(end) point +
CAIRO_LINE_CAP_ROUND use a round ending, the center of the circle is the end point +
CAIRO_LINE_CAP_SQUARE use squared ending, the center of the square is the end point +

cairo_set_line_cap ()

void        cairo_set_line_cap              (cairo_t *cr,
+                                             cairo_line_cap_t line_cap);

+ +

cr: +
line_cap: + + +

enum cairo_line_join_t

typedef enum cairo_line_join {
+    CAIRO_LINE_JOIN_MITER,
+    CAIRO_LINE_JOIN_ROUND,
+    CAIRO_LINE_JOIN_BEVEL
+} cairo_line_join_t;
+

+ +

cairo_set_line_join ()

void        cairo_set_line_join             (cairo_t *cr,
+                                             cairo_line_join_t line_join);

+ +

cr: +
line_join: + + +

cairo_set_dash ()

void        cairo_set_dash                  (cairo_t *cr,
+                                             double *dashes,
+                                             int ndash,
+                                             double offset);

+ +

cr: +
dashes: +
ndash: +
offset: + + +

cairo_set_miter_limit ()

void        cairo_set_miter_limit           (cairo_t *cr,
+                                             double limit);

+ +

cr: +
limit: + + +

cairo_translate ()

void        cairo_translate                 (cairo_t *cr,
+                                             double tx,
+                                             double ty);

+ +

cr: +
tx: +
ty: + + +

cairo_scale ()

void        cairo_scale                     (cairo_t *cr,
+                                             double sx,
+                                             double sy);

+ +

cr: +
sx: +
sy: + + +

cairo_rotate ()

void        cairo_rotate                    (cairo_t *cr,
+                                             double angle);

+ +

cr: +
angle: + + +

cairo_concat_matrix ()

void        cairo_concat_matrix             (cairo_t *cr,
+                                             cairo_matrix_t *matrix);

+ +

cr: +
matrix: + + +

cairo_set_matrix ()

void        cairo_set_matrix                (cairo_t *cr,
+                                             cairo_matrix_t *matrix);

+ +

cr: +
matrix: + + +

cairo_default_matrix ()

void        cairo_default_matrix            (cairo_t *cr);

+ +

cr: + + +

cairo_identity_matrix ()

void        cairo_identity_matrix           (cairo_t *cr);

+ +

cr: + + +

cairo_transform_point ()

void        cairo_transform_point           (cairo_t *cr,
+                                             double *x,
+                                             double *y);

+ +

cr: +
x: +
y: + + +

cairo_transform_distance ()

void        cairo_transform_distance        (cairo_t *cr,
+                                             double *dx,
+                                             double *dy);

+ +

cr: +
dx: +
dy: + + +

cairo_inverse_transform_point ()

void        cairo_inverse_transform_point   (cairo_t *cr,
+                                             double *x,
+                                             double *y);

+ +

cr: +
x: +
y: + + +

cairo_inverse_transform_distance ()

void        cairo_inverse_transform_distance
+                                            (cairo_t *cr,
+                                             double *dx,
+                                             double *dy);

+ +

cr: +
dx: +
dy: + + +

cairo_new_path ()

void        cairo_new_path                  (cairo_t *cr);

+ +

cr: + + +

cairo_move_to ()

void        cairo_move_to                   (cairo_t *cr,
+                                             double x,
+                                             double y);

+ +

cr: +
x: +
y: + + +

cairo_line_to ()

void        cairo_line_to                   (cairo_t *cr,
+                                             double x,
+                                             double y);

+ +

cr: +
x: +
y: + + +

cairo_curve_to ()

void        cairo_curve_to                  (cairo_t *cr,
+                                             double x1,
+                                             double y1,
+                                             double x2,
+                                             double y2,
+                                             double x3,
+                                             double y3);

+ +

cr: +
x1: +
y1: +
x2: +
y2: +
x3: +
y3: + + +

cairo_arc ()

void        cairo_arc                       (cairo_t *cr,
+                                             double xc,
+                                             double yc,
+                                             double radius,
+                                             double angle1,
+                                             double angle2);

+Adds an arc from angle1 to angle2 to the current path. If there +is a current point, that point is connected to the start of the arc +by a straight line segment. Angles are measured in radians with an +angle of 0 along the X axis and an angle of M_PI radians (90 +degrees) along the Y axis, so with the default transformation +matrix, positive angles are clockwise. (To convert from degrees to +radians, use degrees * (M_PI / 180.).) This +function gives the arc in the direction of increasing angle; see +cairo_arc_negative() to get the arc in the direction of decreasing +angle. +

+A full arc is drawn as a circle. To make an oval arc, you can scale +the current transformation matrix by different amounts in the X and +Y directions. For example, to draw a full oval in the box given +by x, y, width, height: + +

+cairo_save (cr);
+cairo_translate (x + width / 2., y + height / 2.);
+cairo_scale (1. / (height / 2.), 1. / (width / 2.));
+cairo_arc (cr, 0., 0., 1., 0., 2 * M_PI);
+cairo_restore (cr);
+

+ +

cr: a Cairo context +
xc: X position of the center of the arc +
yc: Y position of the center of the arc +
radius: the radius of the arc +
angle1: the start angle, in radians +
angle2: the end angle, in radians +

cairo_arc_negative ()

void        cairo_arc_negative              (cairo_t *cr,
+                                             double xc,
+                                             double yc,
+                                             double radius,
+                                             double angle1,
+                                             double angle2);

+Adds an arc from angle1 to angle2 to the current path. The +function behaves identically to cairo_arc() except that instead of +giving the arc in the direction of increasing angle, it gives +the arc in the direction of decreasing angle.

+ +

cr: a Cairo context +
xc: X position of the center of the arc +
yc: Y position of the center of the arc +
radius: the radius of the arc +
angle1: the start angle, in radians +
angle2: the end angle, in radians +

cairo_rel_move_to ()

void        cairo_rel_move_to               (cairo_t *cr,
+                                             double dx,
+                                             double dy);

+ +

cr: +
dx: +
dy: + + +

cairo_rel_line_to ()

void        cairo_rel_line_to               (cairo_t *cr,
+                                             double dx,
+                                             double dy);

+ +

cr: +
dx: +
dy: + + +

cairo_rel_curve_to ()

void        cairo_rel_curve_to              (cairo_t *cr,
+                                             double dx1,
+                                             double dy1,
+                                             double dx2,
+                                             double dy2,
+                                             double dx3,
+                                             double dy3);

+ +

cr: +
dx1: +
dy1: +
dx2: +
dy2: +
dx3: +
dy3: + + +

cairo_rectangle ()

void        cairo_rectangle                 (cairo_t *cr,
+                                             double x,
+                                             double y,
+                                             double width,
+                                             double height);

+ +

cr: +
x: +
y: +
width: +
height: + + +

cairo_close_path ()

void        cairo_close_path                (cairo_t *cr);

+ +

cr: + + +

cairo_stroke ()

void        cairo_stroke                    (cairo_t *cr);

+ +

cr: + + +

cairo_fill ()

void        cairo_fill                      (cairo_t *cr);

+ +

cr: + + +

cairo_copy_page ()

void        cairo_copy_page                 (cairo_t *cr);

+ +

cr: + + +

cairo_show_page ()

void        cairo_show_page                 (cairo_t *cr);

+ +

cr: + + +

cairo_in_stroke ()

cairo_bool_t cairo_in_stroke                (cairo_t *cr,
+                                             double x,
+                                             double y);

+ +

cr: +
x: +
y: +
Returns: + + +

cairo_in_fill ()

cairo_bool_t cairo_in_fill                  (cairo_t *cr,
+                                             double x,
+                                             double y);

+ +

cr: +
x: +
y: +
Returns: + + +

cairo_bool_t

typedef int cairo_bool_t;
+

+cairo_bool_t is used for boolean values. Returns of type +cairo_bool_t will always be either 0 or 1, but testing against +these values explicitely is not encouraged; just use the +value as a boolean condition. +

+

+ if (cairo_in_stroke (cr, x, y)) {
+     /* do something */
+ }
+

+ +

cairo_stroke_extents ()

void        cairo_stroke_extents            (cairo_t *cr,
+                                             double *x1,
+                                             double *y1,
+                                             double *x2,
+                                             double *y2);

+ +

cr: +
x1: +
y1: +
x2: +
y2: + + +

cairo_fill_extents ()

void        cairo_fill_extents              (cairo_t *cr,
+                                             double *x1,
+                                             double *y1,
+                                             double *x2,
+                                             double *y2);

+ +

cr: +
x1: +
y1: +
x2: +
y2: + + +

cairo_init_clip ()

void        cairo_init_clip                 (cairo_t *cr);

+ +

cr: + + +

cairo_clip ()

void        cairo_clip                      (cairo_t *cr);

+ +

cr: + + +

cairo_font_t

typedef struct _cairo_font cairo_font_t;
+

+A cairo_font_t is a font scaled to a particular size and device +resolution. A font can be set on a cairo_t by using +cairo_set_font() assuming that the current transformation and +target surface of the cairo_t match that for which the +cairo_font_t was created. The effect of using a mismatched +cairo_font_t will be incorrect font metrics.

+ +

cairo_glyph_t

typedef struct {
+  unsigned long        index;
+  double               x;
+  double               y;
+} cairo_glyph_t;
+

+The cairo_glyph_t structure holds information about a single glyph +when drawing or measuring text. A font is (in simple terms) a +collection of shapes used to draw text. A glyph is one of these +shapes. There can be multiple glyphs for a single character +(alternates to be used in different contexts, for example), or a +glyph can be a ligature of multiple +characters. Cairo doesn't expose any way of converting input text +into glyphs, so in order to use the Cairo interfaces that take +arrays of glyphs, you must directly access the appropriate +underlying font system. +

+Note that the offsets given by x and y are not cumulative. When +drawing or measuring text, each glyph is individually positioned +with respect to the overall origin

+ +

unsignedlongindex; glyph index in the font. The exact interpretation of the + glyph index depends on the font technology being used. +
doublex; the offset in the X direction between the origin used for + drawing or measuring the string and the origin of this glyph. +
doubley; the offset in the Y direction between the origin used for + drawing or measuring the string and the origin of this glyph. +

cairo_text_extents_t

typedef struct {
+    double x_bearing;
+    double y_bearing;
+    double width;
+    double height;
+    double x_advance;
+    double y_advance;
+} cairo_text_extents_t;
+

+The cairo_text_extents_t< structure stores the extents of a single +glyph or a string of glyphs in user-space coordinates. Because text +extents are in user-space coordinates, they don't scale along with +the current transformation matrix. If you call +cairo_scale(cr, 2.0, 2.0), text will +be drawn twice as big, but the reported text extents will not be +doubled. They will change slightly due to hinting (so you can't +assume that metrics are independent of the transformation matrix), +but otherwise will remain unchanged.

+ +

doublex_bearing; the horizontal distance from the origin to the + leftmost part of the glyphs as drawn. Positive if the + glyphs lie entirely to the right of the origin. +
doubley_bearing; the vertical distance from the origin to the + topmost part of the glyphs as drawn. Positive only if the + glyphs lie completely below the origin; will usually be + negative. +
doublewidth; width of the glyphs as drawn +
doubleheight; height of the glyphs as drawn +
doublex_advance;distance to advance in the X direction + after drawing these glyphs +
doubley_advance; distance to advance in the Y direction + after drawing these glyphs. Will typically be zero except + for vertical text layout as found in East-Asian languages. +

cairo_font_extents_t

typedef struct {
+    double ascent;
+    double descent;
+    double height;
+    double max_x_advance;
+    double max_y_advance;
+} cairo_font_extents_t;
+

+ +

enum cairo_font_slant_t

typedef enum cairo_font_slant {
+  CAIRO_FONT_SLANT_NORMAL,
+  CAIRO_FONT_SLANT_ITALIC,
+  CAIRO_FONT_SLANT_OBLIQUE
+} cairo_font_slant_t;
+

+ +

enum cairo_font_weight_t

typedef enum cairo_font_weight {
+  CAIRO_FONT_WEIGHT_NORMAL,
+  CAIRO_FONT_WEIGHT_BOLD
+} cairo_font_weight_t;
+

+ +

cairo_select_font ()

void        cairo_select_font               (cairo_t *cr,
+                                             const char *family,
+                                             cairo_font_slant_t slant,
+                                             cairo_font_weight_t weight);

+ +

cr: +
family: +
slant: +
weight: + + +

cairo_scale_font ()

void        cairo_scale_font                (cairo_t *cr,
+                                             double scale);

+ +

cr: +
scale: + + +

cairo_transform_font ()

void        cairo_transform_font            (cairo_t *cr,
+                                             cairo_matrix_t *matrix);

+ +

cr: +
matrix: + + +

cairo_show_text ()

void        cairo_show_text                 (cairo_t *cr,
+                                             unsigned char *utf8);

+ +

cr: +
utf8: + + +

cairo_show_glyphs ()

void        cairo_show_glyphs               (cairo_t *cr,
+                                             cairo_glyph_t *glyphs,
+                                             int num_glyphs);

+ +

cr: +
glyphs: +
num_glyphs: + + +

cairo_current_font ()

cairo_font_t* cairo_current_font            (cairo_t *cr);

+Gets the current font object for a cairo_t. If there is no current +font object, because the font parameters, transform, or target +surface has been changed since a font was last used, a font object +will be created and stored in in the cairo_t.

+ +

cr: a cairo_t +
Returns: the current font object. Can return NULL + on out-of-memory or if the context is already in + an error state. This object is owned by Cairo. To keep + a reference to it, you must call cairo_font_reference(). +

cairo_current_font_extents ()

void        cairo_current_font_extents      (cairo_t *cr,
+                                             cairo_font_extents_t *extents);

+ +

cr: +
extents: + + +

cairo_set_font ()

void        cairo_set_font                  (cairo_t *cr,
+                                             cairo_font_t *font);

+Replaces the current cairo_font_t object in the cairo_t with +font. The replaced font in the cairo_t will be destroyed if there +are no other references to it. Since a cairo_font_t is specific to +a particular output device and size, changing the transformation, +font transformation, or target surfaces of a cairo_t will clear +any previously set font. Setting the font using cairo_set_font() is +exclusive with the simple font selection API provided by +cairo_select_font(). The size and transformation set by +cairo_scale_font() and cairo_transform_font() are ignored unless +they were taken into account when creating font.

+ +

cr: a cairo_t +
font: a cairo_font_t, or NULL to unset any previously set font. +

cairo_text_extents ()

void        cairo_text_extents              (cairo_t *cr,
+                                             unsigned char *utf8,
+                                             cairo_text_extents_t *extents);

+ +

cr: +
utf8: +
extents: + + +

cairo_glyph_extents ()

void        cairo_glyph_extents             (cairo_t *cr,
+                                             cairo_glyph_t *glyphs,
+                                             int num_glyphs,
+                                             cairo_text_extents_t *extents);

+ +

cr: +
glyphs: +
num_glyphs: +
extents: + + +

cairo_text_path ()

void        cairo_text_path                 (cairo_t *cr,
+                                             unsigned char *utf8);

+ +

cr: +
utf8: + + +

cairo_glyph_path ()

void        cairo_glyph_path                (cairo_t *cr,
+                                             cairo_glyph_t *glyphs,
+                                             int num_glyphs);

+ +

cr: +
glyphs: +
num_glyphs: + + +

cairo_font_reference ()

void        cairo_font_reference            (cairo_font_t *font);

+ +

font: + + +

cairo_font_destroy ()

void        cairo_font_destroy              (cairo_font_t *font);

+ +

font: + + +

cairo_font_extents ()

cairo_status_t cairo_font_extents           (cairo_font_t *font,
+                                             cairo_matrix_t *font_matrix,
+                                             cairo_font_extents_t *extents);

+Gets the metrics for a cairo_font_t.

+ +

font: a cairo_font_t +
font_matrix: the font transformation for which this font was + created. (See cairo_transform_font()). This is needed + properly convert the metrics from the font into user space. +
extents: a cairo_font_extents_t which to store the retrieved extents. +
Returns: CAIRO_STATUS_SUCCESS on success. Otherwise, an + error such as CAIRO_STATUS_NO_MEMORY. +

cairo_font_glyph_extents ()

void        cairo_font_glyph_extents        (cairo_font_t *font,
+                                             cairo_matrix_t *font_matrix,
+                                             cairo_glyph_t *glyphs,
+                                             int num_glyphs,
+                                             cairo_text_extents_t *extents);

+cairo_font_glyph_extents() gets the overall metrics for a string of +glyphs. The X and Y offsets in glyphs are taken from an origin of 0,0.

+ +

font: a cairo_font_t +
font_matrix: the font transformation for which this font was + created. (See cairo_transform_font()). This is needed + properly convert the metrics from the font into user space. +
glyphs: an array of glyph IDs with X and Y offsets. +
num_glyphs: the number of glyphs in the glyphs array +
extents: a cairo_text_extents_t which to store the retrieved extents. +

cairo_show_surface ()

void        cairo_show_surface              (cairo_t *cr,
+                                             cairo_surface_t *surface,
+                                             int width,
+                                             int height);

+ +

cr: +
surface: +
width: +
height: + + +

cairo_current_operator ()

cairo_operator_t cairo_current_operator     (cairo_t *cr);

+ +

cr: +
Returns: + + +

cairo_current_rgb_color ()

void        cairo_current_rgb_color         (cairo_t *cr,
+                                             double *red,
+                                             double *green,
+                                             double *blue);

+ +

cr: +
red: +
green: +
blue: + + +

cairo_current_pattern ()

cairo_pattern_t* cairo_current_pattern      (cairo_t *cr);

+ +

cr: +
Returns: + + +

cairo_current_alpha ()

double      cairo_current_alpha             (cairo_t *cr);

+ +

cr: +
Returns: + + +

cairo_current_tolerance ()

double      cairo_current_tolerance         (cairo_t *cr);

+ +

cr: +
Returns: + + +

cairo_current_point ()

void        cairo_current_point             (cairo_t *cr,
+                                             double *x,
+                                             double *y);

+ +

cr: +
x: +
y: + + +

cairo_current_fill_rule ()

cairo_fill_rule_t cairo_current_fill_rule   (cairo_t *cr);

+ +

cr: +
Returns: + + +

cairo_current_line_width ()

double      cairo_current_line_width        (cairo_t *cr);

+ +

cr: +
Returns: + + +

cairo_current_line_cap ()

cairo_line_cap_t cairo_current_line_cap     (cairo_t *cr);

+ +

cr: +
Returns: + + +

cairo_current_line_join ()

cairo_line_join_t cairo_current_line_join   (cairo_t *cr);

+ +

cr: +
Returns: + + +

cairo_current_miter_limit ()

double      cairo_current_miter_limit       (cairo_t *cr);

+ +

cr: +
Returns: + + +

cairo_current_matrix ()

void        cairo_current_matrix            (cairo_t *cr,
+                                             cairo_matrix_t *matrix);

+ +

cr: +
matrix: + + +

cairo_current_target_surface ()

cairo_surface_t* cairo_current_target_surface
+                                            (cairo_t *cr);

+ +

cr: +
Returns: + + +

cairo_current_path ()

void        cairo_current_path              (cairo_t *cr,
+                                             cairo_move_to_func_t *move_to,
+                                             cairo_line_to_func_t *line_to,
+                                             cairo_curve_to_func_t *curve_to,
+                                             cairo_close_path_func_t *close_path,
+                                             void *closure);

+ +

cr: +
move_to: +
line_to: +
curve_to: +
close_path: +
closure: + + +

cairo_current_path_flat ()

void        cairo_current_path_flat         (cairo_t *cr,
+                                             cairo_move_to_func_t *move_to,
+                                             cairo_line_to_func_t *line_to,
+                                             cairo_close_path_func_t *close_path,
+                                             void *closure);

+ +

cr: +
move_to: +
line_to: +
close_path: +
closure: + + +

enum cairo_status_t

typedef enum cairo_status {
+    CAIRO_STATUS_SUCCESS = 0,
+    CAIRO_STATUS_NO_MEMORY,
+    CAIRO_STATUS_INVALID_RESTORE,
+    CAIRO_STATUS_INVALID_POP_GROUP,
+    CAIRO_STATUS_NO_CURRENT_POINT,
+    CAIRO_STATUS_INVALID_MATRIX,
+    CAIRO_STATUS_NO_TARGET_SURFACE,
+    CAIRO_STATUS_NULL_POINTER,
+    CAIRO_STATUS_INVALID_STRING
+} cairo_status_t;
+

+ +

cairo_status ()

cairo_status_t cairo_status                 (cairo_t *cr);

+ +

cr: +
Returns: + + +

cairo_status_string ()

const char* cairo_status_string             (cairo_t *cr);

+ +

cr: +
Returns: + + +

enum cairo_filter_t

typedef enum {
+    CAIRO_FILTER_FAST,
+    CAIRO_FILTER_GOOD,
+    CAIRO_FILTER_BEST,
+    CAIRO_FILTER_NEAREST,
+    CAIRO_FILTER_BILINEAR,
+    CAIRO_FILTER_GAUSSIAN
+} cairo_filter_t;
+

+ +

cairo_image_surface_create ()

cairo_surface_t* cairo_image_surface_create (cairo_format_t format,
+                                             int width,
+                                             int height);

+Creates an image surface of the specified format and +dimensions. The initial contents of the surface is undefined; you +must explicitely clear the buffer, using, for example, +cairo_rectangle() and cairo_fill() if you want it cleared.

+ +

format: format of pixels in the surface to create +
width: width of the surface, in pixels +
height: height of the surface, in pixels +
Returns: the newly created surface, or NULL if it couldn't + be created because of lack of memory +

cairo_image_surface_create_for_data ()

cairo_surface_t* cairo_image_surface_create_for_data
+                                            (char *data,
+                                             cairo_format_t format,
+                                             int width,
+                                             int height,
+                                             int stride);

+Creates an image surface for the provided pixel data. The output +buffer must be kept around until the cairo_surface_t is destroyed +or cairo_surface_finish() is called on the surface. The initial +contents of buffer will be used as the inital image contents; you +must explicitely clear the buffer, using, for example, +cairo_rectangle() and cairo_fill() if you want it cleared.

+ +

data: a pointer to a buffer supplied by the application + in which to write contents. +
format: the format of pixels in the buffer +
width: the width of the image to be stored in the buffer +
height: the height of the image to be stored in the buffer +
stride: the number of bytes between the start of rows + in the buffer. Having this be specified separate from width + allows for padding at the end of rows, or for writing + to a subportion of a larger image. +
Returns: the newly created surface, or NULL if it couldn't + be created because of lack of memory +
<<PartII.Referencecairo_surface_t>>
diff --git a/gfx/cairo/cairo/doc/public/html/cairo.devhelp b/gfx/cairo/cairo/doc/public/html/cairo.devhelp new file mode 100644 index 000000000000..84563e3ab510 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/html/cairo.devhelp @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gfx/cairo/cairo/doc/public/html/home.png b/gfx/cairo/cairo/doc/public/html/home.png new file mode 100644 index 0000000000000000000000000000000000000000..17003611d9df2b066afc682cbde962f3a575002d GIT binary patch literal 654 zcmV;90&)F`P)~yY zO1cF+0vxb!W?!x?K+*#62Jq)nA4q`)5S6sgX4ao{=)(Mgq+YMr)7sjak|a^9)zS!j zlk{-n29mabXYF=7SYBQx&vO8xC}MYams+hxqtO7sImhPaCf@rq;I^3!#u*2aUP)55 zT2&N90xmEJ0s&fGT~(T<3d2xYmK9C>IP*x-M@ib*+0pFm>>uW37N2Wzaq-fCnIZE9 zpb8}0+uN+KuQM2oZVHfP8U6kQdo3?>Wo2dT)WeM9So8DqhLi#T0 z-i(>mfjhvbsYV`;4sgfJ-p>G-SqJ!fjR6BQYs1h*y9xaN0l{VB;o%`08yiy@)$8@~ z2PD1gcDuiy;j1tR0v#V8OH%W)25-YKyx(j#IXO9*YWf0mb8}QG6@b@;cHxh9{t7+@ o!Yd`f8L$sLH?yBt^q3C6015TtIu@BS5dZ)H07*qoM6N<$f*igdr~m)} literal 0 HcmV?d00001 diff --git a/gfx/cairo/cairo/doc/public/html/index.html b/gfx/cairo/cairo/doc/public/html/index.html new file mode 100644 index 000000000000..e189c0098b5e --- /dev/null +++ b/gfx/cairo/cairo/doc/public/html/index.html @@ -0,0 +1,2 @@ +Cairo: A Vector Graphics Library

Cairo: A Vector Graphics Library

Table of Contents

I. Tutorial
II. Reference
cairo_t - Drawing contexts.
cairo_surface_t -
cairo_pattern_t -
cairo_matrix_t - + Transformation matrices
ATSUI Fonts -
FreeType Fonts -
Glitz backend -
PDF Backend -
PNG Backend -
PS Backend -
Quartz Backend -
Microsoft Windows Backend -
XCB Backend -
XLib Backend -
PartI.Tutorial>>
diff --git a/gfx/cairo/cairo/doc/public/html/index.sgml b/gfx/cairo/cairo/doc/public/html/index.sgml new file mode 100644 index 000000000000..81b09b9738d3 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/html/index.sgml @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gfx/cairo/cairo/doc/public/html/left.png b/gfx/cairo/cairo/doc/public/html/left.png new file mode 100644 index 0000000000000000000000000000000000000000..2d05b3d5b4aeec9384bbfe404bfc4ed0897051c4 GIT binary patch literal 459 zcmV;+0W|)JP)40xL?wO*>WZ(J#ML5j2<9jD6A%Q&kC}jOeEc;X{s;`zcnxLeZR6?6h#^ihmNF6NpGdilO$m<82oD9WQ|6nVv1`? z>KufRi{?QPXg;4;wroQu4?mN1Ydd@|kaQ|ZyWLK!)yi7Wb%=0{}lD)tfliHAUyWRQ+fD_;aV6j->y6!O_8bENgPartI.Tutorial
PrevHomeCairo: A Vector Graphics LibraryNext

Tutorial

<<Cairo: A Vector Graphics LibraryPartII.Reference>>
diff --git a/gfx/cairo/cairo/doc/public/html/pt02.html b/gfx/cairo/cairo/doc/public/html/pt02.html new file mode 100644 index 000000000000..e906eefe44b8 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/html/pt02.html @@ -0,0 +1 @@ +PartII.Reference
PrevHomeCairo: A Vector Graphics LibraryNext

Reference

<<PartI.Tutorialcairo_t>>
diff --git a/gfx/cairo/cairo/doc/public/html/right.png b/gfx/cairo/cairo/doc/public/html/right.png new file mode 100644 index 0000000000000000000000000000000000000000..92832e3a4566e59d6e4092010e08d28f3be3a68d GIT binary patch literal 472 zcmV;}0Vn>6P)Cd4HCN^TYHBC0dz3r5|}*T3c5!K}0^NPTey!^rYo;W&eW{b1SE%dR-1ljcju- zJITo5P_e{cPDWDszO|97o#m$fni3V4d%~7^?0HU4-k!+X`e~w55Q}HA=c?CM9`EK` z^o5GF_RsnG`ey+9wOf8O4bzg>7W*;jU~M?g`OZAA$mNp|Lz<$s+~N9!2`ir8RcClo$(Q~19INM~9}j;&*|enC yGd}kJak0wj?aUKd8;%}`i}SSew>!A-2iw}^5}Rh(M>+vRkipZ{&t;ucLK6U4uc96R literal 0 HcmV?d00001 diff --git a/gfx/cairo/cairo/doc/public/tmpl/cairo-atsui.sgml b/gfx/cairo/cairo/doc/public/tmpl/cairo-atsui.sgml new file mode 100644 index 000000000000..0d957ecdf242 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/tmpl/cairo-atsui.sgml @@ -0,0 +1,25 @@ + +ATSUI Fonts + + + + + + + + + + + + + + + + + + + +@style: +@Returns: + + diff --git a/gfx/cairo/cairo/doc/public/tmpl/cairo-ft.sgml b/gfx/cairo/cairo/doc/public/tmpl/cairo-ft.sgml new file mode 100644 index 000000000000..bcf52ac34bc1 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/tmpl/cairo-ft.sgml @@ -0,0 +1,63 @@ + +FreeType Fonts + + + + + + + + + + + + + + + + + + + +@pattern: +@scale: +@Returns: + + + + + + + +@face: +@load_flags: +@scale: +@Returns: + + + + + + + +@ft_font: +@Returns: + + + + + + + +@ft_font: + + + + + + + +@ft_font: +@Returns: + + diff --git a/gfx/cairo/cairo/doc/public/tmpl/cairo-glitz.sgml b/gfx/cairo/cairo/doc/public/tmpl/cairo-glitz.sgml new file mode 100644 index 000000000000..101eb9e3ea93 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/tmpl/cairo-glitz.sgml @@ -0,0 +1,34 @@ + +Glitz backend + + + + + + + + + + + + + + + + + + + +@cr: +@surface: + + + + + + + +@surface: +@Returns: + + diff --git a/gfx/cairo/cairo/doc/public/tmpl/cairo-matrix.sgml b/gfx/cairo/cairo/doc/public/tmpl/cairo-matrix.sgml new file mode 100644 index 000000000000..dc24c5754cda --- /dev/null +++ b/gfx/cairo/cairo/doc/public/tmpl/cairo-matrix.sgml @@ -0,0 +1,193 @@ + +cairo_matrix_t + + + + Transformation matrices + + + + typescairo_matrix + cairo_matrix_t is used throughout + Cairo to represents between different coordinates spaces. + A cairo_matrix holds an affine + transformation, such as a scale, rotation, or shear, or a + combination of those. Mathematically, the effect of an affine + transformation on a point (x,y) is given by: + + + x_new = x * a + y * c + tx; + y_new = x * b + y * d + ty; + + + The parameters a, b, + c, d, tx, + ty can be retrieved with + cairo_matrix_get_affine() and set with cairo_matrix_get_affine(). + + + The primary use of transformation matrices in Cairo is as the + current transformation matrix in a #cairo_t. The current + transformation matrix gives the transformation from user space + coordinates to device coordinates. See cairo_set_matrix(), + cairo_current_matrix(). + + + + + + + + + + + + + + + + + + +@Returns: + + + + + + + +@matrix: + + + + + + + +@matrix: +@other: +@Returns: + + + + + + + +@matrix: +@Returns: + + + + + + + +@matrix: +@a: +@b: +@c: +@d: +@tx: +@ty: +@Returns: + +@cr: + + + + + + + +@matrix: +@a: +@b: +@c: +@d: +@tx: +@ty: +@Returns: + + + + + + + +@matrix: +@tx: +@ty: +@Returns: + + + + + + + +@matrix: +@sx: +@sy: +@Returns: + + + + + + + +@matrix: +@radians: +@Returns: + + + + + + + +@matrix: +@Returns: + + + + + + + +@result: +@a: +@b: +@Returns: + + + + + + + +@matrix: +@dx: +@dy: +@Returns: + + + + + + +@matrix: +@x: +@y: +@Returns: + + + + diff --git a/gfx/cairo/cairo/doc/public/tmpl/cairo-pattern.sgml b/gfx/cairo/cairo/doc/public/tmpl/cairo-pattern.sgml new file mode 100644 index 000000000000..84728212bfc4 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/tmpl/cairo-pattern.sgml @@ -0,0 +1,154 @@ + +cairo_pattern_t + + + + + + + + + + + + + + + + + + + + + + + + + +@surface: +@Returns: + + + + + + + +@x0: +@y0: +@x1: +@y1: +@Returns: + + + + + + + +@cx0: +@cy0: +@radius0: +@cx1: +@cy1: +@radius1: +@Returns: + + + + + + + +@pattern: + + + + + + + +@pattern: + + + + + + + +@pattern: +@offset: +@red: +@green: +@blue: +@alpha: +@Returns: + + + + + + + +@pattern: +@matrix: +@Returns: + + + + + + + +@pattern: +@matrix: +@Returns: + + + + + + + +@CAIRO_EXTEND_NONE: +@CAIRO_EXTEND_REPEAT: +@CAIRO_EXTEND_REFLECT: + + + + + + +@pattern: +@extend: +@Returns: + + + + + + + +@pattern: +@Returns: + + + + + + + +@pattern: +@filter: +@Returns: + + + + + + + +@pattern: +@Returns: + + diff --git a/gfx/cairo/cairo/doc/public/tmpl/cairo-pdf.sgml b/gfx/cairo/cairo/doc/public/tmpl/cairo-pdf.sgml new file mode 100644 index 000000000000..e627c236e09f --- /dev/null +++ b/gfx/cairo/cairo/doc/public/tmpl/cairo-pdf.sgml @@ -0,0 +1,42 @@ + +PDF Backend + + + + + + + + + + + + + + + + + + + +@cr: +@file: +@width_inches: +@height_inches: +@x_pixels_per_inch: +@y_pixels_per_inch: + + + + + + + +@file: +@width_inches: +@height_inches: +@x_pixels_per_inch: +@y_pixels_per_inch: +@Returns: + + diff --git a/gfx/cairo/cairo/doc/public/tmpl/cairo-png.sgml b/gfx/cairo/cairo/doc/public/tmpl/cairo-png.sgml new file mode 100644 index 000000000000..d4d5a66b552a --- /dev/null +++ b/gfx/cairo/cairo/doc/public/tmpl/cairo-png.sgml @@ -0,0 +1,40 @@ + +PNG Backend + + + + + + + + + + + + + + + + + + + +@cr: +@file: +@format: +@width: +@height: + + + + + + + +@file: +@format: +@width: +@height: +@Returns: + + diff --git a/gfx/cairo/cairo/doc/public/tmpl/cairo-ps.sgml b/gfx/cairo/cairo/doc/public/tmpl/cairo-ps.sgml new file mode 100644 index 000000000000..70b2e7e8f9e5 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/tmpl/cairo-ps.sgml @@ -0,0 +1,42 @@ + +PS Backend + + + + + + + + + + + + + + + + + + + +@cr: +@file: +@width_inches: +@height_inches: +@x_pixels_per_inch: +@y_pixels_per_inch: + + + + + + + +@file: +@width_inches: +@height_inches: +@x_pixels_per_inch: +@y_pixels_per_inch: +@Returns: + + diff --git a/gfx/cairo/cairo/doc/public/tmpl/cairo-quartz.sgml b/gfx/cairo/cairo/doc/public/tmpl/cairo-quartz.sgml new file mode 100644 index 000000000000..04c9bc61fd10 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/tmpl/cairo-quartz.sgml @@ -0,0 +1,38 @@ + +Quartz Backend + + + + + + + + + + + + + + + + + + + +@cr: +@context: +@width: +@height: + + + + + + + +@context: +@width: +@height: +@Returns: + + diff --git a/gfx/cairo/cairo/doc/public/tmpl/cairo-surface.sgml b/gfx/cairo/cairo/doc/public/tmpl/cairo-surface.sgml new file mode 100644 index 000000000000..2f8ad470c2b8 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/tmpl/cairo-surface.sgml @@ -0,0 +1,112 @@ + +cairo_surface_t + + + + + + + + + + + + + + + + + + + + + + + + + +@data: +@format: +@width: +@height: +@stride: +@Returns: + + + + + + + +@other: +@format: +@width: +@height: +@Returns: + + + + + + + +@surface: + + + + + + + +@surface: + + + + + + + +@surface: +@repeat: +@Returns: + + + + + + + +@surface: +@matrix: +@Returns: + + + + + + + +@surface: +@matrix: +@Returns: + + + + + + + +@surface: +@filter: +@Returns: + + + + + + + +@surface: +@Returns: + + diff --git a/gfx/cairo/cairo/doc/public/tmpl/cairo-xcb.sgml b/gfx/cairo/cairo/doc/public/tmpl/cairo-xcb.sgml new file mode 100644 index 000000000000..e5e1ee912129 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/tmpl/cairo-xcb.sgml @@ -0,0 +1,28 @@ + +XCB Backend + + + + + + + + + + + + + + + + + + + +@cr: +@dpy: +@drawable: +@visual: +@format: + + diff --git a/gfx/cairo/cairo/doc/public/tmpl/cairo-xlib.sgml b/gfx/cairo/cairo/doc/public/tmpl/cairo-xlib.sgml new file mode 100644 index 000000000000..b18e76aae012 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/tmpl/cairo-xlib.sgml @@ -0,0 +1,39 @@ + +XLib Backend + + + + + + + + + + + + + + + + + + + +@cr: +@dpy: +@drawable: + + + + + + + +@dpy: +@drawable: +@visual: +@format: +@colormap: +@Returns: + + diff --git a/gfx/cairo/cairo/doc/public/tmpl/cairo.sgml b/gfx/cairo/cairo/doc/public/tmpl/cairo.sgml new file mode 100644 index 000000000000..a9e195c73716 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/tmpl/cairo.sgml @@ -0,0 +1,1019 @@ + +cairo_t + + +Drawing contexts. + + + + + #cairo_t is the main object used when drawing with Cairo. To + draw with Cairo, you create a #cairo_t, set the target surface, + and drawing options for the #cairo_t, create shapes with + functions like cairo_move_to() and cairo_line_to(), and then + draw ships with cairo_stroke() or cairo_fill(). + + + #cairo_t's can be pushed to a stack via cairo_save(). + They may then safely be changed, without loosing the current state. + Use cairo_restore() to restore to the saved state. + + + + + + + + + + + + + + + + + + +@Returns: + + + + + + + +@cr: + + + + + + + +@cr: + + + + + + + +@cr: + + + + + + + +@cr: + + + + + + + +@dest: +@src: + + + + + + + +@cr: +@surface: + + + + + + + +@CAIRO_FORMAT_ARGB32: +@CAIRO_FORMAT_RGB24: +@CAIRO_FORMAT_A8: +@CAIRO_FORMAT_A1: + + + + + + +@cr: +@data: +@format: +@width: +@height: +@stride: + + + + + + + +@CAIRO_OPERATOR_CLEAR: +@CAIRO_OPERATOR_SRC: +@CAIRO_OPERATOR_DST: +@CAIRO_OPERATOR_OVER: +@CAIRO_OPERATOR_OVER_REVERSE: +@CAIRO_OPERATOR_IN: +@CAIRO_OPERATOR_IN_REVERSE: +@CAIRO_OPERATOR_OUT: +@CAIRO_OPERATOR_OUT_REVERSE: +@CAIRO_OPERATOR_ATOP: +@CAIRO_OPERATOR_ATOP_REVERSE: +@CAIRO_OPERATOR_XOR: +@CAIRO_OPERATOR_ADD: +@CAIRO_OPERATOR_SATURATE: + + + + + + +@cr: +@op: + + + + + + + +@cr: +@red: +@green: +@blue: + + + + + + + +@cr: +@pattern: + + + + + + + +@cr: +@alpha: + + + + + + + +@cr: +@tolerance: + + + + + + + +@CAIRO_FILL_RULE_WINDING: +@CAIRO_FILL_RULE_EVEN_ODD: + + + + + + +@cr: +@fill_rule: + + + + + + + +@cr: +@width: + + + + + + + +@CAIRO_LINE_CAP_BUTT: +@CAIRO_LINE_CAP_ROUND: +@CAIRO_LINE_CAP_SQUARE: + + + + + + +@cr: +@line_cap: + + + + + + + +@CAIRO_LINE_JOIN_MITER: +@CAIRO_LINE_JOIN_ROUND: +@CAIRO_LINE_JOIN_BEVEL: + + + + + + +@cr: +@line_join: + + + + + + + +@cr: +@dashes: +@ndash: +@offset: + + + + + + + +@cr: +@limit: + + + + + + + +@cr: +@tx: +@ty: + + + + + + + +@cr: +@sx: +@sy: + + + + + + + +@cr: +@angle: + + + + + + + +@cr: +@matrix: + + + + + + + +@cr: +@matrix: + + + + + + + +@cr: + + + + + + + +@cr: + + + + + + + +@cr: +@x: +@y: + + + + + + + +@cr: +@dx: +@dy: + + + + + + + +@cr: +@x: +@y: + + + + + + + +@cr: +@dx: +@dy: + + + + + + + +@cr: + + + + + + + +@cr: +@x: +@y: + + + + + + + +@cr: +@x: +@y: + + + + + + + +@cr: +@x1: +@y1: +@x2: +@y2: +@x3: +@y3: + + + + + + + +@cr: +@xc: +@yc: +@radius: +@angle1: +@angle2: + + + + + + + +@cr: +@xc: +@yc: +@radius: +@angle1: +@angle2: + + + + + + + +@cr: +@dx: +@dy: + + + + + + + +@cr: +@dx: +@dy: + + + + + + + +@cr: +@dx1: +@dy1: +@dx2: +@dy2: +@dx3: +@dy3: + + + + + + + +@cr: +@x: +@y: +@width: +@height: + + + + + + + +@cr: + + + + + + + +@cr: + + + + + + + +@cr: + + + + + + + +@cr: + + + + + + + +@cr: + + + + + + + +@cr: +@x: +@y: +@Returns: + + + + + + + +@cr: +@x: +@y: +@Returns: + + + + + + + + + + + + + +@cr: +@x1: +@y1: +@x2: +@y2: + + + + + + + +@cr: +@x1: +@y1: +@x2: +@y2: + + + + + + + +@cr: + + + + + + + +@cr: + + + + + + + + + + + + + +@index: +@x: +@y: + + + + + + +@x_bearing: +@y_bearing: +@width: +@height: +@x_advance: +@y_advance: + + + + + + +@ascent: +@descent: +@height: +@max_x_advance: +@max_y_advance: + + + + + + +@CAIRO_FONT_SLANT_NORMAL: +@CAIRO_FONT_SLANT_ITALIC: +@CAIRO_FONT_SLANT_OBLIQUE: + + + + + + +@CAIRO_FONT_WEIGHT_NORMAL: +@CAIRO_FONT_WEIGHT_BOLD: + + + + + + +@cr: +@family: +@slant: +@weight: + + + + + + + +@cr: +@scale: + + + + + + + +@cr: +@matrix: + + + + + + + +@cr: +@utf8: + + + + + + + +@cr: +@glyphs: +@num_glyphs: + + + + + + + +@cr: +@Returns: + + + + + + + +@cr: +@extents: + + + + + + + +@cr: +@font: + + + + + + + +@cr: +@utf8: +@extents: + + + + + + + +@cr: +@glyphs: +@num_glyphs: +@extents: + + + + + + + +@cr: +@utf8: + + + + + + + +@cr: +@glyphs: +@num_glyphs: + + + + + + + +@font: + + + + + + + +@font: + + + + + + + +@font: +@font_matrix: +@glyphs: +@num_glyphs: +@extents: + + + + + + + +@cr: +@surface: +@width: +@height: + + + + + + + +@cr: +@Returns: + + + + + + + +@cr: +@red: +@green: +@blue: + + + + + + + +@cr: +@Returns: + + + + + + + +@cr: +@Returns: + + + + + + + +@cr: +@Returns: + + + + + + + +@cr: +@x: +@y: + + + + + + + +@cr: +@Returns: + + + + + + + +@cr: +@Returns: + + + + + + + +@cr: +@Returns: + + + + + + + +@cr: +@Returns: + + + + + + + +@cr: +@Returns: + + + + + + + +@cr: +@matrix: + + + + + + + +@cr: +@Returns: + + + + + + + +@cr: +@move_to: +@line_to: +@curve_to: +@close_path: +@closure: + + + + + + + +@cr: +@move_to: +@line_to: +@close_path: +@closure: + + + + + + + +@CAIRO_STATUS_SUCCESS: +@CAIRO_STATUS_NO_MEMORY: +@CAIRO_STATUS_INVALID_RESTORE: +@CAIRO_STATUS_INVALID_POP_GROUP: +@CAIRO_STATUS_NO_CURRENT_POINT: +@CAIRO_STATUS_INVALID_MATRIX: +@CAIRO_STATUS_NO_TARGET_SURFACE: +@CAIRO_STATUS_NULL_POINTER: +@CAIRO_STATUS_INVALID_STRING: + + + + + + +@cr: +@Returns: + + + + + + + +@cr: +@Returns: + + + + + + + +@CAIRO_FILTER_FAST: +@CAIRO_FILTER_GOOD: +@CAIRO_FILTER_BEST: +@CAIRO_FILTER_NEAREST: +@CAIRO_FILTER_BILINEAR: +@CAIRO_FILTER_GAUSSIAN: + + + + + + +@format: +@width: +@height: +@Returns: + + + + + + + +@data: +@format: +@width: +@height: +@stride: +@Returns: + + + + + + diff --git a/gfx/cairo/cairo/doc/public/xml/cairo-atsui.xml b/gfx/cairo/cairo/doc/public/xml/cairo-atsui.xml new file mode 100644 index 000000000000..3186ba8284a3 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/xml/cairo-atsui.xml @@ -0,0 +1,62 @@ + + + + +ATSUI Fonts +3 +CAIRO Library + + + +ATSUI Fonts + + +Synopsis + + + + + +cairo_font_t* cairo_atsui_font_create (ATSUStyle style); + + + + + + + + + + + + +Description + + + + + + +Details + +<anchor id="cairo-atsui-font-create"/>cairo_atsui_font_create () +cairo_atsui_font_createcairo_font_t* cairo_atsui_font_create (ATSUStyle style); + + + +style : + + +Returns : + + + + + + + + + + + diff --git a/gfx/cairo/cairo/doc/public/xml/cairo-ft.xml b/gfx/cairo/cairo/doc/public/xml/cairo-ft.xml new file mode 100644 index 000000000000..de92f3484bdf --- /dev/null +++ b/gfx/cairo/cairo/doc/public/xml/cairo-ft.xml @@ -0,0 +1,206 @@ + + + + +FreeType Fonts +3 +CAIRO Library + + + +FreeType Fonts + + +Synopsis + + + + + +cairo_font_t* cairo_ft_font_create (FcPattern *pattern, + cairo_matrix_t *scale); +cairo_font_t* cairo_ft_font_create_for_ft_face + (FT_Face face, + int load_flags, + cairo_matrix_t *scale); +FT_Face cairo_ft_font_lock_face (cairo_font_t *ft_font); +void cairo_ft_font_unlock_face (cairo_font_t *ft_font); +FcPattern* cairo_ft_font_get_pattern (cairo_font_t *ft_font); + + + + + + + + + + + + +Description + + + + + + +Details + +<anchor id="cairo-ft-font-create"/>cairo_ft_font_create () +cairo_ft_font_createcairo_font_t* cairo_ft_font_create (FcPattern *pattern, + cairo_matrix_t *scale); + +Creates a new font for the FreeType font backend based on a +fontconfig pattern. This font can then be used with +cairo_set_font(), cairo_font_glyph_extents(), or FreeType backend +specific functions like cairo_ft_font_lock_face(). + + + +pattern : + A fully resolved fontconfig + pattern. A pattern can be resolved, by, among other things, calling + FcConfigSubstitute(), FcDefaultSubstitute(), then + FcFontMatch(). Cairo will call FcPatternReference() on this + pattern, so you should not further modify the pattern, but you can + release your reference to the pattern with FcPatternDestroy() if + you no longer need to access it. + +scale : + The scale at which this font will be used. The + scale is given by multiplying the font matrix (see + cairo_transform_font()) by the current transformation matrix. + The translation elements of the resulting matrix are ignored. + +Returns : a newly created cairo_font_t. Free with + cairo_font_destroy() when you are done using it. + + + +<anchor id="cairo-ft-font-create-for-ft-face"/>cairo_ft_font_create_for_ft_face () +cairo_ft_font_create_for_ft_facecairo_font_t* cairo_ft_font_create_for_ft_face + (FT_Face face, + int load_flags, + cairo_matrix_t *scale); + +Creates a new font forthe FreeType font backend from a pre-opened +FreeType face. This font can then be used with cairo_set_font(), +cairo_font_glyph_extents(), or FreeType backend specific +functions like cairo_ft_font_lock_face() Cairo will determine the +pixel size and transformation from the scale parameter and call +FT_Set_Transform() and FT_Set_Pixel_Sizes(). + + + +face : + A FreeType face object, already opened. This must + be kept around until the font object's refcount drops to + zero and it is freed. The font object can be kept alive by + internal caching, so it's safest to keep the face object + around forever. + +load_flags : + The flags to pass to FT_Load_Glyph when loading + glyphs from the font. These flags control aspects of + rendering such as hinting and antialiasing. See the FreeType + docs for full information. + +scale : + The scale at which this font will be used. The + scale is given by multiplying the font matrix (see + cairo_transform_font()) by the current transformation matrix. + The translation elements of the resulting matrix are ignored. + +Returns : a newly created cairo_font_t. Free with + cairo_font_destroy() when you are done using it. + + + +<anchor id="cairo-ft-font-lock-face"/>cairo_ft_font_lock_face () +cairo_ft_font_lock_faceFT_Face cairo_ft_font_lock_face (cairo_font_t *ft_font); + +cairo_ft_font_lock_face() gets the FT_Face object from a FreeType +backend font and scales it appropriately for the font. You must +release the face with cairo_ft_font_unlock_face() +when you are done using it. Since the FT_Face object can be +shared between multiple cairo_font_t objects, you must not +lock any other font objects until you unlock this one. A count is +kept of the number of times cairo_ft_font_lock_face() is +called. cairo_ft_font_unlock_face() must be called the same number +of times. + + +You must be careful when using this function in a library or in a +threaded application, because other threads may lock faces that +share the same FT_Face object. For this reason, you must call +cairo_ft_lock() before locking any face objects, and +cairo_ft_unlock() after you are done. (These functions are not yet +implemented, so this function cannot be currently safely used in a +threaded application.) + + + +ft_font : + A cairo_font_t from the FreeType font backend. Such an + object can be created with cairo_ft_font_create() or + cairo_ft_font_create_for_ft_face(). On some platforms the font from + cairo_current_font() will also be a FreeType font, but using this + functionality with fonts you don't create yourself is not + recommended. + +Returns : The FT_Face object for font, scaled appropriately. + + + +<anchor id="cairo-ft-font-unlock-face"/>cairo_ft_font_unlock_face () +cairo_ft_font_unlock_facevoid cairo_ft_font_unlock_face (cairo_font_t *ft_font); + +Releases a face obtained with cairo_ft_font_lock_face(). See the +documentation for that function for full details. + + + +ft_font : + A cairo_font_t from the FreeType font backend. Such an + object can be created with cairo_ft_font_create() or + cairo_ft_font_create_for_ft_face(). On some platforms the font from + cairo_current_font() will also be a FreeType font, but using this + functionality with fonts you don't create yourself is not + recommended. + + + +<anchor id="cairo-ft-font-get-pattern"/>cairo_ft_font_get_pattern () +cairo_ft_font_get_patternFcPattern* cairo_ft_font_get_pattern (cairo_font_t *ft_font); + +cairo_ft_font_get_pattern() gets the FcPattern for a FreeType +backend font. + + +Return value: The FcPattenr for font. The return value is owned + by the font, so you must not modify it, and must call + FcPatternReference() to keep a persistant reference to the + pattern. If the font was created with cairo_ft_font_create_for_ft_face() + + + +ft_font : + A cairo_font_t from the FreeType font backend. Such an + object can be created with cairo_ft_font_create() or + cairo_ft_font_create_for_ft_face(). On some platforms the font from + cairo_current_font() will also be a FreeType font, but using this + functionality with fonts you don't create yourself is not + recommended. + +Returns :NULL. + + + + + + + + + diff --git a/gfx/cairo/cairo/doc/public/xml/cairo-glitz.xml b/gfx/cairo/cairo/doc/public/xml/cairo-glitz.xml new file mode 100644 index 000000000000..48a6a726b7f7 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/xml/cairo-glitz.xml @@ -0,0 +1,80 @@ + + + + +Glitz backend +3 +CAIRO Library + + + +Glitz backend + + +Synopsis + + + + + +void cairo_set_target_glitz (cairo_t *cr, + glitz_surface_t *surface); +cairo_surface_t* cairo_glitz_surface_create (glitz_surface_t *surface); + + + + + + + + + + + + +Description + + + + + + +Details + +<anchor id="cairo-set-target-glitz"/>cairo_set_target_glitz () +cairo_set_target_glitzvoid cairo_set_target_glitz (cairo_t *cr, + glitz_surface_t *surface); + + + +cr : + + +surface : + + + + + + +<anchor id="cairo-glitz-surface-create"/>cairo_glitz_surface_create () +cairo_glitz_surface_createcairo_surface_t* cairo_glitz_surface_create (glitz_surface_t *surface); + + + +surface : + + +Returns : + + + + + + + + + + + diff --git a/gfx/cairo/cairo/doc/public/xml/cairo-matrix.xml b/gfx/cairo/cairo/doc/public/xml/cairo-matrix.xml new file mode 100644 index 000000000000..8f22a4046a33 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/xml/cairo-matrix.xml @@ -0,0 +1,434 @@ + + + + +cairo_matrix_t +3 +CAIRO Library + + + +cairo_matrix_t + Transformation matrices + + +Synopsis + + + + + +typedef cairo_matrix_t; +cairo_matrix_t* cairo_matrix_create (void); +void cairo_matrix_destroy (cairo_matrix_t *matrix); +cairo_status_t cairo_matrix_copy (cairo_matrix_t *matrix, + const cairo_matrix_t *other); +cairo_status_t cairo_matrix_set_identity (cairo_matrix_t *matrix); +cairo_status_t cairo_matrix_set_affine (cairo_matrix_t *matrix, + double a, + double b, + double c, + double d, + double tx, + double ty); +cairo_status_t cairo_matrix_get_affine (cairo_matrix_t *matrix, + double *a, + double *b, + double *c, + double *d, + double *tx, + double *ty); +cairo_status_t cairo_matrix_translate (cairo_matrix_t *matrix, + double tx, + double ty); +cairo_status_t cairo_matrix_scale (cairo_matrix_t *matrix, + double sx, + double sy); +cairo_status_t cairo_matrix_rotate (cairo_matrix_t *matrix, + double radians); +cairo_status_t cairo_matrix_invert (cairo_matrix_t *matrix); +cairo_status_t cairo_matrix_multiply (cairo_matrix_t *result, + const cairo_matrix_t *a, + const cairo_matrix_t *b); +cairo_status_t cairo_matrix_transform_distance + (cairo_matrix_t *matrix, + double *dx, + double *dy); +cairo_status_t cairo_matrix_transform_point (cairo_matrix_t *matrix, + double *x, + double *y); + + + + + + + + + + + + +Description + + typescairo_matrix + cairo_matrix_t is used throughout + Cairo to represents between different coordinates spaces. + A cairo_matrix holds an affine + transformation, such as a scale, rotation, or shear, or a + combination of those. Mathematically, the effect of an affine + transformation on a point (x,y) is given by: + + + x_new = x * a + y * c + tx; + y_new = x * b + y * d + ty; + + + The parameters a, b, + c, d, tx, + ty can be retrieved with + cairo_matrix_get_affine() and set with cairo_matrix_get_affine(). + + + The primary use of transformation matrices in Cairo is as the + current transformation matrix in a cairo_t. The current + transformation matrix gives the transformation from user space + coordinates to device coordinates. See cairo_set_matrix(), + cairo_current_matrix(). + + + + +Details + +<anchor id="cairo-matrix-t"/>cairo_matrix_t +cairo_matrix_ttypedef struct _cairo_matrix cairo_matrix_t; + + +A cairo_matrix_t holds an affine transformation, such as a scale, +rotation, or shear, or a combination of those. + + + + +<anchor id="cairo-matrix-create"/>cairo_matrix_create () +cairo_matrix_createcairo_matrix_t* cairo_matrix_create (void); + +Creates a new identity matrix. + + + +Returns : a newly created matrix; free with cairo_matrix_destroy(), + or NULL if memory couldn't be allocated. + + + +<anchor id="cairo-matrix-destroy"/>cairo_matrix_destroy () +cairo_matrix_destroyvoid cairo_matrix_destroy (cairo_matrix_t *matrix); + +Frees a matrix created with cairo_matrix_create. + + + +matrix : + a cairo_matrix_t + + + +<anchor id="cairo-matrix-copy"/>cairo_matrix_copy () +cairo_matrix_copycairo_status_t cairo_matrix_copy (cairo_matrix_t *matrix, + const cairo_matrix_t *other); + +Modifies matrix to be identical to other. + + + +matrix : + a cairo_matrix_t + +other : + another cairo_ + +Returns : CAIRO_STATUS_SUCCESS, always. + + + +<anchor id="cairo-matrix-set-identity"/>cairo_matrix_set_identity () +cairo_matrix_set_identitycairo_status_t cairo_matrix_set_identity (cairo_matrix_t *matrix); + +Modifies matrix to be an identity transformation. + + + +matrix : + a cairo_matrix_t + +Returns : CAIRO_STATUS_SUCCESS, always. + + + +<anchor id="cairo-matrix-set-affine"/>cairo_matrix_set_affine () +cairo_matrix_set_affinecairo_status_t cairo_matrix_set_affine (cairo_matrix_t *matrix, + double a, + double b, + double c, + double d, + double tx, + double ty); + +Sets matrix to be the affine transformation given by +a, b, c, d, tx, ty. The transformation is given +by: + + x_new = x * a + y * c + tx; + y_new = x * b + y * d + ty; + + + + +matrix : + a cairo_matrix_t + +a : + a component of the affine transformation + +b : + b component of the affine transformation + +c : + c component of the affine transformation + +d : + d component of the affine transformation + +tx : + X translation component of the affine transformation + +ty : + Y translation component of the affine transformation + +Returns : CAIRO_STATUS_SUCCESS, always. + + + +<anchor id="cairo-matrix-get-affine"/>cairo_matrix_get_affine () +cairo_matrix_get_affinecairo_status_t cairo_matrix_get_affine (cairo_matrix_t *matrix, + double *a, + double *b, + double *c, + double *d, + double *tx, + double *ty); + +Gets the matrix values for the affine tranformation that matrix represents. +See cairo_matrix_set_affine(). + + + +matrix : + a cairo_matrix_t + +a : + location to store a component of affine transformation, or NULL + +b : + location to store b component of affine transformation, or NULL + +c : + location to store c component of affine transformation, or NULL + +d : + location to store d component of affine transformation, or NULL + +tx : + location to store X-translation component of affine transformation, or NULL + +ty : + location to store Y-translation component of affine transformation, or NULL + +Returns : CAIRO_STATUS_SUCCESS, always. + + + +<anchor id="cairo-matrix-translate"/>cairo_matrix_translate () +cairo_matrix_translatecairo_status_t cairo_matrix_translate (cairo_matrix_t *matrix, + double tx, + double ty); + +Applies a translation by tx, ty to the transformation in +matrix. The new transformation is given by first translating by +tx, ty then applying the original transformation + + + +matrix : + a cairo_matrix_t + +tx : + amount to rotate in the X direction + +ty : + amount to rotate in the Y direction + +Returns : CAIRO_STATUS_SUCCESS, always. + + + +<anchor id="cairo-matrix-scale"/>cairo_matrix_scale () +cairo_matrix_scalecairo_status_t cairo_matrix_scale (cairo_matrix_t *matrix, + double sx, + double sy); + +Applies scaling by tx, ty to the transformation in +matrix. The new transformation is given by first scaling by sx +and sy then applying the original transformation + + + +matrix : + a cairo_matrix_t + +sx : + Scale factor in the X direction + +sy : + Scale factor in the Y direction + +Returns : CAIRO_STATUS_SUCCESS, always. + + + +<anchor id="cairo-matrix-rotate"/>cairo_matrix_rotate () +cairo_matrix_rotatecairo_status_t cairo_matrix_rotate (cairo_matrix_t *matrix, + double radians); + +Applies rotation by radians to the transformation in +matrix. The new transformation is given by first rotating by +radians then applying the original transformation + + + +matrix : + a cairo_matrix_t + +radians : + angle of rotation, in radians. Angles are defined + so that an angle of 90 degrees (M_PI radians) rotates the + positive X axis into the positive Y axis. With the default + Cairo choice of axis orientation, positive rotations are + clockwise. + +Returns : CAIRO_STATUS_SUCCESS, always. + + + +<anchor id="cairo-matrix-invert"/>cairo_matrix_invert () +cairo_matrix_invertcairo_status_t cairo_matrix_invert (cairo_matrix_t *matrix); + +Changes matrix to be the inverse of it's original value. Not +all transformation matrices have inverses; if the matrix +collapses points together (it is degenerate), +then it has no inverse and this function will fail. + + +Returns: If matrix has an inverse, modifies matrix to + be the inverse matrix and returns CAIRO_STATUS_SUCCESS. Otherwise, + + + +matrix : + a cairo_matrix_t + +Returns :CAIRO_STATUS_INVALID_MATRIX. + + + +<anchor id="cairo-matrix-multiply"/>cairo_matrix_multiply () +cairo_matrix_multiplycairo_status_t cairo_matrix_multiply (cairo_matrix_t *result, + const cairo_matrix_t *a, + const cairo_matrix_t *b); + +Multiplies the affine transformations in a and b together +and stores the result in result. The resulting transformation +is given by first applying the transformation in b then +applying the transformation in a. + + + +result : + a cairo_matrix_t in which to store the result + +a : + a cairo_matrix_t + +b : + a cairo_matrix_t + +Returns : CAIRO_STATUS_SUCCESS, always. + + + +<anchor id="cairo-matrix-transform-distance"/>cairo_matrix_transform_distance () +cairo_matrix_transform_distancecairo_status_t cairo_matrix_transform_distance + (cairo_matrix_t *matrix, + double *dx, + double *dy); + +Transforms the vector (dx,dy) by matrix. Translation is +ignored. In terms of the components of the affine transformation: + + + +dx2 = dx1 * a + dy1 * c; +dy2 = dx1 * b + dy1 * d; + + + +Affine transformations are position invariant, so the same vector +always transforms to the same vector. If (x1,y1) transforms +to (x2,y2) then (x1+dx1,y1+dy1) will transform to +(x1+dx2,y1+dy2) for all values of x1 and x2. + + + +matrix : + a cairo_matrix_t + +dx : + a distance in the X direction. An in/out parameter + +dy : + a distance in the Y direction. An in/out parameter + +Returns : CAIRO_STATUS_SUCCESS, always. + + + +<anchor id="cairo-matrix-transform-point"/>cairo_matrix_transform_point () +cairo_matrix_transform_pointcairo_status_t cairo_matrix_transform_point (cairo_matrix_t *matrix, + double *x, + double *y); + +Transforms the point (x, y) by matrix. + + +matrix : + a cairo_matrix_t + +x : + X position. An in/out parameter + +y : + Y position. An in/out parameter + +Returns : CAIRO_STATUS_SUCCESS, always. + + + + + + + + + diff --git a/gfx/cairo/cairo/doc/public/xml/cairo-pattern.xml b/gfx/cairo/cairo/doc/public/xml/cairo-pattern.xml new file mode 100644 index 000000000000..307dabde8fda --- /dev/null +++ b/gfx/cairo/cairo/doc/public/xml/cairo-pattern.xml @@ -0,0 +1,334 @@ + + + + +cairo_pattern_t +3 +CAIRO Library + + + +cairo_pattern_t + + +Synopsis + + + + + +typedef cairo_pattern_t; +cairo_pattern_t* cairo_pattern_create_for_surface + (cairo_surface_t *surface); +cairo_pattern_t* cairo_pattern_create_linear + (double x0, + double y0, + double x1, + double y1); +cairo_pattern_t* cairo_pattern_create_radial + (double cx0, + double cy0, + double radius0, + double cx1, + double cy1, + double radius1); +void cairo_pattern_reference (cairo_pattern_t *pattern); +void cairo_pattern_destroy (cairo_pattern_t *pattern); +cairo_status_t cairo_pattern_add_color_stop (cairo_pattern_t *pattern, + double offset, + double red, + double green, + double blue, + double alpha); +cairo_status_t cairo_pattern_set_matrix (cairo_pattern_t *pattern, + cairo_matrix_t *matrix); +cairo_status_t cairo_pattern_get_matrix (cairo_pattern_t *pattern, + cairo_matrix_t *matrix); +enum cairo_extend_t; +cairo_status_t cairo_pattern_set_extend (cairo_pattern_t *pattern, + cairo_extend_t extend); +cairo_extend_t cairo_pattern_get_extend (cairo_pattern_t *pattern); +cairo_status_t cairo_pattern_set_filter (cairo_pattern_t *pattern, + cairo_filter_t filter); +cairo_filter_t cairo_pattern_get_filter (cairo_pattern_t *pattern); + + + + + + + + + + + + +Description + + + + + + +Details + +<anchor id="cairo-pattern-t"/>cairo_pattern_t +cairo_pattern_ttypedef struct _cairo_pattern cairo_pattern_t; + + + + + +<anchor id="cairo-pattern-create-for-surface"/>cairo_pattern_create_for_surface () +cairo_pattern_create_for_surfacecairo_pattern_t* cairo_pattern_create_for_surface + (cairo_surface_t *surface); + + + +surface : + + +Returns : + + + + + +<anchor id="cairo-pattern-create-linear"/>cairo_pattern_create_linear () +cairo_pattern_create_linearcairo_pattern_t* cairo_pattern_create_linear + (double x0, + double y0, + double x1, + double y1); + + + +x0 : + + +y0 : + + +x1 : + + +y1 : + + +Returns : + + + + + +<anchor id="cairo-pattern-create-radial"/>cairo_pattern_create_radial () +cairo_pattern_create_radialcairo_pattern_t* cairo_pattern_create_radial + (double cx0, + double cy0, + double radius0, + double cx1, + double cy1, + double radius1); + + + +cx0 : + + +cy0 : + + +radius0 : + + +cx1 : + + +cy1 : + + +radius1 : + + +Returns : + + + + + +<anchor id="cairo-pattern-reference"/>cairo_pattern_reference () +cairo_pattern_referencevoid cairo_pattern_reference (cairo_pattern_t *pattern); + + + +pattern : + + + + + + +<anchor id="cairo-pattern-destroy"/>cairo_pattern_destroy () +cairo_pattern_destroyvoid cairo_pattern_destroy (cairo_pattern_t *pattern); + + + +pattern : + + + + + + +<anchor id="cairo-pattern-add-color-stop"/>cairo_pattern_add_color_stop () +cairo_pattern_add_color_stopcairo_status_t cairo_pattern_add_color_stop (cairo_pattern_t *pattern, + double offset, + double red, + double green, + double blue, + double alpha); + + + +pattern : + + +offset : + + +red : + + +green : + + +blue : + + +alpha : + + +Returns : + + + + + +<anchor id="cairo-pattern-set-matrix"/>cairo_pattern_set_matrix () +cairo_pattern_set_matrixcairo_status_t cairo_pattern_set_matrix (cairo_pattern_t *pattern, + cairo_matrix_t *matrix); + + + +pattern : + + +matrix : + + +Returns : + + + + + +<anchor id="cairo-pattern-get-matrix"/>cairo_pattern_get_matrix () +cairo_pattern_get_matrixcairo_status_t cairo_pattern_get_matrix (cairo_pattern_t *pattern, + cairo_matrix_t *matrix); + + + +pattern : + + +matrix : + + +Returns : + + + + + +<anchor id="cairo-extend-t"/>enum cairo_extend_t +cairo_extend_ttypedef enum { + CAIRO_EXTEND_NONE, + CAIRO_EXTEND_REPEAT, + CAIRO_EXTEND_REFLECT +} cairo_extend_t; + + + + + +<anchor id="cairo-pattern-set-extend"/>cairo_pattern_set_extend () +cairo_pattern_set_extendcairo_status_t cairo_pattern_set_extend (cairo_pattern_t *pattern, + cairo_extend_t extend); + + + +pattern : + + +extend : + + +Returns : + + + + + +<anchor id="cairo-pattern-get-extend"/>cairo_pattern_get_extend () +cairo_pattern_get_extendcairo_extend_t cairo_pattern_get_extend (cairo_pattern_t *pattern); + + + +pattern : + + +Returns : + + + + + +<anchor id="cairo-pattern-set-filter"/>cairo_pattern_set_filter () +cairo_pattern_set_filtercairo_status_t cairo_pattern_set_filter (cairo_pattern_t *pattern, + cairo_filter_t filter); + + + +pattern : + + +filter : + + +Returns : + + + + + +<anchor id="cairo-pattern-get-filter"/>cairo_pattern_get_filter () +cairo_pattern_get_filtercairo_filter_t cairo_pattern_get_filter (cairo_pattern_t *pattern); + + + +pattern : + + +Returns : + + + + + + + + + + + diff --git a/gfx/cairo/cairo/doc/public/xml/cairo-pdf.xml b/gfx/cairo/cairo/doc/public/xml/cairo-pdf.xml new file mode 100644 index 000000000000..6d5801a09cf1 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/xml/cairo-pdf.xml @@ -0,0 +1,120 @@ + + + + +PDF Backend +3 +CAIRO Library + + + +PDF Backend + + +Synopsis + + + + + +void cairo_set_target_pdf (cairo_t *cr, + FILE *file, + double width_inches, + double height_inches, + double x_pixels_per_inch, + double y_pixels_per_inch); +cairo_surface_t* cairo_pdf_surface_create (FILE *file, + double width_inches, + double height_inches, + double x_pixels_per_inch, + double y_pixels_per_inch); + + + + + + + + + + + + +Description + + + + + + +Details + +<anchor id="cairo-set-target-pdf"/>cairo_set_target_pdf () +cairo_set_target_pdfvoid cairo_set_target_pdf (cairo_t *cr, + FILE *file, + double width_inches, + double height_inches, + double x_pixels_per_inch, + double y_pixels_per_inch); + + + +cr : + + +file : + + +width_inches : + + +height_inches : + + +x_pixels_per_inch : + + +y_pixels_per_inch : + + + + + + +<anchor id="cairo-pdf-surface-create"/>cairo_pdf_surface_create () +cairo_pdf_surface_createcairo_surface_t* cairo_pdf_surface_create (FILE *file, + double width_inches, + double height_inches, + double x_pixels_per_inch, + double y_pixels_per_inch); + + + +file : + + +width_inches : + + +height_inches : + + +x_pixels_per_inch : + + +y_pixels_per_inch : + + +Returns : + + + + + + + + + + + diff --git a/gfx/cairo/cairo/doc/public/xml/cairo-png.xml b/gfx/cairo/cairo/doc/public/xml/cairo-png.xml new file mode 100644 index 000000000000..f4021b49fae6 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/xml/cairo-png.xml @@ -0,0 +1,110 @@ + + + + +PNG Backend +3 +CAIRO Library + + + +PNG Backend + + +Synopsis + + + + + +void cairo_set_target_png (cairo_t *cr, + FILE *file, + cairo_format_t format, + int width, + int height); +cairo_surface_t* cairo_png_surface_create (FILE *file, + cairo_format_t format, + int width, + int height); + + + + + + + + + + + + +Description + + + + + + +Details + +<anchor id="cairo-set-target-png"/>cairo_set_target_png () +cairo_set_target_pngvoid cairo_set_target_png (cairo_t *cr, + FILE *file, + cairo_format_t format, + int width, + int height); + + + +cr : + + +file : + + +format : + + +width : + + +height : + + + + + + +<anchor id="cairo-png-surface-create"/>cairo_png_surface_create () +cairo_png_surface_createcairo_surface_t* cairo_png_surface_create (FILE *file, + cairo_format_t format, + int width, + int height); + + + +file : + + +format : + + +width : + + +height : + + +Returns : + + + + + + + + + + + diff --git a/gfx/cairo/cairo/doc/public/xml/cairo-ps.xml b/gfx/cairo/cairo/doc/public/xml/cairo-ps.xml new file mode 100644 index 000000000000..7d7219c23819 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/xml/cairo-ps.xml @@ -0,0 +1,125 @@ + + + + +PS Backend +3 +CAIRO Library + + + +PS Backend + + +Synopsis + + + + + +void cairo_set_target_ps (cairo_t *cr, + FILE *file, + double width_inches, + double height_inches, + double x_pixels_per_inch, + double y_pixels_per_inch); +cairo_surface_t* cairo_ps_surface_create (FILE *file, + double width_inches, + double height_inches, + double x_pixels_per_inch, + double y_pixels_per_inch); + + + + + + + + + + + + +Description + + + + + + +Details + +<anchor id="cairo-set-target-ps"/>cairo_set_target_ps () +cairo_set_target_psvoid cairo_set_target_ps (cairo_t *cr, + FILE *file, + double width_inches, + double height_inches, + double x_pixels_per_inch, + double y_pixels_per_inch); + +Directs output for a cairo_t to a postscript file. The file must +be kept open until the cairo_t is destroyed or set to have a +different target, and then must be closed by the application. + + + +cr : + a cairo_t + +file : + an open, writeable file + +width_inches : + width of the output page, in inches + +height_inches : + height of the output page, in inches + +x_pixels_per_inch : + X resolution to use for image fallbacks; + not all Cairo drawing can be represented in a postscript + file, so Cairo will write out images for some portions + of the output. + +y_pixels_per_inch : + Y resolution to use for image fallbacks. + + + +<anchor id="cairo-ps-surface-create"/>cairo_ps_surface_create () +cairo_ps_surface_createcairo_surface_t* cairo_ps_surface_create (FILE *file, + double width_inches, + double height_inches, + double x_pixels_per_inch, + double y_pixels_per_inch); + + + +file : + + +width_inches : + + +height_inches : + + +x_pixels_per_inch : + + +y_pixels_per_inch : + + +Returns : + + + + + + + + + + + diff --git a/gfx/cairo/cairo/doc/public/xml/cairo-quartz.xml b/gfx/cairo/cairo/doc/public/xml/cairo-quartz.xml new file mode 100644 index 000000000000..eda822f346c5 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/xml/cairo-quartz.xml @@ -0,0 +1,102 @@ + + + + +Quartz Backend +3 +CAIRO Library + + + +Quartz Backend + + +Synopsis + + + + + +void cairo_set_target_quartz_context (cairo_t *cr, + CGContextRef context, + int width, + int height); +cairo_surface_t* cairo_quartz_surface_create + (CGContextRef context, + int width, + int height); + + + + + + + + + + + + +Description + + + + + + +Details + +<anchor id="cairo-set-target-quartz-context"/>cairo_set_target_quartz_context () +cairo_set_target_quartz_contextvoid cairo_set_target_quartz_context (cairo_t *cr, + CGContextRef context, + int width, + int height); + + + +cr : + + +context : + + +width : + + +height : + + + + + + +<anchor id="cairo-quartz-surface-create"/>cairo_quartz_surface_create () +cairo_quartz_surface_createcairo_surface_t* cairo_quartz_surface_create + (CGContextRef context, + int width, + int height); + + + +context : + + +width : + + +height : + + +Returns : + + + + + + + + + + + diff --git a/gfx/cairo/cairo/doc/public/xml/cairo-surface.xml b/gfx/cairo/cairo/doc/public/xml/cairo-surface.xml new file mode 100644 index 000000000000..a029810062d9 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/xml/cairo-surface.xml @@ -0,0 +1,255 @@ + + + + +cairo_surface_t +3 +CAIRO Library + + + +cairo_surface_t + + +Synopsis + + + + + +typedef cairo_surface_t; +cairo_surface_t* cairo_surface_create_for_image + (char *data, + cairo_format_t format, + int width, + int height, + int stride); +cairo_surface_t* cairo_surface_create_similar + (cairo_surface_t *other, + cairo_format_t format, + int width, + int height); +void cairo_surface_reference (cairo_surface_t *surface); +void cairo_surface_destroy (cairo_surface_t *surface); +cairo_status_t cairo_surface_set_repeat (cairo_surface_t *surface, + int repeat); +cairo_status_t cairo_surface_set_matrix (cairo_surface_t *surface, + cairo_matrix_t *matrix); +cairo_status_t cairo_surface_get_matrix (cairo_surface_t *surface, + cairo_matrix_t *matrix); +cairo_status_t cairo_surface_set_filter (cairo_surface_t *surface, + cairo_filter_t filter); +cairo_filter_t cairo_surface_get_filter (cairo_surface_t *surface); + + + + + + + + + + + + +Description + + + + + + +Details + +<anchor id="cairo-surface-t"/>cairo_surface_t +cairo_surface_ttypedef struct _cairo_surface cairo_surface_t; + + +A cairo_surface_t represents an image, either as the destination +of a drawing operation or as source when drawing onto another +surface. There are different subtypes of cairo_surface_t for +different drawing backends; for example, cairo_image_surface_create() +creates a bitmap image in memory. + + +Memory management of cairo_surface_t is done with +cairo_surface_reference() and cairo_surface_destroy(). + + + + +<anchor id="cairo-surface-create-for-image"/>cairo_surface_create_for_image () +cairo_surface_create_for_imagecairo_surface_t* cairo_surface_create_for_image + (char *data, + cairo_format_t format, + int width, + int height, + int stride); + + + +data : + + +format : + + +width : + + +height : + + +stride : + + +Returns : + + + + + +<anchor id="cairo-surface-create-similar"/>cairo_surface_create_similar () +cairo_surface_create_similarcairo_surface_t* cairo_surface_create_similar + (cairo_surface_t *other, + cairo_format_t format, + int width, + int height); + + + +other : + + +format : + + +width : + + +height : + + +Returns : + + + + + +<anchor id="cairo-surface-reference"/>cairo_surface_reference () +cairo_surface_referencevoid cairo_surface_reference (cairo_surface_t *surface); + + + +surface : + + + + + + +<anchor id="cairo-surface-destroy"/>cairo_surface_destroy () +cairo_surface_destroyvoid cairo_surface_destroy (cairo_surface_t *surface); + + + +surface : + + + + + + +<anchor id="cairo-surface-set-repeat"/>cairo_surface_set_repeat () +cairo_surface_set_repeatcairo_status_t cairo_surface_set_repeat (cairo_surface_t *surface, + int repeat); + + + +surface : + + +repeat : + + +Returns : + + + + + +<anchor id="cairo-surface-set-matrix"/>cairo_surface_set_matrix () +cairo_surface_set_matrixcairo_status_t cairo_surface_set_matrix (cairo_surface_t *surface, + cairo_matrix_t *matrix); + + + +surface : + + +matrix : + + +Returns : + + + + + +<anchor id="cairo-surface-get-matrix"/>cairo_surface_get_matrix () +cairo_surface_get_matrixcairo_status_t cairo_surface_get_matrix (cairo_surface_t *surface, + cairo_matrix_t *matrix); + + + +surface : + + +matrix : + + +Returns : + + + + + +<anchor id="cairo-surface-set-filter"/>cairo_surface_set_filter () +cairo_surface_set_filtercairo_status_t cairo_surface_set_filter (cairo_surface_t *surface, + cairo_filter_t filter); + + + +surface : + + +filter : + + +Returns : + + + + + +<anchor id="cairo-surface-get-filter"/>cairo_surface_get_filter () +cairo_surface_get_filtercairo_filter_t cairo_surface_get_filter (cairo_surface_t *surface); + + + +surface : + + +Returns : + + + + + + + + + + + diff --git a/gfx/cairo/cairo/doc/public/xml/cairo-win3.xml b/gfx/cairo/cairo/doc/public/xml/cairo-win3.xml new file mode 100644 index 000000000000..91cbcd6302d6 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/xml/cairo-win3.xml @@ -0,0 +1,181 @@ + + + + +Microsoft Windows Backend +3 +CAIRO Library + + + +Microsoft Windows Backend + + +Synopsis + + + + + +void cairo_set_target_win32 (cairo_t *cr, + HDC hdc); +cairo_surface_t* cairo_win32_surface_create (HDC hdc); +cairo_font_t* cairo_win32_font_create_for_logfontw + (LOGFONTW *logfont, + cairo_matrix_t *scale); +cairo_status_t cairo_win32_font_select_font (cairo_font_t *font, + HDC hdc); +void cairo_win32_font_done_font (cairo_font_t *font); +double cairo_win32_font_get_scale_factor + (cairo_font_t *font); + + + + + + + + + + + + +Description + + + + + + +Details + +<anchor id="cairo-set-target-win32"/>cairo_set_target_win32 () +cairo_set_target_win32void cairo_set_target_win32 (cairo_t *cr, + HDC hdc); + + + +cr : + + +hdc : + + + + + + +<anchor id="cairo-win32-surface-create"/>cairo_win32_surface_create () +cairo_win32_surface_createcairo_surface_t* cairo_win32_surface_create (HDC hdc); + + + +hdc : + + +Returns : + + + + + +<anchor id="cairo-win32-font-create-for-logfontw"/>cairo_win32_font_create_for_logfontw () +cairo_win32_font_create_for_logfontwcairo_font_t* cairo_win32_font_create_for_logfontw + (LOGFONTW *logfont, + cairo_matrix_t *scale); + +Creates a new font for the Win32 font backend based on a +LOGFONT. This font can then be used with +cairo_set_font(), cairo_font_glyph_extents(), or FreeType backend +specific functions like cairo_win32_font_select_font(). + + + +logfont : + A LOGFONTW structure specifying the font to use. + The lfHeight, lfWidth, lfOrientation and lfEscapement + fields of this structure are ignored; information from + scale will be used instead. + +scale : + The scale at which this font will be used. The + scale is given by multiplying the font matrix (see + cairo_transform_font()) by the current transformation matrix. + The translation elements of the resulting matrix are ignored. + +Returns : a newly created cairo_font_t. Free with + cairo_font_destroy() when you are done using it. + + + +<anchor id="cairo-win32-font-select-font"/>cairo_win32_font_select_font () +cairo_win32_font_select_fontcairo_status_t cairo_win32_font_select_font (cairo_font_t *font, + HDC hdc); + +Selects the font into the given device context and changes the +map mode and world transformation of the device context to match +that of the font. This function is intended for use when using +layout APIs such as Uniscribe to do text layout with the +Cairo font. After finishing using the device context, you must call +cairo_win32_font_done_font() to release any resources allocated +by this function. + + +See cairo_win32_font_get_scale_factor() for converting logical +coordinates from the device context to font space. + + +Normally, calls to SaveDC() and RestoreDC() would be made around +the use of this function to preserve the original graphics state. + + + +font : + A cairo_font_t from the Win32 font backend. Such an + object can be created with cairo_win32_font_create_for_logfontw(). + +hdc : + a device context + +Returns : CAIRO_STATUS_SUCCESS if the operation succeeded. + otherwise an error such as CAIRO_STATUS_NO_MEMORY and + the device context is unchanged. + + + +<anchor id="cairo-win32-font-done-font"/>cairo_win32_font_done_font () +cairo_win32_font_done_fontvoid cairo_win32_font_done_font (cairo_font_t *font); + +Releases any resources allocated by cairo_win32_font_select_font() + + + +font : + A cairo_font_t from the Win32 font backend. + + + +<anchor id="cairo-win32-font-get-scale-factor"/>cairo_win32_font_get_scale_factor () +cairo_win32_font_get_scale_factordouble cairo_win32_font_get_scale_factor + (cairo_font_t *font); + +Gets a scale factor between logical coordinates in the coordinate +space used by cairo_win32_font_select_font() and font space coordinates. + + + +font : + a cairo_font_t from the Win32 font backend + +Returns : factor to multiply logical units by to get font space + coordinates. + + + + + + + + + diff --git a/gfx/cairo/cairo/doc/public/xml/cairo-win32.xml b/gfx/cairo/cairo/doc/public/xml/cairo-win32.xml new file mode 100644 index 000000000000..4c31db535c99 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/xml/cairo-win32.xml @@ -0,0 +1,181 @@ + + + + +Microsoft Windows Backend +3 +CAIRO Library + + + +Microsoft Windows Backend + + +Synopsis + + + + + +void cairo_set_target_win32 (cairo_t *cr, + HDC hdc); +cairo_surface_t* cairo_win32_surface_create (HDC hdc); +cairo_font_t* cairo_win32_font_create_for_logfontw + (LOGFONTW *logfont, + cairo_matrix_t *scale); +cairo_status_t cairo_win32_font_select_font (cairo_font_t *font, + HDC hdc); +void cairo_win32_font_done_font (cairo_font_t *font); +double cairo_win32_font_get_scale_factor + (cairo_font_t *font); + + + + + + + + + + + + +Description + + + + + + +Details + +<anchor id="cairo-set-target-win32"/>cairo_set_target_win32 () +cairo_set_target_win32void cairo_set_target_win32 (cairo_t *cr, + HDC hdc); + + + +cr : + + +hdc : + + + + + + +<anchor id="cairo-win32-surface-create"/>cairo_win32_surface_create () +cairo_win32_surface_createcairo_surface_t* cairo_win32_surface_create (HDC hdc); + + + +hdc : + + +Returns : + + + + + +<anchor id="cairo-win32-font-create-for-logfontw"/>cairo_win32_font_create_for_logfontw () +cairo_win32_font_create_for_logfontwcairo_font_t* cairo_win32_font_create_for_logfontw + (LOGFONTW *logfont, + cairo_matrix_t *scale); + +Creates a new font for the Win32 font backend based on a +LOGFONT. This font can then be used with +cairo_set_font(), cairo_font_glyph_extents(), or FreeType backend +specific functions like cairo_win32_font_select_font(). + + + +logfont : + A LOGFONTW structure specifying the font to use. + The lfHeight, lfWidth, lfOrientation and lfEscapement + fields of this structure are ignored; information from + scale will be used instead. + +scale : + The scale at which this font will be used. The + scale is given by multiplying the font matrix (see + cairo_transform_font()) by the current transformation matrix. + The translation elements of the resulting matrix are ignored. + +Returns : a newly created cairo_font_t. Free with + cairo_font_destroy() when you are done using it. + + + +<anchor id="cairo-win32-font-select-font"/>cairo_win32_font_select_font () +cairo_win32_font_select_fontcairo_status_t cairo_win32_font_select_font (cairo_font_t *font, + HDC hdc); + +Selects the font into the given device context and changes the +map mode and world transformation of the device context to match +that of the font. This function is intended for use when using +layout APIs such as Uniscribe to do text layout with the +Cairo font. After finishing using the device context, you must call +cairo_win32_font_done_font() to release any resources allocated +by this function. + + +See cairo_win32_font_get_scale_factor() for converting logical +coordinates from the device context to font space. + + +Normally, calls to SaveDC() and RestoreDC() would be made around +the use of this function to preserve the original graphics state. + + + +font : + A cairo_font_t from the Win32 font backend. Such an + object can be created with cairo_win32_font_create_for_logfontw(). + +hdc : + a device context + +Returns : CAIRO_STATUS_SUCCESS if the operation succeeded. + otherwise an error such as CAIRO_STATUS_NO_MEMORY and + the device context is unchanged. + + + +<anchor id="cairo-win32-font-done-font"/>cairo_win32_font_done_font () +cairo_win32_font_done_fontvoid cairo_win32_font_done_font (cairo_font_t *font); + +Releases any resources allocated by cairo_win32_font_select_font() + + + +font : + A cairo_font_t from the Win32 font backend. + + + +<anchor id="cairo-win32-font-get-scale-factor"/>cairo_win32_font_get_scale_factor () +cairo_win32_font_get_scale_factordouble cairo_win32_font_get_scale_factor + (cairo_font_t *font); + +Gets a scale factor between logical coordinates in the coordinate +space used by cairo_win32_font_select_font() and font space coordinates. + + + +font : + a cairo_font_t from the Win32 font backend + +Returns : factor to multiply logical units by to get font space + coordinates. + + + + + + + + + diff --git a/gfx/cairo/cairo/doc/public/xml/cairo-xcb.xml b/gfx/cairo/cairo/doc/public/xml/cairo-xcb.xml new file mode 100644 index 000000000000..4f904d8223f3 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/xml/cairo-xcb.xml @@ -0,0 +1,80 @@ + + + + +XCB Backend +3 +CAIRO Library + + + +XCB Backend + + +Synopsis + + + + + +void cairo_set_target_xcb (cairo_t *cr, + XCBConnection *dpy, + XCBDRAWABLE drawable, + XCBVISUALTYPE *visual, + cairo_format_t format); + + + + + + + + + + + + +Description + + + + + + +Details + +<anchor id="cairo-set-target-xcb"/>cairo_set_target_xcb () +cairo_set_target_xcbvoid cairo_set_target_xcb (cairo_t *cr, + XCBConnection *dpy, + XCBDRAWABLE drawable, + XCBVISUALTYPE *visual, + cairo_format_t format); + + + +cr : + + +dpy : + + +drawable : + + +visual : + + +format : + + + + + + + + + + + + diff --git a/gfx/cairo/cairo/doc/public/xml/cairo-xlib.xml b/gfx/cairo/cairo/doc/public/xml/cairo-xlib.xml new file mode 100644 index 000000000000..dbb59a6786d8 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/xml/cairo-xlib.xml @@ -0,0 +1,113 @@ + + + + +XLib Backend +3 +CAIRO Library + + + +XLib Backend + + +Synopsis + + + + + +void cairo_set_target_drawable (cairo_t *cr, + Display *dpy, + Drawable drawable); +cairo_surface_t* cairo_xlib_surface_create (Display *dpy, + Drawable drawable, + Visual *visual, + cairo_format_t format, + Colormap colormap); + + + + + + + + + + + + +Description + + + + + + +Details + +<anchor id="cairo-set-target-drawable"/>cairo_set_target_drawable () +cairo_set_target_drawablevoid cairo_set_target_drawable (cairo_t *cr, + Display *dpy, + Drawable drawable); + +Directs output for a cairo_t to an Xlib drawable. drawable must +be a Window or Pixmap on the default screen of dpy using the +default colormap and visual. Using this function is slow because +the function must retrieve information about drawable from the X +server. + +The combination of cairo_xlib_surface_create() and +cairo_set_target_surface() is somewhat more flexible, although +it still is slow. + + + +cr : + a cairo_t + +dpy : + an X display + +drawable : + a window or pixmap on the default screen of dpy + + + +<anchor id="cairo-xlib-surface-create"/>cairo_xlib_surface_create () +cairo_xlib_surface_createcairo_surface_t* cairo_xlib_surface_create (Display *dpy, + Drawable drawable, + Visual *visual, + cairo_format_t format, + Colormap colormap); + + + +dpy : + + +drawable : + + +visual : + + +format : + + +colormap : + + +Returns : + + + + + + + + + + + diff --git a/gfx/cairo/cairo/doc/public/xml/cairo.xml b/gfx/cairo/cairo/doc/public/xml/cairo.xml new file mode 100644 index 000000000000..8148ceeea0f7 --- /dev/null +++ b/gfx/cairo/cairo/doc/public/xml/cairo.xml @@ -0,0 +1,2380 @@ + + + + +cairo_t +3 +CAIRO Library + + + +cairo_tDrawing contexts. + + +Synopsis + + + + + +typedef cairo_t; +cairo_t* cairo_create (void); +void cairo_reference (cairo_t *cr); +void cairo_destroy (cairo_t *cr); +void cairo_save (cairo_t *cr); +void cairo_restore (cairo_t *cr); +void cairo_copy (cairo_t *dest, + cairo_t *src); +void cairo_set_target_surface (cairo_t *cr, + cairo_surface_t *surface); +enum cairo_format_t; +void cairo_set_target_image (cairo_t *cr, + char *data, + cairo_format_t format, + int width, + int height, + int stride); +enum cairo_operator_t; +void cairo_set_operator (cairo_t *cr, + cairo_operator_t op); +void cairo_set_rgb_color (cairo_t *cr, + double red, + double green, + double blue); +void cairo_set_pattern (cairo_t *cr, + cairo_pattern_t *pattern); +void cairo_set_alpha (cairo_t *cr, + double alpha); +void cairo_set_tolerance (cairo_t *cr, + double tolerance); +enum cairo_fill_rule_t; +void cairo_set_fill_rule (cairo_t *cr, + cairo_fill_rule_t fill_rule); +void cairo_set_line_width (cairo_t *cr, + double width); +enum cairo_line_cap_t; +void cairo_set_line_cap (cairo_t *cr, + cairo_line_cap_t line_cap); +enum cairo_line_join_t; +void cairo_set_line_join (cairo_t *cr, + cairo_line_join_t line_join); +void cairo_set_dash (cairo_t *cr, + double *dashes, + int ndash, + double offset); +void cairo_set_miter_limit (cairo_t *cr, + double limit); +void cairo_translate (cairo_t *cr, + double tx, + double ty); +void cairo_scale (cairo_t *cr, + double sx, + double sy); +void cairo_rotate (cairo_t *cr, + double angle); +void cairo_concat_matrix (cairo_t *cr, + cairo_matrix_t *matrix); +void cairo_set_matrix (cairo_t *cr, + cairo_matrix_t *matrix); +void cairo_default_matrix (cairo_t *cr); +void cairo_identity_matrix (cairo_t *cr); +void cairo_transform_point (cairo_t *cr, + double *x, + double *y); +void cairo_transform_distance (cairo_t *cr, + double *dx, + double *dy); +void cairo_inverse_transform_point (cairo_t *cr, + double *x, + double *y); +void cairo_inverse_transform_distance + (cairo_t *cr, + double *dx, + double *dy); +void cairo_new_path (cairo_t *cr); +void cairo_move_to (cairo_t *cr, + double x, + double y); +void cairo_line_to (cairo_t *cr, + double x, + double y); +void cairo_curve_to (cairo_t *cr, + double x1, + double y1, + double x2, + double y2, + double x3, + double y3); +void cairo_arc (cairo_t *cr, + double xc, + double yc, + double radius, + double angle1, + double angle2); +void cairo_arc_negative (cairo_t *cr, + double xc, + double yc, + double radius, + double angle1, + double angle2); +void cairo_rel_move_to (cairo_t *cr, + double dx, + double dy); +void cairo_rel_line_to (cairo_t *cr, + double dx, + double dy); +void cairo_rel_curve_to (cairo_t *cr, + double dx1, + double dy1, + double dx2, + double dy2, + double dx3, + double dy3); +void cairo_rectangle (cairo_t *cr, + double x, + double y, + double width, + double height); +void cairo_close_path (cairo_t *cr); +void cairo_stroke (cairo_t *cr); +void cairo_fill (cairo_t *cr); +void cairo_copy_page (cairo_t *cr); +void cairo_show_page (cairo_t *cr); +cairo_bool_t cairo_in_stroke (cairo_t *cr, + double x, + double y); +cairo_bool_t cairo_in_fill (cairo_t *cr, + double x, + double y); +typedef cairo_bool_t; +void cairo_stroke_extents (cairo_t *cr, + double *x1, + double *y1, + double *x2, + double *y2); +void cairo_fill_extents (cairo_t *cr, + double *x1, + double *y1, + double *x2, + double *y2); +void cairo_init_clip (cairo_t *cr); +void cairo_clip (cairo_t *cr); +typedef cairo_font_t; + cairo_glyph_t; + cairo_text_extents_t; + cairo_font_extents_t; +enum cairo_font_slant_t; +enum cairo_font_weight_t; +void cairo_select_font (cairo_t *cr, + const char *family, + cairo_font_slant_t slant, + cairo_font_weight_t weight); +void cairo_scale_font (cairo_t *cr, + double scale); +void cairo_transform_font (cairo_t *cr, + cairo_matrix_t *matrix); +void cairo_show_text (cairo_t *cr, + unsigned char *utf8); +void cairo_show_glyphs (cairo_t *cr, + cairo_glyph_t *glyphs, + int num_glyphs); +cairo_font_t* cairo_current_font (cairo_t *cr); +void cairo_current_font_extents (cairo_t *cr, + cairo_font_extents_t *extents); +void cairo_set_font (cairo_t *cr, + cairo_font_t *font); +void cairo_text_extents (cairo_t *cr, + unsigned char *utf8, + cairo_text_extents_t *extents); +void cairo_glyph_extents (cairo_t *cr, + cairo_glyph_t *glyphs, + int num_glyphs, + cairo_text_extents_t *extents); +void cairo_text_path (cairo_t *cr, + unsigned char *utf8); +void cairo_glyph_path (cairo_t *cr, + cairo_glyph_t *glyphs, + int num_glyphs); +void cairo_font_reference (cairo_font_t *font); +void cairo_font_destroy (cairo_font_t *font); +cairo_status_t cairo_font_extents (cairo_font_t *font, + cairo_matrix_t *font_matrix, + cairo_font_extents_t *extents); +void cairo_font_glyph_extents (cairo_font_t *font, + cairo_matrix_t *font_matrix, + cairo_glyph_t *glyphs, + int num_glyphs, + cairo_text_extents_t *extents); +void cairo_show_surface (cairo_t *cr, + cairo_surface_t *surface, + int width, + int height); +cairo_operator_t cairo_current_operator (cairo_t *cr); +void cairo_current_rgb_color (cairo_t *cr, + double *red, + double *green, + double *blue); +cairo_pattern_t* cairo_current_pattern (cairo_t *cr); +double cairo_current_alpha (cairo_t *cr); +double cairo_current_tolerance (cairo_t *cr); +void cairo_current_point (cairo_t *cr, + double *x, + double *y); +cairo_fill_rule_t cairo_current_fill_rule (cairo_t *cr); +double cairo_current_line_width (cairo_t *cr); +cairo_line_cap_t cairo_current_line_cap (cairo_t *cr); +cairo_line_join_t cairo_current_line_join (cairo_t *cr); +double cairo_current_miter_limit (cairo_t *cr); +void cairo_current_matrix (cairo_t *cr, + cairo_matrix_t *matrix); +cairo_surface_t* cairo_current_target_surface + (cairo_t *cr); +void cairo_current_path (cairo_t *cr, + cairo_move_to_func_t *move_to, + cairo_line_to_func_t *line_to, + cairo_curve_to_func_t *curve_to, + cairo_close_path_func_t *close_path, + void *closure); +void cairo_current_path_flat (cairo_t *cr, + cairo_move_to_func_t *move_to, + cairo_line_to_func_t *line_to, + cairo_close_path_func_t *close_path, + void *closure); +enum cairo_status_t; +cairo_status_t cairo_status (cairo_t *cr); +const char* cairo_status_string (cairo_t *cr); +enum cairo_filter_t; +cairo_surface_t* cairo_image_surface_create (cairo_format_t format, + int width, + int height); +cairo_surface_t* cairo_image_surface_create_for_data + (char *data, + cairo_format_t format, + int width, + int height, + int stride); + + + + + + + + + + + + + +Description + + + cairo_t is the main object used when drawing with Cairo. To + draw with Cairo, you create a cairo_t, set the target surface, + and drawing options for the cairo_t, create shapes with + functions like cairo_move_to() and cairo_line_to(), and then + draw ships with cairo_stroke() or cairo_fill(). + + + cairo_t's can be pushed to a stack via cairo_save(). + They may then safely be changed, without loosing the current state. + Use cairo_restore() to restore to the saved state. + + + + +Details + +<anchor id="cairo-t"/>cairo_t +cairo_ttypedef struct _cairo cairo_t; + + +A cairo_t contains the current state of the rendering device, +including coordinates of yet to be drawn shapes. + + + + +<anchor id="cairo-create"/>cairo_create () +cairo_createcairo_t* cairo_create (void); + +Creates a new cairo_t with default values. The target +surface must be set on the cairo_t with cairo_set_target_surface(), +or a backend-specific function like cairo_set_target_image() before +drawing with the cairo_t. + + + +Returns : a newly allocated cairo_t with a reference + count of 1. The initial reference count should be released + with cairo_destroy() when you are done using the cairo_t. + + + +<anchor id="cairo-reference"/>cairo_reference () +cairo_referencevoid cairo_reference (cairo_t *cr); + +Increases the reference count on cr by one. This prevents +cr from being destroyed until a matching call to cairo_destroy() +is made. + + + +cr : + a cairo_t + + + +<anchor id="cairo-destroy"/>cairo_destroy () +cairo_destroyvoid cairo_destroy (cairo_t *cr); + +Decreases the reference count on cr by one. If the result +is zero, then cr and all associated resources are freed. +See cairo_destroy(). + + + +cr : + a cairo_t + + + +<anchor id="cairo-save"/>cairo_save () +cairo_savevoid cairo_save (cairo_t *cr); + +Makes a copy of the current state of cr and saves it +on an internal stack of saved states for cr. When +cairo_restore() is called, cr will be restored to +the saved state. Multiple calls to cairo_save() and +cairo_restore() can be nested; each call to cairo_restore() +restores the state from the matching paired cairo_save(). + + +It isn't necessary to clear all saved states before +a cairo_t is freed. If the reference count of a cairo_t +drops to zero in response to a call to cairo_destroy(), +any saved states will be freed along with the cairo_t. + + + +cr : + a cairo_t + + + +<anchor id="cairo-restore"/>cairo_restore () +cairo_restorevoid cairo_restore (cairo_t *cr); + +Restores cr to the state saved by a preceding call to +cairo_save() and removes that state from the stack of +saved states. + + + +cr : + a cairo_t + + + +<anchor id="cairo-copy"/>cairo_copy () +cairo_copyvoid cairo_copy (cairo_t *dest, + cairo_t *src); + +This function copies all current state information from src to +dest. This includes the current point and path, the target surface, +the transformation matrix, and so forth. + + +The stack of states saved with cairo_save() is not +not copied; nor are any saved states on dest cleared. The +operation only copies the current state of src to the current +state of dest. + + + +dest : + a cairo_t + +src : + another cairo_t + + + +<anchor id="cairo-set-target-surface"/>cairo_set_target_surface () +cairo_set_target_surfacevoid cairo_set_target_surface (cairo_t *cr, + cairo_surface_t *surface); + +Directs output for a cairo_t to a given surface. The surface +will be referenced by the cairo_t, so you can immediately +call cairo_surface_destroy() on it if you don't need to +keep a reference to it around. + + + +cr : + a cairo_t + +surface : + a cairo_surface_t + + + +<anchor id="cairo-format-t"/>enum cairo_format_t +cairo_format_ttypedef enum cairo_format { + CAIRO_FORMAT_ARGB32, + CAIRO_FORMAT_RGB24, + CAIRO_FORMAT_A8, + CAIRO_FORMAT_A1 +} cairo_format_t; + + +cairo_format_t is used to identify the memory format of +image data. + + + + +CAIRO_FORMAT_ARGB32 + each pixel is a 32-bit quantity, with + alpha in the upper 8 bits, then red, then green, then blue. + The 32-bit quanties are stored native-endian. Pre-multiplied + alpha is used. (That is, 50% transparent red is 0x80800000, + not 0x80ff0000.) + + + +CAIRO_FORMAT_RGB24 + each pixel is a 32-bit quantity, with + the upper 8 bits unused. Red, Green, and Blue are stored + in the remaining 24 bits in that order. + + + +CAIRO_FORMAT_A8 + each pixel is a 8-bit quantity holding + an alpha value. + + + +CAIRO_FORMAT_A1 + each pixel is a 1-bit quantity holding + an alpha value. Pixels are packed together into 32-bit + quantities. The ordering of the bits matches the + endianess of the platform. On a big-endian machine, the + first pixel is in the uppermost bit, on a little-endian + machine the first pixel is in the least-significant bit. + + + + +<anchor id="cairo-set-target-image"/>cairo_set_target_image () +cairo_set_target_imagevoid cairo_set_target_image (cairo_t *cr, + char *data, + cairo_format_t format, + int width, + int height, + int stride); + +Directs output for a cairo_t to an in-memory image. The output +buffer must be kept around until the cairo_t is destroyed or set +to to have a different target. The initial contents of buffer +will be used as the inital image contents; you must explicitely +clear the buffer, using, for example, cairo_rectangle() and +cairo_fill() if you want it cleared. + + + +cr : + a cairo_t + +data : + a pointer to a buffer supplied by the application + in which to write contents. + +format : + the format of pixels in the buffer + +width : + the width of the image to be stored in the buffer + +height : + the eight of the image to be stored in the buffer + +stride : + the number of bytes between the start of rows + in the buffer. Having this be specified separate from width + allows for padding at the end of rows, or for writing + to a subportion of a larger image. + + + +<anchor id="cairo-operator-t"/>enum cairo_operator_t +cairo_operator_ttypedef enum cairo_operator { + CAIRO_OPERATOR_CLEAR, + CAIRO_OPERATOR_SRC, + CAIRO_OPERATOR_DST, + CAIRO_OPERATOR_OVER, + CAIRO_OPERATOR_OVER_REVERSE, + CAIRO_OPERATOR_IN, + CAIRO_OPERATOR_IN_REVERSE, + CAIRO_OPERATOR_OUT, + CAIRO_OPERATOR_OUT_REVERSE, + CAIRO_OPERATOR_ATOP, + CAIRO_OPERATOR_ATOP_REVERSE, + CAIRO_OPERATOR_XOR, + CAIRO_OPERATOR_ADD, + CAIRO_OPERATOR_SATURATE +} cairo_operator_t; + + + + + +<anchor id="cairo-set-operator"/>cairo_set_operator () +cairo_set_operatorvoid cairo_set_operator (cairo_t *cr, + cairo_operator_t op); + + + +cr : + + +op : + + + + + + +<anchor id="cairo-set-rgb-color"/>cairo_set_rgb_color () +cairo_set_rgb_colorvoid cairo_set_rgb_color (cairo_t *cr, + double red, + double green, + double blue); + +Sets a constant color for filling and stroking. This replaces any +pattern set with cairo_set_pattern(). The color components are +floating point numbers in the range 0 to 1. If the values passed in +are outside that range, they will be clamped. + + + +cr : + a cairo_t + +red : + red component of color + +green : + green component of color + +blue : + blue component of color + + + +<anchor id="cairo-set-pattern"/>cairo_set_pattern () +cairo_set_patternvoid cairo_set_pattern (cairo_t *cr, + cairo_pattern_t *pattern); + + + +cr : + + +pattern : + + + + + + +<anchor id="cairo-set-alpha"/>cairo_set_alpha () +cairo_set_alphavoid cairo_set_alpha (cairo_t *cr, + double alpha); + +Sets an overall alpha value used for stroking and filling. This +value is multiplied with any alpha value coming from a gradient or +image pattern. + + + +cr : + a cairo_t + +alpha : + the alpha value. 0 is transparent, 1 fully opaque. + if the value is outside the range 0 to 1, it will be + clamped to that range. + + + +<anchor id="cairo-set-tolerance"/>cairo_set_tolerance () +cairo_set_tolerancevoid cairo_set_tolerance (cairo_t *cr, + double tolerance); + +Sets the tolerance used when converting paths into trapezoids. +Curved segments of the path will be subdivided until the maximum +deviation between the original path and the polygonal approximation +is less than tolerance. The default value is 0.1. A larger +value will give better performance, a smaller value, better +appearance. (Reducing the value from the default value of 0.1 +is unlikely to improve appearance significantly.) + + + +cr : + a cairo_t + +tolerance : + the tolerance, in device units (typically pixels) + + + +<anchor id="cairo-fill-rule-t"/>enum cairo_fill_rule_t +cairo_fill_rule_ttypedef enum cairo_fill_rule { + CAIRO_FILL_RULE_WINDING, + CAIRO_FILL_RULE_EVEN_ODD +} cairo_fill_rule_t; + + +cairo_fill_rule_t is used to select how paths are filled. For both +fill rules, whether or not a point is included in the fill is +determined by taking a ray from that point to infinity and looking +at intersections with the path. The ray can be in any direction, +as long as it doesn't pass through the end point of a segment +or have a tricky intersection such as intersecting tangent to the path. +(Note that filling is not actually implemented in this way. This +is just a description of the rule that is applied.) + + + + +CAIRO_FILL_RULE_WINDING + If the path crosses the ray from +left-to-right, counts +1. If the path crosses the ray +from right to left, counts -1. (Left and right are determined +from the perspective of looking along the ray from the starting +point.) If the total count is non-zero, the point will be filled. + + + +CAIRO_FILL_RULE_EVEN_ODD + Counts the total number of +intersections, without regard to the orientation of the contour. If +the total number of intersections is odd, the point will be +filled. + + + + +<anchor id="cairo-set-fill-rule"/>cairo_set_fill_rule () +cairo_set_fill_rulevoid cairo_set_fill_rule (cairo_t *cr, + cairo_fill_rule_t fill_rule); + + + +cr : + + +fill_rule : + + + + + + +<anchor id="cairo-set-line-width"/>cairo_set_line_width () +cairo_set_line_widthvoid cairo_set_line_width (cairo_t *cr, + double width); + + + +cr : + + +width : + + + + + + +<anchor id="cairo-line-cap-t"/>enum cairo_line_cap_t +cairo_line_cap_ttypedef enum cairo_line_cap { + CAIRO_LINE_CAP_BUTT, + CAIRO_LINE_CAP_ROUND, + CAIRO_LINE_CAP_SQUARE +} cairo_line_cap_t; + + +enumeration for style of line-endings + + + + +CAIRO_LINE_CAP_BUTT + start(stop) the line exactly at the start(end) point + + + +CAIRO_LINE_CAP_ROUND + use a round ending, the center of the circle is the end point + + + +CAIRO_LINE_CAP_SQUARE + use squared ending, the center of the square is the end point + + + + +<anchor id="cairo-set-line-cap"/>cairo_set_line_cap () +cairo_set_line_capvoid cairo_set_line_cap (cairo_t *cr, + cairo_line_cap_t line_cap); + + + +cr : + + +line_cap : + + + + + + +<anchor id="cairo-line-join-t"/>enum cairo_line_join_t +cairo_line_join_ttypedef enum cairo_line_join { + CAIRO_LINE_JOIN_MITER, + CAIRO_LINE_JOIN_ROUND, + CAIRO_LINE_JOIN_BEVEL +} cairo_line_join_t; + + + + + +<anchor id="cairo-set-line-join"/>cairo_set_line_join () +cairo_set_line_joinvoid cairo_set_line_join (cairo_t *cr, + cairo_line_join_t line_join); + + + +cr : + + +line_join : + + + + + + +<anchor id="cairo-set-dash"/>cairo_set_dash () +cairo_set_dashvoid cairo_set_dash (cairo_t *cr, + double *dashes, + int ndash, + double offset); + + + +cr : + + +dashes : + + +ndash : + + +offset : + + + + + + +<anchor id="cairo-set-miter-limit"/>cairo_set_miter_limit () +cairo_set_miter_limitvoid cairo_set_miter_limit (cairo_t *cr, + double limit); + + + +cr : + + +limit : + + + + + + +<anchor id="cairo-translate"/>cairo_translate () +cairo_translatevoid cairo_translate (cairo_t *cr, + double tx, + double ty); + + + +cr : + + +tx : + + +ty : + + + + + + +<anchor id="cairo-scale"/>cairo_scale () +cairo_scalevoid cairo_scale (cairo_t *cr, + double sx, + double sy); + + + +cr : + + +sx : + + +sy : + + + + + + +<anchor id="cairo-rotate"/>cairo_rotate () +cairo_rotatevoid cairo_rotate (cairo_t *cr, + double angle); + + + +cr : + + +angle : + + + + + + +<anchor id="cairo-concat-matrix"/>cairo_concat_matrix () +cairo_concat_matrixvoid cairo_concat_matrix (cairo_t *cr, + cairo_matrix_t *matrix); + + + +cr : + + +matrix : + + + + + + +<anchor id="cairo-set-matrix"/>cairo_set_matrix () +cairo_set_matrixvoid cairo_set_matrix (cairo_t *cr, + cairo_matrix_t *matrix); + + + +cr : + + +matrix : + + + + + + +<anchor id="cairo-default-matrix"/>cairo_default_matrix () +cairo_default_matrixvoid cairo_default_matrix (cairo_t *cr); + + + +cr : + + + + + + +<anchor id="cairo-identity-matrix"/>cairo_identity_matrix () +cairo_identity_matrixvoid cairo_identity_matrix (cairo_t *cr); + + + +cr : + + + + + + +<anchor id="cairo-transform-point"/>cairo_transform_point () +cairo_transform_pointvoid cairo_transform_point (cairo_t *cr, + double *x, + double *y); + + + +cr : + + +x : + + +y : + + + + + + +<anchor id="cairo-transform-distance"/>cairo_transform_distance () +cairo_transform_distancevoid cairo_transform_distance (cairo_t *cr, + double *dx, + double *dy); + + + +cr : + + +dx : + + +dy : + + + + + + +<anchor id="cairo-inverse-transform-point"/>cairo_inverse_transform_point () +cairo_inverse_transform_pointvoid cairo_inverse_transform_point (cairo_t *cr, + double *x, + double *y); + + + +cr : + + +x : + + +y : + + + + + + +<anchor id="cairo-inverse-transform-distance"/>cairo_inverse_transform_distance () +cairo_inverse_transform_distancevoid cairo_inverse_transform_distance + (cairo_t *cr, + double *dx, + double *dy); + + + +cr : + + +dx : + + +dy : + + + + + + +<anchor id="cairo-new-path"/>cairo_new_path () +cairo_new_pathvoid cairo_new_path (cairo_t *cr); + + + +cr : + + + + + + +<anchor id="cairo-move-to"/>cairo_move_to () +cairo_move_tovoid cairo_move_to (cairo_t *cr, + double x, + double y); + + + +cr : + + +x : + + +y : + + + + + + +<anchor id="cairo-line-to"/>cairo_line_to () +cairo_line_tovoid cairo_line_to (cairo_t *cr, + double x, + double y); + + + +cr : + + +x : + + +y : + + + + + + +<anchor id="cairo-curve-to"/>cairo_curve_to () +cairo_curve_tovoid cairo_curve_to (cairo_t *cr, + double x1, + double y1, + double x2, + double y2, + double x3, + double y3); + + + +cr : + + +x1 : + + +y1 : + + +x2 : + + +y2 : + + +x3 : + + +y3 : + + + + + + +<anchor id="cairo-arc"/>cairo_arc () +cairo_arcvoid cairo_arc (cairo_t *cr, + double xc, + double yc, + double radius, + double angle1, + double angle2); + +Adds an arc from angle1 to angle2 to the current path. If there +is a current point, that point is connected to the start of the arc +by a straight line segment. Angles are measured in radians with an +angle of 0 along the X axis and an angle of M_PI radians (90 +degrees) along the Y axis, so with the default transformation +matrix, positive angles are clockwise. (To convert from degrees to +radians, use degrees * (M_PI / 180.).) This +function gives the arc in the direction of increasing angle; see +cairo_arc_negative() to get the arc in the direction of decreasing +angle. + + +A full arc is drawn as a circle. To make an oval arc, you can scale +the current transformation matrix by different amounts in the X and +Y directions. For example, to draw a full oval in the box given +by x, y, width, height: + + +cairo_save (cr); +cairo_translate (x + width / 2., y + height / 2.); +cairo_scale (1. / (height / 2.), 1. / (width / 2.)); +cairo_arc (cr, 0., 0., 1., 0., 2 * M_PI); +cairo_restore (cr); + + + + +cr : + a Cairo context + +xc : + X position of the center of the arc + +yc : + Y position of the center of the arc + +radius : + the radius of the arc + +angle1 : + the start angle, in radians + +angle2 : + the end angle, in radians + + + +<anchor id="cairo-arc-negative"/>cairo_arc_negative () +cairo_arc_negativevoid cairo_arc_negative (cairo_t *cr, + double xc, + double yc, + double radius, + double angle1, + double angle2); + +Adds an arc from angle1 to angle2 to the current path. The +function behaves identically to cairo_arc() except that instead of +giving the arc in the direction of increasing angle, it gives +the arc in the direction of decreasing angle. + + + +cr : + a Cairo context + +xc : + X position of the center of the arc + +yc : + Y position of the center of the arc + +radius : + the radius of the arc + +angle1 : + the start angle, in radians + +angle2 : + the end angle, in radians + + + +<anchor id="cairo-rel-move-to"/>cairo_rel_move_to () +cairo_rel_move_tovoid cairo_rel_move_to (cairo_t *cr, + double dx, + double dy); + + + +cr : + + +dx : + + +dy : + + + + + + +<anchor id="cairo-rel-line-to"/>cairo_rel_line_to () +cairo_rel_line_tovoid cairo_rel_line_to (cairo_t *cr, + double dx, + double dy); + + + +cr : + + +dx : + + +dy : + + + + + + +<anchor id="cairo-rel-curve-to"/>cairo_rel_curve_to () +cairo_rel_curve_tovoid cairo_rel_curve_to (cairo_t *cr, + double dx1, + double dy1, + double dx2, + double dy2, + double dx3, + double dy3); + + + +cr : + + +dx1 : + + +dy1 : + + +dx2 : + + +dy2 : + + +dx3 : + + +dy3 : + + + + + + +<anchor id="cairo-rectangle"/>cairo_rectangle () +cairo_rectanglevoid cairo_rectangle (cairo_t *cr, + double x, + double y, + double width, + double height); + + + +cr : + + +x : + + +y : + + +width : + + +height : + + + + + + +<anchor id="cairo-close-path"/>cairo_close_path () +cairo_close_pathvoid cairo_close_path (cairo_t *cr); + + + +cr : + + + + + + +<anchor id="cairo-stroke"/>cairo_stroke () +cairo_strokevoid cairo_stroke (cairo_t *cr); + + + +cr : + + + + + + +<anchor id="cairo-fill"/>cairo_fill () +cairo_fillvoid cairo_fill (cairo_t *cr); + + + +cr : + + + + + + +<anchor id="cairo-copy-page"/>cairo_copy_page () +cairo_copy_pagevoid cairo_copy_page (cairo_t *cr); + + + +cr : + + + + + + +<anchor id="cairo-show-page"/>cairo_show_page () +cairo_show_pagevoid cairo_show_page (cairo_t *cr); + + + +cr : + + + + + + +<anchor id="cairo-in-stroke"/>cairo_in_stroke () +cairo_in_strokecairo_bool_t cairo_in_stroke (cairo_t *cr, + double x, + double y); + + + +cr : + + +x : + + +y : + + +Returns : + + + + + +<anchor id="cairo-in-fill"/>cairo_in_fill () +cairo_in_fillcairo_bool_t cairo_in_fill (cairo_t *cr, + double x, + double y); + + + +cr : + + +x : + + +y : + + +Returns : + + + + + +<anchor id="cairo-bool-t"/>cairo_bool_t +cairo_bool_ttypedef int cairo_bool_t; + + +cairo_bool_t is used for boolean values. Returns of type +cairo_bool_t will always be either 0 or 1, but testing against +these values explicitely is not encouraged; just use the +value as a boolean condition. + + + + if (cairo_in_stroke (cr, x, y)) { + /* do something */ + } + + + + + +<anchor id="cairo-stroke-extents"/>cairo_stroke_extents () +cairo_stroke_extentsvoid cairo_stroke_extents (cairo_t *cr, + double *x1, + double *y1, + double *x2, + double *y2); + + + +cr : + + +x1 : + + +y1 : + + +x2 : + + +y2 : + + + + + + +<anchor id="cairo-fill-extents"/>cairo_fill_extents () +cairo_fill_extentsvoid cairo_fill_extents (cairo_t *cr, + double *x1, + double *y1, + double *x2, + double *y2); + + + +cr : + + +x1 : + + +y1 : + + +x2 : + + +y2 : + + + + + + +<anchor id="cairo-init-clip"/>cairo_init_clip () +cairo_init_clipvoid cairo_init_clip (cairo_t *cr); + + + +cr : + + + + + + +<anchor id="cairo-clip"/>cairo_clip () +cairo_clipvoid cairo_clip (cairo_t *cr); + + + +cr : + + + + + + +<anchor id="cairo-font-t"/>cairo_font_t +cairo_font_ttypedef struct _cairo_font cairo_font_t; + + +A cairo_font_t is a font scaled to a particular size and device +resolution. A font can be set on a cairo_t by using +cairo_set_font() assuming that the current transformation and +target surface of the cairo_t match that for which the +cairo_font_t was created. The effect of using a mismatched +cairo_font_t will be incorrect font metrics. + + + + +<anchor id="cairo-glyph-t"/>cairo_glyph_t +cairo_glyph_ttypedef struct { + unsigned long index; + double x; + double y; +} cairo_glyph_t; + + +The cairo_glyph_t structure holds information about a single glyph +when drawing or measuring text. A font is (in simple terms) a +collection of shapes used to draw text. A glyph is one of these +shapes. There can be multiple glyphs for a single character +(alternates to be used in different contexts, for example), or a +glyph can be a ligature of multiple +characters. Cairo doesn't expose any way of converting input text +into glyphs, so in order to use the Cairo interfaces that take +arrays of glyphs, you must directly access the appropriate +underlying font system. + + +Note that the offsets given by x and y are not cumulative. When +drawing or measuring text, each glyph is individually positioned +with respect to the overall origin + + + + +unsigned long index; + glyph index in the font. The exact interpretation of the + glyph index depends on the font technology being used. + + + +double x; + the offset in the X direction between the origin used for + drawing or measuring the string and the origin of this glyph. + + + +double y; + the offset in the Y direction between the origin used for + drawing or measuring the string and the origin of this glyph. + + + + +<anchor id="cairo-text-extents-t"/>cairo_text_extents_t +cairo_text_extents_ttypedef struct { + double x_bearing; + double y_bearing; + double width; + double height; + double x_advance; + double y_advance; +} cairo_text_extents_t; + + +The cairo_text_extents_t< structure stores the extents of a single +glyph or a string of glyphs in user-space coordinates. Because text +extents are in user-space coordinates, they don't scale along with +the current transformation matrix. If you call +cairo_scale(cr, 2.0, 2.0), text will +be drawn twice as big, but the reported text extents will not be +doubled. They will change slightly due to hinting (so you can't +assume that metrics are independent of the transformation matrix), +but otherwise will remain unchanged. + + + + +double x_bearing; + the horizontal distance from the origin to the + leftmost part of the glyphs as drawn. Positive if the + glyphs lie entirely to the right of the origin. + + + +double y_bearing; + the vertical distance from the origin to the + topmost part of the glyphs as drawn. Positive only if the + glyphs lie completely below the origin; will usually be + negative. + + + +double width; + width of the glyphs as drawn + + + +double height; + height of the glyphs as drawn + + + +double x_advance; +distance to advance in the X direction + after drawing these glyphs + + + +double y_advance; + distance to advance in the Y direction + after drawing these glyphs. Will typically be zero except + for vertical text layout as found in East-Asian languages. + + + + +<anchor id="cairo-font-extents-t"/>cairo_font_extents_t +cairo_font_extents_ttypedef struct { + double ascent; + double descent; + double height; + double max_x_advance; + double max_y_advance; +} cairo_font_extents_t; + + + + + +<anchor id="cairo-font-slant-t"/>enum cairo_font_slant_t +cairo_font_slant_ttypedef enum cairo_font_slant { + CAIRO_FONT_SLANT_NORMAL, + CAIRO_FONT_SLANT_ITALIC, + CAIRO_FONT_SLANT_OBLIQUE +} cairo_font_slant_t; + + + + + +<anchor id="cairo-font-weight-t"/>enum cairo_font_weight_t +cairo_font_weight_ttypedef enum cairo_font_weight { + CAIRO_FONT_WEIGHT_NORMAL, + CAIRO_FONT_WEIGHT_BOLD +} cairo_font_weight_t; + + + + + +<anchor id="cairo-select-font"/>cairo_select_font () +cairo_select_fontvoid cairo_select_font (cairo_t *cr, + const char *family, + cairo_font_slant_t slant, + cairo_font_weight_t weight); + + + +cr : + + +family : + + +slant : + + +weight : + + + + + + +<anchor id="cairo-scale-font"/>cairo_scale_font () +cairo_scale_fontvoid cairo_scale_font (cairo_t *cr, + double scale); + + + +cr : + + +scale : + + + + + + +<anchor id="cairo-transform-font"/>cairo_transform_font () +cairo_transform_fontvoid cairo_transform_font (cairo_t *cr, + cairo_matrix_t *matrix); + + + +cr : + + +matrix : + + + + + + +<anchor id="cairo-show-text"/>cairo_show_text () +cairo_show_textvoid cairo_show_text (cairo_t *cr, + unsigned char *utf8); + + + +cr : + + +utf8 : + + + + + + +<anchor id="cairo-show-glyphs"/>cairo_show_glyphs () +cairo_show_glyphsvoid cairo_show_glyphs (cairo_t *cr, + cairo_glyph_t *glyphs, + int num_glyphs); + + + +cr : + + +glyphs : + + +num_glyphs : + + + + + + +<anchor id="cairo-current-font"/>cairo_current_font () +cairo_current_fontcairo_font_t* cairo_current_font (cairo_t *cr); + +Gets the current font object for a cairo_t. If there is no current +font object, because the font parameters, transform, or target +surface has been changed since a font was last used, a font object +will be created and stored in in the cairo_t. + + + +cr : + a cairo_t + +Returns : the current font object. Can return NULL + on out-of-memory or if the context is already in + an error state. This object is owned by Cairo. To keep + a reference to it, you must call cairo_font_reference(). + + + +<anchor id="cairo-current-font-extents"/>cairo_current_font_extents () +cairo_current_font_extentsvoid cairo_current_font_extents (cairo_t *cr, + cairo_font_extents_t *extents); + + + +cr : + + +extents : + + + + + + +<anchor id="cairo-set-font"/>cairo_set_font () +cairo_set_fontvoid cairo_set_font (cairo_t *cr, + cairo_font_t *font); + +Replaces the current cairo_font_t object in the cairo_t with +font. The replaced font in the cairo_t will be destroyed if there +are no other references to it. Since a cairo_font_t is specific to +a particular output device and size, changing the transformation, +font transformation, or target surfaces of a cairo_t will clear +any previously set font. Setting the font using cairo_set_font() is +exclusive with the simple font selection API provided by +cairo_select_font(). The size and transformation set by +cairo_scale_font() and cairo_transform_font() are ignored unless +they were taken into account when creating font. + + + +cr : + a cairo_t + +font : + a cairo_font_t, or NULL to unset any previously set font. + + + +<anchor id="cairo-text-extents"/>cairo_text_extents () +cairo_text_extentsvoid cairo_text_extents (cairo_t *cr, + unsigned char *utf8, + cairo_text_extents_t *extents); + + + +cr : + + +utf8 : + + +extents : + + + + + + +<anchor id="cairo-glyph-extents"/>cairo_glyph_extents () +cairo_glyph_extentsvoid cairo_glyph_extents (cairo_t *cr, + cairo_glyph_t *glyphs, + int num_glyphs, + cairo_text_extents_t *extents); + + + +cr : + + +glyphs : + + +num_glyphs : + + +extents : + + + + + + +<anchor id="cairo-text-path"/>cairo_text_path () +cairo_text_pathvoid cairo_text_path (cairo_t *cr, + unsigned char *utf8); + + + +cr : + + +utf8 : + + + + + + +<anchor id="cairo-glyph-path"/>cairo_glyph_path () +cairo_glyph_pathvoid cairo_glyph_path (cairo_t *cr, + cairo_glyph_t *glyphs, + int num_glyphs); + + + +cr : + + +glyphs : + + +num_glyphs : + + + + + + +<anchor id="cairo-font-reference"/>cairo_font_reference () +cairo_font_referencevoid cairo_font_reference (cairo_font_t *font); + + + +font : + + + + + + +<anchor id="cairo-font-destroy"/>cairo_font_destroy () +cairo_font_destroyvoid cairo_font_destroy (cairo_font_t *font); + + + +font : + + + + + + +<anchor id="cairo-font-extents"/>cairo_font_extents () +cairo_font_extentscairo_status_t cairo_font_extents (cairo_font_t *font, + cairo_matrix_t *font_matrix, + cairo_font_extents_t *extents); + +Gets the metrics for a cairo_font_t. + + + +font : + a cairo_font_t + +font_matrix : + the font transformation for which this font was + created. (See cairo_transform_font()). This is needed + properly convert the metrics from the font into user space. + +extents : + a cairo_font_extents_t which to store the retrieved extents. + +Returns : CAIRO_STATUS_SUCCESS on success. Otherwise, an + error such as CAIRO_STATUS_NO_MEMORY. + + + +<anchor id="cairo-font-glyph-extents"/>cairo_font_glyph_extents () +cairo_font_glyph_extentsvoid cairo_font_glyph_extents (cairo_font_t *font, + cairo_matrix_t *font_matrix, + cairo_glyph_t *glyphs, + int num_glyphs, + cairo_text_extents_t *extents); + +cairo_font_glyph_extents() gets the overall metrics for a string of +glyphs. The X and Y offsets in glyphs are taken from an origin of 0,0. + + + +font : + a cairo_font_t + +font_matrix : + the font transformation for which this font was + created. (See cairo_transform_font()). This is needed + properly convert the metrics from the font into user space. + +glyphs : + an array of glyph IDs with X and Y offsets. + +num_glyphs : + the number of glyphs in the glyphs array + +extents : + a cairo_text_extents_t which to store the retrieved extents. + + + +<anchor id="cairo-show-surface"/>cairo_show_surface () +cairo_show_surfacevoid cairo_show_surface (cairo_t *cr, + cairo_surface_t *surface, + int width, + int height); + + + +cr : + + +surface : + + +width : + + +height : + + + + + + +<anchor id="cairo-current-operator"/>cairo_current_operator () +cairo_current_operatorcairo_operator_t cairo_current_operator (cairo_t *cr); + + + +cr : + + +Returns : + + + + + +<anchor id="cairo-current-rgb-color"/>cairo_current_rgb_color () +cairo_current_rgb_colorvoid cairo_current_rgb_color (cairo_t *cr, + double *red, + double *green, + double *blue); + + + +cr : + + +red : + + +green : + + +blue : + + + + + + +<anchor id="cairo-current-pattern"/>cairo_current_pattern () +cairo_current_patterncairo_pattern_t* cairo_current_pattern (cairo_t *cr); + + + +cr : + + +Returns : + + + + + +<anchor id="cairo-current-alpha"/>cairo_current_alpha () +cairo_current_alphadouble cairo_current_alpha (cairo_t *cr); + + + +cr : + + +Returns : + + + + + +<anchor id="cairo-current-tolerance"/>cairo_current_tolerance () +cairo_current_tolerancedouble cairo_current_tolerance (cairo_t *cr); + + + +cr : + + +Returns : + + + + + +<anchor id="cairo-current-point"/>cairo_current_point () +cairo_current_pointvoid cairo_current_point (cairo_t *cr, + double *x, + double *y); + + + +cr : + + +x : + + +y : + + + + + + +<anchor id="cairo-current-fill-rule"/>cairo_current_fill_rule () +cairo_current_fill_rulecairo_fill_rule_t cairo_current_fill_rule (cairo_t *cr); + + + +cr : + + +Returns : + + + + + +<anchor id="cairo-current-line-width"/>cairo_current_line_width () +cairo_current_line_widthdouble cairo_current_line_width (cairo_t *cr); + + + +cr : + + +Returns : + + + + + +<anchor id="cairo-current-line-cap"/>cairo_current_line_cap () +cairo_current_line_capcairo_line_cap_t cairo_current_line_cap (cairo_t *cr); + + + +cr : + + +Returns : + + + + + +<anchor id="cairo-current-line-join"/>cairo_current_line_join () +cairo_current_line_joincairo_line_join_t cairo_current_line_join (cairo_t *cr); + + + +cr : + + +Returns : + + + + + +<anchor id="cairo-current-miter-limit"/>cairo_current_miter_limit () +cairo_current_miter_limitdouble cairo_current_miter_limit (cairo_t *cr); + + + +cr : + + +Returns : + + + + + +<anchor id="cairo-current-matrix"/>cairo_current_matrix () +cairo_current_matrixvoid cairo_current_matrix (cairo_t *cr, + cairo_matrix_t *matrix); + + + +cr : + + +matrix : + + + + + + +<anchor id="cairo-current-target-surface"/>cairo_current_target_surface () +cairo_current_target_surfacecairo_surface_t* cairo_current_target_surface + (cairo_t *cr); + + + +cr : + + +Returns : + + + + + +<anchor id="cairo-current-path"/>cairo_current_path () +cairo_current_pathvoid cairo_current_path (cairo_t *cr, + cairo_move_to_func_t *move_to, + cairo_line_to_func_t *line_to, + cairo_curve_to_func_t *curve_to, + cairo_close_path_func_t *close_path, + void *closure); + + + +cr : + + +move_to : + + +line_to : + + +curve_to : + + +close_path : + + +closure : + + + + + + +<anchor id="cairo-current-path-flat"/>cairo_current_path_flat () +cairo_current_path_flatvoid cairo_current_path_flat (cairo_t *cr, + cairo_move_to_func_t *move_to, + cairo_line_to_func_t *line_to, + cairo_close_path_func_t *close_path, + void *closure); + + + +cr : + + +move_to : + + +line_to : + + +close_path : + + +closure : + + + + + + +<anchor id="cairo-status-t"/>enum cairo_status_t +cairo_status_ttypedef enum cairo_status { + CAIRO_STATUS_SUCCESS = 0, + CAIRO_STATUS_NO_MEMORY, + CAIRO_STATUS_INVALID_RESTORE, + CAIRO_STATUS_INVALID_POP_GROUP, + CAIRO_STATUS_NO_CURRENT_POINT, + CAIRO_STATUS_INVALID_MATRIX, + CAIRO_STATUS_NO_TARGET_SURFACE, + CAIRO_STATUS_NULL_POINTER, + CAIRO_STATUS_INVALID_STRING +} cairo_status_t; + + + + + +<anchor id="cairo-status"/>cairo_status () +cairo_statuscairo_status_t cairo_status (cairo_t *cr); + + + +cr : + + +Returns : + + + + + +<anchor id="cairo-status-string"/>cairo_status_string () +cairo_status_stringconst char* cairo_status_string (cairo_t *cr); + + + +cr : + + +Returns : + + + + + +<anchor id="cairo-filter-t"/>enum cairo_filter_t +cairo_filter_ttypedef enum { + CAIRO_FILTER_FAST, + CAIRO_FILTER_GOOD, + CAIRO_FILTER_BEST, + CAIRO_FILTER_NEAREST, + CAIRO_FILTER_BILINEAR, + CAIRO_FILTER_GAUSSIAN +} cairo_filter_t; + + + + + +<anchor id="cairo-image-surface-create"/>cairo_image_surface_create () +cairo_image_surface_createcairo_surface_t* cairo_image_surface_create (cairo_format_t format, + int width, + int height); + +Creates an image surface of the specified format and +dimensions. The initial contents of the surface is undefined; you +must explicitely clear the buffer, using, for example, +cairo_rectangle() and cairo_fill() if you want it cleared. + + + +format : + format of pixels in the surface to create + +width : + width of the surface, in pixels + +height : + height of the surface, in pixels + +Returns : the newly created surface, or NULL if it couldn't + be created because of lack of memory + + + +<anchor id="cairo-image-surface-create-for-data"/>cairo_image_surface_create_for_data () +cairo_image_surface_create_for_datacairo_surface_t* cairo_image_surface_create_for_data + (char *data, + cairo_format_t format, + int width, + int height, + int stride); + +Creates an image surface for the provided pixel data. The output +buffer must be kept around until the cairo_surface_t is destroyed +or cairo_surface_finish() is called on the surface. The initial +contents of buffer will be used as the inital image contents; you +must explicitely clear the buffer, using, for example, +cairo_rectangle() and cairo_fill() if you want it cleared. + + + +data : + a pointer to a buffer supplied by the application + in which to write contents. + +format : + the format of pixels in the buffer + +width : + the width of the image to be stored in the buffer + +height : + the height of the image to be stored in the buffer + +stride : + the number of bytes between the start of rows + in the buffer. Having this be specified separate from width + allows for padding at the end of rows, or for writing + to a subportion of a larger image. + +Returns : the newly created surface, or NULL if it couldn't + be created because of lack of memory + + + + + + + + + diff --git a/gfx/cairo/cairo/gtk-doc.make b/gfx/cairo/cairo/gtk-doc.make new file mode 100644 index 000000000000..18c60c2d7f48 --- /dev/null +++ b/gfx/cairo/cairo/gtk-doc.make @@ -0,0 +1,163 @@ +# +# *** NOTE *** this file is checked into CVS for convenience only. +# DO NOT EDIT. Rather get changes into upstream gtk-doc and then +# update this version from the gtk-doc version. +# + +# -*- mode: makefile -*- + +#################################### +# Everything below here is generic # +#################################### + +if GTK_DOC_USE_LIBTOOL +GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) +else +GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) +endif + +# We set GPATH here; this gives us semantics for GNU make +# which are more like other make's VPATH, when it comes to +# whether a source that is a target of one rule is then +# searched for in VPATH/GPATH. +# +GPATH = $(srcdir) + +TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) + +EXTRA_DIST = \ + $(content_files) \ + $(HTML_IMAGES) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE).types \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt + +DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ + $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + +SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ + $(DOC_MODULE).interfaces \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS) + +if ENABLE_GTK_DOC +all-local: html-build.stamp + +#### scan #### + +scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + @echo '*** Scanning header files ***' + @-chmod -R u+w $(srcdir) + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ + fi + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + touch scan-build.stamp + +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp + @true + +#### templates #### + +tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo '*** Rebuilding template files ***' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) + touch tmpl-build.stamp + +tmpl.stamp: tmpl-build.stamp + @true + +#### xml #### + +sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml + @echo '*** Building XML ***' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml $(MKDB_OPTIONS) + touch sgml-build.stamp + +sgml.stamp: sgml-build.stamp + @true + +#### html #### + +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo '*** Building HTML ***' + @-chmod -R u+w $(srcdir) + rm -rf $(srcdir)/html + mkdir $(srcdir)/html + cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo '-- Fixing Crossreferences' + cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + touch html-build.stamp +else +all-local: +endif + +############## + +clean-local: + rm -f *~ *.bak + rm -rf .libs + +maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + +install-data-local: + installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ + $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ + for i in $$installfiles; do \ + echo '-- Installing '$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ + echo '-- Installing $(srcdir)/html/index.sgml' ; \ + $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ + fi + +uninstall-local: + rm -f $(DESTDIR)$(TARGET_DIR)/* + +# +# Require gtk-doc when making dist +# +if ENABLE_GTK_DOC +dist-check-gtkdoc: +else +dist-check-gtkdoc: + @echo "*** gtk-doc must be installed and enabled in order to make dist" + @false +endif + +# XXX: Before this was: +# dist-hook: dist-check-gtkdoc dist-hook-local +# which seems reasonable, but for some reason the dist-check-gtkdoc +# was always failing on me, even though I do have gtk-doc installed +# and it is successfully building the documentation. + +dist-hook: dist-hook-local + mkdir $(distdir)/tmpl + mkdir $(distdir)/xml + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl + -cp $(srcdir)/xml/*.xml $(distdir)/xml + -cp $(srcdir)/html/* $(distdir)/html + +.PHONY : dist-hook-local diff --git a/gfx/cairo/cairo/src/Makefile.am b/gfx/cairo/cairo/src/Makefile.am index d4155e817053..3f76d2726fcf 100644 --- a/gfx/cairo/cairo/src/Makefile.am +++ b/gfx/cairo/cairo/src/Makefile.am @@ -1,53 +1,56 @@ -cairoincludedir = $(includedir)/cairo -cairoinclude_HEADERS = \ - cairo.h \ - cairo-atsui.h \ - cairo-features.h\ - cairo-ft.h \ - cairo-glitz.h \ - cairo-pdf.h \ - cairo-png.h \ - cairo-ps.h \ - cairo-quartz.h \ - cairo-xcb.h \ - cairo-xlib.h - -lib_LTLIBRARIES = libcairo.la if CAIRO_HAS_PS_SURFACE -libcairo_ps_sources = cairo_ps_surface.c cairo-ps.h +libcairo_ps_headers = cairo-ps.h +libcairo_ps_sources = cairo_ps_surface.c endif if CAIRO_HAS_PDF_SURFACE -libcairo_pdf_sources = cairo_pdf_surface.c cairo-pdf.h +libcairo_pdf_headers = cairo-pdf.h +libcairo_pdf_sources = cairo_pdf_surface.c endif if CAIRO_HAS_PNG_SURFACE -libcairo_png_sources = cairo_png_surface.c cairo-png.h +libcairo_png_headers = cairo-png.h +libcairo_png_sources = cairo_png_surface.c endif if CAIRO_HAS_XLIB_SURFACE -libcairo_xlib_sources = cairo_xlib_surface.c cairo-xlib.h +libcairo_xlib_headers = cairo-xlib.h +libcairo_xlib_sources = cairo_xlib_surface.c endif if CAIRO_HAS_QUARTZ_SURFACE -libcairo_quartz_sources = cairo_quartz_surface.c cairo-quartz.h +libcairo_quartz_headers = cairo-quartz.h +libcairo_quartz_sources = cairo_quartz_surface.c endif if CAIRO_HAS_XCB_SURFACE -libcairo_xcb_sources = cairo_xcb_surface.c cairo-xcb.h +libcairo_xcb_headers = cairo-xcb.h +libcairo_xcb_sources = cairo_xcb_surface.c +endif + +libcairo_win32_sources = +if CAIRO_HAS_WIN32_SURFACE +libcairo_win32_headers = cairo-win32.h +libcairo_win32_sources += cairo_win32_surface.c cairo-win32-private.h +endif +if CAIRO_HAS_WIN32_FONT +libcairo_win32_sources += cairo_win32_font.c endif if CAIRO_HAS_GLITZ_SURFACE -libcairo_glitz_sources = cairo_glitz_surface.c cairo-glitz.h +libcairo_glitz_headers = cairo-glitz.h +libcairo_glitz_sources = cairo_glitz_surface.c endif if CAIRO_HAS_ATSUI_FONT -libcairo_atsui_sources = cairo_atsui_font.c cairo-atsui.h +libcairo_atsui_headers = cairo-atsui.h +libcairo_atsui_sources = cairo_atsui_font.c endif if CAIRO_HAS_FT_FONT -libcairo_ft_sources = cairo_ft_font.c cairo-ft.h +libcairo_ft_headers = cairo-ft.h +libcairo_ft_sources = cairo_ft_font.c cairo-ft-private.h endif # These names match automake style variable definition conventions so @@ -57,6 +60,23 @@ endif FONTCONFIG_LIBS=@FONTCONFIG_LIBS@ XRENDER_LIBS=@XRENDER_LIBS@ +cairoincludedir = $(includedir)/cairo +cairoinclude_HEADERS = \ + cairo.h \ + cairo-features.h \ + $(libcairo_atsui_headers) \ + $(libcairo_ft_headers) \ + $(libcairo_glitz_headers) \ + $(libcairo_pdf_headers) \ + $(libcairo_png_headers) \ + $(libcairo_ps_headers) \ + $(libcairo_quartz_headers) \ + $(libcairo_win32_headers) \ + $(libcairo_xcb_headers) \ + $(libcairo_xlib_headers) + +lib_LTLIBRARIES = libcairo.la + libcairo_la_SOURCES = \ cairo.c \ cairo.h \ @@ -80,6 +100,7 @@ libcairo_la_SOURCES = \ cairo_surface.c \ cairo_traps.c \ cairo_pattern.c \ + cairo_unicode.c \ cairo_wideint.c \ cairo-wideint.h \ $(libcairo_atsui_sources)\ @@ -91,6 +112,8 @@ libcairo_la_SOURCES = \ $(libcairo_quartz_sources)\ $(libcairo_xcb_sources) \ $(libcairo_glitz_sources)\ + $(libcairo_win32_sources)\ + $(libcairo_freetype_sources) \ cairoint.h libcairo_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined @@ -98,3 +121,13 @@ libcairo_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined INCLUDES = -I$(srcdir) $(CAIRO_CFLAGS) libcairo_la_LIBADD = $(CAIRO_LIBS) + +install-data-local: + @if test -f $(includedir)/cairo.h || test -f $(includedir)/cairo-features.h ; then \ + echo "****************************************************************" ; \ + echo "*** Error: Old headers found. You should remove the following" ; \ + echo "*** files and then type 'make install' again." ; \ + ls $(includedir)/cairo*.h ; \ + echo "****************************************************************" ; \ + false ; \ + fi diff --git a/gfx/cairo/cairo/src/Makefile.in b/gfx/cairo/cairo/src/Makefile.in index 87ae5ccba8c2..9140313c1a88 100644 --- a/gfx/cairo/cairo/src/Makefile.in +++ b/gfx/cairo/cairo/src/Makefile.in @@ -39,11 +39,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_1 = cairo_win32_surface.c cairo-win32-private.h +@CAIRO_HAS_WIN32_FONT_TRUE@am__append_2 = cairo_win32_font.c subdir = src -DIST_COMMON = $(cairoinclude_HEADERS) $(srcdir)/Makefile.am \ +DIST_COMMON = $(am__cairoinclude_HEADERS_DIST) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/cairo-features.h.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -66,13 +69,13 @@ am__libcairo_la_SOURCES_DIST = cairo.c cairo.h cairo_array.c \ cairo_matrix.c cairo_path.c cairo_path_bounds.c \ cairo_path_fill.c cairo_path_stroke.c cairo_pen.c \ cairo_polygon.c cairo_slope.c cairo_spline.c cairo_surface.c \ - cairo_traps.c cairo_pattern.c cairo_wideint.c cairo-wideint.h \ - cairo_atsui_font.c cairo-atsui.h cairo_ft_font.c cairo-ft.h \ - cairo_ps_surface.c cairo-ps.h cairo_pdf_surface.c cairo-pdf.h \ - cairo_png_surface.c cairo-png.h cairo_xlib_surface.c \ - cairo-xlib.h cairo_quartz_surface.c cairo-quartz.h \ - cairo_xcb_surface.c cairo-xcb.h cairo_glitz_surface.c \ - cairo-glitz.h cairoint.h + cairo_traps.c cairo_pattern.c cairo_unicode.c cairo_wideint.c \ + cairo-wideint.h cairo_atsui_font.c cairo_ft_font.c \ + cairo-ft-private.h cairo_ps_surface.c cairo_pdf_surface.c \ + cairo_png_surface.c cairo_xlib_surface.c \ + cairo_quartz_surface.c cairo_xcb_surface.c \ + cairo_glitz_surface.c cairo_win32_surface.c \ + cairo-win32-private.h cairo_win32_font.c cairoint.h @CAIRO_HAS_ATSUI_FONT_TRUE@am__objects_1 = cairo_atsui_font.lo @CAIRO_HAS_FT_FONT_TRUE@am__objects_2 = cairo_ft_font.lo @CAIRO_HAS_PS_SURFACE_TRUE@am__objects_3 = cairo_ps_surface.lo @@ -83,16 +86,20 @@ am__libcairo_la_SOURCES_DIST = cairo.c cairo.h cairo_array.c \ @CAIRO_HAS_QUARTZ_SURFACE_TRUE@ cairo_quartz_surface.lo @CAIRO_HAS_XCB_SURFACE_TRUE@am__objects_8 = cairo_xcb_surface.lo @CAIRO_HAS_GLITZ_SURFACE_TRUE@am__objects_9 = cairo_glitz_surface.lo +@CAIRO_HAS_WIN32_SURFACE_TRUE@am__objects_10 = cairo_win32_surface.lo +@CAIRO_HAS_WIN32_FONT_TRUE@am__objects_11 = cairo_win32_font.lo +am__objects_12 = $(am__objects_10) $(am__objects_11) am_libcairo_la_OBJECTS = cairo.lo cairo_array.lo cairo_cache.lo \ cairo_color.lo cairo_fixed.lo cairo_font.lo cairo_gstate.lo \ cairo_hull.lo cairo_image_surface.lo cairo_matrix.lo \ cairo_path.lo cairo_path_bounds.lo cairo_path_fill.lo \ cairo_path_stroke.lo cairo_pen.lo cairo_polygon.lo \ cairo_slope.lo cairo_spline.lo cairo_surface.lo cairo_traps.lo \ - cairo_pattern.lo cairo_wideint.lo $(am__objects_1) \ - $(am__objects_2) $(am__objects_3) $(am__objects_4) \ - $(am__objects_5) $(am__objects_6) $(am__objects_7) \ - $(am__objects_8) $(am__objects_9) + cairo_pattern.lo cairo_unicode.lo cairo_wideint.lo \ + $(am__objects_1) $(am__objects_2) $(am__objects_3) \ + $(am__objects_4) $(am__objects_5) $(am__objects_6) \ + $(am__objects_7) $(am__objects_8) $(am__objects_9) \ + $(am__objects_12) libcairo_la_OBJECTS = $(am_libcairo_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -107,6 +114,9 @@ LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libcairo_la_SOURCES) DIST_SOURCES = $(am__libcairo_la_SOURCES_DIST) +am__cairoinclude_HEADERS_DIST = cairo.h cairo-features.h cairo-atsui.h \ + cairo-ft.h cairo-glitz.h cairo-pdf.h cairo-png.h cairo-ps.h \ + cairo-quartz.h cairo-win32.h cairo-xcb.h cairo-xlib.h cairoincludeHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(cairoinclude_HEADERS) ETAGS = etags @@ -137,6 +147,10 @@ CAIRO_HAS_PS_SURFACE_FALSE = @CAIRO_HAS_PS_SURFACE_FALSE@ CAIRO_HAS_PS_SURFACE_TRUE = @CAIRO_HAS_PS_SURFACE_TRUE@ CAIRO_HAS_QUARTZ_SURFACE_FALSE = @CAIRO_HAS_QUARTZ_SURFACE_FALSE@ CAIRO_HAS_QUARTZ_SURFACE_TRUE = @CAIRO_HAS_QUARTZ_SURFACE_TRUE@ +CAIRO_HAS_WIN32_FONT_FALSE = @CAIRO_HAS_WIN32_FONT_FALSE@ +CAIRO_HAS_WIN32_FONT_TRUE = @CAIRO_HAS_WIN32_FONT_TRUE@ +CAIRO_HAS_WIN32_SURFACE_FALSE = @CAIRO_HAS_WIN32_SURFACE_FALSE@ +CAIRO_HAS_WIN32_SURFACE_TRUE = @CAIRO_HAS_WIN32_SURFACE_TRUE@ CAIRO_HAS_XCB_SURFACE_FALSE = @CAIRO_HAS_XCB_SURFACE_FALSE@ CAIRO_HAS_XCB_SURFACE_TRUE = @CAIRO_HAS_XCB_SURFACE_TRUE@ CAIRO_HAS_XLIB_SURFACE_FALSE = @CAIRO_HAS_XLIB_SURFACE_FALSE@ @@ -159,6 +173,8 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ @@ -172,11 +188,15 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ FT_FONT_FEATURE = @FT_FONT_FEATURE@ GLITZ_CFLAGS = @GLITZ_CFLAGS@ GLITZ_LIBS = @GLITZ_LIBS@ GLITZ_REQUIRES = @GLITZ_REQUIRES@ GLITZ_SURFACE_FEATURE = @GLITZ_SURFACE_FEATURE@ +GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +HTML_DIR = @HTML_DIR@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -218,6 +238,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ VERSION_INFO = @VERSION_INFO@ +WIN32_FONT_FEATURE = @WIN32_FONT_FEATURE@ +WIN32_SURFACE_FEATURE = @WIN32_SURFACE_FEATURE@ XCB_CFLAGS = @XCB_CFLAGS@ XCB_LIBS = @XCB_LIBS@ XCB_SURFACE_FEATURE = @XCB_SURFACE_FEATURE@ @@ -272,30 +294,42 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +@CAIRO_HAS_PS_SURFACE_TRUE@libcairo_ps_headers = cairo-ps.h +@CAIRO_HAS_PS_SURFACE_TRUE@libcairo_ps_sources = cairo_ps_surface.c +@CAIRO_HAS_PDF_SURFACE_TRUE@libcairo_pdf_headers = cairo-pdf.h +@CAIRO_HAS_PDF_SURFACE_TRUE@libcairo_pdf_sources = cairo_pdf_surface.c +@CAIRO_HAS_PNG_SURFACE_TRUE@libcairo_png_headers = cairo-png.h +@CAIRO_HAS_PNG_SURFACE_TRUE@libcairo_png_sources = cairo_png_surface.c +@CAIRO_HAS_XLIB_SURFACE_TRUE@libcairo_xlib_headers = cairo-xlib.h +@CAIRO_HAS_XLIB_SURFACE_TRUE@libcairo_xlib_sources = cairo_xlib_surface.c +@CAIRO_HAS_QUARTZ_SURFACE_TRUE@libcairo_quartz_headers = cairo-quartz.h +@CAIRO_HAS_QUARTZ_SURFACE_TRUE@libcairo_quartz_sources = cairo_quartz_surface.c +@CAIRO_HAS_XCB_SURFACE_TRUE@libcairo_xcb_headers = cairo-xcb.h +@CAIRO_HAS_XCB_SURFACE_TRUE@libcairo_xcb_sources = cairo_xcb_surface.c +libcairo_win32_sources = $(am__append_1) $(am__append_2) +@CAIRO_HAS_WIN32_SURFACE_TRUE@libcairo_win32_headers = cairo-win32.h +@CAIRO_HAS_GLITZ_SURFACE_TRUE@libcairo_glitz_headers = cairo-glitz.h +@CAIRO_HAS_GLITZ_SURFACE_TRUE@libcairo_glitz_sources = cairo_glitz_surface.c +@CAIRO_HAS_ATSUI_FONT_TRUE@libcairo_atsui_headers = cairo-atsui.h +@CAIRO_HAS_ATSUI_FONT_TRUE@libcairo_atsui_sources = cairo_atsui_font.c +@CAIRO_HAS_FT_FONT_TRUE@libcairo_ft_headers = cairo-ft.h +@CAIRO_HAS_FT_FONT_TRUE@libcairo_ft_sources = cairo_ft_font.c cairo-ft-private.h cairoincludedir = $(includedir)/cairo cairoinclude_HEADERS = \ - cairo.h \ - cairo-atsui.h \ - cairo-features.h\ - cairo-ft.h \ - cairo-glitz.h \ - cairo-pdf.h \ - cairo-png.h \ - cairo-ps.h \ - cairo-quartz.h \ - cairo-xcb.h \ - cairo-xlib.h + cairo.h \ + cairo-features.h \ + $(libcairo_atsui_headers) \ + $(libcairo_ft_headers) \ + $(libcairo_glitz_headers) \ + $(libcairo_pdf_headers) \ + $(libcairo_png_headers) \ + $(libcairo_ps_headers) \ + $(libcairo_quartz_headers) \ + $(libcairo_win32_headers) \ + $(libcairo_xcb_headers) \ + $(libcairo_xlib_headers) lib_LTLIBRARIES = libcairo.la -@CAIRO_HAS_PS_SURFACE_TRUE@libcairo_ps_sources = cairo_ps_surface.c cairo-ps.h -@CAIRO_HAS_PDF_SURFACE_TRUE@libcairo_pdf_sources = cairo_pdf_surface.c cairo-pdf.h -@CAIRO_HAS_PNG_SURFACE_TRUE@libcairo_png_sources = cairo_png_surface.c cairo-png.h -@CAIRO_HAS_XLIB_SURFACE_TRUE@libcairo_xlib_sources = cairo_xlib_surface.c cairo-xlib.h -@CAIRO_HAS_QUARTZ_SURFACE_TRUE@libcairo_quartz_sources = cairo_quartz_surface.c cairo-quartz.h -@CAIRO_HAS_XCB_SURFACE_TRUE@libcairo_xcb_sources = cairo_xcb_surface.c cairo-xcb.h -@CAIRO_HAS_GLITZ_SURFACE_TRUE@libcairo_glitz_sources = cairo_glitz_surface.c cairo-glitz.h -@CAIRO_HAS_ATSUI_FONT_TRUE@libcairo_atsui_sources = cairo_atsui_font.c cairo-atsui.h -@CAIRO_HAS_FT_FONT_TRUE@libcairo_ft_sources = cairo_ft_font.c cairo-ft.h libcairo_la_SOURCES = \ cairo.c \ cairo.h \ @@ -319,6 +353,7 @@ libcairo_la_SOURCES = \ cairo_surface.c \ cairo_traps.c \ cairo_pattern.c \ + cairo_unicode.c \ cairo_wideint.c \ cairo-wideint.h \ $(libcairo_atsui_sources)\ @@ -330,6 +365,8 @@ libcairo_la_SOURCES = \ $(libcairo_quartz_sources)\ $(libcairo_xcb_sources) \ $(libcairo_glitz_sources)\ + $(libcairo_win32_sources)\ + $(libcairo_freetype_sources) \ cairoint.h libcairo_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined @@ -434,7 +471,10 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_spline.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_surface.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_traps.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_unicode.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_wideint.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_win32_font.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_win32_surface.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_xcb_surface.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_xlib_surface.Plo@am__quote@ @@ -613,7 +653,7 @@ info: info-am info-am: -install-data-am: install-cairoincludeHEADERS +install-data-am: install-cairoincludeHEADERS install-data-local install-exec-am: install-libLTLIBRARIES @@ -649,15 +689,25 @@ uninstall-am: uninstall-cairoincludeHEADERS uninstall-info-am \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-cairoincludeHEADERS install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-libLTLIBRARIES install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-cairoincludeHEADERS uninstall-info-am \ - uninstall-libLTLIBRARIES + install-data-am install-data-local install-exec \ + install-exec-am install-info install-info-am \ + install-libLTLIBRARIES install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-cairoincludeHEADERS \ + uninstall-info-am uninstall-libLTLIBRARIES + +install-data-local: + @if test -f $(includedir)/cairo.h || test -f $(includedir)/cairo-features.h ; then \ + echo "****************************************************************" ; \ + echo "*** Error: Old headers found. You should remove the following" ; \ + echo "*** files and then type 'make install' again." ; \ + ls $(includedir)/cairo*.h ; \ + echo "****************************************************************" ; \ + false ; \ + fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/gfx/cairo/cairo/src/cairo-atsui.h b/gfx/cairo/cairo/src/cairo-atsui.h index 94b30432add0..a5b7308f8290 100644 --- a/gfx/cairo/cairo/src/cairo-atsui.h +++ b/gfx/cairo/cairo/src/cairo-atsui.h @@ -1,6 +1,6 @@ /* cairo - a vector graphics library with display and print output * - * Copyright 2004 Calum Robinson + * Copyright © 2004 Calum Robinson * * This library is free software; you can redistribute it and/or * modify it either under the terms of the GNU Lesser General Public @@ -33,18 +33,23 @@ * Calum Robinson */ -#include - #ifndef CAIRO_ATSUI_H #define CAIRO_ATSUI_H + +#include + #ifdef CAIRO_HAS_ATSUI_FONT /* ATSUI platform-specific font interface */ #include +CAIRO_BEGIN_DECLS + cairo_font_t * cairo_atsui_font_create(ATSUStyle style); +CAIRO_END_DECLS + #endif /* CAIRO_HAS_ATSUI_FONT */ #endif /* CAIRO_ATSUI_H */ diff --git a/gfx/cairo/cairo/src/cairo-features.h b/gfx/cairo/cairo/src/cairo-features.h index fdf991c67ad5..9c45af577591 100644 --- a/gfx/cairo/cairo/src/cairo-features.h +++ b/gfx/cairo/cairo/src/cairo-features.h @@ -31,7 +31,7 @@ * California. * * Contributor(s): - * Carl Worth + * Carl D. Worth */ #ifndef CAIRO_FEATURES_H @@ -49,10 +49,14 @@ #define CAIRO_HAS_NO_XCB_SURFACE -#define CAIRO_HAS_GLITZ_SURFACE +#define CAIRO_HAS_NO_WIN32_SURFACE + +#define CAIRO_HAS_NO_GLITZ_SURFACE #define CAIRO_HAS_FT_FONT +#define CAIRO_HAS_NO_WIN32_FONT + #define CAIRO_HAS_NO_ATSUI_FONT #define CAIRO_DO_SANITY_CHECKING diff --git a/gfx/cairo/cairo/src/cairo-features.h.in b/gfx/cairo/cairo/src/cairo-features.h.in index e2a62ba668e5..a13250d974d4 100644 --- a/gfx/cairo/cairo/src/cairo-features.h.in +++ b/gfx/cairo/cairo/src/cairo-features.h.in @@ -31,7 +31,7 @@ * California. * * Contributor(s): - * Carl Worth + * Carl D. Worth */ #ifndef CAIRO_FEATURES_H @@ -49,10 +49,14 @@ #define @XCB_SURFACE_FEATURE@ +#define @WIN32_SURFACE_FEATURE@ + #define @GLITZ_SURFACE_FEATURE@ #define @FT_FONT_FEATURE@ +#define @WIN32_FONT_FEATURE@ + #define @ATSUI_FONT_FEATURE@ #define @SANITY_CHECKING_FEATURE@ diff --git a/gfx/cairo/cairo/src/cairo-ft-private.h b/gfx/cairo/cairo/src/cairo-ft-private.h new file mode 100644 index 000000000000..37a6feecc20c --- /dev/null +++ b/gfx/cairo/cairo/src/cairo-ft-private.h @@ -0,0 +1,63 @@ +/* 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. + * + * Contributor(s): + * Graydon Hoare + * Owen Taylor + */ + +#ifndef CAIRO_FT_PRIVATE_H +#define CAIRO_FT_PRIVATE_H + +#include +#include + +#ifdef CAIRO_HAS_FT_FONT + +CAIRO_BEGIN_DECLS + +/* These functions are needed by the PDF backend, which needs to keep track of the + * the different fonts-on-disk used by a document, so it can embed them + */ +cairo_private cairo_unscaled_font_t * +_cairo_ft_font_get_unscaled_font (cairo_font_t *font); + +cairo_private FT_Face +_cairo_ft_unscaled_font_lock_face (cairo_unscaled_font_t *unscaled_font); + +cairo_private void +_cairo_ft_unscaled_font_unlock_face (cairo_unscaled_font_t *unscaled_font); + +CAIRO_END_DECLS + +#endif /* CAIRO_HAS_FT_FONT */ + +#endif /* CAIRO_FT_PRIVATE_H */ diff --git a/gfx/cairo/cairo/src/cairo-ft.h b/gfx/cairo/cairo/src/cairo-ft.h index 57d439ab28c1..f10c67d80522 100644 --- a/gfx/cairo/cairo/src/cairo-ft.h +++ b/gfx/cairo/cairo/src/cairo-ft.h @@ -1,6 +1,6 @@ /* cairo - a vector graphics library with display and print output * - * Copyright © 2002 University of Southern California + * 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 @@ -27,17 +27,18 @@ * * The Original Code is the cairo graphics library. * - * The Initial Developer of the Original Code is University of Southern - * California. + * The Initial Developer of the Original Code is Red Hat, Inc. * * Contributor(s): - * Carl D. Worth + * Graydon Hoare + * Owen Taylor */ -#include - #ifndef CAIRO_FT_H #define CAIRO_FT_H + +#include + #ifdef CAIRO_HAS_FT_FONT /* Fontconfig/Freetype platform-specific font interface */ @@ -46,17 +47,27 @@ #include #include FT_FREETYPE_H -cairo_font_t * -cairo_ft_font_create (FT_Library ft_library, FcPattern *pattern); +CAIRO_BEGIN_DECLS cairo_font_t * -cairo_ft_font_create_for_ft_face (FT_Face face); +cairo_ft_font_create (FcPattern *pattern, + cairo_matrix_t *scale); + +cairo_font_t * +cairo_ft_font_create_for_ft_face (FT_Face face, + int load_flags, + cairo_matrix_t *scale); FT_Face -cairo_ft_font_face (cairo_font_t *ft_font); +cairo_ft_font_lock_face (cairo_font_t *ft_font); + +void +cairo_ft_font_unlock_face (cairo_font_t *ft_font); FcPattern * -cairo_ft_font_pattern (cairo_font_t *ft_font); +cairo_ft_font_get_pattern (cairo_font_t *ft_font); + +CAIRO_END_DECLS #endif /* CAIRO_HAS_FT_FONT */ #endif /* CAIRO_FT_H */ diff --git a/gfx/cairo/cairo/src/cairo-glitz.h b/gfx/cairo/cairo/src/cairo-glitz.h index 350d10233eb2..f1917eb28fa1 100644 --- a/gfx/cairo/cairo/src/cairo-glitz.h +++ b/gfx/cairo/cairo/src/cairo-glitz.h @@ -31,17 +31,20 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ -#include - #ifndef CAIRO_GLITZ_H #define CAIRO_GLITZ_H + +#include + #ifdef CAIRO_HAS_GLITZ_SURFACE #include +CAIRO_BEGIN_DECLS + void cairo_set_target_glitz (cairo_t *cr, glitz_surface_t *surface); @@ -49,5 +52,7 @@ cairo_set_target_glitz (cairo_t *cr, cairo_surface_t * cairo_glitz_surface_create (glitz_surface_t *surface); +CAIRO_END_DECLS + #endif /* CAIRO_HAS_GLITZ_SURFACE */ #endif /* CAIRO_GLITZ_H */ diff --git a/gfx/cairo/cairo/src/cairo-pdf.h b/gfx/cairo/cairo/src/cairo-pdf.h index 0f624af31392..701a7b4a75ca 100644 --- a/gfx/cairo/cairo/src/cairo-pdf.h +++ b/gfx/cairo/cairo/src/cairo-pdf.h @@ -31,17 +31,20 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ -#include - #ifndef CAIRO_PDF_H #define CAIRO_PDF_H + +#include + #ifdef CAIRO_HAS_PDF_SURFACE #include +CAIRO_BEGIN_DECLS + void cairo_set_target_pdf (cairo_t *cr, FILE *file, @@ -58,5 +61,7 @@ cairo_pdf_surface_create (FILE *file, double x_pixels_per_inch, double y_pixels_per_inch); +CAIRO_END_DECLS + #endif /* CAIRO_HAS_PDF_SURFACE */ #endif /* CAIRO_PDF_H */ diff --git a/gfx/cairo/cairo/src/cairo-png.h b/gfx/cairo/cairo/src/cairo-png.h index 766d6f91f86c..3e86210b066d 100644 --- a/gfx/cairo/cairo/src/cairo-png.h +++ b/gfx/cairo/cairo/src/cairo-png.h @@ -31,17 +31,20 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ -#include - #ifndef CAIRO_PNG_H #define CAIRO_PNG_H -#ifdef CAIRO_HAS_PNG_SURFACE + +#include + +#ifdef CAIRO_HAS_PNG_SURFACE #include +CAIRO_BEGIN_DECLS + void cairo_set_target_png (cairo_t *cr, FILE *file, @@ -55,5 +58,7 @@ cairo_png_surface_create (FILE *file, int width, int height); +CAIRO_END_DECLS + #endif /* CAIRO_HAS_PNG_SURFACE */ #endif /* CAIRO_PNG_H */ diff --git a/gfx/cairo/cairo/src/cairo-ps.h b/gfx/cairo/cairo/src/cairo-ps.h index ae8e721928d0..88382920edd9 100644 --- a/gfx/cairo/cairo/src/cairo-ps.h +++ b/gfx/cairo/cairo/src/cairo-ps.h @@ -31,17 +31,20 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ -#include - #ifndef CAIRO_PS_H #define CAIRO_PS_H + +#include + #ifdef CAIRO_HAS_PS_SURFACE #include +CAIRO_BEGIN_DECLS + void cairo_set_target_ps (cairo_t *cr, FILE *file, @@ -59,5 +62,7 @@ cairo_ps_surface_create (FILE *file, double x_pixels_per_inch, double y_pixels_per_inch); +CAIRO_END_DECLS + #endif /* CAIRO_HAS_PS_SURFACE */ #endif /* CAIRO_PS_H */ diff --git a/gfx/cairo/cairo/src/cairo-quartz.h b/gfx/cairo/cairo/src/cairo-quartz.h index 918bc18d768c..5afd46426366 100644 --- a/gfx/cairo/cairo/src/cairo-quartz.h +++ b/gfx/cairo/cairo/src/cairo-quartz.h @@ -31,17 +31,20 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ -#include - #ifndef CAIRO_QUARTZ_H #define CAIRO_QUARTZ_H + +#include + #ifdef CAIRO_HAS_QUARTZ_SURFACE #include +CAIRO_BEGIN_DECLS + void cairo_set_target_quartz_context( cairo_t *cr, CGContextRef context, @@ -53,6 +56,8 @@ cairo_quartz_surface_create ( CGContextRef context, int width, int height); +CAIRO_END_DECLS + #endif /* CAIRO_HAS_QUARTZ_SURFACE */ #endif /* CAIRO_QUARTZ_H */ diff --git a/gfx/cairo/cairo/src/cairo-wideint.h b/gfx/cairo/cairo/src/cairo-wideint.h index ad2a8f33dc4d..528093af68ef 100644 --- a/gfx/cairo/cairo/src/cairo-wideint.h +++ b/gfx/cairo/cairo/src/cairo-wideint.h @@ -1,5 +1,5 @@ /* - * $Id: cairo-wideint.h,v 1.2 2005/03/14 16:16:21 tor%cs.brown.edu Exp $ + * $Id: cairo-wideint.h,v 1.3 2005/03/23 19:53:39 tor%cs.brown.edu Exp $ * * Copyright © 2004 Keith Packard * @@ -41,7 +41,7 @@ #if defined (__SVR4) && defined (__sun) # include #else -# if defined (__OpenBSD__) || defined (_AIX) +# if defined (__OpenBSD__) # include # else # include diff --git a/gfx/cairo/cairo/src/cairo-win32-private.h b/gfx/cairo/cairo/src/cairo-win32-private.h new file mode 100644 index 000000000000..71e677ad148d --- /dev/null +++ b/gfx/cairo/cairo/src/cairo-win32-private.h @@ -0,0 +1,87 @@ +/* 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. + * + * Contributor(s): + * Owen Taylor + */ + +#ifndef CAIRO_WIN32_PRIVATE_H +#define CAIRO_WIN32_PRIVATE_H + +/* We depend on various features introduced with Win2k and Win98, + * like AlphaBlend. If it turns out to be a problem, we could + * use GetProcAddress() to look them up. + */ +#define WINVER 0x0500 + +#include +#include + +typedef struct _cairo_win32_surface { + cairo_surface_t base; + + cairo_format_t format; + + HDC dc; + + /* We create off-screen surfaces as DIBs */ + HBITMAP bitmap; + + /* Used to save the initial 1x1 monochrome bitmap for the DC to + * select back into the DC before deleting the DC and our + * bitmap. For Windows XP, this doesn't seem to be necessary + * ... we can just delete the DC and that automatically unselects + * out bitmap. But it's standard practice so apparently is needed + * on some versions of Windows. + */ + HBITMAP saved_dc_bitmap; + + cairo_surface_t *image; + + cairo_rectangle_t clip_rect; + + int set_clip; + HRGN saved_clip; + +} cairo_win32_surface_t; + +cairo_status_t +_cairo_win32_print_gdi_error (const char *context); + +cairo_surface_t * +_cairo_win32_surface_create_dib (cairo_format_t format, + int width, + int height); + +cairo_bool_t +_cairo_surface_is_win32 (cairo_surface_t *surface); + +#endif /* CAIRO_WIN32_PRIVATE_H */ diff --git a/gfx/cairo/cairo/src/cairo-win32.h b/gfx/cairo/cairo/src/cairo-win32.h new file mode 100644 index 000000000000..fab497aa4d74 --- /dev/null +++ b/gfx/cairo/cairo/src/cairo-win32.h @@ -0,0 +1,71 @@ +/* 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. + * + * Contributor(s): + * Owen Taylor + */ + +#ifndef _CAIRO_WIN32_H_ + +#include + +#ifdef CAIRO_HAS_WIN32_SURFACE + +#include + +CAIRO_BEGIN_DECLS + +void +cairo_set_target_win32 (cairo_t *cr, + HDC hdc); + +cairo_surface_t * +cairo_win32_surface_create (HDC hdc); + +cairo_font_t * +cairo_win32_font_create_for_logfontw (LOGFONTW *logfont, + cairo_matrix_t *scale); + +cairo_status_t +cairo_win32_font_select_font (cairo_font_t *font, + HDC hdc); + +void +cairo_win32_font_done_font (cairo_font_t *font); + +double +cairo_win32_font_get_scale_factor (cairo_font_t *font); + +#endif /* CAIRO_HAS_WIN32_SURFACE */ + +CAIRO_END_DECLS + +#endif /* _CAIRO_WIN32_H_ */ diff --git a/gfx/cairo/cairo/src/cairo-xcb.h b/gfx/cairo/cairo/src/cairo-xcb.h index 27ebad52310c..a5c65f441bf5 100644 --- a/gfx/cairo/cairo/src/cairo-xcb.h +++ b/gfx/cairo/cairo/src/cairo-xcb.h @@ -31,18 +31,21 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ -#include - #ifndef CAIRO_XCB_H #define CAIRO_XCB_H + +#include + #ifdef CAIRO_HAS_XCB_SURFACE #include #include +CAIRO_BEGIN_DECLS + void cairo_set_target_xcb (cairo_t *cr, XCBConnection *dpy, @@ -50,5 +53,7 @@ cairo_set_target_xcb (cairo_t *cr, XCBVISUALTYPE *visual, cairo_format_t format); +CAIRO_END_DECLS + #endif /* CAIRO_HAS_XCB_SURFACE */ #endif /* CAIRO_XCB_H */ diff --git a/gfx/cairo/cairo/src/cairo-xlib.h b/gfx/cairo/cairo/src/cairo-xlib.h index 4f241b034284..18db7b114f13 100644 --- a/gfx/cairo/cairo/src/cairo-xlib.h +++ b/gfx/cairo/cairo/src/cairo-xlib.h @@ -31,17 +31,20 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ -#include - #ifndef CAIRO_XLIB_H #define CAIRO_XLIB_H + +#include + #ifdef CAIRO_HAS_XLIB_SURFACE #include +CAIRO_BEGIN_DECLS + /* XXX: This shold be renamed to cairo_set_target_xlib to match the * other backends */ void @@ -66,6 +69,8 @@ cairo_status_t cairo_xlib_surface_set_size (cairo_surface_t *surface, int width, int height); */ +CAIRO_END_DECLS + #endif /* CAIRO_HAS_XLIB_SURFACE */ #endif /* CAIRO_XLIB_H */ diff --git a/gfx/cairo/cairo/src/cairo.c b/gfx/cairo/cairo/src/cairo.c index 20d94938ce63..fd10b5cacf5c 100644 --- a/gfx/cairo/cairo/src/cairo.c +++ b/gfx/cairo/cairo/src/cairo.c @@ -31,7 +31,7 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ @@ -68,6 +68,18 @@ cairo_sane_state (cairo_t *cr) #endif +/** + * cairo_create: + * + * Creates a new #cairo_t with default values. The target + * surface must be set on the #cairo_t with cairo_set_target_surface(), + * or a backend-specific function like cairo_set_target_image() before + * drawing with the #cairo_t. + * + * Return value: a newly allocated #cairo_t with a reference + * count of 1. The initial reference count should be released + * with cairo_destroy() when you are done using the #cairo_t. + **/ cairo_t * cairo_create (void) { @@ -88,6 +100,14 @@ cairo_create (void) return cr; } +/** + * cairo_reference: + * @cr: a #cairo_t + * + * Increases the reference count on @cr by one. This prevents + * @cr from being destroyed until a matching call to cairo_destroy() + * is made. + **/ void cairo_reference (cairo_t *cr) { @@ -99,6 +119,14 @@ cairo_reference (cairo_t *cr) CAIRO_CHECK_SANITY (cr); } +/** + * cairo_destroy: + * @cr: a #cairo_t + * + * Decreases the reference count on @cr by one. If the result + * is zero, then @cr and all associated resources are freed. + * See cairo_destroy(). + **/ void cairo_destroy (cairo_t *cr) { @@ -117,6 +145,22 @@ cairo_destroy (cairo_t *cr) free (cr); } +/** + * cairo_save: + * @cr: a #cairo_t + * + * Makes a copy of the current state of @cr and saves it + * on an internal stack of saved states for @cr. When + * cairo_restore() is called, @cr will be restored to + * the saved state. Multiple calls to cairo_save() and + * cairo_restore() can be nested; each call to cairo_restore() + * restores the state from the matching paired cairo_save(). + * + * It isn't necessary to clear all saved states before + * a #cairo_t is freed. If the reference count of a #cairo_t + * drops to zero in response to a call to cairo_destroy(), + * any saved states will be freed along with the #cairo_t. + **/ void cairo_save (cairo_t *cr) { @@ -144,6 +188,14 @@ cairo_save (cairo_t *cr) } slim_hidden_def(cairo_save); +/** + * cairo_restore: + * @cr: a #cairo_t + * + * Restores @cr to the state saved by a preceding call to + * cairo_save() and removes that state from the stack of + * saved states. + **/ void cairo_restore (cairo_t *cr) { @@ -170,6 +222,20 @@ cairo_restore (cairo_t *cr) } slim_hidden_def(cairo_restore); +/** + * cairo_copy: + * @dest: a #cairo_t + * @src: another #cairo_t + * + * This function copies all current state information from src to + * dest. This includes the current point and path, the target surface, + * the transformation matrix, and so forth. + * + * The stack of states saved with cairo_save() is not + * not copied; nor are any saved states on @dest cleared. The + * operation only copies the current state of @src to the current + * state of @dest. + **/ void cairo_copy (cairo_t *dest, cairo_t *src) { @@ -216,6 +282,16 @@ cairo_pop_group (cairo_t *cr) } */ +/** + * cairo_set_target_surface: + * @cr: a #cairo_t + * @surface: a #cairo_surface_t + * + * Directs output for a #cairo_t to a given surface. The surface + * will be referenced by the #cairo_t, so you can immediately + * call cairo_surface_destroy() on it if you don't need to + * keep a reference to it around. + **/ void cairo_set_target_surface (cairo_t *cr, cairo_surface_t *surface) { @@ -228,6 +304,26 @@ cairo_set_target_surface (cairo_t *cr, cairo_surface_t *surface) } slim_hidden_def(cairo_set_target_surface); +/** + * cairo_set_target_image: + * @cr: a #cairo_t + * @data: a pointer to a buffer supplied by the application + * in which to write contents. + * @format: the format of pixels in the buffer + * @width: the width of the image to be stored in the buffer + * @height: the eight of the image to be stored in the buffer + * @stride: the number of bytes between the start of rows + * in the buffer. Having this be specified separate from @width + * allows for padding at the end of rows, or for writing + * to a subportion of a larger image. + * + * Directs output for a #cairo_t to an in-memory image. The output + * buffer must be kept around until the #cairo_t is destroyed or set + * to to have a different target. The initial contents of @buffer + * will be used as the inital image contents; you must explicitely + * clear the buffer, using, for example, cairo_rectangle() and + * cairo_fill() if you want it cleared. + **/ void cairo_set_target_image (cairo_t *cr, char *data, @@ -268,6 +364,18 @@ cairo_set_operator (cairo_t *cr, cairo_operator_t op) CAIRO_CHECK_SANITY (cr); } +/** + * cairo_set_rgb_color: + * @cr: a #cairo_t + * @red: red component of color + * @green: green component of color + * @blue: blue component of color + * + * Sets a constant color for filling and stroking. This replaces any + * pattern set with cairo_set_pattern(). The color components are + * floating point numbers in the range 0 to 1. If the values passed in + * are outside that range, they will be clamped. + **/ void cairo_set_rgb_color (cairo_t *cr, double red, double green, double blue) { @@ -301,6 +409,19 @@ cairo_current_pattern (cairo_t *cr) return _cairo_gstate_current_pattern (cr->gstate); } +/** + * cairo_set_tolerance: + * @cr: a #cairo_t + * @tolerance: the tolerance, in device units (typically pixels) + * + * Sets the tolerance used when converting paths into trapezoids. + * Curved segments of the path will be subdivided until the maximum + * deviation between the original path and the polygonal approximation + * is less than @tolerance. The default value is 0.1. A larger + * value will give better performance, a smaller value, better + * appearance. (Reducing the value from the default value of 0.1 + * is unlikely to improve appearance significantly.) + **/ void cairo_set_tolerance (cairo_t *cr, double tolerance) { @@ -314,6 +435,17 @@ cairo_set_tolerance (cairo_t *cr, double tolerance) CAIRO_CHECK_SANITY (cr); } +/** + * cairo_set_alpha: + * @cr: a #cairo_t + * @alpha: the alpha value. 0 is transparent, 1 fully opaque. + * if the value is outside the range 0 to 1, it will be + * clamped to that range. + * + * Sets an overall alpha value used for stroking and filling. This + * value is multiplied with any alpha value coming from a gradient or + * image pattern. + **/ void cairo_set_alpha (cairo_t *cr, double alpha) { @@ -569,6 +701,39 @@ cairo_curve_to (cairo_t *cr, CAIRO_CHECK_SANITY (cr); } +/** + * cairo_arc: + * @cr: a Cairo context + * @xc: X position of the center of the arc + * @yc: Y position of the center of the arc + * @radius: the radius of the arc + * @angle1: the start angle, in radians + * @angle2: the end angle, in radians + * + * Adds an arc from @angle1 to @angle2 to the current path. If there + * is a current point, that point is connected to the start of the arc + * by a straight line segment. Angles are measured in radians with an + * angle of 0 along the X axis and an angle of %M_PI radians (90 + * degrees) along the Y axis, so with the default transformation + * matrix, positive angles are clockwise. (To convert from degrees to + * radians, use degrees * (M_PI / 180.).) This + * function gives the arc in the direction of increasing angle; see + * cairo_arc_negative() to get the arc in the direction of decreasing + * angle. + * + * A full arc is drawn as a circle. To make an oval arc, you can scale + * the current transformation matrix by different amounts in the X and + * Y directions. For example, to draw a full oval in the box given + * by @x, @y, @width, @height: + + * + * cairo_save (cr); + * cairo_translate (x + width / 2., y + height / 2.); + * cairo_scale (1. / (height / 2.), 1. / (width / 2.)); + * cairo_arc (cr, 0., 0., 1., 0., 2 * M_PI); + * cairo_restore (cr); + * + **/ void cairo_arc (cairo_t *cr, double xc, double yc, @@ -586,6 +751,20 @@ cairo_arc (cairo_t *cr, CAIRO_CHECK_SANITY (cr); } +/** + * cairo_arc_negative: + * @cr: a Cairo context + * @xc: X position of the center of the arc + * @yc: Y position of the center of the arc + * @radius: the radius of the arc + * @angle1: the start angle, in radians + * @angle2: the end angle, in radians + * + * Adds an arc from @angle1 to @angle2 to the current path. The + * function behaves identically to cairo_arc() except that instead of + * giving the arc in the direction of increasing angle, it gives + * the arc in the direction of decreasing angle. + **/ void cairo_arc_negative (cairo_t *cr, double xc, double yc, @@ -744,7 +923,7 @@ cairo_show_page (cairo_t *cr) CAIRO_CHECK_SANITY (cr); } -int +cairo_bool_t cairo_in_stroke (cairo_t *cr, double x, double y) { int inside; @@ -842,6 +1021,20 @@ cairo_select_font (cairo_t *cr, CAIRO_CHECK_SANITY (cr); } +/** + * cairo_current_font: + * @cr: a #cairo_t + * + * Gets the current font object for a #cairo_t. If there is no current + * font object, because the font parameters, transform, or target + * surface has been changed since a font was last used, a font object + * will be created and stored in in the #cairo_t. + * + * Return value: the current font object. Can return %NULL + * on out-of-memory or if the context is already in + * an error state. This object is owned by Cairo. To keep + * a reference to it, you must call cairo_font_reference(). + **/ cairo_font_t * cairo_current_font (cairo_t *cr) { @@ -869,6 +1062,22 @@ cairo_current_font_extents (cairo_t *cr, } +/** + * cairo_set_font: + * @cr: a #cairo_t + * @font: a #cairo_font_t, or %NULL to unset any previously set font. + * + * Replaces the current #cairo_font_t object in the #cairo_t with + * @font. The replaced font in the #cairo_t will be destroyed if there + * are no other references to it. Since a #cairo_font_t is specific to + * a particular output device and size, changing the transformation, + * font transformation, or target surfaces of a #cairo_t will clear + * any previously set font. Setting the font using cairo_set_font() is + * exclusive with the simple font selection API provided by + * cairo_select_font(). The size and transformation set by + * cairo_scale_font() and cairo_transform_font() are ignored unless + * they were taken into account when creating @font. + **/ void cairo_set_font (cairo_t *cr, cairo_font_t *font) { @@ -914,6 +1123,16 @@ cairo_text_extents (cairo_t *cr, if (cr->status) return; + if (utf8 == NULL) { + extents->x_bearing = 0.0; + extents->y_bearing = 0.0; + extents->width = 0.0; + extents->height = 0.0; + extents->x_advance = 0.0; + extents->y_advance = 0.0; + return; + } + cr->status = _cairo_gstate_text_to_glyphs (cr->gstate, utf8, &glyphs, &nglyphs); CAIRO_CHECK_SANITY (cr); @@ -1205,6 +1424,8 @@ cairo_status_string (cairo_t *cr) return "no target surface has been set"; case CAIRO_STATUS_NULL_POINTER: return "NULL pointer"; + case CAIRO_STATUS_INVALID_STRING: + return "input string not valid UTF-8"; } return ""; diff --git a/gfx/cairo/cairo/src/cairo.h b/gfx/cairo/cairo/src/cairo.h index b7bcc1dbbb69..03e063242408 100644 --- a/gfx/cairo/cairo/src/cairo.h +++ b/gfx/cairo/cairo/src/cairo.h @@ -31,23 +31,83 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ #ifndef CAIRO_H #define CAIRO_H +#ifdef __cplusplus +# define CAIRO_BEGIN_DECLS extern "C" { +# define CAIRO_END_DECLS } +#else +# define CAIRO_BEGIN_DECLS +# define CAIRO_END_DECLS +#endif + #include #include +CAIRO_BEGIN_DECLS + +/** + * cairo_bool_t: + * + * #cairo_bool_t is used for boolean values. Returns of type + * #cairo_bool_t will always be either 0 or 1, but testing against + * these values explicitely is not encouraged; just use the + * value as a boolean condition. + * + * + * if (cairo_in_stroke (cr, x, y)) { + * /* do something */ + * } + * + */ +typedef int cairo_bool_t; + +/** + * cairo_t: + * + * A #cairo_t contains the current state of the rendering device, + * including coordinates of yet to be drawn shapes. + **/ typedef struct _cairo cairo_t; + +/** + * cairo_surface_t: + * + * A #cairo_surface_t represents an image, either as the destination + * of a drawing operation or as source when drawing onto another + * surface. There are different subtypes of cairo_surface_t for + * different drawing backends; for example, cairo_image_surface_create() + * creates a bitmap image in memory. + * + * Memory management of #cairo_surface_t is done with + * cairo_surface_reference() and cairo_surface_destroy(). + */ typedef struct _cairo_surface cairo_surface_t; + +/** + * cairo_matrix_t: + * + * A #cairo_matrix_t holds an affine transformation, such as a scale, + * rotation, or shear, or a combination of those. + **/ typedef struct _cairo_matrix cairo_matrix_t; typedef struct _cairo_pattern cairo_pattern_t; -#ifdef __cplusplus -extern "C" { -#endif +typedef enum cairo_status { + CAIRO_STATUS_SUCCESS = 0, + CAIRO_STATUS_NO_MEMORY, + CAIRO_STATUS_INVALID_RESTORE, + CAIRO_STATUS_INVALID_POP_GROUP, + CAIRO_STATUS_NO_CURRENT_POINT, + CAIRO_STATUS_INVALID_MATRIX, + CAIRO_STATUS_NO_TARGET_SURFACE, + CAIRO_STATUS_NULL_POINTER, + CAIRO_STATUS_INVALID_STRING +} cairo_status_t; /* Functions for manipulating state objects */ cairo_t * @@ -81,6 +141,28 @@ cairo_pop_group (cairo_t *cr); void cairo_set_target_surface (cairo_t *cr, cairo_surface_t *surface); +/** + * cairo_format_t + * @CAIRO_FORMAT_ARGB32: each pixel is a 32-bit quantity, with + * alpha in the upper 8 bits, then red, then green, then blue. + * The 32-bit quanties are stored native-endian. Pre-multiplied + * alpha is used. (That is, 50% transparent red is 0x80800000, + * not 0x80ff0000.) + * @CAIRO_FORMAT_RGB24: each pixel is a 32-bit quantity, with + * the upper 8 bits unused. Red, Green, and Blue are stored + * in the remaining 24 bits in that order. + * @CAIRO_FORMAT_A8: each pixel is a 8-bit quantity holding + * an alpha value. + * @CAIRO_FORMAT_A1: each pixel is a 1-bit quantity holding + * an alpha value. Pixels are packed together into 32-bit + * quantities. The ordering of the bits matches the + * endianess of the platform. On a big-endian machine, the + * first pixel is in the uppermost bit, on a little-endian + * machine the first pixel is in the least-significant bit. + * + * #cairo_format_t is used to identify the memory format of + * image data. + */ typedef enum cairo_format { CAIRO_FORMAT_ARGB32, CAIRO_FORMAT_RGB24, @@ -88,6 +170,7 @@ typedef enum cairo_format { CAIRO_FORMAT_A1 } cairo_format_t; +/* XXX: Need to add cairo_set_target_image_data */ void cairo_set_target_image (cairo_t *cr, char *data, @@ -149,6 +232,27 @@ cairo_set_alpha (cairo_t *cr, double alpha); void cairo_set_tolerance (cairo_t *cr, double tolerance); +/** + * cairo_fill_rule_t + * @CAIRO_FILL_RULE_WINDING: If the path crosses the ray from + * left-to-right, counts +1. If the path crosses the ray + * from right to left, counts -1. (Left and right are determined + * from the perspective of looking along the ray from the starting + * point.) If the total count is non-zero, the point will be filled. + * @CAIRO_FILL_RULE_EVEN_ODD: Counts the total number of + * intersections, without regard to the orientation of the contour. If + * the total number of intersections is odd, the point will be + * filled. + * + * #cairo_fill_rule_t is used to select how paths are filled. For both + * fill rules, whether or not a point is included in the fill is + * determined by taking a ray from that point to infinity and looking + * at intersections with the path. The ray can be in any direction, + * as long as it doesn't pass through the end point of a segment + * or have a tricky intersection such as intersecting tangent to the path. + * (Note that filling is not actually implemented in this way. This + * is just a description of the rule that is applied.) + **/ typedef enum cairo_fill_rule { CAIRO_FILL_RULE_WINDING, CAIRO_FILL_RULE_EVEN_ODD @@ -160,6 +264,15 @@ cairo_set_fill_rule (cairo_t *cr, cairo_fill_rule_t fill_rule); void cairo_set_line_width (cairo_t *cr, double width); + +/** + * cairo_line_cap_t + * @CAIRO_LINE_CAP_BUTT: start(stop) the line exactly at the start(end) point + * @CAIRO_LINE_CAP_ROUND: use a round ending, the center of the circle is the end point + * @CAIRO_LINE_CAP_SQUARE: use squared ending, the center of the square is the end point + * + * enumeration for style of line-endings + **/ typedef enum cairo_line_cap { CAIRO_LINE_CAP_BUTT, CAIRO_LINE_CAP_ROUND, @@ -303,10 +416,10 @@ void cairo_show_page (cairo_t *cr); /* Insideness testing */ -int +cairo_bool_t cairo_in_stroke (cairo_t *cr, double x, double y); -int +cairo_bool_t cairo_in_fill (cairo_t *cr, double x, double y); /* Rectangular extents */ @@ -330,14 +443,75 @@ cairo_clip (cairo_t *cr); /* Font/Text functions */ +/** + * cairo_font_t: + * + * A #cairo_font_t is a font scaled to a particular size and device + * resolution. A font can be set on a #cairo_t by using + * cairo_set_font() assuming that the current transformation and + * target surface of the #cairo_t match that for which the + * #cairo_font_t was created. The effect of using a mismatched + * #cairo_font_t will be incorrect font metrics. + */ typedef struct _cairo_font cairo_font_t; +/** + * cairo_glyph_t: + * @index: glyph index in the font. The exact interpretation of the + * glyph index depends on the font technology being used. + * @x: the offset in the X direction between the origin used for + * drawing or measuring the string and the origin of this glyph. + * @y: the offset in the Y direction between the origin used for + * drawing or measuring the string and the origin of this glyph. + * + * The #cairo_glyph_t structure holds information about a single glyph + * when drawing or measuring text. A font is (in simple terms) a + * collection of shapes used to draw text. A glyph is one of these + * shapes. There can be multiple glyphs for a single character + * (alternates to be used in different contexts, for example), or a + * glyph can be a ligature of multiple + * characters. Cairo doesn't expose any way of converting input text + * into glyphs, so in order to use the Cairo interfaces that take + * arrays of glyphs, you must directly access the appropriate + * underlying font system. + * + * Note that the offsets given by @x and @y are not cumulative. When + * drawing or measuring text, each glyph is individually positioned + * with respect to the overall origin + **/ typedef struct { unsigned long index; double x; double y; } cairo_glyph_t; +/** + * cairo_text_extents_t: + * @x_bearing: the horizontal distance from the origin to the + * leftmost part of the glyphs as drawn. Positive if the + * glyphs lie entirely to the right of the origin. + * @y_bearing: the vertical distance from the origin to the + * topmost part of the glyphs as drawn. Positive only if the + * glyphs lie completely below the origin; will usually be + * negative. + * @width: width of the glyphs as drawn + * @height: height of the glyphs as drawn + * @x_advance:distance to advance in the X direction + * after drawing these glyphs + * @y_advance: distance to advance in the Y direction + * after drawing these glyphs. Will typically be zero except + * for vertical text layout as found in East-Asian languages. + * + * The #cairo_text_extents_t< structure stores the extents of a single + * glyph or a string of glyphs in user-space coordinates. Because text + * extents are in user-space coordinates, they don't scale along with + * the current transformation matrix. If you call + * cairo_scale(cr, 2.0, 2.0), text will + * be drawn twice as big, but the reported text extents will not be + * doubled. They will change slightly due to hinting (so you can't + * assume that metrics are independent of the transformation matrix), + * but otherwise will remain unchanged. + */ typedef struct { double x_bearing; double y_bearing; @@ -422,13 +596,17 @@ cairo_font_reference (cairo_font_t *font); void cairo_font_destroy (cairo_font_t *font); -void -cairo_font_set_transform (cairo_font_t *font, - cairo_matrix_t *matrix); +cairo_status_t +cairo_font_extents (cairo_font_t *font, + cairo_matrix_t *font_matrix, + cairo_font_extents_t *extents); void -cairo_font_current_transform (cairo_font_t *font, - cairo_matrix_t *matrix); +cairo_font_glyph_extents (cairo_font_t *font, + cairo_matrix_t *font_matrix, + cairo_glyph_t *glyphs, + int num_glyphs, + cairo_text_extents_t *extents); /* Image functions */ @@ -521,17 +699,6 @@ cairo_current_path_flat (cairo_t *cr, /* Error status queries */ -typedef enum cairo_status { - CAIRO_STATUS_SUCCESS = 0, - CAIRO_STATUS_NO_MEMORY, - CAIRO_STATUS_INVALID_RESTORE, - CAIRO_STATUS_INVALID_POP_GROUP, - CAIRO_STATUS_NO_CURRENT_POINT, - CAIRO_STATUS_INVALID_MATRIX, - CAIRO_STATUS_NO_TARGET_SURFACE, - CAIRO_STATUS_NULL_POINTER -} cairo_status_t; - cairo_status_t cairo_status (cairo_t *cr); @@ -671,7 +838,7 @@ cairo_status_t cairo_matrix_set_identity (cairo_matrix_t *matrix); cairo_status_t -cairo_matrix_set_affine (cairo_matrix_t *cr, +cairo_matrix_set_affine (cairo_matrix_t *matrix, double a, double b, double c, double d, double tx, double ty); @@ -724,8 +891,6 @@ cairo_matrix_transform_point (cairo_matrix_t *matrix, double *x, double *y); #define cairo_get_status_string cairo_get_status_string_DEPRECATED_BY_cairo_status_string #endif -#ifdef __cplusplus -} -#endif +CAIRO_END_DECLS #endif /* CAIRO_H */ diff --git a/gfx/cairo/cairo/src/cairo_atsui_font.c b/gfx/cairo/cairo/src/cairo_atsui_font.c index 52cfc6bd82da..590df4d7fa9b 100644 --- a/gfx/cairo/cairo/src/cairo_atsui_font.c +++ b/gfx/cairo/cairo/src/cairo_atsui_font.c @@ -1,6 +1,6 @@ /* cairo - a vector graphics library with display and print output * - * Copyright 2004 Calum Robinson + * Copyright © 2004 Calum Robinson * * This library is free software; you can redistribute it and/or * modify it either under the terms of the GNU Lesser General Public @@ -30,778 +30,712 @@ * The Initial Developer of the Original Code is Calum Robinson * * Contributor(s): - * Calum Robinson + * Calum Robinson */ #include #include - #include "cairo-atsui.h" #include "cairoint.h" - - - - - -#pragma mark Types - - - - +#include "cairo-quartz-private.h" +#include typedef struct { - cairo_unscaled_font_t base; - - ATSUStyle style; - ATSUFontID fontID; + cairo_font_t base; + + cairo_font_scale_t scale; + ATSUStyle style; + ATSUStyle unscaled_style; + ATSUFontID fontID; } cairo_atsui_font_t; - typedef struct cairo_ATSUI_glyph_path_callback_info_t { - cairo_path_t *path; - cairo_matrix_t scale; + cairo_path_t *path; + cairo_matrix_t scale; } cairo_ATSUI_glyph_path_callback_info_t; - - -#pragma mark Private Functions - - - - - -static CGAffineTransform CGAffineTransformMakeWithCairoFontScale(cairo_font_scale_t scale) +static CGAffineTransform +CGAffineTransformMakeWithCairoFontScale(cairo_font_scale_t scale) { - return CGAffineTransformMake( scale.matrix[0][0], scale.matrix[0][1], - scale.matrix[1][0], scale.matrix[1][1], - 0, 0); + return CGAffineTransformMake(scale.matrix[0][0], scale.matrix[0][1], + scale.matrix[1][0], scale.matrix[1][1], + 0, 0); } -static ATSUStyle CreateSizedCopyOfStyle(ATSUStyle inStyle, cairo_font_scale_t *scale) +static ATSUStyle +CreateSizedCopyOfStyle(ATSUStyle inStyle, cairo_font_scale_t * scale) { - ATSUStyle style; - OSStatus err; - - - // Set the style's size - CGAffineTransform theTransform = CGAffineTransformMakeWithCairoFontScale(*scale); - Fixed theSize = FloatToFixed(CGSizeApplyAffineTransform(CGSizeMake(1.0, 1.0), theTransform).height); - const ATSUAttributeTag theFontStyleTags[] = { kATSUSizeTag }; - const ByteCount theFontStyleSizes[] = { sizeof(Fixed) }; - ATSUAttributeValuePtr theFontStyleValues[] = { &theSize }; + ATSUStyle style; + OSStatus err; - err = ATSUCreateAndCopyStyle(inStyle, &style); - - err = ATSUSetAttributes( style, - sizeof(theFontStyleTags) / sizeof(ATSUAttributeTag), - theFontStyleTags, theFontStyleSizes, theFontStyleValues); - - - return style; + + // Set the style's size + CGAffineTransform theTransform = + CGAffineTransformMakeWithCairoFontScale(*scale); + Fixed theSize = + FloatToFixed(CGSizeApplyAffineTransform + (CGSizeMake(1.0, 1.0), theTransform).height); + const ATSUAttributeTag theFontStyleTags[] = { kATSUSizeTag }; + const ByteCount theFontStyleSizes[] = { sizeof(Fixed) }; + ATSUAttributeValuePtr theFontStyleValues[] = { &theSize }; + + err = ATSUCreateAndCopyStyle(inStyle, &style); + + err = ATSUSetAttributes(style, + sizeof(theFontStyleTags) / + sizeof(ATSUAttributeTag), theFontStyleTags, + theFontStyleSizes, theFontStyleValues); + + + return style; } - - - -#pragma mark Public Functions - - - - - -static cairo_unscaled_font_t * -_cairo_atsui_font_create( const char *family, - cairo_font_slant_t slant, - cairo_font_weight_t weight) +static cairo_status_t +_cairo_atsui_font_create(const char *family, + cairo_font_slant_t slant, + cairo_font_weight_t weight, + cairo_font_scale_t *scale, + cairo_font_t **font_out) { - cairo_atsui_font_t *font = NULL; - ATSUStyle style; - ATSUFontID fontID; - OSStatus err; - Boolean isItalic, isBold; - - - err = ATSUCreateStyle(&style); - - - switch (weight) - { - case CAIRO_FONT_WEIGHT_BOLD: - isBold = true; - break; - case CAIRO_FONT_WEIGHT_NORMAL: - default: - isBold = false; - break; - } - - switch (slant) - { - case CAIRO_FONT_SLANT_ITALIC: - isItalic = true; - break; - case CAIRO_FONT_SLANT_OBLIQUE: - isItalic = false; - break; - case CAIRO_FONT_SLANT_NORMAL: - default: - isItalic = false; - break; - } - - err = ATSUFindFontFromName( family, strlen(family), - kFontFamilyName, - kFontNoPlatformCode, - kFontRomanScript, - kFontNoLanguageCode, - &fontID); - - - ATSUAttributeTag styleTags[] = {kATSUQDItalicTag, kATSUQDBoldfaceTag, kATSUFontTag}; - ATSUAttributeValuePtr styleValues[] = {&isItalic, &isBold, &fontID}; - ByteCount styleSizes[] = {sizeof(Boolean), sizeof(Boolean), sizeof(ATSUFontID)}; + cairo_atsui_font_t *font = NULL; + ATSUStyle style; + ATSUFontID fontID; + OSStatus err; + Boolean isItalic, isBold; - err = ATSUSetAttributes( style, - sizeof(styleTags) / sizeof(styleTags[0]), - styleTags, - styleSizes, - styleValues); - - - - font = malloc(sizeof(cairo_atsui_font_t)); - - if (_cairo_unscaled_font_init(&font->base, &cairo_atsui_font_backend) == CAIRO_STATUS_SUCCESS) - { - font->style = style; - font->fontID = fontID; - - - return &font->base; - } - - - free(font); - - return NULL; + err = ATSUCreateStyle(&style); + + + switch (weight) { + case CAIRO_FONT_WEIGHT_BOLD: + isBold = true; + break; + case CAIRO_FONT_WEIGHT_NORMAL: + default: + isBold = false; + break; + } + + switch (slant) { + case CAIRO_FONT_SLANT_ITALIC: + isItalic = true; + break; + case CAIRO_FONT_SLANT_OBLIQUE: + isItalic = false; + break; + case CAIRO_FONT_SLANT_NORMAL: + default: + isItalic = false; + break; + } + + err = ATSUFindFontFromName(family, strlen(family), + kFontFamilyName, + kFontNoPlatformCode, + kFontRomanScript, + kFontNoLanguageCode, &fontID); + + if (err != noErr) { + // couldn't get the font - remap css names and try again + + if (!strcmp(family, "serif")) + family = "Times"; + else if (!strcmp(family, "sans-serif")) + family = "Helvetica"; + else if (!strcmp(family, "cursive")) + family = "Apple Chancery"; + else if (!strcmp(family, "fantasy")) + family = "Gadget"; + else if (!strcmp(family, "monospace")) + family = "Courier"; + else // anything else - return error instead? + family = "Courier"; + + err = ATSUFindFontFromName(family, strlen(family), + kFontFamilyName, + kFontNoPlatformCode, + kFontRomanScript, + kFontNoLanguageCode, &fontID); + } + + + ATSUAttributeTag styleTags[] = + { kATSUQDItalicTag, kATSUQDBoldfaceTag, kATSUFontTag }; + ATSUAttributeValuePtr styleValues[] = { &isItalic, &isBold, &fontID }; + ByteCount styleSizes[] = + { sizeof(Boolean), sizeof(Boolean), sizeof(ATSUFontID) }; + + + err = ATSUSetAttributes(style, + sizeof(styleTags) / sizeof(styleTags[0]), + styleTags, styleSizes, styleValues); + + font = malloc(sizeof(cairo_atsui_font_t)); + + _cairo_font_init(&font->base, scale, &cairo_atsui_font_backend); + + font->style = CreateSizedCopyOfStyle(style, scale); + + + Fixed theSize = FloatToFixed(1.0); + const ATSUAttributeTag theFontStyleTags[] = { kATSUSizeTag }; + const ByteCount theFontStyleSizes[] = { sizeof(Fixed) }; + ATSUAttributeValuePtr theFontStyleValues[] = { &theSize }; + err = ATSUSetAttributes(style, + sizeof(theFontStyleTags) / + sizeof(ATSUAttributeTag), theFontStyleTags, + theFontStyleSizes, theFontStyleValues); + + font->unscaled_style = style; + + font->fontID = fontID; + font->scale = *scale; + + *font_out = (cairo_font_t *)font; + + return CAIRO_STATUS_SUCCESS; +} + + +static void +_cairo_atsui_font_destroy_font(void *abstract_font) +{ + cairo_atsui_font_t *font = abstract_font; + + + if (font == NULL) + return; + + if (font->style) + ATSUDisposeStyle(font->style); + if (font->unscaled_style) + ATSUDisposeStyle(font->unscaled_style); + + free(font); } static void -_cairo_atsui_font_destroy(void *abstract_font) +_cairo_atsui_font_destroy_unscaled_font(void *abstract_font) { - cairo_atsui_font_t *font = abstract_font; - - - if (font == NULL) - return; - - if (font->style) - ATSUDisposeStyle(font->style); - - free(font); } -static cairo_status_t -_cairo_atsui_font_text_to_glyphs( void *abstract_font, - cairo_font_scale_t *sc, - const unsigned char *utf8, - cairo_glyph_t **glyphs, - int *nglyphs) +static void +_cairo_atsui_font_get_glyph_cache_key(void *abstract_font, + cairo_glyph_cache_key_t *key) { - cairo_atsui_font_t *font = abstract_font; - size_t i; - OSStatus err; - ATSUTextLayout textLayout; - ATSLayoutRecord *layoutRecords; - ItemCount glyphCount, charCount; - UniChar *theText; - ATSUStyle style; - - - charCount = strlen(utf8); - - - err = ATSUCreateTextLayout(&textLayout); - - - // Set the text in the text layout object, so we can measure it - theText = (UniChar *)malloc(charCount * sizeof(UniChar)); - - for (i = 0; i < charCount; i++) - { - theText[i] = utf8[i]; - } - - err = ATSUSetTextPointerLocation( textLayout, - theText, - 0, - charCount, - charCount); - - - style = CreateSizedCopyOfStyle(font->style, sc); - - - // Set the style for all of the text - err = ATSUSetRunStyle( textLayout, - style, - kATSUFromTextBeginning, - kATSUToTextEnd); - - - - // Get the glyphs from the text layout object - err = ATSUDirectGetLayoutDataArrayPtrFromTextLayout( textLayout, - 0, - kATSUDirectDataLayoutRecordATSLayoutRecordCurrent, - (void *)&layoutRecords, - &glyphCount); - - *nglyphs = glyphCount; - - - *glyphs = (cairo_glyph_t *)malloc(glyphCount * (sizeof(cairo_glyph_t))); - if (*glyphs == NULL) - { - return CAIRO_STATUS_NO_MEMORY; - } - - for (i = 0; i < glyphCount; i++) - { - (*glyphs)[i].index = layoutRecords[i].glyphID; - (*glyphs)[i].x = FixedToFloat(layoutRecords[i].realPos); - (*glyphs)[i].y = 0; - } - - - free(theText); - - ATSUDirectReleaseLayoutDataArrayPtr( NULL, - kATSUDirectDataLayoutRecordATSLayoutRecordCurrent, - (void *)&layoutRecords); - - ATSUDisposeTextLayout(textLayout); - - ATSUDisposeStyle(style); - - - return CAIRO_STATUS_SUCCESS; } -static cairo_status_t -_cairo_atsui_font_font_extents( void *abstract_font, - cairo_font_scale_t *sc, - cairo_font_extents_t *extents) +static cairo_status_t +_cairo_atsui_font_text_to_glyphs(void *abstract_font, + const unsigned char *utf8, + cairo_glyph_t ** glyphs, int *nglyphs) { - cairo_atsui_font_t *font = abstract_font; - ATSFontRef atsFont; - ATSFontMetrics metrics; - OSStatus err; - - - // TODO - test this - - atsFont = FMGetATSFontRefFromFont(font->fontID); - - if (atsFont) - { - err = ATSFontGetHorizontalMetrics(atsFont, kATSOptionFlagsDefault, &metrics); - - if (err == noErr) - { - extents->ascent = metrics.ascent; - extents->descent = metrics.descent; - extents->height = metrics.capHeight; - extents->max_x_advance = metrics.maxAdvanceWidth; - - // The FT backend doesn't handle max_y_advance either, so we'll ignore it for now. - extents->max_y_advance = 0.0; - + cairo_atsui_font_t *font = abstract_font; + size_t i; + OSStatus err; + ATSUTextLayout textLayout; + ATSLayoutRecord *layoutRecords; + ItemCount glyphCount, charCount; + UniChar *theText; + ATSUStyle style; - return CAIRO_STATUS_SUCCESS; - } - } - - - return CAIRO_STATUS_NULL_POINTER; + err = ATSUCreateTextLayout(&textLayout); + +#if 1 + charCount = strlen(utf8); + + // Set the text in the text layout object, so we can measure it + theText = (UniChar *) malloc(charCount * sizeof(UniChar)); + + for (i = 0; i < charCount; i++) { + theText[i] = utf8[i]; + } +#endif + +#if 0 + // Set the text in the text layout object, so we can measure it + charCount = strlen(utf8); + theText = (UniChar *) malloc(charCount * sizeof(UniChar)); + + size_t inBytes = charCount, outBytes = charCount; + iconv_t converter = iconv_open("UTF-8", "UTF-16"); + charCount = iconv(converter, utf8, &inBytes, theText, &outBytes); +#endif + + err = ATSUSetTextPointerLocation(textLayout, + theText, 0, charCount, charCount); + + + // Set the style for all of the text + err = ATSUSetRunStyle(textLayout, + font->unscaled_style, kATSUFromTextBeginning, kATSUToTextEnd); + + // Get the glyphs from the text layout object + err = ATSUDirectGetLayoutDataArrayPtrFromTextLayout(textLayout, + 0, + kATSUDirectDataLayoutRecordATSLayoutRecordCurrent, + (void *) + &layoutRecords, + &glyphCount); + + *nglyphs = glyphCount - 1; + + + *glyphs = + (cairo_glyph_t *) malloc(*nglyphs * (sizeof(cairo_glyph_t))); + if (*glyphs == NULL) { + return CAIRO_STATUS_NO_MEMORY; + } + + for (i = 0; i < *nglyphs; i++) { + (*glyphs)[i].index = layoutRecords[i].glyphID; + (*glyphs)[i].x = FixedToFloat(layoutRecords[i].realPos); + (*glyphs)[i].y = 0; + } + + + free(theText); + + ATSUDirectReleaseLayoutDataArrayPtr(NULL, + kATSUDirectDataLayoutRecordATSLayoutRecordCurrent, + (void *) &layoutRecords); + + ATSUDisposeTextLayout(textLayout); + + ATSUDisposeStyle(style); + + + return CAIRO_STATUS_SUCCESS; } -static cairo_status_t -_cairo_atsui_font_glyph_extents( void *abstract_font, - cairo_font_scale_t *sc, - cairo_glyph_t *glyphs, - int num_glyphs, - cairo_text_extents_t *extents) +static cairo_status_t +_cairo_atsui_font_font_extents(void *abstract_font, + cairo_font_extents_t * extents) { - cairo_atsui_font_t *font = abstract_font; - cairo_point_double_t origin; - cairo_point_double_t glyph_min, glyph_max; - cairo_point_double_t total_min, total_max; - OSStatus err; - ATSUStyle style; - int i; - + cairo_atsui_font_t *font = abstract_font; + ATSFontRef atsFont; + ATSFontMetrics metrics; + OSStatus err; - if (num_glyphs == 0) - { - extents->x_bearing = 0.0; - extents->y_bearing = 0.0; - extents->width = 0.0; - extents->height = 0.0; - extents->x_advance = 0.0; - extents->y_advance = 0.0; + // TODO - test this - return CAIRO_STATUS_SUCCESS; - } + atsFont = FMGetATSFontRefFromFont(font->fontID); - origin.x = glyphs[0].x; - origin.y = glyphs[0].y; - - - style = CreateSizedCopyOfStyle(font->style, sc); - + if (atsFont) { + err = + ATSFontGetHorizontalMetrics(atsFont, kATSOptionFlagsDefault, + &metrics); - for (i = 0; i < num_glyphs; i++) - { - GlyphID theGlyph = glyphs[i].index; - double minX, maxX, ascent, descent; - ATSGlyphIdealMetrics metricsH, metricsV; - - - err = ATSUGlyphGetIdealMetrics( style, - 1, - &theGlyph, - 0, - &metricsH); - - - ATSUVerticalCharacterType verticalType = kATSUStronglyVertical; - ATSUAttributeTag theTag = kATSUVerticalCharacterTag; - ByteCount theSize = sizeof(ATSUVerticalCharacterType); - - err = ATSUSetAttributes(style, 1, &theTag, &theSize, (ATSUAttributeValuePtr)&verticalType); - - err = ATSUGlyphGetIdealMetrics( style, - 1, - &theGlyph, - 0, - &metricsV); - - minX = metricsH.otherSideBearing.x; - maxX = metricsH.advance.x; - - ascent = metricsV.advance.x; - descent = metricsV.otherSideBearing.x; - - glyph_min.x = glyphs[i].x + minX; - glyph_min.y = glyphs[i].y + descent; - glyph_max.x = glyphs[i].x + maxX; - glyph_max.y = glyphs[i].y + ascent; - - if (i==0) - { - total_min = glyph_min; - total_max = glyph_max; - } - else - { - if (glyph_min.x < total_min.x) - total_min.x = glyph_min.x; - if (glyph_min.y < total_min.y) - total_min.y = glyph_min.y; + if (err == noErr) { + extents->ascent = metrics.ascent; + extents->descent = metrics.descent; + extents->height = metrics.capHeight; + extents->max_x_advance = metrics.maxAdvanceWidth; - if (glyph_max.x > total_max.x) - total_max.x = glyph_max.x; - if (glyph_max.y > total_max.y) - total_max.y = glyph_max.y; - } - } - + // The FT backend doesn't handle max_y_advance either, so we'll ignore it for now. + extents->max_y_advance = 0.0; - extents->x_bearing = total_min.x - origin.x; - extents->y_bearing = total_min.y - origin.y; - extents->width = total_max.x - total_min.x; - extents->height = total_max.y - total_min.y; - extents->x_advance = glyphs[i-1].x - origin.x; - extents->y_advance = glyphs[i-1].y - origin.y; - - - return CAIRO_STATUS_SUCCESS; + return CAIRO_STATUS_SUCCESS; + } + } + + + return CAIRO_STATUS_NULL_POINTER; } -static cairo_status_t -_cairo_atsui_font_glyph_bbox( void *abstract_font, - cairo_font_scale_t *sc, - const cairo_glyph_t *glyphs, - int num_glyphs, - cairo_box_t *bbox) +static cairo_status_t +_cairo_atsui_font_glyph_extents(void *abstract_font, + cairo_glyph_t * glyphs, + int num_glyphs, + cairo_text_extents_t * extents) { - cairo_atsui_font_t *font = abstract_font; - cairo_fixed_t x1, y1, x2, y2; - int i; - OSStatus err; - ATSUStyle style; - + cairo_atsui_font_t *font = abstract_font; + OSStatus err; - bbox->p1.x = bbox->p1.y = CAIRO_MAXSHORT << 16; - bbox->p2.x = bbox->p2.y = CAIRO_MINSHORT << 16; - - - style = CreateSizedCopyOfStyle(font->style, sc); - - - for (i = 0; i < num_glyphs; i++) - { - GlyphID theGlyph = glyphs[i].index; - ATSGlyphIdealMetrics metrics; - - - err = ATSUGlyphGetIdealMetrics( style, - 1, - &theGlyph, - 0, - &metrics); - - x1 = _cairo_fixed_from_double(glyphs[i].x); - y1 = _cairo_fixed_from_double(glyphs[i].y); - x2 = x1 + _cairo_fixed_from_double(metrics.advance.x); - y2 = y1 + _cairo_fixed_from_double(metrics.advance.y); - - if (x1 < bbox->p1.x) - bbox->p1.x = x1; - - if (y1 < bbox->p1.y) - bbox->p1.y = y1; - - if (x2 > bbox->p2.x) - bbox->p2.x = x2; - - if (y2 > bbox->p2.y) - bbox->p2.y = y2; - } - - - ATSUDisposeStyle(style); - + assert(num_glyphs == 1); - return CAIRO_STATUS_SUCCESS; -} + GlyphID theGlyph = glyphs[0].index; + ATSGlyphIdealMetrics metricsH, metricsV; + ATSUStyle style; -static cairo_status_t -_cairo_atsui_font_show_glyphs( void *abstract_font, - cairo_font_scale_t *sc, - cairo_operator_t operator, - cairo_surface_t *source, - cairo_surface_t *surface, - int source_x, - int source_y, - const cairo_glyph_t *glyphs, - int num_glyphs) -{ - cairo_atsui_font_t *font = abstract_font; - CGContextRef myBitmapContext; - CGColorSpaceRef colorSpace; - cairo_image_surface_t *destImageSurface; - int i; - - - destImageSurface = _cairo_surface_get_image(surface); + ATSUCreateAndCopyStyle(font->unscaled_style, &style); + + err = ATSUGlyphGetIdealMetrics(style, + 1, &theGlyph, 0, &metricsH); + + ATSUVerticalCharacterType verticalType = kATSUStronglyVertical; + const ATSUAttributeTag theTag[] = { kATSUVerticalCharacterTag }; + const ByteCount theSizes[] = { sizeof(verticalType) }; + ATSUAttributeValuePtr theValues[] = { &verticalType }; - - // Create a CGBitmapContext for the dest surface for drawing into - colorSpace = CGColorSpaceCreateDeviceRGB(); - - myBitmapContext = CGBitmapContextCreate( destImageSurface->data, - destImageSurface->width, - destImageSurface->height, - destImageSurface->depth / 4, - destImageSurface->stride, - colorSpace, - kCGImageAlphaPremultipliedFirst); - - - ATSFontRef atsFont = FMGetATSFontRefFromFont(font->fontID); - CGFontRef cgFont = CGFontCreateWithPlatformFont(&atsFont); - - CGContextSetFont(myBitmapContext, cgFont); - - - CGAffineTransform textTransform = CGAffineTransformMakeWithCairoFontScale(*sc); - CGSize textSize = CGSizeMake(1.0, 1.0); - - textSize = CGSizeApplyAffineTransform(textSize, textTransform); - - CGContextSetFontSize(myBitmapContext, textSize.width); - - - // TODO - bold and italic text - // - // We could draw the text using ATSUI and get bold, italics - // etc. for free, but ATSUI does a lot of text layout work - // that we don't really need... - - - for (i = 0; i < num_glyphs; i++) - { - CGGlyph theGlyph = glyphs[i].index; - - CGContextShowGlyphsAtPoint(myBitmapContext, source_x + glyphs[i].x, destImageSurface->height - (source_y + glyphs[i].y), &theGlyph, 1); - } - - - CGColorSpaceRelease(colorSpace); - CGContextRelease(myBitmapContext); - - - return CAIRO_STATUS_SUCCESS; + err = ATSUSetAttributes(style, 1, theTag, theSizes, theValues); + + err = ATSUGlyphGetIdealMetrics(style, + 1, &theGlyph, 0, &metricsV); + + extents->x_bearing = metricsH.sideBearing.x; + extents->y_bearing = metricsV.advance.y; + extents->width = + metricsH.advance.x - metricsH.sideBearing.x - metricsH.otherSideBearing.x; + extents->height = + -metricsV.advance.y - metricsV.sideBearing.y - metricsV.otherSideBearing.y; + extents->x_advance = metricsH.advance.x; + extents->y_advance = 0; + + ATSUDisposeStyle(style); + + return CAIRO_STATUS_SUCCESS; } -#pragma mark - - - -static OSStatus MyATSCubicMoveToCallback(const Float32Point *pt, void *callBackDataPtr) +static cairo_status_t +_cairo_atsui_font_glyph_bbox(void *abstract_font, + const cairo_glyph_t *glyphs, + int num_glyphs, cairo_box_t *bbox) { - cairo_ATSUI_glyph_path_callback_info_t *info = callBackDataPtr; - double scaledPt[2]; - cairo_point_t point; - - - scaledPt[0] = pt->x; - scaledPt[1] = pt->y; - - cairo_matrix_transform_point(&info->scale, &scaledPt[0], &scaledPt[1]); + cairo_atsui_font_t *font = abstract_font; + cairo_fixed_t x1, y1, x2, y2; + int i; + OSStatus err; + + bbox->p1.x = bbox->p1.y = CAIRO_MAXSHORT << 16; + bbox->p2.x = bbox->p2.y = CAIRO_MINSHORT << 16; + + + for (i = 0; i < num_glyphs; i++) { + GlyphID theGlyph = glyphs[i].index; + + ATSGlyphScreenMetrics metrics; + ATSUGlyphGetScreenMetrics(font->style, + 1, &theGlyph, 0, true, true, &metrics); + + x1 = _cairo_fixed_from_double(glyphs[i].x + metrics.topLeft.x); + y1 = _cairo_fixed_from_double(glyphs[i].y - metrics.topLeft.y); + x2 = x1 + _cairo_fixed_from_double(metrics.height); + y2 = y1 + _cairo_fixed_from_double(metrics.width); + + if (x1 < bbox->p1.x) + bbox->p1.x = x1; + + if (y1 < bbox->p1.y) + bbox->p1.y = y1; + + if (x2 > bbox->p2.x) + bbox->p2.x = x2; + + if (y2 > bbox->p2.y) + bbox->p2.y = y2; + } + + return CAIRO_STATUS_SUCCESS; +} + + +static cairo_status_t +_cairo_atsui_font_show_glyphs(void *abstract_font, + cairo_operator_t operator, + cairo_pattern_t *pattern, + cairo_surface_t *generic_surface, + int source_x, + int source_y, + int dest_x, + int dest_y, + unsigned int width, + unsigned int height, + const cairo_glyph_t *glyphs, + int num_glyphs) +{ + cairo_atsui_font_t *font = abstract_font; + CGContextRef myBitmapContext; + CGColorSpaceRef colorSpace; + cairo_quartz_surface_t *surface = (cairo_quartz_surface_t *)generic_surface; + cairo_image_surface_t *destImageSurface; + int i; + + cairo_rectangle_t rect = {dest_x, dest_y, width, height}; + _cairo_surface_acquire_dest_image(generic_surface, + &rect, + &destImageSurface, + &rect, + NULL); + + // Create a CGBitmapContext for the dest surface for drawing into + colorSpace = CGColorSpaceCreateDeviceRGB(); + + myBitmapContext = CGBitmapContextCreate(destImageSurface->data, + destImageSurface->width, + destImageSurface->height, + destImageSurface->depth / 4, + destImageSurface->stride, + colorSpace, + kCGImageAlphaPremultipliedFirst); + CGContextTranslateCTM(myBitmapContext, 0, destImageSurface->height); + CGContextScaleCTM(myBitmapContext, 1.0f, -1.0f); + + ATSFontRef atsFont = FMGetATSFontRefFromFont(font->fontID); + CGFontRef cgFont = CGFontCreateWithPlatformFont(&atsFont); + + CGContextSetFont(myBitmapContext, cgFont); + + CGAffineTransform textTransform = + CGAffineTransformMakeWithCairoFontScale(font->scale); + + textTransform = CGAffineTransformScale(textTransform, 1.0f, -1.0f); + + CGContextSetFontSize(myBitmapContext, 1.0); + CGContextSetTextMatrix(myBitmapContext, textTransform); + + if (pattern->type == CAIRO_PATTERN_SOLID && + _cairo_pattern_is_opaque(pattern)) { + cairo_solid_pattern_t *solid = (cairo_solid_pattern_t *)pattern; + CGContextSetRGBFillColor(myBitmapContext, + solid->red, solid->green, solid->blue, 1.0f); + } else + CGContextSetRGBFillColor(myBitmapContext, 0.0f, 0.0f, 0.0f, 0.0f); + + // TODO - bold and italic text + // + // We could draw the text using ATSUI and get bold, italics + // etc. for free, but ATSUI does a lot of text layout work + // that we don't really need... + + + for (i = 0; i < num_glyphs; i++) { + CGGlyph theGlyph = glyphs[i].index; + + CGContextShowGlyphsAtPoint(myBitmapContext, + glyphs[i].x, + glyphs[i].y, + &theGlyph, 1); + } + + + CGColorSpaceRelease(colorSpace); + CGContextRelease(myBitmapContext); + + _cairo_surface_release_dest_image(generic_surface, + &rect, + destImageSurface, + &rect, + NULL); + + return CAIRO_STATUS_SUCCESS; +} + + +static OSStatus MyATSCubicMoveToCallback(const Float32Point * pt, + void *callBackDataPtr) +{ + cairo_ATSUI_glyph_path_callback_info_t *info = callBackDataPtr; + double scaledPt[2]; + cairo_point_t point; + + + scaledPt[0] = pt->x; + scaledPt[1] = pt->y; + + cairo_matrix_transform_point(&info->scale, &scaledPt[0], &scaledPt[1]); point.x = _cairo_fixed_from_double(scaledPt[0]); point.y = _cairo_fixed_from_double(scaledPt[1]); _cairo_path_move_to(info->path, &point); - - + + return noErr; } -static OSStatus MyATSCubicLineToCallback(const Float32Point *pt, void *callBackDataPtr) +static OSStatus MyATSCubicLineToCallback(const Float32Point * pt, + void *callBackDataPtr) { - cairo_ATSUI_glyph_path_callback_info_t *info = callBackDataPtr; - cairo_point_t point; - double scaledPt[2]; - - - scaledPt[0] = pt->x; - scaledPt[1] = pt->y; - - cairo_matrix_transform_point(&info->scale, &scaledPt[0], &scaledPt[1]); - + cairo_ATSUI_glyph_path_callback_info_t *info = callBackDataPtr; + cairo_point_t point; + double scaledPt[2]; + + + scaledPt[0] = pt->x; + scaledPt[1] = pt->y; + + cairo_matrix_transform_point(&info->scale, &scaledPt[0], &scaledPt[1]); + point.x = _cairo_fixed_from_double(scaledPt[0]); point.y = _cairo_fixed_from_double(scaledPt[1]); _cairo_path_line_to(info->path, &point); - - - return noErr; + + + return noErr; } -static OSStatus MyATSCubicCurveToCallback( const Float32Point *pt1, - const Float32Point *pt2, - const Float32Point *pt3, - void *callBackDataPtr) +static OSStatus MyATSCubicCurveToCallback(const Float32Point * pt1, + const Float32Point * pt2, + const Float32Point * pt3, + void *callBackDataPtr) { - cairo_ATSUI_glyph_path_callback_info_t *info = callBackDataPtr; + cairo_ATSUI_glyph_path_callback_info_t *info = callBackDataPtr; cairo_point_t p0, p1, p2; - double scaledPt[2]; - - - scaledPt[0] = pt1->x; - scaledPt[1] = pt1->y; - - cairo_matrix_transform_point(&info->scale, &scaledPt[0], &scaledPt[1]); + double scaledPt[2]; + + + scaledPt[0] = pt1->x; + scaledPt[1] = pt1->y; + + cairo_matrix_transform_point(&info->scale, &scaledPt[0], &scaledPt[1]); p0.x = _cairo_fixed_from_double(scaledPt[0]); p0.y = _cairo_fixed_from_double(scaledPt[1]); - + scaledPt[0] = pt2->x; - scaledPt[1] = pt2->y; - - cairo_matrix_transform_point(&info->scale, &scaledPt[0], &scaledPt[1]); + scaledPt[1] = pt2->y; + + cairo_matrix_transform_point(&info->scale, &scaledPt[0], &scaledPt[1]); p1.x = _cairo_fixed_from_double(scaledPt[0]); p1.y = _cairo_fixed_from_double(scaledPt[1]); - + scaledPt[0] = pt3->x; - scaledPt[1] = pt3->y; - - cairo_matrix_transform_point(&info->scale, &scaledPt[0], &scaledPt[1]); + scaledPt[1] = pt3->y; + + cairo_matrix_transform_point(&info->scale, &scaledPt[0], &scaledPt[1]); p2.x = _cairo_fixed_from_double(scaledPt[0]); p2.y = _cairo_fixed_from_double(scaledPt[1]); - + _cairo_path_curve_to(info->path, &p0, &p1, &p2); - - - return noErr; + + + return noErr; } -static OSStatus MyCubicClosePathProc(void * callBackDataPtr) +static OSStatus MyCubicClosePathProc(void *callBackDataPtr) { - cairo_ATSUI_glyph_path_callback_info_t *info = callBackDataPtr; - - + cairo_ATSUI_glyph_path_callback_info_t *info = callBackDataPtr; + + _cairo_path_close_path(info->path); - - - return noErr; + + + return noErr; } -static cairo_status_t -_cairo_atsui_font_glyph_path( void *abstract_font, - cairo_font_scale_t *sc, - cairo_glyph_t *glyphs, - int num_glyphs, - cairo_path_t *path) +static cairo_status_t +_cairo_atsui_font_glyph_path(void *abstract_font, + cairo_glyph_t *glyphs, int num_glyphs, + cairo_path_t *path) { - int i; - cairo_atsui_font_t *font = abstract_font; - OSStatus err; - cairo_ATSUI_glyph_path_callback_info_t info; - ATSUStyle style; - - - static ATSCubicMoveToUPP moveProc = NULL; - static ATSCubicLineToUPP lineProc = NULL; - static ATSCubicCurveToUPP curveProc = NULL; - static ATSCubicClosePathUPP closePathProc = NULL; - - - if (moveProc == NULL) - { - moveProc = NewATSCubicMoveToUPP(MyATSCubicMoveToCallback); - lineProc = NewATSCubicLineToUPP(MyATSCubicLineToCallback); - curveProc = NewATSCubicCurveToUPP(MyATSCubicCurveToCallback); - closePathProc = NewATSCubicClosePathUPP(MyCubicClosePathProc); - } - - - info.path = path; - - - style = CreateSizedCopyOfStyle(font->style, sc); - + int i; + cairo_atsui_font_t *font = abstract_font; + OSStatus err; + cairo_ATSUI_glyph_path_callback_info_t info; - for (i = 0; i < num_glyphs; i++) - { - GlyphID theGlyph = glyphs[i].index; - - - cairo_matrix_set_affine( &info.scale, - 1.0, 0.0, - 0.0, 1.0, - glyphs[i].x, glyphs[i].y); - - - err = ATSUGlyphGetCubicPaths( style, - theGlyph, - moveProc, - lineProc, - curveProc, - closePathProc, - (void *)&info, - &err); - } - - - err = ATSUDisposeStyle(style); - - - return CAIRO_STATUS_SUCCESS; + + static ATSCubicMoveToUPP moveProc = NULL; + static ATSCubicLineToUPP lineProc = NULL; + static ATSCubicCurveToUPP curveProc = NULL; + static ATSCubicClosePathUPP closePathProc = NULL; + + + if (moveProc == NULL) { + moveProc = NewATSCubicMoveToUPP(MyATSCubicMoveToCallback); + lineProc = NewATSCubicLineToUPP(MyATSCubicLineToCallback); + curveProc = NewATSCubicCurveToUPP(MyATSCubicCurveToCallback); + closePathProc = NewATSCubicClosePathUPP(MyCubicClosePathProc); + } + + + info.path = path; + + + for (i = 0; i < num_glyphs; i++) { + GlyphID theGlyph = glyphs[i].index; + + + cairo_matrix_set_affine(&info.scale, + 1.0, 0.0, + 0.0, 1.0, glyphs[i].x, glyphs[i].y); + + + err = ATSUGlyphGetCubicPaths(font->style, + theGlyph, + moveProc, + lineProc, + curveProc, + closePathProc, (void *) &info, &err); + } + + return CAIRO_STATUS_SUCCESS; } -#pragma mark - - - -static cairo_status_t -_cairo_atsui_font_create_glyph(cairo_image_glyph_cache_entry_t *val) +static cairo_status_t +_cairo_atsui_font_create_glyph(cairo_image_glyph_cache_entry_t * val) { - // TODO - printf("_cairo_atsui_font_create_glyph is unimplemented\n"); - - // I'm not sure if we need this, given that the ATSUI backend does no caching(?) - - - return CAIRO_STATUS_SUCCESS; + return CAIRO_STATUS_NO_MEMORY; } -cairo_font_t * -cairo_atsui_font_create(ATSUStyle style) -{ - cairo_font_scale_t scale; - cairo_font_t *scaled; - cairo_atsui_font_t *f = NULL; - - - scaled = malloc(sizeof(cairo_font_t)); - if (scaled == NULL) - return NULL; - - - f = malloc(sizeof(cairo_atsui_font_t)); - if (f) - { - if (_cairo_unscaled_font_init(&f->base, &cairo_atsui_font_backend) == CAIRO_STATUS_SUCCESS) - { - f->style = style; - - _cairo_font_init(scaled, &scale, &f->base); - - return scaled; - } - } - - - free(scaled); - - - return NULL; -} - - - - - -#pragma mark Backend - - - - - const cairo_font_backend_t cairo_atsui_font_backend = { - _cairo_atsui_font_create, - _cairo_atsui_font_destroy, - _cairo_atsui_font_font_extents, - _cairo_atsui_font_text_to_glyphs, - _cairo_atsui_font_glyph_extents, - _cairo_atsui_font_glyph_bbox, - _cairo_atsui_font_show_glyphs, - _cairo_atsui_font_glyph_path, - _cairo_atsui_font_create_glyph + _cairo_atsui_font_create, + _cairo_atsui_font_destroy_font, + _cairo_atsui_font_destroy_unscaled_font, + _cairo_atsui_font_font_extents, + _cairo_atsui_font_text_to_glyphs, + _cairo_atsui_font_glyph_extents, + _cairo_atsui_font_glyph_bbox, + _cairo_atsui_font_show_glyphs, + _cairo_atsui_font_glyph_path, + _cairo_atsui_font_get_glyph_cache_key, + _cairo_atsui_font_create_glyph }; + + +cairo_font_t *cairo_atsui_font_create(ATSUStyle style) +{ +#if 0 + cairo_font_scale_t scale; + cairo_font_t *scaled; + cairo_atsui_font_t *f = NULL; + + + scaled = malloc(sizeof(cairo_font_t)); + if (scaled == NULL) + return NULL; + + + f = malloc(sizeof(cairo_atsui_font_t)); + if (f) { + if (_cairo_unscaled_font_init(&f->base, &cairo_atsui_font_backend) + == CAIRO_STATUS_SUCCESS) { + f->style = style; + + _cairo_font_init(scaled, &scale, &f->base); + + return scaled; + } + } + + + free(scaled); + +#endif + + return NULL; +} diff --git a/gfx/cairo/cairo/src/cairo_cache.c b/gfx/cairo/cairo/src/cairo_cache.c index b097b609bb26..d1ad5a4e2f6d 100644 --- a/gfx/cairo/cairo/src/cairo_cache.c +++ b/gfx/cairo/cairo/src/cairo_cache.c @@ -94,9 +94,9 @@ static const cairo_cache_arrangement_t cache_arrangements [] = { * a mostly-dead table. * * Generally you do not need to worry about freeing cache entries; the - * cache will expire entries randomly as it experiences memory pressure. - * There is currently no explicit entry-removing call, though one can be - * added easily. + * cache will expire entries randomly as it experiences memory pressure. + * If max_memory is set, entries are not expired, and must be explicitely + * removed. * * This table is open-addressed with double hashing. Each table size is a * prime chosen to be a little more than double the high water mark for a @@ -282,17 +282,51 @@ _load_factor (cairo_cache_t *cache) } #endif -static unsigned long -_random_live_entry (cairo_cache_t *cache) -{ - unsigned long idx; - assert(cache != NULL); - do { - idx = rand () % cache->arrangement->size; - } while (! LIVE_ENTRY_P(cache, idx)); - return idx; -} +/* Find a random in the cache matching the given predicate. We use the + * same algorithm as the probing algorithm to walk over the entries in + * the hash table in a pseudo-random order. Walking linearly would + * favor entries following gaps in the hash table. We could also + * call rand() repeatedly, which works well for almost-full tables, + * but degrades when the table is almost empty, or predicate + * returns false for most entries. + */ +static cairo_cache_entry_base_t ** +_random_entry (cairo_cache_t *cache, + int (*predicate)(void*)) +{ + cairo_cache_entry_base_t **probe; + unsigned long hash; + unsigned long table_size, i, idx, step; + + _cache_sane_state (cache); + table_size = cache->arrangement->size; + hash = rand (); + idx = hash % table_size; + step = 0; + + for (i = 0; i < table_size; ++i) + { + assert(idx < table_size); + probe = cache->entries + idx; + + if (LIVE_ENTRY_P(cache, idx) + && (!predicate || predicate (*probe))) + return probe; + + if (step == 0) { + step = hash % cache->arrangement->rehash; + if (step == 0) + step = 1; + } + + idx += step; + if (idx >= table_size) + idx -= table_size; + } + + return NULL; +} /* public API follows */ @@ -356,8 +390,9 @@ _cairo_cache_destroy (cairo_cache_t *cache) cairo_status_t _cairo_cache_lookup (cairo_cache_t *cache, - void *key, - void **entry_return) + void *key, + void **entry_return, + int *created_entry) { unsigned long idx; @@ -392,6 +427,8 @@ _cairo_cache_lookup (cairo_cache_t *cache, cache->hits++; #endif *entry_return = *slot; + if (created_entry) + *created_entry = 0; return status; } @@ -401,19 +438,18 @@ _cairo_cache_lookup (cairo_cache_t *cache, /* Build the new entry. */ status = cache->backend->create_entry (cache, key, - entry_return); + (void **)&new_entry); if (status != CAIRO_STATUS_SUCCESS) return status; - new_entry = (cairo_cache_entry_base_t *) (*entry_return); - /* Store the hash value in case the backend forgot. */ new_entry->hashcode = cache->backend->hash (cache, key); /* Make some entries die if we're under memory pressure. */ while (cache->live_entries > 0 && + cache->max_memory > 0 && ((cache->max_memory - cache->used_memory) < new_entry->memory)) { - idx = _random_live_entry (cache); + idx = _random_entry (cache, NULL) - cache->entries; assert (idx < cache->arrangement->size); _entry_destroy (cache, idx); } @@ -425,7 +461,6 @@ _cairo_cache_lookup (cairo_cache_t *cache, status = _resize_cache (cache, cache->live_entries + 1); if (status != CAIRO_STATUS_SUCCESS) { cache->backend->destroy_entry (cache, new_entry); - *entry_return = NULL; return status; } @@ -439,9 +474,38 @@ _cairo_cache_lookup (cairo_cache_t *cache, _cache_sane_state (cache); + *entry_return = new_entry; + if (created_entry) + *created_entry = 1; + return status; } +cairo_status_t +_cairo_cache_remove (cairo_cache_t *cache, + void *key) +{ + cairo_cache_entry_base_t **slot; + + _cache_sane_state (cache); + + /* See if we have an entry in the table already. */ + slot = _find_exact_live_entry_for (cache, key); + if (slot != NULL) + _entry_destroy (cache, slot - cache->entries); + + return CAIRO_STATUS_SUCCESS; +} + +void * +_cairo_cache_random_entry (cairo_cache_t *cache, + int (*predicate)(void*)) +{ + cairo_cache_entry_base_t **slot = _random_entry (cache, predicate); + + return slot ? *slot : NULL; +} + unsigned long _cairo_hash_string (const char *c) { diff --git a/gfx/cairo/cairo/src/cairo_color.c b/gfx/cairo/cairo/src/cairo_color.c index 899b1e3d588b..f203d96cc0bc 100644 --- a/gfx/cairo/cairo/src/cairo_color.c +++ b/gfx/cairo/cairo/src/cairo_color.c @@ -31,7 +31,7 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ #include "cairoint.h" @@ -67,7 +67,8 @@ _cairo_color_set_rgb (cairo_color_t *color, double red, double green, double blu } void -_cairo_color_get_rgb (cairo_color_t *color, double *red, double *green, double *blue) +_cairo_color_get_rgb (const cairo_color_t *color, + double *red, double *green, double *blue) { if (red) *red = color->red; diff --git a/gfx/cairo/cairo/src/cairo_fixed.c b/gfx/cairo/cairo/src/cairo_fixed.c index ee31718eff82..a4faa1708d62 100644 --- a/gfx/cairo/cairo/src/cairo_fixed.c +++ b/gfx/cairo/cairo/src/cairo_fixed.c @@ -31,7 +31,7 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ #include "cairoint.h" diff --git a/gfx/cairo/cairo/src/cairo_font.c b/gfx/cairo/cairo/src/cairo_font.c index f5fc0e981ca1..529c1c7c3dc7 100644 --- a/gfx/cairo/cairo/src/cairo_font.c +++ b/gfx/cairo/cairo/src/cairo_font.c @@ -1,6 +1,7 @@ /* cairo - a vector graphics library with display and print output * * Copyright © 2002 University of Southern California + * 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 @@ -31,293 +32,129 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth + * Graydon Hoare + * Owen Taylor */ #include "cairoint.h" -/* First we implement a global font cache for named fonts. */ - -typedef struct { - cairo_cache_entry_base_t base; - const char *family; - cairo_font_slant_t slant; - cairo_font_weight_t weight; -} cairo_font_cache_key_t; - -typedef struct { - cairo_font_cache_key_t key; - cairo_unscaled_font_t *unscaled; -} cairo_font_cache_entry_t; - -static unsigned long -_font_cache_hash (void *cache, void *key) -{ - unsigned long hash; - cairo_font_cache_key_t *in; - in = (cairo_font_cache_key_t *) key; - - /* 1607 and 1451 are just a couple random primes. */ - hash = _cairo_hash_string (in->family); - hash += ((unsigned long) in->slant) * 1607; - hash += ((unsigned long) in->weight) * 1451; - return hash; -} - - -static int -_font_cache_keys_equal (void *cache, - void *k1, - void *k2) -{ - cairo_font_cache_key_t *a, *b; - a = (cairo_font_cache_key_t *) k1; - b = (cairo_font_cache_key_t *) k2; - - return (strcmp (a->family, b->family) == 0) - && (a->weight == b->weight) - && (a->slant == b->slant); -} - - -static cairo_status_t -_font_cache_create_entry (void *cache, - void *key, - void **return_value) -{ - const cairo_font_backend_t *backend = CAIRO_FONT_BACKEND_DEFAULT; - cairo_font_cache_key_t *k; - cairo_font_cache_entry_t *entry; - k = (cairo_font_cache_key_t *) key; - - /* XXX: The current freetype backend may return NULL, (for example - * if no fonts are installed), but I would like to guarantee that - * the toy API always returns at least *some* font, so I would - * like to build in some sort fo font here, (even a really lame, - * ugly one if necessary). */ - - entry = malloc (sizeof (cairo_font_cache_entry_t)); - if (entry == NULL) - goto FAIL; - - entry->key.slant = k->slant; - entry->key.weight = k->weight; - entry->key.family = strdup(k->family); - if (entry->key.family == NULL) - goto FREE_ENTRY; - - entry->unscaled = backend->create (k->family, k->slant, k->weight); - if (entry->unscaled == NULL) - goto FREE_FAMILY; - - /* Not sure how to measure backend font mem; use a simple count for now.*/ - entry->key.base.memory = 1; - *return_value = entry; - return CAIRO_STATUS_SUCCESS; - - FREE_FAMILY: - free ((void *) entry->key.family); - - FREE_ENTRY: - free (entry); - - FAIL: - return CAIRO_STATUS_NO_MEMORY; -} - -static void -_font_cache_destroy_entry (void *cache, - void *entry) -{ - cairo_font_cache_entry_t *e; - - e = (cairo_font_cache_entry_t *) entry; - _cairo_unscaled_font_destroy (e->unscaled); - free ((void *) e->key.family); - free (e); -} - -static void -_font_cache_destroy_cache (void *cache) -{ - free (cache); -} - -static const cairo_cache_backend_t cairo_font_cache_backend = { - _font_cache_hash, - _font_cache_keys_equal, - _font_cache_create_entry, - _font_cache_destroy_entry, - _font_cache_destroy_cache -}; - -static void -_lock_global_font_cache (void) -{ - /* FIXME: implement locking. */ -} - -static void -_unlock_global_font_cache (void) -{ - /* FIXME: implement locking. */ -} - -static cairo_cache_t * -_global_font_cache = NULL; - -static cairo_cache_t * -_get_global_font_cache (void) -{ - if (_global_font_cache == NULL) { - _global_font_cache = malloc (sizeof (cairo_cache_t)); - - if (_global_font_cache == NULL) - goto FAIL; - - if (_cairo_cache_init (_global_font_cache, - &cairo_font_cache_backend, - CAIRO_FONT_CACHE_NUM_FONTS_DEFAULT)) - goto FAIL; - } - - return _global_font_cache; - - FAIL: - if (_global_font_cache) - free (_global_font_cache); - _global_font_cache = NULL; - return NULL; -} - - /* Now the internal "unscaled + scale" font API */ -cairo_unscaled_font_t * -_cairo_unscaled_font_create (const char *family, - cairo_font_slant_t slant, - cairo_font_weight_t weight) +cairo_private cairo_status_t +_cairo_font_create (const char *family, + cairo_font_slant_t slant, + cairo_font_weight_t weight, + cairo_font_scale_t *sc, + cairo_font_t **font) { - cairo_cache_t * cache; - cairo_font_cache_key_t key; - cairo_font_cache_entry_t *font; - cairo_status_t status; + const cairo_font_backend_t *backend = CAIRO_FONT_BACKEND_DEFAULT; - _lock_global_font_cache (); - cache = _get_global_font_cache (); - if (cache == NULL) { - _unlock_global_font_cache (); - return NULL; - } - - key.family = family; - key.slant = slant; - key.weight = weight; - - status = _cairo_cache_lookup (cache, &key, (void **) &font); - if (status) { - _unlock_global_font_cache (); - return NULL; - } - - _cairo_unscaled_font_reference (font->unscaled); - _unlock_global_font_cache (); - return font->unscaled; + return backend->create (family, slant, weight, sc, font); } void -_cairo_font_init (cairo_font_t *scaled, - cairo_font_scale_t *scale, - cairo_unscaled_font_t *unscaled) +_cairo_font_init (cairo_font_t *font, + cairo_font_scale_t *scale, + const cairo_font_backend_t *backend) { - scaled->scale = *scale; - scaled->unscaled = unscaled; - scaled->refcount = 1; + font->scale = *scale; + font->refcount = 1; + font->backend = backend; } -cairo_status_t -_cairo_unscaled_font_init (cairo_unscaled_font_t *font, - const cairo_font_backend_t *backend) +void +_cairo_unscaled_font_init (cairo_unscaled_font_t *font, + const cairo_font_backend_t *backend) { font->refcount = 1; font->backend = backend; - return CAIRO_STATUS_SUCCESS; } - cairo_status_t -_cairo_unscaled_font_text_to_glyphs (cairo_unscaled_font_t *font, - cairo_font_scale_t *scale, - const unsigned char *utf8, - cairo_glyph_t **glyphs, - int *num_glyphs) +_cairo_font_text_to_glyphs (cairo_font_t *font, + const unsigned char *utf8, + cairo_glyph_t **glyphs, + int *num_glyphs) { - return font->backend->text_to_glyphs (font, scale, utf8, glyphs, num_glyphs); + return font->backend->text_to_glyphs (font, utf8, glyphs, num_glyphs); } cairo_status_t -_cairo_unscaled_font_glyph_extents (cairo_unscaled_font_t *font, - cairo_font_scale_t *scale, - cairo_glyph_t *glyphs, - int num_glyphs, - cairo_text_extents_t *extents) +_cairo_font_glyph_extents (cairo_font_t *font, + cairo_glyph_t *glyphs, + int num_glyphs, + cairo_text_extents_t *extents) { - return font->backend->glyph_extents(font, scale, glyphs, num_glyphs, extents); + return font->backend->glyph_extents(font, glyphs, num_glyphs, extents); } cairo_status_t -_cairo_unscaled_font_glyph_bbox (cairo_unscaled_font_t *font, - cairo_font_scale_t *scale, - cairo_glyph_t *glyphs, - int num_glyphs, - cairo_box_t *bbox) +_cairo_font_glyph_bbox (cairo_font_t *font, + cairo_glyph_t *glyphs, + int num_glyphs, + cairo_box_t *bbox) { - return font->backend->glyph_bbox (font, scale, glyphs, num_glyphs, bbox); + return font->backend->glyph_bbox (font, glyphs, num_glyphs, bbox); } cairo_status_t -_cairo_unscaled_font_show_glyphs (cairo_unscaled_font_t *font, - cairo_font_scale_t *scale, - cairo_operator_t operator, - cairo_surface_t *source, - cairo_surface_t *surface, - int source_x, - int source_y, - cairo_glyph_t *glyphs, - int num_glyphs) +_cairo_font_show_glyphs (cairo_font_t *font, + cairo_operator_t operator, + cairo_pattern_t *pattern, + cairo_surface_t *surface, + int source_x, + int source_y, + int dest_x, + int dest_y, + unsigned int width, + unsigned int height, + cairo_glyph_t *glyphs, + int num_glyphs) { cairo_status_t status; if (surface->backend->show_glyphs != NULL) { - status = surface->backend->show_glyphs (font, scale, operator, source, - surface, source_x, source_y, + status = surface->backend->show_glyphs (font, operator, pattern, + surface, + source_x, source_y, + dest_x, dest_y, + width, height, glyphs, num_glyphs); if (status == CAIRO_STATUS_SUCCESS) return status; } /* Surface display routine either does not exist or failed. */ - return font->backend->show_glyphs (font, scale, operator, source, - surface, source_x, source_y, + return font->backend->show_glyphs (font, operator, pattern, + surface, + source_x, source_y, + dest_x, dest_y, + width, height, glyphs, num_glyphs); } cairo_status_t -_cairo_unscaled_font_glyph_path (cairo_unscaled_font_t *font, - cairo_font_scale_t *scale, - cairo_glyph_t *glyphs, - int num_glyphs, - cairo_path_t *path) +_cairo_font_glyph_path (cairo_font_t *font, + cairo_glyph_t *glyphs, + int num_glyphs, + cairo_path_t *path) { - return font->backend->glyph_path (font, scale, glyphs, num_glyphs, path); + return font->backend->glyph_path (font, glyphs, num_glyphs, path); +} + +void +_cairo_font_get_glyph_cache_key (cairo_font_t *font, + cairo_glyph_cache_key_t *key) +{ + font->backend->get_glyph_cache_key (font, key); } cairo_status_t -_cairo_unscaled_font_font_extents (cairo_unscaled_font_t *font, - cairo_font_scale_t *scale, - cairo_font_extents_t *extents) +_cairo_font_font_extents (cairo_font_t *font, + cairo_font_extents_t *extents) { - return font->backend->font_extents(font, scale, extents); + return font->backend->font_extents (font, extents); } void @@ -332,8 +169,7 @@ _cairo_unscaled_font_destroy (cairo_unscaled_font_t *font) if (--(font->refcount) > 0) return; - if (font->backend) - font->backend->destroy (font); + font->backend->destroy_unscaled_font (font); } @@ -352,37 +188,154 @@ cairo_font_destroy (cairo_font_t *font) if (--(font->refcount) > 0) return; - if (font->unscaled) - _cairo_unscaled_font_destroy (font->unscaled); - - free (font); + font->backend->destroy_font (font); } -void -cairo_font_set_transform (cairo_font_t *font, - cairo_matrix_t *matrix) +/** + * cairo_font_extents: + * @font: a #cairo_font_t + * @font_matrix: the font transformation for which this font was + * created. (See cairo_transform_font()). This is needed + * properly convert the metrics from the font into user space. + * @extents: a #cairo_font_extents_t which to store the retrieved extents. + * + * Gets the metrics for a #cairo_font_t. + * + * Return value: %CAIRO_STATUS_SUCCESS on success. Otherwise, an + * error such as %CAIRO_STATUS_NO_MEMORY. + **/ +cairo_status_t +cairo_font_extents (cairo_font_t *font, + cairo_matrix_t *font_matrix, + cairo_font_extents_t *extents) { - double dummy; - cairo_matrix_get_affine (matrix, - &font->scale.matrix[0][0], - &font->scale.matrix[0][1], - &font->scale.matrix[1][0], - &font->scale.matrix[1][1], - &dummy, &dummy); + cairo_int_status_t status; + double font_scale_x, font_scale_y; + + status = _cairo_font_font_extents (font, extents); + + if (!CAIRO_OK (status)) + return status; + + _cairo_matrix_compute_scale_factors (font_matrix, + &font_scale_x, &font_scale_y, + /* XXX */ 1); + + /* + * The font responded in unscaled units, scale by the font + * matrix scale factors to get to user space + */ + + extents->ascent *= font_scale_y; + extents->descent *= font_scale_y; + extents->height *= font_scale_y; + extents->max_x_advance *= font_scale_x; + extents->max_y_advance *= font_scale_y; + + return status; } +/** + * cairo_font_glyph_extents: + * @font: a #cairo_font_t + * @font_matrix: the font transformation for which this font was + * created. (See cairo_transform_font()). This is needed + * properly convert the metrics from the font into user space. + * @glyphs: an array of glyph IDs with X and Y offsets. + * @num_glyphs: the number of glyphs in the @glyphs array + * @extents: a #cairo_text_extents_t which to store the retrieved extents. + * + * cairo_font_glyph_extents() gets the overall metrics for a string of + * glyphs. The X and Y offsets in @glyphs are taken from an origin of 0,0. + **/ void -cairo_font_current_transform (cairo_font_t *font, - cairo_matrix_t *matrix) +cairo_font_glyph_extents (cairo_font_t *font, + cairo_matrix_t *font_matrix, + cairo_glyph_t *glyphs, + int num_glyphs, + cairo_text_extents_t *extents) { - cairo_matrix_set_affine (matrix, - font->scale.matrix[0][0], - font->scale.matrix[0][1], - font->scale.matrix[1][0], - font->scale.matrix[1][1], - 0, 0); -} + cairo_status_t status = CAIRO_STATUS_SUCCESS; + cairo_glyph_t origin_glyph; + cairo_text_extents_t origin_extents; + int i; + double min_x = 0.0, min_y = 0.0, max_x = 0.0, max_y = 0.0; + double x_pos = 0.0, y_pos = 0.0; + int set = 0; + if (!num_glyphs) + { + extents->x_bearing = 0.0; + extents->y_bearing = 0.0; + extents->width = 0.0; + extents->height = 0.0; + extents->x_advance = 0.0; + extents->y_advance = 0.0; + + return; + } + + for (i = 0; i < num_glyphs; i++) + { + double x, y; + double wm, hm; + + origin_glyph = glyphs[i]; + origin_glyph.x = 0.0; + origin_glyph.y = 0.0; + status = _cairo_font_glyph_extents (font, + &origin_glyph, 1, + &origin_extents); + + /* + * Transform font space metrics into user space metrics + * by running the corners through the font matrix and + * expanding the bounding box as necessary + */ + x = origin_extents.x_bearing; + y = origin_extents.y_bearing; + cairo_matrix_transform_point (font_matrix, + &x, &y); + + for (hm = 0.0; hm <= 1.0; hm += 1.0) + for (wm = 0.0; wm <= 1.0; wm += 1.0) + { + x = origin_extents.x_bearing + origin_extents.width * wm; + y = origin_extents.y_bearing + origin_extents.height * hm; + cairo_matrix_transform_point (font_matrix, + &x, &y); + x += glyphs[i].x; + y += glyphs[i].y; + if (!set) + { + min_x = max_x = x; + min_y = max_y = y; + set = 1; + } + else + { + if (x < min_x) min_x = x; + if (x > max_x) max_x = x; + if (y < min_y) min_y = y; + if (y > max_y) max_y = y; + } + } + + x = origin_extents.x_advance; + y = origin_extents.y_advance; + cairo_matrix_transform_point (font_matrix, + &x, &y); + x_pos = glyphs[i].x + x; + y_pos = glyphs[i].y + y; + } + + extents->x_bearing = min_x - glyphs[0].x; + extents->y_bearing = min_y - glyphs[0].y; + extents->width = max_x - min_x; + extents->height = max_y - min_y; + extents->x_advance = x_pos - glyphs[0].x; + extents->y_advance = y_pos - glyphs[0].y; +} /* Now we implement functions to access a default global image & metrics * cache. @@ -398,7 +351,8 @@ _cairo_glyph_cache_hash (void *cache, void *key) ^ ((unsigned long) in->scale.matrix[0][0]) ^ ((unsigned long) in->scale.matrix[0][1]) ^ ((unsigned long) in->scale.matrix[1][0]) - ^ ((unsigned long) in->scale.matrix[1][1]) + ^ ((unsigned long) in->scale.matrix[1][1]) + ^ (in->flags * 1451) /* 1451 is just an abitrary prime */ ^ in->index; } @@ -412,6 +366,7 @@ _cairo_glyph_cache_keys_equal (void *cache, b = (cairo_glyph_cache_key_t *) k2; return (a->index == b->index) && (a->unscaled == b->unscaled) + && (a->flags == b->flags) && (a->scale.matrix[0][0] == b->scale.matrix[0][0]) && (a->scale.matrix[0][1] == b->scale.matrix[0][1]) && (a->scale.matrix[1][0] == b->scale.matrix[1][0]) diff --git a/gfx/cairo/cairo/src/cairo_ft_font.c b/gfx/cairo/cairo/src/cairo_ft_font.c index b928b04fc90f..44e1b0e84493 100644 --- a/gfx/cairo/cairo/src/cairo_ft_font.c +++ b/gfx/cairo/cairo/src/cairo_ft_font.c @@ -1,29 +1,40 @@ -/* - * Copyright © 2003 Red Hat Inc. +/* cairo - a vector graphics library with display and print output * - * Permission to use, copy, modify, distribute, and sell this software and - * its documentation for any purpose is hereby granted without fee, - * provided that the above copyright notice appear in all copies and that - * both that copyright notice and this permission notice appear in - * supporting documentation, and that the name of Red Hat Inc. not be used - * in advertising or publicity pertaining to distribution of the software - * without specific, written prior permission. Red Hat Inc. makes no - * representations about the suitability of this software for any purpose. - * It is provided "as is" without express or implied warranty. + * Copyright © 2005 Red Hat, Inc * - * RED HAT INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL RED HAT INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF - * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. + * 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. * - * Author: Graydon Hoare + * 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. + * + * Contributor(s): + * Graydon Hoare + * Owen Taylor */ -#include "cairoint.h" -#include "cairo-ft.h" +#include "cairo-ft-private.h" #include #include @@ -38,19 +49,9 @@ #define DOUBLE_TO_16_16(d) ((FT_Fixed)((d) * 65536.0)) #define DOUBLE_FROM_16_16(t) ((double)(t) / 65536.0) -/* - * First we make a private, sharable implementation object which can be - * stored both in a private cache and in public font objects (including - * those connected to fonts we don't own) +/* This is the max number of FT_face objects we keep open at once */ - -typedef struct { - int refcount; - - FT_Face face; - int owns_face; - -} ft_font_val_t; +#define MAX_OPEN_FACES 10 /* * The simple 2x2 matrix is converted into separate scale and shape @@ -62,141 +63,126 @@ typedef struct { double shape[2][2]; } ft_font_transform_t; -static ft_font_val_t * -_create_from_face (FT_Face face, int owns_face) -{ - ft_font_val_t *tmp = malloc (sizeof(ft_font_val_t)); - if (tmp) { - tmp->refcount = 1; - tmp->face = face; - tmp->owns_face = owns_face; - FT_Set_Char_Size (face, - DOUBLE_TO_26_6 (1.0), - DOUBLE_TO_26_6 (1.0), - 0, 0); - } - return tmp; -} - -static void -_reference_font_val (ft_font_val_t *f) -{ - f->refcount++; -} - -static void -_destroy_font_val (ft_font_val_t *f) -{ - if (--(f->refcount) > 0) - return; - - if (f->owns_face) - FT_Done_Face (f->face); - - free (f); -} - -static ft_font_val_t * -_create_from_library_and_pattern (FT_Library ft_library, FcPattern *pattern) -{ - ft_font_val_t *f = NULL; - char *filename = NULL; - int owns_face = 0; - FT_Face face = NULL; - FcPattern *resolved = NULL; - FcResult result = FcResultMatch; - - if (pattern == NULL) - goto FAIL; - - FcConfigSubstitute (0, pattern, FcMatchPattern); - FcDefaultSubstitute (pattern); - - resolved = FcFontMatch (0, pattern, &result); - if (!resolved) - goto FAIL; - - if (result != FcResultMatch) - goto FREE_RESOLVED; - - /* If the pattern has an FT_Face object, use that. */ - if (FcPatternGetFTFace (resolved, FC_FT_FACE, 0, &face) != FcResultMatch - || face == NULL) - { - /* otherwise it had better have a filename */ - result = FcPatternGetString (resolved, FC_FILE, 0, (FcChar8 **)(&filename)); - - if (result == FcResultMatch) - if (FT_New_Face (ft_library, filename, 0, &face)) - goto FREE_RESOLVED; - - if (face == NULL) - goto FREE_RESOLVED; - - owns_face = 1; - } - - f = _create_from_face (face, owns_face); - - FcPatternDestroy (resolved); - return f; - - FREE_RESOLVED: - if (resolved) - FcPatternDestroy (resolved); - - FAIL: - return NULL; -} - - /* - * We then make the user-exposed structure out of one of these impls, such - * that it is reasonably cheap to copy and/or destroy. Unfortunately this - * duplicates a certain amount of the caching machinery in the font cache, - * but that's unavoidable as we also provide an FcPattern resolution API, - * which is not part of cairo's generic font finding system. + * We create an object that corresponds to a single font on the disk; + * (identified by a filename/id pair) these are shared between all + * fonts using that file. For cairo_ft_font_create_for_ft_face(), we + * just create a one-off version with a permanent face value. */ typedef struct { cairo_unscaled_font_t base; - FcPattern *pattern; - ft_font_val_t *val; -} cairo_ft_font_t; -/* - * We then make a key and entry type which are compatible with the generic - * cache system. This cache serves to share single ft_font_val_t instances - * between fonts (or between font lifecycles). + int from_face; /* from cairo_ft_font_create_for_ft_face()? */ + FT_Face face; /* provided or cached face */ + + /* only set if from_face is false */ + FT_Library library; + char *filename; + int id; + + /* We temporarily scale the unscaled font as neede */ + int have_scale; + cairo_font_scale_t current_scale; + double x_scale; /* Extracted X scale factor */ + double y_scale; /* Extracted Y scale factor */ + + int lock; /* count of how many times this font has been locked */ +} ft_unscaled_font_t; + +const cairo_font_backend_t cairo_ft_font_backend; + +static ft_unscaled_font_t * +_ft_unscaled_font_create_from_face (FT_Face face) +{ + ft_unscaled_font_t *unscaled = malloc (sizeof(ft_unscaled_font_t)); + if (!unscaled) + return NULL; + + unscaled->from_face = 1; + unscaled->face = face; + + unscaled->library = NULL; + unscaled->filename = NULL; + unscaled->id = 0; + + unscaled->have_scale = 0; + unscaled->lock = 0; + + _cairo_unscaled_font_init ((cairo_unscaled_font_t *)unscaled, + &cairo_ft_font_backend); + return unscaled; +} + +static ft_unscaled_font_t * +_ft_unscaled_font_create_from_filename (FT_Library library, + const char *filename, + int id) +{ + ft_unscaled_font_t *unscaled; + char *new_filename; + + new_filename = strdup (filename); + if (!new_filename) + return NULL; + + unscaled = malloc (sizeof (ft_unscaled_font_t)); + if (!unscaled) { + free (new_filename); + return NULL; + } + + unscaled->from_face = 0; + unscaled->face = NULL; + + unscaled->library = library; + unscaled->filename = new_filename; + unscaled->id = id; + + unscaled->have_scale = 0; + unscaled->lock = 0; + + _cairo_unscaled_font_init ((cairo_unscaled_font_t *)unscaled, + &cairo_ft_font_backend); + return unscaled; +} + +/* + * We keep a global cache from [file/id] => [ft_unscaled_font_t]. This + * hash isn't limited in size. However, we limit the number of + * FT_Face objects we keep around; when we've exceeeded that + * limit and need to create a new FT_Face, we dump the FT_Face from + * a random ft_unscaled_font_t. */ typedef struct { cairo_cache_entry_base_t base; - FcPattern *pattern; + char *filename; + int id; } cairo_ft_cache_key_t; typedef struct { cairo_ft_cache_key_t key; - ft_font_val_t *val; + ft_unscaled_font_t *unscaled; } cairo_ft_cache_entry_t; -/* - * Then we create a cache which maps FcPattern keys to the refcounted - * ft_font_val_t values. - */ - typedef struct { cairo_cache_t base; FT_Library lib; + int n_faces; /* Number of open FT_Face objects */ } ft_cache_t; - static unsigned long _ft_font_cache_hash (void *cache, void *key) { - cairo_ft_cache_key_t *in; - in = (cairo_ft_cache_key_t *) key; - return FcPatternHash (in->pattern); + cairo_ft_cache_key_t *in = (cairo_ft_cache_key_t *) key; + unsigned long hash; + + /* 1607 is just a random prime. */ + hash = _cairo_hash_string (in->filename); + hash += ((unsigned long) in->id) * 1607; + + return hash; } static int @@ -208,10 +194,10 @@ _ft_font_cache_keys_equal (void *cache, cairo_ft_cache_key_t *b; a = (cairo_ft_cache_key_t *) k1; b = (cairo_ft_cache_key_t *) k2; - - return FcPatternEqual (a->pattern, b->pattern); -} + return strcmp (a->filename, b->filename) == 0 && + a->id == b->id; +} static cairo_status_t _ft_font_cache_create_entry (void *cache, @@ -226,27 +212,33 @@ _ft_font_cache_create_entry (void *cache, if (entry == NULL) return CAIRO_STATUS_NO_MEMORY; - entry->key.pattern = FcPatternDuplicate (k->pattern); - if (!entry->key.pattern) { + entry->unscaled = _ft_unscaled_font_create_from_filename (ftcache->lib, + k->filename, + k->id); + if (!entry->unscaled) { free (entry); return CAIRO_STATUS_NO_MEMORY; } - - entry->val = _create_from_library_and_pattern (ftcache->lib, entry->key.pattern); - entry->key.base.memory = 1; - + + entry->key.base.memory = 0; + entry->key.filename = entry->unscaled->filename; + entry->key.id = entry->unscaled->id; + *return_entry = entry; return CAIRO_STATUS_SUCCESS; } +/* Entries are never spontaneously destroyed; but only when + * we remove them from the cache specifically. We free entry->unscaled + * in the code that removes the entry from the cache + */ static void _ft_font_cache_destroy_entry (void *cache, void *entry) { cairo_ft_cache_entry_t *e = (cairo_ft_cache_entry_t *) entry; - FcPatternDestroy (e->key.pattern); - _destroy_font_val (e->val); + free (e); } @@ -291,11 +283,12 @@ _get_global_ft_cache (void) if (_cairo_cache_init (&_global_ft_cache->base, &_ft_font_cache_backend, - CAIRO_FT_CACHE_NUM_FONTS_DEFAULT)) + 0)) /* No memory limit */ goto FAIL; if (FT_Init_FreeType (&_global_ft_cache->lib)) goto FAIL; + _global_ft_cache->n_faces = 0; } return &_global_ft_cache->base; @@ -306,150 +299,114 @@ _get_global_ft_cache (void) return NULL; } -/* implement the backend interface */ - -const cairo_font_backend_t cairo_ft_font_backend; - -static cairo_unscaled_font_t * -_cairo_ft_font_create (const char *family, - cairo_font_slant_t slant, - cairo_font_weight_t weight) +/* Finds or creates a ft_unscaled_font for the filename/id from pattern. + * Returns a new reference to the unscaled font. + */ +static ft_unscaled_font_t * +_ft_unscaled_font_get_for_pattern (FcPattern *pattern) { - cairo_status_t status; - cairo_ft_font_t *font = NULL; - int fcslant; - int fcweight; - cairo_cache_t *cache; cairo_ft_cache_entry_t *entry; cairo_ft_cache_key_t key; - - key.pattern = FcPatternCreate (); - if (key.pattern == NULL) - goto FAIL; - - font = malloc (sizeof (cairo_ft_font_t)); - if (font == NULL) - goto FREE_PATTERN; - - switch (weight) - { - case CAIRO_FONT_WEIGHT_BOLD: - fcweight = FC_WEIGHT_BOLD; - break; - case CAIRO_FONT_WEIGHT_NORMAL: - default: - fcweight = FC_WEIGHT_MEDIUM; - break; - } - - switch (slant) - { - case CAIRO_FONT_SLANT_ITALIC: - fcslant = FC_SLANT_ITALIC; - break; - case CAIRO_FONT_SLANT_OBLIQUE: - fcslant = FC_SLANT_OBLIQUE; - break; - case CAIRO_FONT_SLANT_NORMAL: - default: - fcslant = FC_SLANT_ROMAN; - break; - } - - FcPatternAddString (key.pattern, FC_FAMILY, family); - FcPatternAddInteger (key.pattern, FC_SLANT, fcslant); - FcPatternAddInteger (key.pattern, FC_WEIGHT, fcweight); - - if (_cairo_unscaled_font_init (&font->base, &cairo_ft_font_backend)) - goto FREE_PATTERN; - + cairo_cache_t *cache; + cairo_status_t status; + FcChar8 *filename; + int created_entry; + + if (FcPatternGetString (pattern, FC_FILE, 0, &filename) != FcResultMatch) + return NULL; + key.filename = (char *)filename; + + if (FcPatternGetInteger (pattern, FC_INDEX, 0, &key.id) != FcResultMatch) + return NULL; + _lock_global_ft_cache (); cache = _get_global_ft_cache (); if (cache == NULL) { _unlock_global_ft_cache (); - goto FREE_PATTERN; - } + return NULL; + } - status = _cairo_cache_lookup (cache, &key, (void **) &entry); + status = _cairo_cache_lookup (cache, &key, (void **) &entry, &created_entry); _unlock_global_ft_cache (); - if (status) - goto FREE_PATTERN; + return NULL; - font->pattern = FcPatternDuplicate (entry->key.pattern); - if (font->pattern == NULL) - goto FREE_PATTERN; + if (!created_entry) + _cairo_unscaled_font_reference ((cairo_unscaled_font_t *)entry->unscaled); - font->val = entry->val; - _reference_font_val (font->val); + return entry->unscaled; +} + +static int +_has_unlocked_face (void *entry) +{ + cairo_ft_cache_entry_t *e = entry; + + return (e->unscaled->lock == 0 && e->unscaled->face); +} + +/* Ensures that an unscaled font has a face object. If we exceed + * MAX_OPEN_FACES, try to close some. + */ +static FT_Face +_ft_unscaled_font_lock_face (ft_unscaled_font_t *unscaled) +{ + ft_cache_t *ftcache; + FT_Face face = NULL; + + if (unscaled->face) { + unscaled->lock++; + return unscaled->face; + } + + assert (!unscaled->from_face); - return &font->base; + _lock_global_ft_cache (); + ftcache = (ft_cache_t *) _get_global_ft_cache (); + assert (ftcache != NULL); + + while (ftcache->n_faces >= MAX_OPEN_FACES) { + cairo_ft_cache_entry_t *entry; + + entry = _cairo_cache_random_entry ((cairo_cache_t *)ftcache, _has_unlocked_face); + if (entry) { + FT_Done_Face (entry->unscaled->face); + entry->unscaled->face = NULL; + entry->unscaled->have_scale = 0; + ftcache->n_faces--; + } else { + break; + } + } - FREE_PATTERN: - FcPatternDestroy (key.pattern); + if (FT_New_Face (ftcache->lib, + unscaled->filename, + unscaled->id, + &face) != FT_Err_Ok) + goto FAIL; + + unscaled->face = face; + unscaled->lock++; + ftcache->n_faces++; FAIL: - return NULL; - + _unlock_global_ft_cache (); + return face; } - -static void -_cairo_ft_font_destroy (void *abstract_font) -{ - cairo_ft_font_t * font = abstract_font; - - if (font == NULL) - return; - - if (font->pattern != NULL) - FcPatternDestroy (font->pattern); - - _destroy_font_val (font->val); - - free (font); -} - -static void -_utf8_to_ucs4 (char const *utf8, - FT_ULong **ucs4, - int *nchars) -{ - int len = 0, step = 0; - int n = 0, alloc = 0; - FcChar32 u = 0; - - if (utf8 == NULL || ucs4 == NULL || nchars == NULL) - return; - - len = strlen (utf8); - alloc = len; - *ucs4 = malloc (sizeof (FT_ULong) * alloc); - if (*ucs4 == NULL) - return; - - while (len && (step = FcUtf8ToUcs4(utf8, &u, len)) > 0) - { - if (n == alloc) - { - alloc *= 2; - *ucs4 = realloc (*ucs4, sizeof (FT_ULong) * alloc); - if (*ucs4 == NULL) - return; - } - (*ucs4)[n++] = u; - len -= step; - utf8 += step; - } - *nchars = n; -} - -/* - * Split a matrix into the component pieces of scale and shape +/* Unlock unscaled font locked with _ft_unscaled_font_lock_face */ +static void +_ft_unscaled_font_unlock_face (ft_unscaled_font_t *unscaled) +{ + assert (unscaled->lock > 0); + + unscaled->lock--; +} static void -_cairo_ft_font_compute_transform (ft_font_transform_t *sf, cairo_font_scale_t *sc) +_compute_transform (ft_font_transform_t *sf, + cairo_font_scale_t *sc) { cairo_matrix_t normalized; double tx, ty; @@ -478,106 +435,329 @@ _cairo_ft_font_compute_transform (ft_font_transform_t *sf, cairo_font_scale_t *s &tx, &ty); } -/* - * Set the font transformation +/* Temporarily scales an unscaled font to the give scale. We catch + * scaling to the same size, since changing a FT_Face is expensive. */ - static void -_cairo_ft_font_install_transform (ft_font_transform_t *sf, FT_Face face) +_ft_unscaled_font_set_scale (ft_unscaled_font_t *unscaled, + cairo_font_scale_t *scale) { + ft_font_transform_t sf; FT_Matrix mat; - mat.xx = DOUBLE_TO_16_16(sf->shape[0][0]); - mat.yx = -DOUBLE_TO_16_16(sf->shape[0][1]); - mat.xy = -DOUBLE_TO_16_16(sf->shape[1][0]); - mat.yy = DOUBLE_TO_16_16(sf->shape[1][1]); + assert (unscaled->face != NULL); + + if (unscaled->have_scale && + scale->matrix[0][0] == unscaled->current_scale.matrix[0][0] && + scale->matrix[0][1] == unscaled->current_scale.matrix[0][1] && + scale->matrix[1][0] == unscaled->current_scale.matrix[1][0] && + scale->matrix[1][1] == unscaled->current_scale.matrix[1][1]) + return; - FT_Set_Transform(face, &mat, NULL); + unscaled->have_scale = 1; + unscaled->current_scale = *scale; + + _compute_transform (&sf, scale); - FT_Set_Char_Size(face, - (FT_F26Dot6) (sf->x_scale * 64.0), - (FT_F26Dot6) (sf->y_scale * 64.0), - 0, 0); + unscaled->x_scale = sf.x_scale; + unscaled->y_scale = sf.y_scale; + + mat.xx = DOUBLE_TO_16_16(sf.shape[0][0]); + mat.yx = - DOUBLE_TO_16_16(sf.shape[0][1]); + mat.xy = - DOUBLE_TO_16_16(sf.shape[1][0]); + mat.yy = DOUBLE_TO_16_16(sf.shape[1][1]); + + FT_Set_Transform(unscaled->face, &mat, NULL); + + FT_Set_Pixel_Sizes(unscaled->face, + (FT_UInt) sf.x_scale, + (FT_UInt) sf.y_scale); +} + +/* implement the font backend interface */ + +typedef struct { + cairo_font_t base; + FcPattern *pattern; + int load_flags; + ft_unscaled_font_t *unscaled; +} cairo_ft_font_t; + +/* for compatibility with older freetype versions */ +#ifndef FT_LOAD_TARGET_MONO +#define FT_LOAD_TARGET_MONO FT_LOAD_MONOCHROME +#endif + +/* The load flags passed to FT_Load_Glyph control aspects like hinting and + * antialiasing. Here we compute them from the fields of a FcPattern. + */ +static int +_get_load_flags (FcPattern *pattern) +{ + FcBool antialias, hinting, autohint; +#ifdef FC_HINT_STYLE + int hintstyle; +#endif + int load_flags = 0; + + /* disable antialiasing if requested */ + if (FcPatternGetBool (pattern, + FC_ANTIALIAS, 0, &antialias) != FcResultMatch) + antialias = FcTrue; + + if (antialias) + load_flags |= FT_LOAD_NO_BITMAP; + else + load_flags |= FT_LOAD_TARGET_MONO; + + /* disable hinting if requested */ + if (FcPatternGetBool (pattern, + FC_HINTING, 0, &hinting) != FcResultMatch) + hinting = FcTrue; + +#ifdef FC_HINT_STYLE + if (FcPatternGetInteger (pattern, FC_HINT_STYLE, 0, &hintstyle) != FcResultMatch) + hintstyle = FC_HINT_FULL; + + if (!hinting || hintstyle == FC_HINT_NONE) + load_flags |= FT_LOAD_NO_HINTING; + + switch (hintstyle) { + case FC_HINT_SLIGHT: + case FC_HINT_MEDIUM: + load_flags |= FT_LOAD_TARGET_LIGHT; + break; + default: + load_flags |= FT_LOAD_TARGET_NORMAL; + break; + } +#else /* !FC_HINT_STYLE */ + if (!hinting) + load_flags |= FT_LOAD_NO_HINTING; +#endif /* FC_FHINT_STYLE */ + + /* force autohinting if requested */ + if (FcPatternGetBool (pattern, + FC_AUTOHINT, 0, &autohint) != FcResultMatch) + autohint = FcFalse; + + if (autohint) + load_flags |= FT_LOAD_FORCE_AUTOHINT; + + return load_flags; +} + +/* Like the public cairo_ft_font_create, but takes a cairo_font_scale_t, + * rather than a cairo_font_t + */ +static cairo_font_t * +_ft_font_create (FcPattern *pattern, + cairo_font_scale_t *scale) +{ + cairo_ft_font_t *f = NULL; + ft_unscaled_font_t *unscaled = NULL; + + unscaled = _ft_unscaled_font_get_for_pattern (pattern); + if (unscaled == NULL) + return NULL; + + f = malloc (sizeof(cairo_ft_font_t)); + if (f == NULL) + goto FREE_UNSCALED; + + f->unscaled = unscaled; + f->pattern = pattern; + FcPatternReference (pattern); + f->load_flags = _get_load_flags (pattern); + + _cairo_font_init ((cairo_font_t *)f, scale, &cairo_ft_font_backend); + + return (cairo_font_t *)f; + + FREE_UNSCALED: + _cairo_unscaled_font_destroy ((cairo_unscaled_font_t *)unscaled); + + return NULL; +} + +static cairo_status_t +_cairo_ft_font_create (const char *family, + cairo_font_slant_t slant, + cairo_font_weight_t weight, + cairo_font_scale_t *scale, + cairo_font_t **font) +{ + FcPattern *pattern, *resolved; + cairo_font_t *new_font; + FcResult result; + int fcslant; + int fcweight; + ft_font_transform_t sf; + + pattern = FcPatternCreate (); + if (!pattern) + return CAIRO_STATUS_NO_MEMORY; + + switch (weight) + { + case CAIRO_FONT_WEIGHT_BOLD: + fcweight = FC_WEIGHT_BOLD; + break; + case CAIRO_FONT_WEIGHT_NORMAL: + default: + fcweight = FC_WEIGHT_MEDIUM; + break; + } + + switch (slant) + { + case CAIRO_FONT_SLANT_ITALIC: + fcslant = FC_SLANT_ITALIC; + break; + case CAIRO_FONT_SLANT_OBLIQUE: + fcslant = FC_SLANT_OBLIQUE; + break; + case CAIRO_FONT_SLANT_NORMAL: + default: + fcslant = FC_SLANT_ROMAN; + break; + } + + if (!FcPatternAddString (pattern, FC_FAMILY, family)) + goto FREE_PATTERN; + if (!FcPatternAddInteger (pattern, FC_SLANT, fcslant)) + goto FREE_PATTERN; + if (!FcPatternAddInteger (pattern, FC_WEIGHT, fcweight)) + goto FREE_PATTERN; + + _compute_transform (&sf, scale); + + FcPatternAddInteger (pattern, FC_PIXEL_SIZE, sf.y_scale); + + FcConfigSubstitute (NULL, pattern, FcMatchPattern); + FcDefaultSubstitute (pattern); + + resolved = FcFontMatch (NULL, pattern, &result); + if (!resolved) + goto FREE_PATTERN; + + new_font = _ft_font_create (resolved, scale); + + FcPatternDestroy (resolved); + FcPatternDestroy (pattern); + + if (new_font) { + *font = new_font; + return CAIRO_STATUS_SUCCESS; + } else { + return CAIRO_STATUS_NO_MEMORY; /* A guess */ + } + + FREE_PATTERN: + FcPatternDestroy (pattern); + + return CAIRO_STATUS_NO_MEMORY; +} + +static void +_cairo_ft_font_destroy_font (void *abstract_font) +{ + cairo_ft_font_t * font = abstract_font; + + if (font == NULL) + return; + + if (font->pattern != NULL) + FcPatternDestroy (font->pattern); + + _cairo_unscaled_font_destroy ((cairo_unscaled_font_t *)font->unscaled); + + free (font); +} + +static void +_cairo_ft_font_destroy_unscaled_font (void *abstract_font) +{ + ft_unscaled_font_t *unscaled = abstract_font; + + if (!unscaled->from_face) { + cairo_cache_t *cache; + cairo_ft_cache_key_t key; + + _lock_global_ft_cache (); + cache = _get_global_ft_cache (); + assert (cache); + + key.filename = unscaled->filename; + key.id = unscaled->id; + + _cairo_cache_remove (cache, &key); + + _unlock_global_ft_cache (); + } + + if (unscaled == NULL) + return; + + if (!unscaled->from_face && unscaled->face) + FT_Done_Face (unscaled->face); + + if (unscaled->filename) + free (unscaled->filename); + + free (unscaled); } static void -_install_font_scale (cairo_font_scale_t *sc, FT_Face face) +_cairo_ft_font_get_glyph_cache_key (void *abstract_font, + cairo_glyph_cache_key_t *key) { - cairo_matrix_t normalized; - double x_scale, y_scale; - double xx, xy, yx, yy, tx, ty; - FT_Matrix mat; - - /* The font matrix has x and y "scale" components which we extract and - * use as character scale values. These influence the way freetype - * chooses hints, as well as selecting different bitmaps in - * hand-rendered fonts. We also copy the normalized matrix to - * freetype's transformation. - */ + cairo_ft_font_t *font = abstract_font; - cairo_matrix_set_affine (&normalized, - sc->matrix[0][0], - sc->matrix[0][1], - sc->matrix[1][0], - sc->matrix[1][1], - 0, 0); - - _cairo_matrix_compute_scale_factors (&normalized, &x_scale, &y_scale, - /* XXX */ 1); - cairo_matrix_scale (&normalized, 1.0 / x_scale, 1.0 / y_scale); - cairo_matrix_get_affine (&normalized, - &xx /* 00 */ , &yx /* 01 */, - &xy /* 10 */, &yy /* 11 */, - &tx, &ty); - - mat.xx = DOUBLE_TO_16_16(xx); - mat.xy = -DOUBLE_TO_16_16(xy); - mat.yx = -DOUBLE_TO_16_16(yx); - mat.yy = DOUBLE_TO_16_16(yy); - - FT_Set_Transform(face, &mat, NULL); - - FT_Set_Pixel_Sizes(face, - (FT_UInt) x_scale, - (FT_UInt) y_scale); + key->unscaled = (cairo_unscaled_font_t *)font->unscaled; + key->scale = font->base.scale; + key->flags = font->load_flags; } static cairo_status_t _cairo_ft_font_text_to_glyphs (void *abstract_font, - cairo_font_scale_t *sc, const unsigned char *utf8, cairo_glyph_t **glyphs, int *nglyphs) { double x = 0., y = 0.; size_t i; - FT_ULong *ucs4 = NULL; + uint32_t *ucs4 = NULL; cairo_ft_font_t *font = abstract_font; - FT_Face face = font->val->face; + FT_Face face; cairo_glyph_cache_key_t key; cairo_image_glyph_cache_entry_t *val; - cairo_cache_t *cache; + cairo_cache_t *cache = NULL; + cairo_status_t status = CAIRO_STATUS_SUCCESS; - key.unscaled = &font->base; - key.scale = *sc; + _cairo_ft_font_get_glyph_cache_key (font, &key); - _utf8_to_ucs4 (utf8, &ucs4, nglyphs); + status = _cairo_utf8_to_ucs4 (utf8, -1, &ucs4, nglyphs); + if (!CAIRO_OK (status)) + return status; - if (ucs4 == NULL) - return CAIRO_STATUS_NO_MEMORY; - - *glyphs = (cairo_glyph_t *) malloc ((*nglyphs) * (sizeof (cairo_glyph_t))); - if (*glyphs == NULL) - { - free (ucs4); - return CAIRO_STATUS_NO_MEMORY; + face = cairo_ft_font_lock_face ((cairo_font_t *)font); + if (!face) { + status = CAIRO_STATUS_NO_MEMORY; + goto FAIL1; } _cairo_lock_global_image_glyph_cache (); cache = _cairo_get_global_image_glyph_cache (); if (cache == NULL) { - _cairo_unlock_global_image_glyph_cache (); - return CAIRO_STATUS_NO_MEMORY; + status = CAIRO_STATUS_NO_MEMORY; + goto FAIL2; + } + + *glyphs = (cairo_glyph_t *) malloc ((*nglyphs) * (sizeof (cairo_glyph_t))); + if (*glyphs == NULL) { + status = CAIRO_STATUS_NO_MEMORY; + goto FAIL2; } for (i = 0; i < *nglyphs; i++) @@ -589,51 +769,62 @@ _cairo_ft_font_text_to_glyphs (void *abstract_font, val = NULL; key.index = (*glyphs)[i].index; - if (_cairo_cache_lookup (cache, &key, (void **) &val) + if (_cairo_cache_lookup (cache, &key, (void **) &val, NULL) != CAIRO_STATUS_SUCCESS || val == NULL) continue; x += val->extents.x_advance; y += val->extents.y_advance; } - _cairo_unlock_global_image_glyph_cache (); + FAIL2: + if (cache) + _cairo_unlock_global_image_glyph_cache (); + + cairo_ft_font_unlock_face ((cairo_font_t *)font); + + FAIL1: free (ucs4); - return CAIRO_STATUS_SUCCESS; + + return status; } static cairo_status_t _cairo_ft_font_font_extents (void *abstract_font, - cairo_font_scale_t *sc, cairo_font_extents_t *extents) { cairo_ft_font_t *font = abstract_font; - FT_Face face = font->val->face; - FT_Size_Metrics *metrics = &face->size->metrics; - ft_font_transform_t sf; + FT_Face face; + FT_Size_Metrics *metrics; + + face = _ft_unscaled_font_lock_face (font->unscaled); + if (!face) + return CAIRO_STATUS_NO_MEMORY; - _cairo_ft_font_compute_transform (&sf, sc); - _cairo_ft_font_install_transform (&sf, face); + metrics = &face->size->metrics; + _ft_unscaled_font_set_scale (font->unscaled, &font->base.scale); + /* * Get to unscaled metrics so that the upper level can get back to * user space */ - extents->ascent = DOUBLE_FROM_26_6(metrics->ascender) / sf.y_scale; - extents->descent = DOUBLE_FROM_26_6(metrics->descender) / sf.y_scale; - extents->height = DOUBLE_FROM_26_6(metrics->height) / sf.y_scale; - extents->max_x_advance = DOUBLE_FROM_26_6(metrics->max_advance) / sf.x_scale; + extents->ascent = DOUBLE_FROM_26_6(metrics->ascender) / font->unscaled->y_scale; + extents->descent = DOUBLE_FROM_26_6(metrics->descender) / font->unscaled->y_scale; + extents->height = DOUBLE_FROM_26_6(metrics->height) / font->unscaled->y_scale; + extents->max_x_advance = DOUBLE_FROM_26_6(metrics->max_advance) / font->unscaled->x_scale; /* FIXME: this doesn't do vertical layout atm. */ extents->max_y_advance = 0.0; + _ft_unscaled_font_unlock_face (font->unscaled); + return CAIRO_STATUS_SUCCESS; } static cairo_status_t _cairo_ft_font_glyph_extents (void *abstract_font, - cairo_font_scale_t *sc, cairo_glyph_t *glyphs, int num_glyphs, cairo_text_extents_t *extents) @@ -670,14 +861,13 @@ _cairo_ft_font_glyph_extents (void *abstract_font, return CAIRO_STATUS_NO_MEMORY; } - key.unscaled = &font->base; - key.scale = *sc; + _cairo_ft_font_get_glyph_cache_key (font, &key); for (i = 0; i < num_glyphs; i++) { img = NULL; key.index = glyphs[i].index; - if (_cairo_cache_lookup (cache, &key, (void **) &img) + if (_cairo_cache_lookup (cache, &key, (void **) &img, NULL) != CAIRO_STATUS_SUCCESS || img == NULL) continue; @@ -721,7 +911,6 @@ _cairo_ft_font_glyph_extents (void *abstract_font, static cairo_status_t _cairo_ft_font_glyph_bbox (void *abstract_font, - cairo_font_scale_t *sc, const cairo_glyph_t *glyphs, int num_glyphs, cairo_box_t *bbox) @@ -747,16 +936,15 @@ _cairo_ft_font_glyph_bbox (void *abstract_font, return CAIRO_STATUS_NO_MEMORY; } - key.unscaled = &font->base; - key.scale = *sc; - + _cairo_ft_font_get_glyph_cache_key (font, &key); + for (i = 0; i < num_glyphs; i++) { img = NULL; key.index = glyphs[i].index; - if (_cairo_cache_lookup (cache, &key, (void **) &img) + if (_cairo_cache_lookup (cache, &key, (void **) &img, NULL) != CAIRO_STATUS_SUCCESS || img == NULL) continue; @@ -785,12 +973,15 @@ _cairo_ft_font_glyph_bbox (void *abstract_font, static cairo_status_t _cairo_ft_font_show_glyphs (void *abstract_font, - cairo_font_scale_t *sc, cairo_operator_t operator, - cairo_surface_t *source, + cairo_pattern_t *pattern, cairo_surface_t *surface, int source_x, int source_y, + int dest_x, + int dest_y, + unsigned int width, + unsigned int height, const cairo_glyph_t *glyphs, int num_glyphs) { @@ -798,9 +989,9 @@ _cairo_ft_font_show_glyphs (void *abstract_font, cairo_cache_t *cache; cairo_glyph_cache_key_t key; cairo_ft_font_t *font = abstract_font; + cairo_surface_pattern_t glyph_pattern; cairo_status_t status; - - double x, y; + int x, y; int i; _cairo_lock_global_image_glyph_cache (); @@ -808,47 +999,54 @@ _cairo_ft_font_show_glyphs (void *abstract_font, if (cache == NULL || font == NULL - || source == NULL + || pattern == NULL || surface == NULL || glyphs == NULL) { _cairo_unlock_global_image_glyph_cache (); return CAIRO_STATUS_NO_MEMORY; } - key.unscaled = &font->base; - key.scale = *sc; + key.unscaled = (cairo_unscaled_font_t *)font->unscaled; + key.scale = font->base.scale; + key.flags = font->load_flags; for (i = 0; i < num_glyphs; i++) { img = NULL; key.index = glyphs[i].index; - if (_cairo_cache_lookup (cache, &key, (void **) &img) + if (_cairo_cache_lookup (cache, &key, (void **) &img, NULL) != CAIRO_STATUS_SUCCESS || img == NULL || img->image == NULL) continue; - x = glyphs[i].x; - y = glyphs[i].y; + x = (int) floor (glyphs[i].x + 0.5); + y = (int) floor (glyphs[i].y + 0.5); - status = _cairo_surface_composite (operator, source, - &(img->image->base), + _cairo_pattern_init_for_surface (&glyph_pattern, &(img->image->base)); + + status = _cairo_surface_composite (operator, pattern, + &glyph_pattern.base, surface, - source_x + x + img->size.x, - source_y + y + img->size.y, + x + img->size.x, + y + img->size.y, 0, 0, x + img->size.x, y + img->size.y, (double) img->size.width, (double) img->size.height); + _cairo_pattern_fini (&glyph_pattern.base); + if (status) { - _cairo_unlock_global_image_glyph_cache (); + _cairo_unlock_global_image_glyph_cache (); return status; } } + _cairo_unlock_global_image_glyph_cache (); + return CAIRO_STATUS_SUCCESS; } @@ -932,7 +1130,6 @@ _cubic_to (FT_Vector *control1, FT_Vector *control2, FT_Vector *to, void *closur static cairo_status_t _cairo_ft_font_glyph_path (void *abstract_font, - cairo_font_scale_t *sc, cairo_glyph_t *glyphs, int num_glyphs, cairo_path_t *path) @@ -940,6 +1137,7 @@ _cairo_ft_font_glyph_path (void *abstract_font, int i; cairo_ft_font_t *font = abstract_font; FT_GlyphSlot glyph; + FT_Face face; FT_Error error; FT_Outline_Funcs outline_funcs = { _move_to, @@ -949,10 +1147,12 @@ _cairo_ft_font_glyph_path (void *abstract_font, 0, /* shift */ 0, /* delta */ }; + + face = cairo_ft_font_lock_face (abstract_font); + if (!face) + return CAIRO_STATUS_NO_MEMORY; - glyph = font->val->face->glyph; - - _install_font_scale (sc, font->val->face); + glyph = face->glyph; for (i = 0; i < num_glyphs; i++) { @@ -961,7 +1161,7 @@ _cairo_ft_font_glyph_path (void *abstract_font, 0, DOUBLE_TO_16_16 (-1.0), }; - error = FT_Load_Glyph (font->val->face, glyphs[i].index, FT_LOAD_DEFAULT); + error = FT_Load_Glyph (font->unscaled->face, glyphs[i].index, font->load_flags | FT_LOAD_NO_BITMAP); /* XXX: What to do in this error case? */ if (error) continue; @@ -977,32 +1177,39 @@ _cairo_ft_font_glyph_path (void *abstract_font, FT_Outline_Decompose (&glyph->outline, &outline_funcs, path); } _cairo_path_close_path (path); + + cairo_ft_font_unlock_face (abstract_font); return CAIRO_STATUS_SUCCESS; } - static cairo_status_t -_cairo_ft_font_create_glyph(cairo_image_glyph_cache_entry_t *val) +_cairo_ft_font_create_glyph (cairo_image_glyph_cache_entry_t *val) { - cairo_ft_font_t *font = (cairo_ft_font_t *)val->key.unscaled; + ft_unscaled_font_t *unscaled = (ft_unscaled_font_t *)val->key.unscaled; FT_GlyphSlot glyphslot; unsigned int width, height, stride; + FT_Face face; FT_Outline *outline; FT_BBox cbox; FT_Bitmap bitmap; FT_Glyph_Metrics *metrics; - ft_font_transform_t sf; + cairo_status_t status = CAIRO_STATUS_SUCCESS; - glyphslot = font->val->face->glyph; + glyphslot = unscaled->face->glyph; metrics = &glyphslot->metrics; - _cairo_ft_font_compute_transform (&sf, &val->key.scale); - _cairo_ft_font_install_transform (&sf, font->val->face); - - if (FT_Load_Glyph (font->val->face, val->key.index, FT_LOAD_DEFAULT) != 0) + face = _ft_unscaled_font_lock_face (unscaled); + if (!face) return CAIRO_STATUS_NO_MEMORY; + _ft_unscaled_font_set_scale (unscaled, &val->key.scale); + + if (FT_Load_Glyph (face, val->key.index, val->key.flags) != 0) { + status = CAIRO_STATUS_NO_MEMORY; + goto FAIL; + } + /* * Note: the font's coordinate system is upside down from ours, so the * Y coordinates of the bearing and advance need to be negated. @@ -1011,11 +1218,11 @@ _cairo_ft_font_create_glyph(cairo_image_glyph_cache_entry_t *val) * by FreeType */ - val->extents.x_bearing = DOUBLE_FROM_26_6 (metrics->horiBearingX) / sf.x_scale; - val->extents.y_bearing = -DOUBLE_FROM_26_6 (metrics->horiBearingY) / sf.y_scale; + val->extents.x_bearing = DOUBLE_FROM_26_6 (metrics->horiBearingX) / unscaled->x_scale; + val->extents.y_bearing = -DOUBLE_FROM_26_6 (metrics->horiBearingY) / unscaled->y_scale; - val->extents.width = DOUBLE_FROM_26_6 (metrics->width) / sf.x_scale; - val->extents.height = DOUBLE_FROM_26_6 (metrics->height) / sf.y_scale; + val->extents.width = DOUBLE_FROM_26_6 (metrics->width) / unscaled->x_scale; + val->extents.height = DOUBLE_FROM_26_6 (metrics->height) / unscaled->y_scale; /* * use untransformed advance values @@ -1023,8 +1230,8 @@ _cairo_ft_font_create_glyph(cairo_image_glyph_cache_entry_t *val) should provide FT_LOAD_VERTICAL_LAYOUT */ - val->extents.x_advance = DOUBLE_FROM_26_6 (font->val->face->glyph->metrics.horiAdvance) / sf.x_scale; - val->extents.y_advance = 0 / sf.y_scale; + val->extents.x_advance = DOUBLE_FROM_26_6 (face->glyph->metrics.horiAdvance) / unscaled->x_scale; + val->extents.y_advance = 0 / unscaled->y_scale; outline = &glyphslot->outline; @@ -1052,14 +1259,16 @@ _cairo_ft_font_create_glyph(cairo_image_glyph_cache_entry_t *val) bitmap.buffer = calloc (1, stride * height); if (bitmap.buffer == NULL) { - return CAIRO_STATUS_NO_MEMORY; - }; + status = CAIRO_STATUS_NO_MEMORY; + goto FAIL; + } FT_Outline_Translate (outline, -cbox.xMin, -cbox.yMin); if (FT_Outline_Get_Bitmap (glyphslot->library, outline, &bitmap) != 0) { free (bitmap.buffer); - return CAIRO_STATUS_NO_MEMORY; + status = CAIRO_STATUS_NO_MEMORY; + goto FAIL; } val->image = (cairo_image_surface_t *) @@ -1068,7 +1277,8 @@ _cairo_ft_font_create_glyph(cairo_image_glyph_cache_entry_t *val) width, height, stride); if (val->image == NULL) { free (bitmap.buffer); - return CAIRO_STATUS_NO_MEMORY; + status = CAIRO_STATUS_NO_MEMORY; + goto FAIL; } _cairo_image_surface_assume_ownership_of_data (val->image); @@ -1084,138 +1294,245 @@ _cairo_ft_font_create_glyph(cairo_image_glyph_cache_entry_t *val) val->size.x = (short) (cbox.xMin >> 6); val->size.y = - (short) (cbox.yMax >> 6); - return CAIRO_STATUS_SUCCESS; + FAIL: + _ft_unscaled_font_unlock_face (unscaled); + + return status; } const cairo_font_backend_t cairo_ft_font_backend = { _cairo_ft_font_create, - _cairo_ft_font_destroy, + _cairo_ft_font_destroy_font, + _cairo_ft_font_destroy_unscaled_font, _cairo_ft_font_font_extents, _cairo_ft_font_text_to_glyphs, _cairo_ft_font_glyph_extents, _cairo_ft_font_glyph_bbox, _cairo_ft_font_show_glyphs, _cairo_ft_font_glyph_path, + _cairo_ft_font_get_glyph_cache_key, _cairo_ft_font_create_glyph }; - /* implement the platform-specific interface */ +/** + * cairo_ft_font_create: + * @pattern: A fully resolved fontconfig + * pattern. A pattern can be resolved, by, among other things, calling + * FcConfigSubstitute(), FcDefaultSubstitute(), then + * FcFontMatch(). Cairo will call FcPatternReference() on this + * pattern, so you should not further modify the pattern, but you can + * release your reference to the pattern with FcPatternDestroy() if + * you no longer need to access it. + * @scale: The scale at which this font will be used. The + * scale is given by multiplying the font matrix (see + * cairo_transform_font()) by the current transformation matrix. + * The translation elements of the resulting matrix are ignored. + * + * Creates a new font for the FreeType font backend based on a + * fontconfig pattern. This font can then be used with + * cairo_set_font(), cairo_font_glyph_extents(), or FreeType backend + * specific functions like cairo_ft_font_lock_face(). + * + * Return value: a newly created #cairo_font_t. Free with + * cairo_font_destroy() when you are done using it. + **/ cairo_font_t * -cairo_ft_font_create (FT_Library ft_library, FcPattern *pattern) +cairo_ft_font_create (FcPattern *pattern, + cairo_matrix_t *scale) { - cairo_font_scale_t scale; - cairo_font_t *scaled; - cairo_ft_font_t *f = NULL; - ft_font_val_t *v = NULL; - FcPattern *dup; + cairo_font_scale_t sc; + double tx, ty; - scale.matrix[0][0] = 1.; - scale.matrix[0][1] = 0.; - scale.matrix[1][0] = 0.; - scale.matrix[1][1] = 1.; + cairo_matrix_get_affine (scale, + &sc.matrix[0][0], &sc.matrix[0][1], + &sc.matrix[1][0], &sc.matrix[1][1], + &tx, &ty); - scaled = malloc (sizeof (cairo_font_t)); - if (scaled == NULL) - goto FAIL; - - dup = FcPatternDuplicate(pattern); - if (dup == NULL) - goto FREE_SCALED; - - v = _create_from_library_and_pattern (ft_library, pattern); - if (v == NULL) - goto FREE_PATTERN; - - f = malloc (sizeof(cairo_ft_font_t)); - if (f == NULL) - goto FREE_VAL; - - if (_cairo_unscaled_font_init (&f->base, &cairo_ft_font_backend)) - goto FREE_VAL; - - f->pattern = dup; - f->val = v; - - _cairo_font_init (scaled, &scale, &f->base); - - return scaled; - - FREE_VAL: - _destroy_font_val (v); - - FREE_PATTERN: - FcPatternDestroy (dup); - - FREE_SCALED: - free (scaled); - - FAIL: - return NULL; + return _ft_font_create (pattern, &sc); } +/** + * cairo_ft_font_create_for_ft_face: + * @face: A FreeType face object, already opened. This must + * be kept around until the font object's refcount drops to + * zero and it is freed. The font object can be kept alive by + * internal caching, so it's safest to keep the face object + * around forever. + * @load_flags: The flags to pass to FT_Load_Glyph when loading + * glyphs from the font. These flags control aspects of + * rendering such as hinting and antialiasing. See the FreeType + * docs for full information. + * @scale: The scale at which this font will be used. The + * scale is given by multiplying the font matrix (see + * cairo_transform_font()) by the current transformation matrix. + * The translation elements of the resulting matrix are ignored. + * + * Creates a new font forthe FreeType font backend from a pre-opened + * FreeType face. This font can then be used with cairo_set_font(), + * cairo_font_glyph_extents(), or FreeType backend specific + * functions like cairo_ft_font_lock_face() Cairo will determine the + * pixel size and transformation from the @scale parameter and call + * FT_Set_Transform() and FT_Set_Pixel_Sizes(). + * + * Return value: a newly created #cairo_font_t. Free with + * cairo_font_destroy() when you are done using it. + **/ cairo_font_t * -cairo_ft_font_create_for_ft_face (FT_Face face) +cairo_ft_font_create_for_ft_face (FT_Face face, + int load_flags, + cairo_matrix_t *scale) { - cairo_font_scale_t scale; - cairo_font_t *scaled; cairo_ft_font_t *f = NULL; - ft_font_val_t *v = NULL; + ft_unscaled_font_t *unscaled = NULL; + cairo_font_scale_t sc; + double tx, ty; - scale.matrix[0][0] = 1.; - scale.matrix[0][1] = 0.; - scale.matrix[1][0] = 0.; - scale.matrix[1][1] = 1.; - - scaled = malloc (sizeof (cairo_font_t)); - if (scaled == NULL) - goto FAIL; - - v = _create_from_face (face, 0); - if (v == NULL) - goto FREE_SCALED; + unscaled = _ft_unscaled_font_create_from_face (face); + if (unscaled == NULL) + return NULL; f = malloc (sizeof(cairo_ft_font_t)); if (f == NULL) - goto FREE_VAL; + goto FREE_UNSCALED; - _cairo_unscaled_font_init (&f->base, &cairo_ft_font_backend); + f->unscaled = unscaled; f->pattern = NULL; - f->val = v; + f->load_flags = load_flags; - _cairo_font_init (scaled, &scale, &f->base); + cairo_matrix_get_affine (scale, + &sc.matrix[0][0], &sc.matrix[0][1], + &sc.matrix[1][0], &sc.matrix[1][1], + &tx, &ty); - return scaled; + _cairo_font_init ((cairo_font_t *)f, &sc, &cairo_ft_font_backend); - FREE_VAL: - _destroy_font_val (v); + return (cairo_font_t *)f; - FREE_SCALED: - free (scaled); + FREE_UNSCALED: + _cairo_unscaled_font_destroy ((cairo_unscaled_font_t *)unscaled); - FAIL: return NULL; } + +/** + * cairo_ft_font_lock_face: + * @ft_font: A #cairo_font_t from the FreeType font backend. Such an + * object can be created with cairo_ft_font_create() or + * cairo_ft_font_create_for_ft_face(). On some platforms the font from + * cairo_current_font() will also be a FreeType font, but using this + * functionality with fonts you don't create yourself is not + * recommended. + * + * cairo_ft_font_lock_face() gets the #FT_Face object from a FreeType + * backend font and scales it appropriately for the font. You must + * release the face with cairo_ft_font_unlock_face() + * when you are done using it. Since the #FT_Face object can be + * shared between multiple #cairo_font_t objects, you must not + * lock any other font objects until you unlock this one. A count is + * kept of the number of times cairo_ft_font_lock_face() is + * called. cairo_ft_font_unlock_face() must be called the same number + * of times. + * + * You must be careful when using this function in a library or in a + * threaded application, because other threads may lock faces that + * share the same #FT_Face object. For this reason, you must call + * cairo_ft_lock() before locking any face objects, and + * cairo_ft_unlock() after you are done. (These functions are not yet + * implemented, so this function cannot be currently safely used in a + * threaded application.) + + * Return value: The #FT_Face object for @font, scaled appropriately. + **/ FT_Face -cairo_ft_font_face (cairo_font_t *abstract_font) +cairo_ft_font_lock_face (cairo_font_t *abstract_font) { - cairo_ft_font_t *font = (cairo_ft_font_t *) abstract_font->unscaled; + cairo_ft_font_t *font = (cairo_ft_font_t *) abstract_font; + FT_Face face; - if (font == NULL || font->val == NULL) - return NULL; + face = _ft_unscaled_font_lock_face (font->unscaled); + if (!face) + return NULL; + + _ft_unscaled_font_set_scale (font->unscaled, &font->base.scale); - return font->val->face; + return face; } -FcPattern * -cairo_ft_font_pattern (cairo_font_t *abstract_font) +/** + * cairo_ft_font_unlock_face: + * @ft_font: A #cairo_font_t from the FreeType font backend. Such an + * object can be created with cairo_ft_font_create() or + * cairo_ft_font_create_for_ft_face(). On some platforms the font from + * cairo_current_font() will also be a FreeType font, but using this + * functionality with fonts you don't create yourself is not + * recommended. + * + * Releases a face obtained with cairo_ft_font_lock_face(). See the + * documentation for that function for full details. + **/ +void +cairo_ft_font_unlock_face (cairo_font_t *abstract_font) { - cairo_ft_font_t *font = (cairo_ft_font_t *) abstract_font->unscaled; + cairo_ft_font_t *font = (cairo_ft_font_t *) abstract_font; + + _ft_unscaled_font_unlock_face (font->unscaled); +} + +/** + * cairo_ft_font_get_pattern: + * @ft_font: A #cairo_font_t from the FreeType font backend. Such an + * object can be created with cairo_ft_font_create() or + * cairo_ft_font_create_for_ft_face(). On some platforms the font from + * cairo_current_font() will also be a FreeType font, but using this + * functionality with fonts you don't create yourself is not + * recommended. + * + * cairo_ft_font_get_pattern() gets the #FcPattern for a FreeType + * backend font. + + * Return value: The #FcPattenr for @font. The return value is owned + * by the font, so you must not modify it, and must call + * FcPatternReference() to keep a persistant reference to the + * pattern. If the font was created with cairo_ft_font_create_for_ft_face() + * returns %NULL. + **/ +FcPattern * +cairo_ft_font_get_pattern (cairo_font_t *abstract_font) +{ + cairo_ft_font_t *font = (cairo_ft_font_t *) abstract_font; if (font == NULL) return NULL; return font->pattern; } + +/* We expose our unscaled font implementation internally for the the + * PDF backend, which needs to keep track of the the different + * fonts-on-disk used by a document, so it can embed them. + */ +cairo_unscaled_font_t * +_cairo_ft_font_get_unscaled_font (cairo_font_t *abstract_font) +{ + cairo_ft_font_t *font = (cairo_ft_font_t *) abstract_font; + + return (cairo_unscaled_font_t *)font->unscaled; +} + +/* This differs from _cairo_ft_scaled_font_lock_face in that it doesn't + * set the scale on the face, but just returns it at the last scale. + */ +FT_Face +_cairo_ft_unscaled_font_lock_face (cairo_unscaled_font_t *unscaled_font) +{ + return _ft_unscaled_font_lock_face ((ft_unscaled_font_t *)unscaled_font); +} + +void +_cairo_ft_unscaled_font_unlock_face (cairo_unscaled_font_t *unscaled_font) +{ + _ft_unscaled_font_unlock_face ((ft_unscaled_font_t *)unscaled_font); +} diff --git a/gfx/cairo/cairo/src/cairo_glitz_surface.c b/gfx/cairo/cairo/src/cairo_glitz_surface.c index 69fc82f2eabc..ee664e1cc45e 100644 --- a/gfx/cairo/cairo/src/cairo_glitz_surface.c +++ b/gfx/cairo/cairo/src/cairo_glitz_surface.c @@ -21,30 +21,12 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * Author: David Reveman + * Author: David Reveman */ #include "cairoint.h" #include "cairo-glitz.h" -#define GLITZ_FIXED_TO_FLOAT(f) \ - (((glitz_float_t) (f)) / 65536) - -#define GLITZ_FIXED_LINE_X_TO_FLOAT(line, v) \ - (((glitz_float_t) \ - ((line).p1.x + (cairo_fixed_16_16_t) \ - (((cairo_fixed_32_32_t) ((v) - (line).p1.y) * \ - ((line).p2.x - (line).p1.x)) / \ - ((line).p2.y - (line).p1.y)))) / 65536) - -#define GLITZ_FIXED_LINE_X_CEIL_TO_FLOAT(line, v) \ - (((glitz_float_t) \ - ((line).p1.x + (cairo_fixed_16_16_t) \ - (((((line).p2.y - (line).p1.y) - 1) + \ - ((cairo_fixed_32_32_t) ((v) - (line).p1.y) * \ - ((line).p2.x - (line).p1.x))) / \ - ((line).p2.y - (line).p1.y)))) / 65536) - void cairo_set_target_glitz (cairo_t *cr, glitz_surface_t *surface) { @@ -65,13 +47,11 @@ cairo_set_target_glitz (cairo_t *cr, glitz_surface_t *surface) } typedef struct _cairo_glitz_surface { - cairo_surface_t base; + cairo_surface_t base; - glitz_surface_t *surface; - glitz_format_t *format; - - cairo_pattern_t pattern; - cairo_box_t pattern_box; + glitz_surface_t *surface; + glitz_format_t *format; + pixman_region16_t *clip; } cairo_glitz_surface_t; static void @@ -79,44 +59,116 @@ _cairo_glitz_surface_destroy (void *abstract_surface) { cairo_glitz_surface_t *surface = abstract_surface; + if (surface->clip) + { + glitz_surface_set_clip_region (surface->surface, 0, 0, NULL, 0); + pixman_region_destroy (surface->clip); + } + glitz_surface_destroy (surface->surface); - - _cairo_pattern_fini (&surface->pattern); - free (surface); } +static glitz_format_name_t +_glitz_format (cairo_format_t format) +{ + switch (format) { + default: + case CAIRO_FORMAT_ARGB32: + return GLITZ_STANDARD_ARGB32; + case CAIRO_FORMAT_RGB24: + return GLITZ_STANDARD_RGB24; + case CAIRO_FORMAT_A8: + return GLITZ_STANDARD_A8; + case CAIRO_FORMAT_A1: + return GLITZ_STANDARD_A1; + } +} + +static cairo_surface_t * +_cairo_glitz_surface_create_similar (void *abstract_src, + cairo_format_t format, + int draw, + int width, + int height) +{ + cairo_glitz_surface_t *src = abstract_src; + cairo_surface_t *crsurface; + glitz_drawable_t *drawable; + glitz_surface_t *surface; + glitz_format_t *gformat; + + drawable = glitz_surface_get_drawable (src->surface); + + gformat = glitz_find_standard_format (drawable, _glitz_format (format)); + if (!gformat) + return NULL; + + surface = glitz_surface_create (drawable, gformat, width, height, 0, NULL); + if (!surface) + return NULL; + + crsurface = cairo_glitz_surface_create (surface); + + glitz_surface_destroy (surface); + + return crsurface; +} + static double _cairo_glitz_surface_pixels_per_inch (void *abstract_surface) { return 96.0; } -static cairo_image_surface_t * -_cairo_glitz_surface_get_image (void *abstract_surface) +static cairo_status_t +_cairo_glitz_surface_get_image (cairo_glitz_surface_t *surface, + cairo_rectangle_t *interest, + cairo_image_surface_t **image_out, + cairo_rectangle_t *rect_out) { - cairo_glitz_surface_t *surface = abstract_surface; cairo_image_surface_t *image; - char *pixels; - int width, height; - cairo_format_masks_t format; - glitz_buffer_t *buffer; - glitz_pixel_format_t pf; + int x1, y1, x2, y2; + int width, height; + char *pixels; + cairo_format_masks_t format; + glitz_buffer_t *buffer; + glitz_pixel_format_t pf; - if (surface->pattern.type != CAIRO_PATTERN_SURFACE) { - cairo_box_t box; + x1 = 0; + y1 = 0; + x2 = glitz_surface_get_width (surface->surface); + y2 = glitz_surface_get_height (surface->surface); - box.p1.x = box.p1.y = 0; - box.p2.x = surface->pattern_box.p2.x; - box.p2.y = surface->pattern_box.p2.y; - - return _cairo_pattern_get_image (&surface->pattern, &box); + if (interest) + { + if (interest->x > x1) + x1 = interest->x; + if (interest->y > y1) + y1 = interest->y; + if (interest->x + interest->width < x2) + x2 = interest->x + interest->width; + if (interest->y + interest->height < y2) + y2 = interest->y + interest->height; + + if (x1 >= x2 || y1 >= y2) + { + *image_out = NULL; + return CAIRO_STATUS_SUCCESS; + } } + width = x2 - x1; + height = y2 - y1; - width = glitz_surface_get_width (surface->surface); - height = glitz_surface_get_height (surface->surface); - + if (rect_out) + { + rect_out->x = x1; + rect_out->y = y1; + rect_out->width = width; + rect_out->height = height; + } + if (surface->format->type == GLITZ_FORMAT_TYPE_COLOR) { if (surface->format->color.red_size > 0) { format.bpp = 32; @@ -149,21 +201,24 @@ _cairo_glitz_surface_get_image (void *abstract_surface) pf.masks.blue_mask = format.blue_mask; pf.xoffset = 0; pf.skip_lines = 0; + + /* XXX: we should eventually return images with negative stride, + need to verify that libpixman have no problem with this first. */ pf.bytes_per_line = (((width * format.bpp) / 8) + 3) & -4; pf.scanline_order = GLITZ_PIXEL_SCANLINE_ORDER_TOP_DOWN; pixels = malloc (height * pf.bytes_per_line); if (!pixels) - return NULL; + return CAIRO_STATUS_NO_MEMORY; buffer = glitz_buffer_create_for_data (pixels); if (!buffer) { free (pixels); - return NULL; + return CAIRO_STATUS_NO_MEMORY; } glitz_get_pixels (surface->surface, - 0, 0, + x1, y1, width, height, &pf, buffer); @@ -175,27 +230,38 @@ _cairo_glitz_surface_get_image (void *abstract_surface) &format, width, height, pf.bytes_per_line); - + + if (!image) + { + free (pixels); + return CAIRO_STATUS_NO_MEMORY; + } + _cairo_image_surface_assume_ownership_of_data (image); _cairo_image_surface_set_repeat (image, surface->base.repeat); _cairo_image_surface_set_matrix (image, &(surface->base.matrix)); - return image; + *image_out = image; + + return CAIRO_STATUS_SUCCESS; } static cairo_status_t -_cairo_glitz_surface_set_image (void *abstract_surface, - cairo_image_surface_t *image) +_cairo_glitz_surface_set_image (void *abstract_surface, + cairo_image_surface_t *image, + int x_dst, + int y_dst) { cairo_glitz_surface_t *surface = abstract_surface; - glitz_buffer_t *buffer; - glitz_pixel_format_t pf; - pixman_format_t *format; - int am, rm, gm, bm; + glitz_buffer_t *buffer; + glitz_pixel_format_t pf; + pixman_format_t *format; + int am, rm, gm, bm; + char *data; format = pixman_image_get_format (image->pixman_image); - if (format == NULL) + if (!format) return CAIRO_STATUS_NO_MEMORY; pixman_format_get_masks (format, &pf.masks.bpp, &am, &rm, &gm, &bm); @@ -206,15 +272,27 @@ _cairo_glitz_surface_set_image (void *abstract_surface, pf.masks.blue_mask = bm; pf.xoffset = 0; pf.skip_lines = 0; - pf.bytes_per_line = image->stride; - pf.scanline_order = GLITZ_PIXEL_SCANLINE_ORDER_TOP_DOWN; - buffer = glitz_buffer_create_for_data (image->data); + /* check for negative stride */ + if (image->stride < 0) + { + pf.bytes_per_line = -image->stride; + pf.scanline_order = GLITZ_PIXEL_SCANLINE_ORDER_BOTTOM_UP; + data = (char *) image->data + image->stride * (image->height - 1); + } + else + { + pf.bytes_per_line = image->stride; + pf.scanline_order = GLITZ_PIXEL_SCANLINE_ORDER_TOP_DOWN; + data = (char *) image->data; + } + + buffer = glitz_buffer_create_for_data (data); if (!buffer) return CAIRO_STATUS_NO_MEMORY; glitz_set_pixels (surface->surface, - 0, 0, + x_dst, y_dst, image->width, image->height, &pf, buffer); @@ -225,10 +303,103 @@ _cairo_glitz_surface_set_image (void *abstract_surface, } static cairo_status_t -_cairo_glitz_surface_set_matrix (void *abstract_surface, - cairo_matrix_t *matrix) +_cairo_glitz_surface_acquire_source_image (void *abstract_surface, + cairo_image_surface_t **image_out, + void **image_extra) { cairo_glitz_surface_t *surface = abstract_surface; + + *image_extra = NULL; + + return _cairo_glitz_surface_get_image (surface, NULL, image_out, NULL); +} + +static void +_cairo_glitz_surface_release_source_image (void *abstract_surface, + cairo_image_surface_t *image, + void *image_extra) +{ + cairo_surface_destroy (&image->base); +} + +static cairo_status_t +_cairo_glitz_surface_acquire_dest_image (void *abstract_surface, + cairo_rectangle_t *interest_rect, + cairo_image_surface_t **image_out, + cairo_rectangle_t *image_rect_out, + void **image_extra) +{ + cairo_glitz_surface_t *surface = abstract_surface; + cairo_image_surface_t *image; + cairo_status_t status; + + status = _cairo_glitz_surface_get_image (surface, interest_rect, &image, + image_rect_out); + if (status) + return status; + + *image_out = image; + *image_extra = NULL; + + return status; +} + +static void +_cairo_glitz_surface_release_dest_image (void *abstract_surface, + cairo_rectangle_t *interest_rect, + cairo_image_surface_t *image, + cairo_rectangle_t *image_rect, + void *image_extra) +{ + cairo_glitz_surface_t *surface = abstract_surface; + + _cairo_glitz_surface_set_image (surface, image, + image_rect->x, image_rect->y); + + cairo_surface_destroy (&image->base); +} + + +static cairo_status_t +_cairo_glitz_surface_clone_similar (void *abstract_surface, + cairo_surface_t *src, + cairo_surface_t **clone_out) +{ + cairo_glitz_surface_t *surface = abstract_surface; + cairo_glitz_surface_t *clone; + + if (src->backend == surface->base.backend) + { + *clone_out = src; + cairo_surface_reference (src); + + return CAIRO_STATUS_SUCCESS; + } + else if (_cairo_surface_is_image (src)) + { + cairo_image_surface_t *image_src = (cairo_image_surface_t *) src; + + clone = (cairo_glitz_surface_t *) + _cairo_glitz_surface_create_similar (surface, image_src->format, 0, + image_src->width, + image_src->height); + if (!clone) + return CAIRO_STATUS_NO_MEMORY; + + _cairo_glitz_surface_set_image (clone, image_src, 0, 0); + + *clone_out = &clone->base; + + return CAIRO_STATUS_SUCCESS; + } + + return CAIRO_INT_STATUS_UNSUPPORTED; +} + +static void +_cairo_glitz_surface_set_matrix (cairo_glitz_surface_t *surface, + cairo_matrix_t *matrix) +{ glitz_transform_t transform; transform.matrix[0][0] = _cairo_fixed_from_double (matrix->m[0][0]); @@ -244,44 +415,6 @@ _cairo_glitz_surface_set_matrix (void *abstract_surface, transform.matrix[2][2] = 1 << 16; glitz_surface_set_transform (surface->surface, &transform); - - return CAIRO_STATUS_SUCCESS; -} - -static cairo_status_t -_cairo_glitz_surface_set_filter (void *abstract_surface, cairo_filter_t filter) -{ - cairo_glitz_surface_t *surface = abstract_surface; - glitz_filter_t glitz_filter; - - switch (filter) { - case CAIRO_FILTER_FAST: - case CAIRO_FILTER_NEAREST: - glitz_filter = GLITZ_FILTER_NEAREST; - break; - case CAIRO_FILTER_GOOD: - case CAIRO_FILTER_BEST: - case CAIRO_FILTER_BILINEAR: - default: - glitz_filter = GLITZ_FILTER_BILINEAR; - break; - } - - glitz_surface_set_filter (surface->surface, glitz_filter, NULL, 0); - - return CAIRO_STATUS_SUCCESS; -} - -static cairo_status_t -_cairo_glitz_surface_set_repeat (void *abstract_surface, int repeat) -{ - cairo_glitz_surface_t *surface = abstract_surface; - - glitz_surface_set_fill (surface->surface, - (repeat)? GLITZ_FILL_REPEAT: - GLITZ_FILL_TRANSPARENT); - - return CAIRO_STATUS_SUCCESS; } static glitz_operator_t @@ -318,32 +451,6 @@ _glitz_operator (cairo_operator_t op) } } -static glitz_surface_t * -_glitz_surface_create_solid (glitz_surface_t *other, - glitz_format_name_t format_name, - glitz_color_t *color) -{ - glitz_drawable_t *drawable; - glitz_format_t *format; - glitz_surface_t *surface; - - drawable = glitz_surface_get_drawable (other); - - format = glitz_find_standard_format (drawable, format_name); - if (format == NULL) - return NULL; - - surface = glitz_surface_create (drawable, format, 1, 1); - if (surface == NULL) - return NULL; - - glitz_set_rectangle (surface, color, 0, 0, 1, 1); - - glitz_surface_set_fill (surface, GLITZ_FILL_REPEAT); - - return surface; -} - static glitz_status_t _glitz_ensure_target (glitz_surface_t *surface) { @@ -355,7 +462,6 @@ _glitz_ensure_target (glitz_surface_t *surface) glitz_drawable_format_t templ; glitz_format_t *format; glitz_drawable_t *pbuffer; - glitz_pbuffer_attributes_t attributes; unsigned long mask; int i; @@ -397,21 +503,13 @@ _glitz_ensure_target (glitz_surface_t *surface) if (!dformat) return CAIRO_INT_STATUS_UNSUPPORTED; - attributes.width = glitz_surface_get_width (surface); - attributes.height = glitz_surface_get_height (surface); - mask = GLITZ_PBUFFER_WIDTH_MASK | GLITZ_PBUFFER_HEIGHT_MASK; - - pbuffer = glitz_create_pbuffer_drawable (drawable, dformat, - &attributes, mask); + pbuffer = + glitz_create_pbuffer_drawable (drawable, dformat, + glitz_surface_get_width (surface), + glitz_surface_get_height (surface)); if (!pbuffer) return CAIRO_INT_STATUS_UNSUPPORTED; - if (glitz_drawable_get_width (pbuffer) < attributes.width || - glitz_drawable_get_height (pbuffer) < attributes.height) { - glitz_drawable_destroy (pbuffer); - return CAIRO_INT_STATUS_UNSUPPORTED; - } - glitz_surface_attach (surface, pbuffer, GLITZ_DRAWABLE_BUFFER_FRONT_COLOR, 0, 0); @@ -422,388 +520,711 @@ _glitz_ensure_target (glitz_surface_t *surface) return CAIRO_STATUS_SUCCESS; } -static glitz_format_name_t -_glitz_format (cairo_format_t format) +typedef struct _cairo_glitz_surface_attributes { + cairo_surface_attributes_t base; + + glitz_fill_t fill; + glitz_filter_t filter; + glitz_fixed16_16_t *params; + int n_params; + cairo_bool_t acquired; +} cairo_glitz_surface_attributes_t; + +static cairo_int_status_t +_cairo_glitz_pattern_acquire_surface (cairo_pattern_t *pattern, + cairo_glitz_surface_t *dst, + int x, + int y, + unsigned int width, + unsigned int height, + cairo_glitz_surface_t **surface_out, + cairo_glitz_surface_attributes_t *attr) { - switch (format) { + cairo_glitz_surface_t *src = NULL; + + attr->acquired = FALSE; + + switch (pattern->type) { + case CAIRO_PATTERN_LINEAR: + case CAIRO_PATTERN_RADIAL: { + cairo_gradient_pattern_t *gradient = + (cairo_gradient_pattern_t *) pattern; + glitz_drawable_t *drawable; + glitz_fixed16_16_t *params; + int n_params; + int i; + unsigned short alpha; + + /* XXX: the current color gradient acceleration provided by glitz is + * experimental, it's been proven inappropriate in a number of ways, + * most importantly, it's currently implemented as filters and + * gradients are not filters. eventually, it will be replaced with + * something more appropriate. + */ + + if (gradient->n_stops < 2) + break; + + /* glitz doesn't support inner and outer circle with different + center points. */ + if (pattern->type == CAIRO_PATTERN_RADIAL) + { + cairo_radial_pattern_t *grad = (cairo_radial_pattern_t *) pattern; + + if (grad->center0.x != grad->center1.x || + grad->center0.y != grad->center1.y) + break; + } + + drawable = glitz_surface_get_drawable (dst->surface); + if (!(glitz_drawable_get_features (drawable) & + GLITZ_FEATURE_FRAGMENT_PROGRAM_MASK)) + break; + + if (pattern->filter != CAIRO_FILTER_BILINEAR && + pattern->filter != CAIRO_FILTER_GOOD && + pattern->filter != CAIRO_FILTER_BEST) + break; + + alpha = (gradient->stops[0].color.alpha * pattern->alpha) * 0xffff; + for (i = 1; i < gradient->n_stops; i++) + { + unsigned short a; + + a = (gradient->stops[i].color.alpha * pattern->alpha) * 0xffff; + if (a != alpha) + break; + } + + /* we can't have color stops with different alpha as gradient color + interpolation should be done to unpremultiplied colors. */ + if (i < gradient->n_stops) + break; + + n_params = gradient->n_stops * 3 + 4; + + params = malloc (sizeof (glitz_fixed16_16_t) * n_params); + if (!params) + return CAIRO_STATUS_NO_MEMORY; + + src = (cairo_glitz_surface_t *) + _cairo_surface_create_similar_scratch (&dst->base, + CAIRO_FORMAT_ARGB32, 0, + gradient->n_stops, 1); + if (!src) + { + free (params); + return CAIRO_STATUS_NO_MEMORY; + } + + for (i = 0; i < gradient->n_stops; i++) { + glitz_color_t color; + + color.red = gradient->stops[i].color.red * alpha; + color.green = gradient->stops[i].color.green * alpha; + color.blue = gradient->stops[i].color.blue * alpha; + color.alpha = alpha; + + glitz_set_rectangle (src->surface, &color, i, 0, 1, 1); + + params[4 + 3 * i] = gradient->stops[i].offset; + params[5 + 3 * i] = i << 16; + params[6 + 3 * i] = 0; + } + + if (pattern->type == CAIRO_PATTERN_LINEAR) + { + cairo_linear_pattern_t *grad = (cairo_linear_pattern_t *) pattern; + + params[0] = _cairo_fixed_from_double (grad->point0.x); + params[1] = _cairo_fixed_from_double (grad->point0.y); + params[2] = _cairo_fixed_from_double (grad->point1.x); + params[3] = _cairo_fixed_from_double (grad->point1.y); + attr->filter = GLITZ_FILTER_LINEAR_GRADIENT; + } + else + { + cairo_radial_pattern_t *grad = (cairo_radial_pattern_t *) pattern; + + params[0] = _cairo_fixed_from_double (grad->center0.x); + params[1] = _cairo_fixed_from_double (grad->center0.y); + params[2] = _cairo_fixed_from_double (grad->radius0); + params[3] = _cairo_fixed_from_double (grad->radius1); + attr->filter = GLITZ_FILTER_RADIAL_GRADIENT; + } + + switch (pattern->extend) { + case CAIRO_EXTEND_NONE: + attr->fill = GLITZ_FILL_NEAREST; + break; + case CAIRO_EXTEND_REPEAT: + attr->fill = GLITZ_FILL_REPEAT; + break; + case CAIRO_EXTEND_REFLECT: + attr->fill = GLITZ_FILL_REFLECT; + break; + } + + attr->params = params; + attr->n_params = n_params; + attr->base.matrix = pattern->matrix; + attr->base.x_offset = 0; + attr->base.y_offset = 0; + } break; default: - case CAIRO_FORMAT_ARGB32: - return GLITZ_STANDARD_ARGB32; - case CAIRO_FORMAT_RGB24: - return GLITZ_STANDARD_RGB24; - case CAIRO_FORMAT_A8: - return GLITZ_STANDARD_A8; - case CAIRO_FORMAT_A1: - return GLITZ_STANDARD_A1; + break; } + + if (!src) + { + cairo_int_status_t status; + + status = _cairo_pattern_acquire_surface (pattern, &dst->base, + x, y, width, height, + (cairo_surface_t **) &src, + &attr->base); + if (status) + return status; + + if (src) + { + switch (attr->base.extend) { + case CAIRO_EXTEND_NONE: + attr->fill = GLITZ_FILL_TRANSPARENT; + break; + case CAIRO_EXTEND_REPEAT: + attr->fill = GLITZ_FILL_REPEAT; + break; + case CAIRO_EXTEND_REFLECT: + attr->fill = GLITZ_FILL_REFLECT; + break; + } + + switch (attr->base.filter) { + case CAIRO_FILTER_FAST: + case CAIRO_FILTER_NEAREST: + attr->filter = GLITZ_FILTER_NEAREST; + break; + case CAIRO_FILTER_GOOD: + case CAIRO_FILTER_BEST: + case CAIRO_FILTER_BILINEAR: + default: + attr->filter = GLITZ_FILTER_BILINEAR; + break; + } + + attr->params = NULL; + attr->n_params = 0; + attr->acquired = TRUE; + } + } + + *surface_out = src; + + return CAIRO_STATUS_SUCCESS; } -static cairo_surface_t * -_cairo_glitz_surface_create_similar (void *abstract_src, - cairo_format_t format, - int draw, - int width, - int height) +static void +_cairo_glitz_pattern_release_surface (cairo_glitz_surface_t *dst, + cairo_glitz_surface_t *surface, + cairo_glitz_surface_attributes_t *attr) { - cairo_glitz_surface_t *src = abstract_src; - cairo_surface_t *crsurface; - glitz_drawable_t *drawable; - glitz_surface_t *surface; - glitz_format_t *gformat; - - drawable = glitz_surface_get_drawable (src->surface); - - gformat = glitz_find_standard_format (drawable, _glitz_format (format)); - if (gformat == NULL) - return NULL; - - surface = glitz_surface_create (drawable, gformat, width, height); - if (surface == NULL) - return NULL; - - crsurface = cairo_glitz_surface_create (surface); - - glitz_surface_destroy (surface); - - return crsurface; -} - -static cairo_glitz_surface_t * -_cairo_glitz_surface_clone_similar (cairo_glitz_surface_t *templ, - cairo_surface_t *src, - cairo_format_t format) -{ - cairo_glitz_surface_t *clone; - cairo_image_surface_t *src_image; - - src_image = _cairo_surface_get_image (src); - - clone = (cairo_glitz_surface_t *) - _cairo_glitz_surface_create_similar (templ, format, 0, - src_image->width, - src_image->height); - if (clone == NULL) - return NULL; - - _cairo_glitz_surface_set_filter (clone, cairo_surface_get_filter (src)); - - _cairo_glitz_surface_set_image (clone, src_image); - - _cairo_glitz_surface_set_matrix (clone, &(src_image->base.matrix)); - - cairo_surface_destroy (&src_image->base); - - return clone; + if (attr->acquired) + _cairo_pattern_release_surface (&dst->base, &surface->base, + &attr->base); + else + _cairo_glitz_surface_destroy (surface); } static cairo_int_status_t -_glitz_composite (glitz_operator_t op, - glitz_surface_t *src, - glitz_surface_t *mask, - glitz_surface_t *dst, - int src_x, - int src_y, - int mask_x, - int mask_y, - int dst_x, - int dst_y, - int width, - int height, - glitz_buffer_t *geometry, - glitz_geometry_format_t *format) +_cairo_glitz_pattern_acquire_surfaces (cairo_pattern_t *src, + cairo_pattern_t *mask, + cairo_glitz_surface_t *dst, + int src_x, + int src_y, + int mask_x, + int mask_y, + unsigned int width, + unsigned int height, + cairo_glitz_surface_t **src_out, + cairo_glitz_surface_t **mask_out, + cairo_glitz_surface_attributes_t *sattr, + cairo_glitz_surface_attributes_t *mattr) { - if (_glitz_ensure_target (dst)) - return CAIRO_INT_STATUS_UNSUPPORTED; + cairo_int_status_t status; + cairo_pattern_union_t tmp; + cairo_bool_t src_opaque, mask_opaque; + double src_alpha, mask_alpha; + + src_opaque = _cairo_pattern_is_opaque (src); + mask_opaque = !mask || _cairo_pattern_is_opaque (mask); + + /* For surface patterns, we move any translucency from src->alpha + * to mask->alpha so we can use the source unchanged. Otherwise we + * move the translucency from mask->alpha to src->alpha so that + * we can drop the mask if possible. + */ + if (src->type == CAIRO_PATTERN_SURFACE) + { + if (mask) { + mask_opaque = mask_opaque && src_opaque; + mask_alpha = mask->alpha * src->alpha; + } else { + mask_opaque = src_opaque; + mask_alpha = src->alpha; + } - if (glitz_surface_get_status (dst)) - return CAIRO_STATUS_NO_TARGET_SURFACE; + src_alpha = 1.0; + src_opaque = TRUE; + } + else + { + if (mask) + { + src_opaque = mask_opaque && src_opaque; + src_alpha = mask->alpha * src->alpha; + /* FIXME: This needs changing when we support RENDER + * style 4-channel masks. + */ + if (mask->type == CAIRO_PATTERN_SOLID) + mask = NULL; + } else + src_alpha = src->alpha; - glitz_set_geometry (dst, - 0, 0, - format, geometry); + mask_alpha = 1.0; + mask_opaque = TRUE; + } - glitz_composite (op, - src, - mask, - dst, - src_x, src_y, - mask_x, mask_y, - dst_x, dst_y, - width, height); + _cairo_pattern_init_copy (&tmp.base, src); + _cairo_pattern_set_alpha (&tmp.base, src_alpha); + + status = _cairo_glitz_pattern_acquire_surface (&tmp.base, dst, + src_x, src_y, + width, height, + src_out, sattr); + + _cairo_pattern_fini (&tmp.base); - glitz_set_geometry (dst, 0, 0, NULL, NULL); + if (status) + return status; - if (glitz_surface_get_status (dst) == GLITZ_STATUS_NOT_SUPPORTED) - return CAIRO_INT_STATUS_UNSUPPORTED; + if (mask || !mask_opaque) + { + if (mask) + _cairo_pattern_init_copy (&tmp.base, mask); + else + _cairo_pattern_init_solid (&tmp.solid, 0.0, 0.0, 0.0); + + _cairo_pattern_set_alpha (&tmp.base, mask_alpha); + + status = _cairo_glitz_pattern_acquire_surface (&tmp.base, dst, + mask_x, mask_y, + width, height, + mask_out, mattr); + + _cairo_pattern_fini (&tmp.base); + + if (status) + { + _cairo_glitz_pattern_release_surface (dst, *src_out, sattr); + return status; + } + } + else + { + *mask_out = NULL; + } return CAIRO_STATUS_SUCCESS; } +static void +_cairo_glitz_surface_set_attributes (cairo_glitz_surface_t *surface, + cairo_glitz_surface_attributes_t *a) +{ + _cairo_glitz_surface_set_matrix (surface, &a->base.matrix); + glitz_surface_set_fill (surface->surface, a->fill); + glitz_surface_set_filter (surface->surface, a->filter, + a->params, a->n_params); +} + static cairo_int_status_t _cairo_glitz_surface_composite (cairo_operator_t op, - cairo_surface_t *generic_src, - cairo_surface_t *generic_mask, - void *abstract_dst, - int src_x, - int src_y, - int mask_x, - int mask_y, - int dst_x, - int dst_y, - unsigned int width, - unsigned int height) + cairo_pattern_t *src_pattern, + cairo_pattern_t *mask_pattern, + void *abstract_dst, + int src_x, + int src_y, + int mask_x, + int mask_y, + int dst_x, + int dst_y, + unsigned int width, + unsigned int height) { - cairo_glitz_surface_t *dst = abstract_dst; - cairo_glitz_surface_t *src = (cairo_glitz_surface_t *) generic_src; - cairo_glitz_surface_t *mask = (cairo_glitz_surface_t *) generic_mask; - cairo_glitz_surface_t *src_clone = NULL; - cairo_glitz_surface_t *mask_clone = NULL; - cairo_int_status_t status; + cairo_glitz_surface_attributes_t src_attr, mask_attr; + cairo_glitz_surface_t *dst = abstract_dst; + cairo_glitz_surface_t *src; + cairo_glitz_surface_t *mask; + cairo_int_status_t status; if (op == CAIRO_OPERATOR_SATURATE) return CAIRO_INT_STATUS_UNSUPPORTED; - if (generic_src->backend != dst->base.backend) { - src_clone = _cairo_glitz_surface_clone_similar (dst, generic_src, - CAIRO_FORMAT_ARGB32); - if (!src_clone) - return CAIRO_INT_STATUS_UNSUPPORTED; + if (_glitz_ensure_target (dst->surface)) + return CAIRO_INT_STATUS_UNSUPPORTED; + + status = _cairo_glitz_pattern_acquire_surfaces (src_pattern, mask_pattern, + dst, + src_x, src_y, + mask_x, mask_y, + width, height, + &src, &mask, + &src_attr, &mask_attr); + if (status) + return status; + + _cairo_glitz_surface_set_attributes (src, &src_attr); + if (mask) + { + _cairo_glitz_surface_set_attributes (mask, &mask_attr); + glitz_composite (_glitz_operator (op), + src->surface, + mask->surface, + dst->surface, + src_x + src_attr.base.x_offset, + src_y + src_attr.base.y_offset, + mask_x + mask_attr.base.x_offset, + mask_y + mask_attr.base.y_offset, + dst_x, dst_y, + width, height); - src = src_clone; + if (mask_attr.n_params) + free (mask_attr.params); + + _cairo_glitz_pattern_release_surface (dst, mask, &mask_attr); } - - if (generic_mask && (generic_mask->backend != dst->base.backend)) { - mask_clone = _cairo_glitz_surface_clone_similar (dst, generic_mask, - CAIRO_FORMAT_A8); - if (!mask_clone) - return CAIRO_INT_STATUS_UNSUPPORTED; - - mask = mask_clone; + else + { + glitz_composite (_glitz_operator (op), + src->surface, + NULL, + dst->surface, + src_x + src_attr.base.x_offset, + src_y + src_attr.base.y_offset, + 0, 0, + dst_x, dst_y, + width, height); } - status = _glitz_composite (_glitz_operator (op), - src->surface, - (mask)? mask->surface: NULL, - dst->surface, - src_x, src_y, - mask_x, mask_y, - dst_x, dst_y, - width, height, - NULL, NULL); + if (src_attr.n_params) + free (src_attr.params); - if (src_clone) - cairo_surface_destroy (&src_clone->base); + _cairo_glitz_pattern_release_surface (dst, src, &src_attr); + + if (glitz_surface_get_status (dst->surface) == GLITZ_STATUS_NOT_SUPPORTED) + return CAIRO_INT_STATUS_UNSUPPORTED; - if (mask_clone) - cairo_surface_destroy (&mask_clone->base); - - return status; + return CAIRO_STATUS_SUCCESS; } static cairo_int_status_t -_cairo_glitz_surface_fill_rectangles (void *abstract_dst, - cairo_operator_t op, +_cairo_glitz_surface_fill_rectangles (void *abstract_dst, + cairo_operator_t op, const cairo_color_t *color, - cairo_rectangle_t *rects, - int n_rects) + cairo_rectangle_t *rects, + int n_rects) { cairo_glitz_surface_t *dst = abstract_dst; - glitz_color_t glitz_color; - if (op == CAIRO_OPERATOR_SATURATE) - return CAIRO_INT_STATUS_UNSUPPORTED; - - glitz_color.red = color->red_short; - glitz_color.green = color->green_short; - glitz_color.blue = color->blue_short; - glitz_color.alpha = color->alpha_short; - - if (op != CAIRO_OPERATOR_SRC) { - glitz_surface_t *solid; - glitz_float_t *vertices; - glitz_buffer_t *buffer; - glitz_geometry_format_t gf; - cairo_int_status_t status; - int width, height; - void *data; - - gf.mode = GLITZ_GEOMETRY_MODE_DIRECT; - gf.edge_hint = GLITZ_GEOMETRY_EDGE_HINT_SHARP; - gf.primitive = GLITZ_GEOMETRY_PRIMITIVE_QUADS; - gf.type = GLITZ_DATA_TYPE_FLOAT; - gf.first = 0; - gf.count = n_rects * 4; + if (op == CAIRO_OPERATOR_SRC) + { + glitz_color_t glitz_color; - data = malloc (n_rects * 8 * sizeof (glitz_float_t)); - if (!data) - return CAIRO_STATUS_NO_MEMORY; + glitz_color.red = color->red_short; + glitz_color.green = color->green_short; + glitz_color.blue = color->blue_short; + glitz_color.alpha = color->alpha_short; - buffer = glitz_buffer_create_for_data (data); - if (buffer == NULL) { - free (data); - return CAIRO_STATUS_NO_MEMORY; - } - - width = height = 0; - vertices = glitz_buffer_map (buffer, GLITZ_BUFFER_ACCESS_WRITE_ONLY); - for (; n_rects; rects++, n_rects--) { - *vertices++ = (glitz_float_t) rects->x; - *vertices++ = (glitz_float_t) rects->y; - *vertices++ = (glitz_float_t) (rects->x + rects->width); - *vertices++ = (glitz_float_t) rects->y; - *vertices++ = (glitz_float_t) (rects->x + rects->width); - *vertices++ = (glitz_float_t) (rects->y + rects->height); - *vertices++ = (glitz_float_t) rects->x; - *vertices++ = (glitz_float_t) (rects->y + rects->height); - - if ((rects->x + rects->width) > width) - width = rects->x + rects->width; - - if ((rects->y + rects->height) > height) - height = rects->y + rects->height; - } - glitz_buffer_unmap (buffer); - - solid = _glitz_surface_create_solid (dst->surface, - GLITZ_STANDARD_ARGB32, - &glitz_color); - if (solid == NULL) - return CAIRO_STATUS_NO_MEMORY; - - status = _glitz_composite (_glitz_operator (op), - solid, - NULL, - dst->surface, - 0, 0, - 0, 0, - 0, 0, - width, height, - buffer, &gf); - - glitz_surface_destroy (solid); - glitz_buffer_destroy (buffer); - free (data); - - return status; - } else { if (glitz_surface_get_width (dst->surface) != 1 || - glitz_surface_get_height (dst->surface) != 1) { - if (_glitz_ensure_target (dst->surface)) - return CAIRO_INT_STATUS_UNSUPPORTED; - } + glitz_surface_get_height (dst->surface) != 1) + _glitz_ensure_target (dst->surface); glitz_set_rectangles (dst->surface, &glitz_color, (glitz_rectangle_t *) rects, n_rects); } + else + { + cairo_glitz_surface_t *src; + + if (op == CAIRO_OPERATOR_SATURATE) + return CAIRO_INT_STATUS_UNSUPPORTED; + + if (_glitz_ensure_target (dst->surface)) + return CAIRO_INT_STATUS_UNSUPPORTED; + + src = (cairo_glitz_surface_t *) + _cairo_surface_create_similar_solid (&dst->base, + CAIRO_FORMAT_ARGB32, 1, 1, + (cairo_color_t *) color); + if (!src) + return CAIRO_STATUS_NO_MEMORY; + + while (n_rects--) + { + glitz_composite (_glitz_operator (op), + src->surface, + NULL, + dst->surface, + 0, 0, + 0, 0, + rects->x, rects->y, + rects->width, rects->height); + rects++; + } + + cairo_surface_destroy (&src->base); + } + + if (glitz_surface_get_status (dst->surface) == GLITZ_STATUS_NOT_SUPPORTED) + return CAIRO_INT_STATUS_UNSUPPORTED; return CAIRO_STATUS_SUCCESS; } static cairo_int_status_t -_cairo_glitz_surface_composite_trapezoids (cairo_operator_t op, - cairo_surface_t *generic_src, - void *abstract_dst, - int x_src, - int y_src, +_cairo_glitz_surface_composite_trapezoids (cairo_operator_t op, + cairo_pattern_t *pattern, + void *abstract_dst, + int src_x, + int src_y, + int dst_x, + int dst_y, + unsigned int width, + unsigned int height, cairo_trapezoid_t *traps, - int n_traps) + int n_traps) { - cairo_glitz_surface_t *dst = abstract_dst; - cairo_glitz_surface_t *src = (cairo_glitz_surface_t *) generic_src; - glitz_surface_t *mask = NULL; - glitz_float_t *vertices; - glitz_buffer_t *buffer; - glitz_geometry_format_t gf; - cairo_int_status_t status; - int x_dst, y_dst, x_rel, y_rel, width, height; - void *data; + cairo_glitz_surface_attributes_t attributes; + cairo_glitz_surface_t *dst = abstract_dst; + cairo_glitz_surface_t *src; + cairo_glitz_surface_t *mask = NULL; + glitz_buffer_t *buffer = NULL; + void *data = NULL; + cairo_int_status_t status; + unsigned short alpha; if (op == CAIRO_OPERATOR_SATURATE) return CAIRO_INT_STATUS_UNSUPPORTED; - if (generic_src->backend != dst->base.backend) + if (_glitz_ensure_target (dst->surface)) return CAIRO_INT_STATUS_UNSUPPORTED; - gf.mode = GLITZ_GEOMETRY_MODE_DIRECT; - gf.edge_hint = GLITZ_GEOMETRY_EDGE_HINT_GOOD_SMOOTH; - gf.primitive = GLITZ_GEOMETRY_PRIMITIVE_QUADS; - gf.type = GLITZ_DATA_TYPE_FLOAT; - gf.first = 0; - gf.count = n_traps * 4; + if (pattern->type == CAIRO_PATTERN_SURFACE) + { + cairo_pattern_union_t tmp; - data = malloc (n_traps * 8 * sizeof (glitz_float_t)); - if (!data) - return CAIRO_STATUS_NO_MEMORY; + _cairo_pattern_init_copy (&tmp.base, pattern); + _cairo_pattern_set_alpha (&tmp.base, 1.0); + + status = _cairo_glitz_pattern_acquire_surface (&tmp.base, dst, + src_x, src_y, + width, height, + &src, &attributes); - buffer = glitz_buffer_create_for_data (data); - if (buffer == NULL) { - free (data); - return CAIRO_STATUS_NO_MEMORY; + _cairo_pattern_fini (&tmp.base); + + alpha = pattern->alpha * 0xffff; } - - x_dst = traps[0].left.p1.x >> 16; - y_dst = traps[0].left.p1.y >> 16; - - vertices = glitz_buffer_map (buffer, GLITZ_BUFFER_ACCESS_WRITE_ONLY); - for (; n_traps; traps++, n_traps--) { - glitz_float_t top, bottom; - - top = GLITZ_FIXED_TO_FLOAT (traps->top); - bottom = GLITZ_FIXED_TO_FLOAT (traps->bottom); - - *vertices++ = GLITZ_FIXED_LINE_X_TO_FLOAT (traps->left, traps->top); - *vertices++ = top; - *vertices++ = - GLITZ_FIXED_LINE_X_CEIL_TO_FLOAT (traps->right, traps->top); - *vertices++ = top; - *vertices++ = - GLITZ_FIXED_LINE_X_CEIL_TO_FLOAT (traps->right, traps->bottom); - *vertices++ = bottom; - *vertices++ = GLITZ_FIXED_LINE_X_TO_FLOAT (traps->left, traps->bottom); - *vertices++ = bottom; - } - glitz_buffer_unmap (buffer); - - if ((src->pattern.type == CAIRO_PATTERN_SURFACE) && - (src->pattern.color.alpha != 1.0)) { - glitz_color_t color; - - color.red = color.green = color.blue = 0; - color.alpha = src->pattern.color.alpha_short; - - mask = _glitz_surface_create_solid (dst->surface, - GLITZ_STANDARD_A8, - &color); + else + { + status = _cairo_glitz_pattern_acquire_surface (pattern, dst, + src_x, src_y, + width, height, + &src, &attributes); + alpha = 0xffff; } - x_rel = (src->pattern_box.p1.x >> 16) + x_src - x_dst; - y_rel = (src->pattern_box.p1.y >> 16) + y_src - y_dst; + if (status) + return status; - x_dst = src->pattern_box.p1.x >> 16; - y_dst = src->pattern_box.p1.y >> 16; + if (op == CAIRO_OPERATOR_ADD || n_traps <= 1) + { + static glitz_color_t clear_black = { 0, 0, 0, 0 }; + glitz_color_t color; + glitz_geometry_format_t format; + int n_trap_added; + int offset = 0; + int data_size = 0; + int size = 30 * n_traps; /* just a guess */ + + format.vertex.primitive = GLITZ_PRIMITIVE_QUADS; + format.vertex.type = GLITZ_DATA_TYPE_FLOAT; + format.vertex.bytes_per_vertex = 3 * sizeof (glitz_float_t); + format.vertex.attributes = GLITZ_VERTEX_ATTRIBUTE_MASK_COORD_MASK; + format.vertex.mask.type = GLITZ_DATA_TYPE_FLOAT; + format.vertex.mask.size = GLITZ_COORDINATE_SIZE_X; + format.vertex.mask.offset = 2 * sizeof (glitz_float_t); + + mask = (cairo_glitz_surface_t *) + _cairo_glitz_surface_create_similar (&dst->base, + CAIRO_FORMAT_A8, 0, + 2, 1); + if (!mask) + { + _cairo_glitz_pattern_release_surface (dst, src, &attributes); + return CAIRO_INT_STATUS_UNSUPPORTED; + } + + color.red = color.green = color.blue = color.alpha = alpha; + + glitz_set_rectangle (mask->surface, &clear_black, 0, 0, 1, 1); + glitz_set_rectangle (mask->surface, &color, 1, 0, 1, 1); + + glitz_surface_set_fill (mask->surface, GLITZ_FILL_NEAREST); + glitz_surface_set_filter (mask->surface, + GLITZ_FILTER_BILINEAR, + NULL, 0); + + size *= format.vertex.bytes_per_vertex; + + while (n_traps) + { + if (data_size < size) + { + data_size = size; + data = realloc (data, data_size); + if (!data) + { + _cairo_glitz_pattern_release_surface (dst, src, + &attributes); + return CAIRO_STATUS_NO_MEMORY; + } + + if (buffer) + glitz_buffer_destroy (buffer); + + buffer = glitz_buffer_create_for_data (data); + if (!buffer) { + free (data); + _cairo_glitz_pattern_release_surface (dst, src, + &attributes); + return CAIRO_STATUS_NO_MEMORY; + } + } - width = ((src->pattern_box.p2.x + 65535) >> 16) - - (src->pattern_box.p1.x >> 16); - height = ((src->pattern_box.p2.y + 65535) >> 16) - - (src->pattern_box.p1.y >> 16); + offset += + glitz_add_trapezoids (buffer, + offset, size - offset, + format.vertex.type, mask->surface, + (glitz_trapezoid_t *) traps, n_traps, + &n_trap_added); + + n_traps -= n_trap_added; + traps += n_trap_added; + size *= 2; + } - status = _glitz_composite (_glitz_operator (op), - src->surface, - mask, - dst->surface, - x_rel, y_rel, - 0, 0, - x_dst, y_dst, - width, height, - buffer, &gf); + glitz_set_geometry (dst->surface, + GLITZ_GEOMETRY_TYPE_VERTEX, + &format, buffer); + glitz_set_array (dst->surface, 0, 3, + offset / format.vertex.bytes_per_vertex, + 0, 0); + } + else + { + cairo_image_surface_t *image; + char *ptr; + int stride; - if (mask) - glitz_surface_destroy (mask); + stride = (width + 3) & -4; + data = malloc (stride * height); + if (!data) + { + _cairo_glitz_pattern_release_surface (dst, src, &attributes); + return CAIRO_STATUS_NO_MEMORY; + } - glitz_buffer_destroy (buffer); + memset (data, 0, stride * height); + + /* using negative stride */ + ptr = (char *) data + stride * (height - 1); + + image = (cairo_image_surface_t *) + cairo_image_surface_create_for_data (ptr, + CAIRO_FORMAT_A8, + width, height, + -stride); + if (!image) + { + cairo_surface_destroy (&src->base); + free (data); + return CAIRO_STATUS_NO_MEMORY; + } + + pixman_add_trapezoids (image->pixman_image, -dst_x, -dst_y, + (pixman_trapezoid_t *) traps, n_traps); + + if (alpha != 0xffff) + { + pixman_color_t color; + + color.red = color.green = color.blue = color.alpha = alpha; + + pixman_fill_rectangle (PIXMAN_OPERATOR_IN, + image->pixman_image, + &color, + 0, 0, width, height); + } + + mask = (cairo_glitz_surface_t *) + _cairo_surface_create_similar_scratch (&dst->base, + CAIRO_FORMAT_A8, 0, + width, height); + if (!mask) + { + _cairo_glitz_pattern_release_surface (dst, src, &attributes); + free (data); + cairo_surface_destroy (&image->base); + return CAIRO_STATUS_NO_MEMORY; + } + + _cairo_glitz_surface_set_image (mask, image, 0, 0); + } + + _cairo_glitz_surface_set_attributes (src, &attributes); + + glitz_composite (_glitz_operator (op), + src->surface, + mask->surface, + dst->surface, + src_x + attributes.base.x_offset, + src_y + attributes.base.y_offset, + 0, 0, + dst_x, dst_y, + width, height); + + if (attributes.n_params) + free (attributes.params); + + glitz_set_geometry (dst->surface, + GLITZ_GEOMETRY_TYPE_NONE, + NULL, NULL); + + if (buffer) + glitz_buffer_destroy (buffer); + free (data); + + _cairo_glitz_pattern_release_surface (dst, src, &attributes); + if (mask) + cairo_surface_destroy (&mask->base); + + if (glitz_surface_get_status (dst->surface) == GLITZ_STATUS_NOT_SUPPORTED) + return CAIRO_INT_STATUS_UNSUPPORTED; - return status; + return CAIRO_STATUS_SUCCESS; } static cairo_int_status_t @@ -819,173 +1240,56 @@ _cairo_glitz_surface_show_page (void *abstract_surface) } static cairo_int_status_t -_cairo_glitz_surface_create_pattern (void *abstract_dst, - cairo_pattern_t *pattern, - cairo_box_t *box) -{ - cairo_glitz_surface_t *dst = abstract_dst; - cairo_surface_t *generic_src = NULL; - cairo_image_surface_t *image = NULL; - cairo_glitz_surface_t *src; - - switch (pattern->type) { - case CAIRO_PATTERN_SOLID: - generic_src = - _cairo_surface_create_similar_solid (abstract_dst, - CAIRO_FORMAT_ARGB32, - 1, 1, - &pattern->color); - if (generic_src) - cairo_surface_set_repeat (generic_src, 1); - break; - case CAIRO_PATTERN_RADIAL: - /* glitz doesn't support inner and outer circle with different - center points. */ - if (pattern->u.radial.center0.x != pattern->u.radial.center1.x || - pattern->u.radial.center0.y != pattern->u.radial.center1.y) - break; - /* fall-through */ - case CAIRO_PATTERN_LINEAR: { - glitz_drawable_t *drawable; - glitz_fixed16_16_t *params; - int i, n_params; - - drawable = glitz_surface_get_drawable (dst->surface); - if (!(glitz_drawable_get_features (drawable) & - GLITZ_FEATURE_FRAGMENT_PROGRAM_MASK)) - break; - - if (pattern->filter != CAIRO_FILTER_BILINEAR) - break; - - n_params = pattern->n_stops * 3 + 4; - - params = malloc (sizeof (glitz_fixed16_16_t) * n_params); - if (params == NULL) - return CAIRO_STATUS_NO_MEMORY; - - generic_src = - _cairo_glitz_surface_create_similar (abstract_dst, - CAIRO_FORMAT_ARGB32, 0, - pattern->n_stops, 1); - if (generic_src == NULL) { - free (params); - return CAIRO_STATUS_NO_MEMORY; - } - - src = (cairo_glitz_surface_t *) generic_src; - - for (i = 0; i < pattern->n_stops; i++) { - glitz_color_t color; - - color.alpha = pattern->stops[i].color_char[3]; - color.red = pattern->stops[i].color_char[0] * color.alpha; - color.green = pattern->stops[i].color_char[1] * color.alpha; - color.blue = pattern->stops[i].color_char[2] * color.alpha; - color.alpha *= 256; - - glitz_set_rectangle (src->surface, &color, i, 0, 1, 1); - - params[4 + 3 * i] = pattern->stops[i].offset; - params[5 + 3 * i] = i << 16; - params[6 + 3 * i] = 0; - } - - if (pattern->type == CAIRO_PATTERN_LINEAR) { - params[0] = _cairo_fixed_from_double (pattern->u.linear.point0.x); - params[1] = _cairo_fixed_from_double (pattern->u.linear.point0.y); - params[2] = _cairo_fixed_from_double (pattern->u.linear.point1.x); - params[3] = _cairo_fixed_from_double (pattern->u.linear.point1.y); - - glitz_surface_set_filter (src->surface, - GLITZ_FILTER_LINEAR_GRADIENT, - params, n_params); - } else { - params[0] = _cairo_fixed_from_double (pattern->u.radial.center0.x); - params[1] = _cairo_fixed_from_double (pattern->u.radial.center0.y); - params[2] = _cairo_fixed_from_double (pattern->u.radial.radius0); - params[3] = _cairo_fixed_from_double (pattern->u.radial.radius1); - - glitz_surface_set_filter (src->surface, - GLITZ_FILTER_RADIAL_GRADIENT, - params, n_params); - } - - switch (pattern->extend) { - case CAIRO_EXTEND_REPEAT: - glitz_surface_set_fill (src->surface, GLITZ_FILL_REPEAT); - break; - case CAIRO_EXTEND_REFLECT: - glitz_surface_set_fill (src->surface, GLITZ_FILL_REFLECT); - break; - case CAIRO_EXTEND_NONE: - default: - glitz_surface_set_fill (src->surface, GLITZ_FILL_NEAREST); - break; - } - - cairo_surface_set_matrix (&src->base, &pattern->matrix); - - free (params); - } break; - case CAIRO_PATTERN_SURFACE: - generic_src = pattern->u.surface.surface; - cairo_surface_reference (generic_src); - break; - } - - if (generic_src == NULL) { - image = _cairo_pattern_get_image (pattern, box); - if (image == NULL) - return CAIRO_STATUS_NO_MEMORY; - - generic_src = &image->base; - } - - if (generic_src->backend != dst->base.backend) { - src = _cairo_glitz_surface_clone_similar (dst, generic_src, - CAIRO_FORMAT_ARGB32); - if (src == NULL) - return CAIRO_STATUS_NO_MEMORY; - - cairo_surface_set_repeat (&src->base, generic_src->repeat); - } else - src = (cairo_glitz_surface_t *) generic_src; - - if (image) - cairo_surface_destroy (&image->base); - - _cairo_pattern_init_copy (&src->pattern, pattern); - src->pattern_box = *box; - - pattern->source = &src->base; - - return CAIRO_STATUS_SUCCESS; -} - -static cairo_int_status_t -_cairo_glitz_surface_set_clip_region (void *abstract_surface, +_cairo_glitz_surface_set_clip_region (void *abstract_surface, pixman_region16_t *region) { - return CAIRO_INT_STATUS_UNSUPPORTED; + cairo_glitz_surface_t *surface = abstract_surface; + + if (region) + { + glitz_box_t *box; + int n; + + if (!surface->clip) + { + surface->clip = pixman_region_create (); + if (!surface->clip) + return CAIRO_STATUS_NO_MEMORY; + } + pixman_region_copy (surface->clip, region); + + box = (glitz_box_t *) pixman_region_rects (surface->clip); + n = pixman_region_num_rects (surface->clip); + glitz_surface_set_clip_region (surface->surface, 0, 0, box, n); + } + else + { + glitz_surface_set_clip_region (surface->surface, 0, 0, NULL, 0); + + if (surface->clip) + pixman_region_destroy (surface->clip); + + surface->clip = NULL; + } + + return CAIRO_STATUS_SUCCESS; } static const cairo_surface_backend_t cairo_glitz_surface_backend = { _cairo_glitz_surface_create_similar, _cairo_glitz_surface_destroy, _cairo_glitz_surface_pixels_per_inch, - _cairo_glitz_surface_get_image, - _cairo_glitz_surface_set_image, - _cairo_glitz_surface_set_matrix, - _cairo_glitz_surface_set_filter, - _cairo_glitz_surface_set_repeat, + _cairo_glitz_surface_acquire_source_image, + _cairo_glitz_surface_release_source_image, + _cairo_glitz_surface_acquire_dest_image, + _cairo_glitz_surface_release_dest_image, + _cairo_glitz_surface_clone_similar, _cairo_glitz_surface_composite, _cairo_glitz_surface_fill_rectangles, _cairo_glitz_surface_composite_trapezoids, _cairo_glitz_surface_copy_page, _cairo_glitz_surface_show_page, _cairo_glitz_surface_set_clip_region, - _cairo_glitz_surface_create_pattern, NULL /* show_glyphs */ }; @@ -1004,12 +1308,10 @@ cairo_glitz_surface_create (glitz_surface_t *surface) _cairo_surface_init (&crsurface->base, &cairo_glitz_surface_backend); glitz_surface_reference (surface); - crsurface->surface = surface; - crsurface->format = glitz_surface_get_format (surface); - _cairo_pattern_init (&crsurface->pattern); - crsurface->pattern.type = CAIRO_PATTERN_SURFACE; - crsurface->pattern.u.surface.surface = NULL; + crsurface->surface = surface; + crsurface->format = glitz_surface_get_format (surface); + crsurface->clip = NULL; return (cairo_surface_t *) crsurface; } diff --git a/gfx/cairo/cairo/src/cairo_gstate.c b/gfx/cairo/cairo/src/cairo_gstate.c index e855a7a66c3c..d6db560a37f3 100644 --- a/gfx/cairo/cairo/src/cairo_gstate.c +++ b/gfx/cairo/cairo/src/cairo_gstate.c @@ -31,7 +31,7 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ #include @@ -46,20 +46,33 @@ _cairo_gstate_clip_and_composite_trapezoids (cairo_gstate_t *gstate, cairo_surface_t *dst, cairo_traps_t *traps); +static cairo_status_t +_cairo_gstate_ensure_font (cairo_gstate_t *gstate); + +static void +_cairo_gstate_unset_font (cairo_gstate_t *gstate); + cairo_gstate_t * _cairo_gstate_create () { + cairo_status_t status; cairo_gstate_t *gstate; gstate = malloc (sizeof (cairo_gstate_t)); if (gstate) - _cairo_gstate_init (gstate); + { + status = _cairo_gstate_init (gstate); + if (status) { + free (gstate); + return NULL; + } + } return gstate; } -void +cairo_status_t _cairo_gstate_init (cairo_gstate_t *gstate) { gstate->operator = CAIRO_GSTATE_OPERATOR_DEFAULT; @@ -77,9 +90,11 @@ _cairo_gstate_init (cairo_gstate_t *gstate) gstate->num_dashes = 0; gstate->dash_offset = 0.0; - gstate->font = _cairo_unscaled_font_create (CAIRO_FONT_FAMILY_DEFAULT, - CAIRO_FONT_SLANT_DEFAULT, - CAIRO_FONT_WEIGHT_DEFAULT); + gstate->font_family = NULL; + gstate->font_slant = CAIRO_FONT_SLANT_DEFAULT; + gstate->font_weight = CAIRO_FONT_WEIGHT_DEFAULT; + + gstate->font = NULL; gstate->surface = NULL; @@ -87,6 +102,9 @@ _cairo_gstate_init (cairo_gstate_t *gstate) gstate->clip.surface = NULL; gstate->pattern = _cairo_pattern_create_solid (0.0, 0.0, 0.0); + if (!gstate->pattern) + return CAIRO_STATUS_NO_MEMORY; + gstate->alpha = 1.0; gstate->pixels_per_inch = CAIRO_GSTATE_PIXELS_PER_INCH_DEFAULT; @@ -97,6 +115,8 @@ _cairo_gstate_init (cairo_gstate_t *gstate) _cairo_pen_init_empty (&gstate->pen_regular); gstate->next = NULL; + + return CAIRO_STATUS_SUCCESS; } cairo_status_t @@ -118,9 +138,15 @@ _cairo_gstate_init_copy (cairo_gstate_t *gstate, cairo_gstate_t *other) memcpy (gstate->dash, other->dash, other->num_dashes * sizeof (double)); } + if (other->font_family) { + gstate->font_family = strdup (other->font_family); + if (!gstate->font_family) + goto CLEANUP_DASH; + } + if (other->font) { gstate->font = other->font; - _cairo_unscaled_font_reference (gstate->font); + cairo_font_reference (gstate->font); } if (other->clip.region) @@ -148,18 +174,29 @@ _cairo_gstate_init_copy (cairo_gstate_t *gstate, cairo_gstate_t *other) _cairo_path_fini (&gstate->path); CLEANUP_FONT: - _cairo_unscaled_font_destroy (gstate->font); + cairo_font_destroy (gstate->font); + gstate->font = NULL; + + if (gstate->font_family) { + free (gstate->font_family); + gstate->font_family = NULL; + } + CLEANUP_DASH: free (gstate->dash); gstate->dash = NULL; - return status; + return CAIRO_STATUS_NO_MEMORY; } void _cairo_gstate_fini (cairo_gstate_t *gstate) { - _cairo_unscaled_font_destroy (gstate->font); + if (gstate->font_family) + free (gstate->font_family); + + if (gstate->font) + cairo_font_destroy (gstate->font); if (gstate->surface) cairo_surface_destroy (gstate->surface); @@ -323,6 +360,8 @@ _cairo_gstate_set_target_surface (cairo_gstate_t *gstate, cairo_surface_t *surfa { double scale; + _cairo_gstate_unset_font (gstate); + if (gstate->surface) cairo_surface_destroy (gstate->surface); @@ -365,11 +404,9 @@ _cairo_gstate_set_pattern (cairo_gstate_t *gstate, cairo_pattern_t *pattern) if (pattern == NULL) return CAIRO_STATUS_NULL_POINTER; - if (gstate->pattern) - cairo_pattern_destroy (gstate->pattern); - - gstate->pattern = pattern; cairo_pattern_reference (pattern); + cairo_pattern_destroy (gstate->pattern); + gstate->pattern = pattern; return CAIRO_STATUS_SUCCESS; } @@ -407,6 +444,8 @@ _cairo_gstate_set_rgb_color (cairo_gstate_t *gstate, double red, double green, d cairo_pattern_destroy (gstate->pattern); gstate->pattern = _cairo_pattern_create_solid (red, green, blue); + if (!gstate->pattern) + return CAIRO_STATUS_NO_MEMORY; return CAIRO_STATUS_SUCCESS; } @@ -549,6 +588,8 @@ _cairo_gstate_translate (cairo_gstate_t *gstate, double tx, double ty) { cairo_matrix_t tmp; + _cairo_gstate_unset_font (gstate); + _cairo_matrix_set_translate (&tmp, tx, ty); cairo_matrix_multiply (&gstate->ctm, &tmp, &gstate->ctm); @@ -566,6 +607,8 @@ _cairo_gstate_scale (cairo_gstate_t *gstate, double sx, double sy) if (sx == 0 || sy == 0) return CAIRO_STATUS_INVALID_MATRIX; + _cairo_gstate_unset_font (gstate); + _cairo_matrix_set_scale (&tmp, sx, sy); cairo_matrix_multiply (&gstate->ctm, &tmp, &gstate->ctm); @@ -580,6 +623,8 @@ _cairo_gstate_rotate (cairo_gstate_t *gstate, double angle) { cairo_matrix_t tmp; + _cairo_gstate_unset_font (gstate); + _cairo_matrix_set_rotate (&tmp, angle); cairo_matrix_multiply (&gstate->ctm, &tmp, &gstate->ctm); @@ -595,6 +640,8 @@ _cairo_gstate_concat_matrix (cairo_gstate_t *gstate, { cairo_matrix_t tmp; + _cairo_gstate_unset_font (gstate); + cairo_matrix_copy (&tmp, matrix); cairo_matrix_multiply (&gstate->ctm, &tmp, &gstate->ctm); @@ -610,6 +657,8 @@ _cairo_gstate_set_matrix (cairo_gstate_t *gstate, { cairo_status_t status; + _cairo_gstate_unset_font (gstate); + cairo_matrix_copy (&gstate->ctm, matrix); cairo_matrix_copy (&gstate->ctm_inverse, matrix); @@ -627,6 +676,8 @@ _cairo_gstate_default_matrix (cairo_gstate_t *gstate) if (scale == 0) scale = 1; + _cairo_gstate_unset_font (gstate); + cairo_matrix_set_identity (&gstate->font_matrix); cairo_matrix_set_identity (&gstate->ctm); @@ -640,6 +691,8 @@ _cairo_gstate_default_matrix (cairo_gstate_t *gstate) cairo_status_t _cairo_gstate_identity_matrix (cairo_gstate_t *gstate) { + _cairo_gstate_unset_font (gstate); + cairo_matrix_set_identity (&gstate->ctm); cairo_matrix_set_identity (&gstate->ctm_inverse); @@ -1256,54 +1309,17 @@ _cairo_gstate_interpret_path (cairo_gstate_t *gstate, &gpi); } -/* This function modifies the pattern and the state of the pattern surface it - may contain. The pattern surface will be restored to its orignal state - when the pattern is destroyed. The appropriate way is to pass a copy of - the original pattern to this function just before the pattern should be - used and destroy the copy when done. */ -static cairo_status_t -_cairo_gstate_create_pattern (cairo_gstate_t *gstate, - cairo_pattern_t *pattern, - cairo_box_t *extents) +/* XXX: gstate->alpha will be going away before too long, and when it + * does, it may make sense for this function to just disappear. + */ +static void +_cairo_gstate_pattern_init_copy (cairo_gstate_t *gstate, + cairo_pattern_union_t *pattern, + cairo_pattern_t *src) { - cairo_int_status_t status; - - if (gstate->surface == NULL) { - _cairo_pattern_fini (pattern); - return CAIRO_STATUS_NO_TARGET_SURFACE; - } - - if (pattern->type == CAIRO_PATTERN_LINEAR || - pattern->type == CAIRO_PATTERN_RADIAL) { - if (pattern->n_stops < 2) { - pattern->type = CAIRO_PATTERN_SOLID; - - if (pattern->n_stops) { - cairo_color_stop_t *stop = pattern->stops; - - _cairo_color_set_rgb (&pattern->color, - (double) stop->color_char[0] / 0xff, - (double) stop->color_char[1] / 0xff, - (double) stop->color_char[2] / 0xff); - _cairo_color_set_alpha (&pattern->color, - (double) stop->color_char[3] / 0xff); - } - } - } - - _cairo_pattern_set_alpha (pattern, gstate->alpha); - _cairo_pattern_transform (pattern, &gstate->ctm_inverse); - - status = _cairo_surface_create_pattern (gstate->surface, pattern, extents); - if (status) { - _cairo_pattern_fini (pattern); - return status; - } - - if (pattern->type == CAIRO_PATTERN_SURFACE) - _cairo_pattern_prepare_surface (pattern); - - return CAIRO_STATUS_SUCCESS; + _cairo_pattern_init_copy (&pattern->base, src); + _cairo_pattern_transform (&pattern->base, &gstate->ctm_inverse); + _cairo_pattern_set_alpha (&pattern->base, gstate->alpha); } cairo_status_t @@ -1342,7 +1358,7 @@ cairo_status_t _cairo_gstate_in_stroke (cairo_gstate_t *gstate, double x, double y, - int *inside_ret) + cairo_bool_t *inside_ret) { cairo_status_t status = CAIRO_STATUS_SUCCESS; cairo_traps_t traps; @@ -1365,51 +1381,85 @@ BAIL: return status; } -static cairo_status_t -_calculate_region_for_intermediate_clip_surface (pixman_region16_t *out, - cairo_box_t *extents, - cairo_clip_rec_t *clip_rect) +/* XXX We currently have a confusing mix of boxes and rectangles as + * exemplified by this function. A cairo_box_t is a rectangular area + * represented by the coordinates of the upper left and lower right + * corners, expressed in fixed point numbers. A cairo_rectangle_t is + * also a rectangular area, but represented by the upper left corner + * and the width and the height, as integer numbers. + * + * This function converts a cairo_box_t to a cairo_rectangle_t by + * increasing the area to the nearest integer coordinates. We should + * standardize on cairo_rectangle_t and cairo_rectangle_fixed_t, and + * this function could be renamed to the more reasonable + * _cairo_rectangle_fixed_round. + */ + +static void +_cairo_box_round_to_rectangle (cairo_box_t *box, cairo_rectangle_t *rectangle) { - cairo_status_t status; - pixman_region16_t *extents_region, *clip_region; - pixman_box16_t clip_box, pixman_extents; - - pixman_extents.x1 = _cairo_fixed_integer_floor (extents->p1.x); - pixman_extents.y1 = _cairo_fixed_integer_floor (extents->p1.y); - pixman_extents.x2 = _cairo_fixed_integer_ceil (extents->p2.x); - pixman_extents.y2 = _cairo_fixed_integer_ceil (extents->p2.y); - extents_region = pixman_region_create_simple (&pixman_extents); - if (extents_region == NULL) - { - status = CAIRO_STATUS_NO_MEMORY; - goto BAIL0; - } + rectangle->x = _cairo_fixed_integer_floor (box->p1.x); + rectangle->y = _cairo_fixed_integer_floor (box->p1.y); + rectangle->width = _cairo_fixed_integer_ceil (box->p2.x) - rectangle->x; + rectangle->height = _cairo_fixed_integer_ceil (box->p2.y) - rectangle->y; +} - clip_box.x1 = clip_rect->x; - clip_box.y1 = clip_rect->y; - clip_box.x2 = clip_rect->x + clip_rect->width; - clip_box.y2 = clip_rect->y + clip_rect->height; - clip_region = pixman_region_create_simple (&clip_box); - if (clip_region == NULL) - { - status = CAIRO_STATUS_NO_MEMORY; - goto BAIL1; - } +static void +_cairo_rectangle_intersect (cairo_rectangle_t *dest, cairo_rectangle_t *src) +{ + int x1, y1, x2, y2; - if (pixman_region_intersect (out, - extents_region, - clip_region) - == PIXMAN_REGION_STATUS_FAILURE) - status = CAIRO_STATUS_NO_MEMORY; - else - status = CAIRO_STATUS_SUCCESS; - - pixman_region_destroy (extents_region); - BAIL1: - pixman_region_destroy (clip_region); - - BAIL0: - return status; + x1 = MAX (dest->x, src->x); + y1 = MAX (dest->y, src->y); + x2 = MIN (dest->x + dest->width, src->x + src->width); + y2 = MIN (dest->y + dest->height, src->y + src->height); + + if (x1 >= x2 || y1 >= y2) { + dest->x = 0; + dest->y = 0; + dest->width = 0; + dest->height = 0; + } else { + dest->x = x1; + dest->y = y1; + dest->width = x2 - x1; + dest->height = y2 - y1; + } +} + +static int +_cairo_rectangle_empty (cairo_rectangle_t *rect) +{ + return rect->width == 0 || rect->height == 0; +} + +static void +translate_traps (cairo_traps_t *traps, int x, int y) +{ + cairo_fixed_t xoff, yoff; + cairo_trapezoid_t *t; + int i; + + /* Ugh. The cairo_composite/(Render) interface doesn't allow + an offset for the trapezoids. Need to manually shift all + the coordinates to align with the offset origin of the + intermediate surface. */ + + xoff = _cairo_fixed_from_int (x); + yoff = _cairo_fixed_from_int (y); + + for (i = 0, t = traps->traps; i < traps->num_traps; i++, t++) { + t->top += yoff; + t->bottom += yoff; + t->left.p1.x += xoff; + t->left.p1.y += yoff; + t->left.p2.x += xoff; + t->left.p2.y += yoff; + t->right.p1.x += xoff; + t->right.p1.y += yoff; + t->right.p2.x += xoff; + t->right.p2.y += yoff; + } } @@ -1422,173 +1472,148 @@ _cairo_gstate_clip_and_composite_trapezoids (cairo_gstate_t *gstate, cairo_traps_t *traps) { cairo_status_t status; - cairo_pattern_t pattern; - cairo_box_t extents; - int x_src, y_src; + cairo_pattern_union_t pattern; + cairo_rectangle_t extents; + cairo_box_t trap_extents; if (traps->num_traps == 0) return CAIRO_STATUS_SUCCESS; + if (gstate->surface == NULL) + return CAIRO_STATUS_NO_TARGET_SURFACE; + + _cairo_traps_extents (traps, &trap_extents); + _cairo_box_round_to_rectangle (&trap_extents, &extents); + if (gstate->clip.surface) { - cairo_fixed_t xoff, yoff; - cairo_trapezoid_t *t; - int i; cairo_surface_t *intermediate; + cairo_surface_pattern_t intermediate_pattern; cairo_color_t empty_color; - pixman_box16_t *draw_extents; - pixman_region16_t *draw_region; - draw_region = pixman_region_create (); - if (draw_region == NULL) - { - status = CAIRO_STATUS_NO_MEMORY; - goto BAIL0; - } - - _cairo_traps_extents (traps, &extents); + _cairo_rectangle_intersect (&extents, &gstate->clip.rect); - status = _calculate_region_for_intermediate_clip_surface (draw_region, - &extents, - &gstate->clip); - if (status) - goto BAIL1; - - /* Shortcut if empty */ - if (!pixman_region_not_empty (draw_region)) { + if (_cairo_rectangle_empty (&extents)) { status = CAIRO_STATUS_SUCCESS; goto BAIL1; } - draw_extents = pixman_region_extents (draw_region); - - /* Ugh. The cairo_composite/(Render) interface doesn't allow - an offset for the trapezoids. Need to manually shift all - the coordinates to align with the offset origin of the - intermediate surface. */ - xoff = _cairo_fixed_from_int (draw_extents->x1); - yoff = _cairo_fixed_from_int (draw_extents->y1); - for (i=0, t=traps->traps; i < traps->num_traps; i++, t++) { - t->top -= yoff; - t->bottom -= yoff; - t->left.p1.x -= xoff; - t->left.p1.y -= yoff; - t->left.p2.x -= xoff; - t->left.p2.y -= yoff; - t->right.p1.x -= xoff; - t->right.p1.y -= yoff; - t->right.p2.x -= xoff; - t->right.p2.y -= yoff; - } - - if (traps->traps[0].left.p1.y < traps->traps[0].left.p2.y) { - x_src = _cairo_fixed_to_double (traps->traps[0].left.p1.x); - y_src = _cairo_fixed_to_double (traps->traps[0].left.p1.y); - } else { - x_src = _cairo_fixed_to_double (traps->traps[0].left.p2.x); - y_src = _cairo_fixed_to_double (traps->traps[0].left.p2.y); - } - - _cairo_pattern_init_solid (&pattern, 1.0, 1.0, 1.0); - _cairo_pattern_set_alpha (&pattern, 1.0); - - status = _cairo_gstate_create_pattern (gstate, &pattern, &extents); - if (status) - goto BAIL1; + translate_traps (traps, -extents.x, -extents.y); _cairo_color_init (&empty_color); _cairo_color_set_alpha (&empty_color, 0.); intermediate = _cairo_surface_create_similar_solid (gstate->clip.surface, CAIRO_FORMAT_A8, - draw_extents->x2 - draw_extents->x1, - draw_extents->y2 - draw_extents->y1, + extents.width, + extents.height, &empty_color); if (intermediate == NULL) { status = CAIRO_STATUS_NO_MEMORY; - goto BAIL2; + goto BAIL1; } + _cairo_pattern_init_solid (&pattern.solid, 1.0, 1.0, 1.0); + status = _cairo_surface_composite_trapezoids (CAIRO_OPERATOR_ADD, - pattern.source, intermediate, - x_src, - y_src, + &pattern.base, + intermediate, + extents.x, extents.y, + 0, 0, + extents.width, + extents.height, traps->traps, traps->num_traps); + _cairo_pattern_fini (&pattern.base); + if (status) - goto BAIL3; + goto BAIL2; + + + _cairo_pattern_init_for_surface (&pattern.surface, + gstate->clip.surface); status = _cairo_surface_composite (CAIRO_OPERATOR_IN, - gstate->clip.surface, + &pattern.base, NULL, intermediate, - draw_extents->x1 - gstate->clip.x, - draw_extents->y1 - gstate->clip.y, + extents.x - gstate->clip.rect.x, + extents.y - gstate->clip.rect.y, 0, 0, 0, 0, - draw_extents->x2 - draw_extents->x1, - draw_extents->y2 - draw_extents->y1); + extents.width, extents.height); + _cairo_pattern_fini (&pattern.base); + if (status) - goto BAIL3; - - _cairo_pattern_fini (&pattern); - - _cairo_pattern_init_copy (&pattern, src); - - extents.p1.x = _cairo_fixed_from_int (draw_extents->x1); - extents.p1.y = _cairo_fixed_from_int (draw_extents->y1); - extents.p2.x = _cairo_fixed_from_int (draw_extents->x2); - extents.p2.y = _cairo_fixed_from_int (draw_extents->y2); - status = _cairo_gstate_create_pattern (gstate, &pattern, &extents); - if (status) - goto BAIL3; + goto BAIL2; - if (dst == gstate->clip.surface) - xoff = yoff = 0; + _cairo_pattern_init_for_surface (&intermediate_pattern, intermediate); + _cairo_gstate_pattern_init_copy (gstate, &pattern, src); status = _cairo_surface_composite (operator, - pattern.source, intermediate, dst, + &pattern.base, + &intermediate_pattern.base, + dst, + extents.x, extents.y, 0, 0, - 0, 0, - xoff >> 16, - yoff >> 16, - draw_extents->x2 - draw_extents->x1, - draw_extents->y2 - draw_extents->y1); + extents.x, extents.y, + extents.width, extents.height); + _cairo_pattern_fini (&pattern.base); + _cairo_pattern_fini (&intermediate_pattern.base); - BAIL3: - cairo_surface_destroy (intermediate); BAIL2: - _cairo_pattern_fini (&pattern); + cairo_surface_destroy (intermediate); BAIL1: - pixman_region_destroy (draw_region); - BAIL0: if (status) return status; } else { - if (traps->traps[0].left.p1.y < traps->traps[0].left.p2.y) { - x_src = _cairo_fixed_to_double (traps->traps[0].left.p1.x); - y_src = _cairo_fixed_to_double (traps->traps[0].left.p1.y); - } else { - x_src = _cairo_fixed_to_double (traps->traps[0].left.p2.x); - y_src = _cairo_fixed_to_double (traps->traps[0].left.p2.y); + if (gstate->clip.region) { + pixman_box16_t box; + pixman_box16_t *intersection_extents; + pixman_region16_t *rect, *intersection; + + box.x1 = _cairo_fixed_integer_floor (trap_extents.p1.x); + box.y1 = _cairo_fixed_integer_floor (trap_extents.p1.y); + box.x2 = _cairo_fixed_integer_ceil (trap_extents.p2.x); + box.y2 = _cairo_fixed_integer_ceil (trap_extents.p2.y); + + rect = pixman_region_create_simple (&box); + if (rect == NULL) + goto bail1; + intersection = pixman_region_create(); + if (intersection == NULL) + goto bail2; + + if (pixman_region_intersect (intersection, gstate->clip.region, + rect) != PIXMAN_REGION_STATUS_SUCCESS) + goto bail3; + intersection_extents = pixman_region_extents (intersection); + + extents.x = intersection_extents->x1; + extents.y = intersection_extents->y1; + extents.width = intersection_extents->x2 - intersection_extents->x1; + extents.height = intersection_extents->y2 - intersection_extents->y1; + bail3: + pixman_region_destroy (intersection); + bail2: + pixman_region_destroy (rect); + bail1: + ; } - _cairo_pattern_init_copy (&pattern, src); + _cairo_gstate_pattern_init_copy (gstate, &pattern, src); - _cairo_traps_extents (traps, &extents); - status = _cairo_gstate_create_pattern (gstate, &pattern, &extents); - if (status) - return status; - status = _cairo_surface_composite_trapezoids (gstate->operator, - pattern.source, dst, - x_src - pattern.source_offset.x, - y_src - pattern.source_offset.y, + &pattern.base, dst, + extents.x, extents.y, + extents.x, extents.y, + extents.width, + extents.height, traps->traps, traps->num_traps); - _cairo_pattern_fini (&pattern); + _cairo_pattern_fini (&pattern.base); if (status) return status; @@ -1628,7 +1653,7 @@ cairo_status_t _cairo_gstate_in_fill (cairo_gstate_t *gstate, double x, double y, - int *inside_ret) + cairo_bool_t *inside_ret) { cairo_status_t status = CAIRO_STATUS_SUCCESS; cairo_traps_t traps; @@ -1807,9 +1832,10 @@ cairo_status_t _cairo_gstate_clip (cairo_gstate_t *gstate) { cairo_status_t status; - cairo_pattern_t pattern; + cairo_pattern_union_t pattern; cairo_traps_t traps; cairo_color_t white_color; + cairo_box_t extents; pixman_box16_t box; /* Fill the clip region as traps. */ @@ -1871,33 +1897,32 @@ _cairo_gstate_clip (cairo_gstate_t *gstate) _cairo_color_init (&white_color); if (gstate->clip.surface == NULL) { - cairo_box_t extents; - _cairo_traps_extents (&traps, &extents); - gstate->clip.x = extents.p1.x >> 16; - gstate->clip.y = extents.p1.y >> 16; - gstate->clip.width = ((extents.p2.x + 65535) >> 16) - gstate->clip.x; - gstate->clip.height = ((extents.p2.y + 65535) >> 16) - gstate->clip.y; + _cairo_box_round_to_rectangle (&extents, &gstate->clip.rect); gstate->clip.surface = _cairo_surface_create_similar_solid (gstate->surface, CAIRO_FORMAT_A8, - gstate->clip.width, - gstate->clip.height, + gstate->clip.rect.width, + gstate->clip.rect.height, &white_color); if (gstate->clip.surface == NULL) return CAIRO_STATUS_NO_MEMORY; } - _cairo_pattern_init_solid (&pattern, 1.0, 1.0, 1.0); - _cairo_pattern_set_alpha (&pattern, 1.0); + translate_traps (&traps, -gstate->clip.rect.x, -gstate->clip.rect.y); + _cairo_pattern_init_solid (&pattern.solid, 1.0, 1.0, 1.0); - _cairo_gstate_clip_and_composite_trapezoids (gstate, - &pattern, - CAIRO_OPERATOR_IN, - gstate->clip.surface, - &traps); - - _cairo_pattern_fini (&pattern); + status = _cairo_surface_composite_trapezoids (CAIRO_OPERATOR_IN, + &pattern.base, + gstate->clip.surface, + 0, 0, + 0, 0, + gstate->clip.rect.width, + gstate->clip.rect.height, + traps.traps, + traps.num_traps); + + _cairo_pattern_fini (&pattern.base); _cairo_traps_fini (&traps); @@ -1978,19 +2003,15 @@ _cairo_gstate_show_surface (cairo_gstate_t *gstate, * */ - cairo_status_t status; - cairo_matrix_t user_to_image, image_to_user; - cairo_matrix_t image_to_device, device_to_image; + cairo_status_t status = CAIRO_STATUS_SUCCESS; + cairo_matrix_t image_to_user, image_to_device; double device_x, device_y; double device_width, device_height; - cairo_pattern_t pattern; + cairo_surface_pattern_t pattern; cairo_box_t pattern_extents; + cairo_rectangle_t extents; - cairo_surface_get_matrix (surface, &user_to_image); - cairo_matrix_multiply (&device_to_image, &gstate->ctm_inverse, &user_to_image); - cairo_surface_set_matrix (surface, &device_to_image); - - image_to_user = user_to_image; + cairo_surface_get_matrix (surface, &image_to_user); cairo_matrix_invert (&image_to_user); cairo_matrix_multiply (&image_to_device, &image_to_user, &gstate->ctm); @@ -2001,126 +2022,82 @@ _cairo_gstate_show_surface (cairo_gstate_t *gstate, &device_x, &device_y, &device_width, &device_height); - _cairo_pattern_init (&pattern); + _cairo_pattern_init_for_surface (&pattern, surface); + + /* inherit surface attributes while surface attribute functions still + exist */ + pattern.base.matrix = surface->matrix; + pattern.base.filter = surface->filter; + if (surface->repeat) + pattern.base.extend = CAIRO_EXTEND_REPEAT; + else + pattern.base.extend = CAIRO_EXTEND_NONE; + + _cairo_pattern_transform (&pattern.base, &gstate->ctm_inverse); + _cairo_pattern_set_alpha (&pattern.base, gstate->alpha); pattern_extents.p1.x = _cairo_fixed_from_double (device_x); pattern_extents.p1.y = _cairo_fixed_from_double (device_y); pattern_extents.p2.x = _cairo_fixed_from_double (device_x + device_width); pattern_extents.p2.y = _cairo_fixed_from_double (device_y + device_height); - - if ((gstate->pattern->type != CAIRO_PATTERN_SOLID) || - (gstate->alpha != 1.0)) { - /* I'm allowing any type of pattern for the mask right now. - Maybe this is bad. Will allow for some cool effects though. */ - _cairo_pattern_init_copy (&pattern, gstate->pattern); - status = _cairo_gstate_create_pattern (gstate, &pattern, &pattern_extents); - if (status) - return status; - } - + _cairo_box_round_to_rectangle (&pattern_extents, &extents); + if (gstate->clip.surface) { - cairo_surface_t *intermediate; - cairo_color_t empty_color; - pixman_box16_t *draw_extents; - pixman_region16_t *draw_region; + _cairo_rectangle_intersect (&extents, &gstate->clip.rect); - draw_region = pixman_region_create (); - if (draw_region == NULL) - { - status = CAIRO_STATUS_NO_MEMORY; - goto BAIL0; + /* We only need to composite if the rectangle is not empty. */ + if (!_cairo_rectangle_empty (&extents)) { + cairo_surface_pattern_t clip_pattern; + + _cairo_pattern_init_for_surface (&clip_pattern, + gstate->clip.surface); + + status = _cairo_surface_composite (gstate->operator, + &pattern.base, + &clip_pattern.base, + gstate->surface, + extents.x, extents.y, + 0, 0, + extents.x, extents.y, + extents.width, extents.height); + + _cairo_pattern_fini (&clip_pattern.base); } - - status = _calculate_region_for_intermediate_clip_surface (draw_region, - &pattern_extents, - &gstate->clip); - if (status) - goto BAIL1; - - /* Shortcut if empty */ - if (!pixman_region_not_empty (draw_region)) { - status = CAIRO_STATUS_SUCCESS; - goto BAIL1; - } - - draw_extents = pixman_region_extents (draw_region); - - _cairo_color_init (&empty_color); - _cairo_color_set_alpha (&empty_color, .0); - intermediate = _cairo_surface_create_similar_solid (gstate->clip.surface, - CAIRO_FORMAT_A8, - draw_extents->x2 - draw_extents->x1, - draw_extents->y2 - draw_extents->y1, - &empty_color); - - /* it is not completely clear what the "right" way to combine the - pattern and mask surface is. I will use the the clip as a source - and the pattern as a mask in building up my temporary, because - this is not *totally* bogus and accomodates the case where - pattern's source image is NULL reasonably well. feel free to - correct this if you see a reason. */ - - status = _cairo_surface_composite (CAIRO_OPERATOR_SRC, - gstate->clip.surface, - pattern.source, - intermediate, - draw_extents->x1 - gstate->clip.x, - draw_extents->y1 - gstate->clip.y, - 0, 0, - 0, 0, - draw_extents->x2 - draw_extents->x1, - draw_extents->y2 - draw_extents->y1); - - - if (status) - goto BAIL2; - - status = _cairo_surface_composite (gstate->operator, - surface, - intermediate, - gstate->surface, - draw_extents->x1, draw_extents->y1, - 0, 0, - draw_extents->x1, draw_extents->y1, - draw_extents->x2 - draw_extents->x1, - draw_extents->y2 - draw_extents->y1); - - BAIL2: - cairo_surface_destroy (intermediate); - BAIL1: - pixman_region_destroy (draw_region); - BAIL0: - ; } else { - - /* XXX: The rendered size is sometimes 1 or 2 pixels short from - what I expect. Need to fix this. */ + /* XXX: The rendered size is sometimes 1 or 2 pixels short + * from what I expect. Need to fix this. + * KRH: I'm guessing this was due to rounding error when + * passing double coordinates for integer arguments. Using + * the extents rectangle should fix this, since it's properly + * rounded. Is this still the case? + */ status = _cairo_surface_composite (gstate->operator, - surface, - pattern.source, + &pattern.base, + NULL, gstate->surface, - device_x, device_y, + extents.x, extents.y, 0, 0, - device_x, device_y, - device_width, - device_height); + extents.x, extents.y, + extents.width, extents.height); } - _cairo_pattern_fini (&pattern); + _cairo_pattern_fini (&pattern.base); - /* restore the matrix originally in the surface */ - cairo_surface_set_matrix (surface, &user_to_image); - - if (status) - return status; - - return CAIRO_STATUS_SUCCESS; + return status; } +static void +_cairo_gstate_unset_font (cairo_gstate_t *gstate) +{ + if (gstate->font) { + cairo_font_destroy (gstate->font); + gstate->font = NULL; + } +} cairo_status_t _cairo_gstate_select_font (cairo_gstate_t *gstate, @@ -2128,12 +2105,17 @@ _cairo_gstate_select_font (cairo_gstate_t *gstate, cairo_font_slant_t slant, cairo_font_weight_t weight) { - if (gstate->font) - _cairo_unscaled_font_destroy (gstate->font); + char *new_family; - gstate->font = _cairo_unscaled_font_create (family, slant, weight); - if (gstate->font == NULL) + new_family = strdup (family); + if (!new_family) return CAIRO_STATUS_NO_MEMORY; + + _cairo_gstate_unset_font (gstate); + + gstate->font_family = new_family; + gstate->font_slant = slant; + gstate->font_weight = weight; cairo_matrix_set_identity (&gstate->font_matrix); @@ -2144,6 +2126,8 @@ cairo_status_t _cairo_gstate_scale_font (cairo_gstate_t *gstate, double scale) { + _cairo_gstate_unset_font (gstate); + return cairo_matrix_scale (&gstate->font_matrix, scale, scale); } @@ -2153,6 +2137,9 @@ _cairo_gstate_transform_font (cairo_gstate_t *gstate, { cairo_matrix_t tmp; double a, b, c, d, tx, ty; + + _cairo_gstate_unset_font (gstate); + cairo_matrix_get_affine (matrix, &a, &b, &c, &d, &tx, &ty); cairo_matrix_set_affine (&tmp, a, b, c, d, 0, 0); return cairo_matrix_multiply (&gstate->font_matrix, &gstate->font_matrix, &tmp); @@ -2160,28 +2147,16 @@ _cairo_gstate_transform_font (cairo_gstate_t *gstate, cairo_status_t -_cairo_gstate_current_font (cairo_gstate_t *gstate, - cairo_font_t **font) +_cairo_gstate_current_font (cairo_gstate_t *gstate, + cairo_font_t **font) { - cairo_font_scale_t scale; - cairo_font_t *scaled; - double dummy; + cairo_status_t status; - scaled = malloc (sizeof (cairo_font_t)); - if (scaled == NULL) - return CAIRO_STATUS_NO_MEMORY; - - cairo_matrix_get_affine (&gstate->font_matrix, - &scale.matrix[0][0], - &scale.matrix[0][1], - &scale.matrix[1][0], - &scale.matrix[1][1], - &dummy, &dummy); - - _cairo_font_init (scaled, &scale, gstate->font); - _cairo_unscaled_font_reference (gstate->font); - - *font = scaled; + status = _cairo_gstate_ensure_font (gstate); + if (status) + return status; + + *font = gstate->font; return CAIRO_STATUS_SUCCESS; } @@ -2190,6 +2165,8 @@ void _cairo_gstate_set_font_transform (cairo_gstate_t *gstate, cairo_matrix_t *matrix) { + _cairo_gstate_unset_font (gstate); + cairo_matrix_copy (&gstate->font_matrix, matrix); } @@ -2214,12 +2191,10 @@ _cairo_gstate_current_font_transform (cairo_gstate_t *gstate, * independently scale the user coordinate system *or* the font matrix, in * order to adjust the rendered size of the font. * - * If the user asks for a permanent reference to "a font", they are given a - * handle to a structure holding a scale matrix and an unscaled font. This - * effectively decouples the font from further changes to user space. Even - * if the user then "sets" the current cairo_t font to the handle they were - * passed, further changes to the cairo_t CTM will not affect externally - * held references to the font. + * The only font type exposed to the user is cairo_font_t which is a + * a font specialized to a particular scale matrix, CTM, and target + * surface. The user is responsible for not using a cairo_font_t + * after changing the parameters; doing so will produce garbled metrics. * * * The font's view @@ -2279,9 +2254,9 @@ _cairo_gstate_current_font_transform (cairo_gstate_t *gstate, * */ -static void -_build_font_scale (cairo_gstate_t *gstate, - cairo_font_scale_t *sc) +void +_cairo_gstate_current_font_scale (cairo_gstate_t *gstate, + cairo_font_scale_t *sc) { cairo_matrix_t tmp; double dummy; @@ -2294,34 +2269,46 @@ _build_font_scale (cairo_gstate_t *gstate, &dummy, &dummy); } +static cairo_status_t +_cairo_gstate_ensure_font (cairo_gstate_t *gstate) +{ + cairo_font_scale_t sc; + cairo_status_t status; + const char *family; + + if (gstate->font) + return CAIRO_STATUS_SUCCESS; + + _cairo_gstate_current_font_scale (gstate, &sc); + + if (gstate->font_family) + family = gstate->font_family; + else + family = CAIRO_FONT_FAMILY_DEFAULT; + + status = _cairo_font_create (family, + gstate->font_slant, + gstate->font_weight, + &sc, + &gstate->font); + + if (status) + return status; + + return CAIRO_STATUS_SUCCESS; +} + cairo_status_t _cairo_gstate_current_font_extents (cairo_gstate_t *gstate, cairo_font_extents_t *extents) { - cairo_int_status_t status; - cairo_font_scale_t sc; - double font_scale_x, font_scale_y; + cairo_status_t status = _cairo_gstate_ensure_font (gstate); + if (status) + return status; - _build_font_scale (gstate, &sc); - - status = _cairo_unscaled_font_font_extents (gstate->font, &sc, extents); - - _cairo_matrix_compute_scale_factors (&gstate->font_matrix, - &font_scale_x, &font_scale_y, - /* XXX */ 1); - - /* - * The font responded in unscaled units, scale by the font - * matrix scale factors to get to user space - */ - - extents->ascent *= font_scale_y; - extents->descent *= font_scale_y; - extents->height *= font_scale_y; - extents->max_x_advance *= font_scale_x; - extents->max_y_advance *= font_scale_y; - - return status; + return cairo_font_extents (gstate->font, + &gstate->font_matrix, + extents); } cairo_status_t @@ -2331,14 +2318,15 @@ _cairo_gstate_text_to_glyphs (cairo_gstate_t *gstate, int *nglyphs) { cairo_status_t status; - cairo_font_scale_t sc; cairo_point_t point; double origin_x, origin_y; int i; - _build_font_scale (gstate, &sc); - + status = _cairo_gstate_ensure_font (gstate); + if (status) + return status; + status = _cairo_path_current_point (&gstate->path, &point); if (status == CAIRO_STATUS_NO_CURRENT_POINT) { origin_x = 0.0; @@ -2350,8 +2338,8 @@ _cairo_gstate_text_to_glyphs (cairo_gstate_t *gstate, &origin_x, &origin_y); } - status = _cairo_unscaled_font_text_to_glyphs (gstate->font, - &sc, utf8, glyphs, nglyphs); + status = _cairo_font_text_to_glyphs (gstate->font, + utf8, glyphs, nglyphs); if (status || !glyphs || !nglyphs || !(*glyphs) || !(nglyphs)) return status; @@ -2373,18 +2361,16 @@ _cairo_gstate_text_to_glyphs (cairo_gstate_t *gstate, cairo_status_t _cairo_gstate_set_font (cairo_gstate_t *gstate, - cairo_font_t *font) + cairo_font_t *font) { - if (gstate->font != NULL) - _cairo_unscaled_font_destroy (gstate->font); - gstate->font = font->unscaled; - _cairo_unscaled_font_reference (gstate->font); - cairo_matrix_set_affine (&gstate->font_matrix, - font->scale.matrix[0][0], - font->scale.matrix[0][1], - font->scale.matrix[1][0], - font->scale.matrix[1][1], - 0, 0); + if (font != gstate->font) { + if (gstate->font) + cairo_font_destroy (gstate->font); + gstate->font = font; + if (gstate->font) + cairo_font_reference (gstate->font); + } + return CAIRO_STATUS_SUCCESS; } @@ -2394,90 +2380,18 @@ _cairo_gstate_glyph_extents (cairo_gstate_t *gstate, int num_glyphs, cairo_text_extents_t *extents) { - cairo_status_t status = CAIRO_STATUS_SUCCESS; - cairo_glyph_t origin_glyph; - cairo_text_extents_t origin_extents; - cairo_font_scale_t sc; - int i; - double min_x = 0.0, min_y = 0.0, max_x = 0.0, max_y = 0.0; - double x_pos = 0.0, y_pos = 0.0; - int set = 0; + cairo_status_t status; - if (!num_glyphs) - { - extents->x_bearing = 0.0; - extents->y_bearing = 0.0; - extents->width = 0.0; - extents->height = 0.0; - extents->x_advance = 0.0; - extents->y_advance = 0.0; - return CAIRO_STATUS_SUCCESS; - } + status = _cairo_gstate_ensure_font (gstate); + if (status) + return status; - _build_font_scale (gstate, &sc); + cairo_font_glyph_extents (gstate->font, + &gstate->font_matrix, + glyphs, num_glyphs, + extents); - for (i = 0; i < num_glyphs; i++) - { - double x, y; - double wm, hm; - - origin_glyph = glyphs[i]; - origin_glyph.x = 0.0; - origin_glyph.y = 0.0; - status = _cairo_unscaled_font_glyph_extents (gstate->font, &sc, - &origin_glyph, 1, - &origin_extents); - - /* - * Transform font space metrics into user space metrics - * by running the corners through the font matrix and - * expanding the bounding box as necessary - */ - x = origin_extents.x_bearing; - y = origin_extents.y_bearing; - cairo_matrix_transform_point (&gstate->font_matrix, - &x, &y); - - for (hm = 0.0; hm <= 1.0; hm += 1.0) - for (wm = 0.0; wm <= 1.0; wm += 1.0) - { - x = origin_extents.x_bearing + origin_extents.width * wm; - y = origin_extents.y_bearing + origin_extents.height * hm; - cairo_matrix_transform_point (&gstate->font_matrix, - &x, &y); - x += glyphs[i].x; - y += glyphs[i].y; - if (!set) - { - min_x = max_x = x; - min_y = max_y = y; - set = 1; - } - else - { - if (x < min_x) min_x = x; - if (x > max_x) max_x = x; - if (y < min_y) min_y = y; - if (y > max_y) max_y = y; - } - } - - x = origin_extents.x_advance; - y = origin_extents.y_advance; - cairo_matrix_transform_point (&gstate->font_matrix, - &x, &y); - x_pos = glyphs[i].x + x; - y_pos = glyphs[i].y + y; - } - - extents->x_bearing = min_x - glyphs[0].x; - extents->y_bearing = min_y - glyphs[0].y; - extents->width = max_x - min_x; - extents->height = max_y - min_y; - extents->x_advance = x_pos - glyphs[0].x; - extents->y_advance = y_pos - glyphs[0].y; - - return status; + return CAIRO_STATUS_SUCCESS; } cairo_status_t @@ -2488,12 +2402,14 @@ _cairo_gstate_show_glyphs (cairo_gstate_t *gstate, cairo_status_t status; int i; cairo_glyph_t *transformed_glyphs = NULL; - cairo_font_scale_t sc; - cairo_pattern_t pattern; + cairo_pattern_union_t pattern; cairo_box_t bbox; + cairo_rectangle_t extents; - _build_font_scale (gstate, &sc); - + status = _cairo_gstate_ensure_font (gstate); + if (status) + return status; + transformed_glyphs = malloc (num_glyphs * sizeof(cairo_glyph_t)); if (transformed_glyphs == NULL) return CAIRO_STATUS_NO_MEMORY; @@ -2506,52 +2422,34 @@ _cairo_gstate_show_glyphs (cairo_gstate_t *gstate, &transformed_glyphs[i].y); } - _cairo_pattern_init_copy (&pattern, gstate->pattern); - status = _cairo_unscaled_font_glyph_bbox (gstate->font, &sc, - transformed_glyphs, num_glyphs, - &bbox); + status = _cairo_font_glyph_bbox (gstate->font, + transformed_glyphs, num_glyphs, + &bbox); + _cairo_box_round_to_rectangle (&bbox, &extents); + if (status) goto CLEANUP_GLYPHS; - status = _cairo_gstate_create_pattern (gstate, &pattern, &bbox); - if (status) - goto CLEANUP_GLYPHS; - if (gstate->clip.surface) { cairo_surface_t *intermediate; + cairo_surface_pattern_t intermediate_pattern; cairo_color_t empty_color; - pixman_box16_t *draw_extents; - pixman_region16_t *draw_region; - draw_region = pixman_region_create (); - if (draw_region == NULL) - { - status = CAIRO_STATUS_NO_MEMORY; - goto BAIL0; - } - - status = _calculate_region_for_intermediate_clip_surface (draw_region, - &bbox, - &gstate->clip); - if (status) { - goto BAIL1; - } + _cairo_rectangle_intersect (&extents, &gstate->clip.rect); /* Shortcut if empty */ - if (!pixman_region_not_empty (draw_region)) { + if (_cairo_rectangle_empty (&extents)) { status = CAIRO_STATUS_SUCCESS; goto BAIL1; } - draw_extents = pixman_region_extents (draw_region); - _cairo_color_init (&empty_color); _cairo_color_set_alpha (&empty_color, .0); intermediate = _cairo_surface_create_similar_solid (gstate->clip.surface, CAIRO_FORMAT_A8, - draw_extents->x2 - draw_extents->x1, - draw_extents->y2 - draw_extents->y1, + extents.width, + extents.height, &empty_color); if (intermediate == NULL) { status = CAIRO_STATUS_NO_MEMORY; @@ -2561,66 +2459,77 @@ _cairo_gstate_show_glyphs (cairo_gstate_t *gstate, /* move the glyphs again, from dev space to intermediate space */ for (i = 0; i < num_glyphs; ++i) { - transformed_glyphs[i].x -= draw_extents->x1; - transformed_glyphs[i].y -= draw_extents->y1; + transformed_glyphs[i].x -= extents.x; + transformed_glyphs[i].y -= extents.y; } - status = _cairo_unscaled_font_show_glyphs (gstate->font, - &sc, - CAIRO_OPERATOR_ADD, - pattern.source, intermediate, - draw_extents->x1 - pattern.source_offset.x, - draw_extents->y1 - pattern.source_offset.y, - transformed_glyphs, num_glyphs); + _cairo_pattern_init_solid (&pattern.solid, 1.0, 1.0, 1.0); + + status = _cairo_font_show_glyphs (gstate->font, + CAIRO_OPERATOR_ADD, + &pattern.base, intermediate, + extents.x, extents.y, + 0, 0, + extents.width, extents.height, + transformed_glyphs, num_glyphs); + + _cairo_pattern_fini (&pattern.base); if (status) goto BAIL2; + _cairo_pattern_init_for_surface (&pattern.surface, + gstate->clip.surface); + status = _cairo_surface_composite (CAIRO_OPERATOR_IN, - gstate->clip.surface, + &pattern.base, NULL, intermediate, - draw_extents->x1 - gstate->clip.x, - draw_extents->y1 - gstate->clip.y, + extents.x - gstate->clip.rect.x, + extents.y - gstate->clip.rect.y, 0, 0, 0, 0, - draw_extents->x2 - draw_extents->x1, - draw_extents->y2 - draw_extents->y1); + extents.width, extents.height); + + _cairo_pattern_fini (&pattern.base); if (status) goto BAIL2; + _cairo_pattern_init_for_surface (&intermediate_pattern, intermediate); + _cairo_gstate_pattern_init_copy (gstate, &pattern, gstate->pattern); + status = _cairo_surface_composite (gstate->operator, - pattern.source, - intermediate, + &pattern.base, + &intermediate_pattern.base, gstate->surface, - 0, 0, + extents.x, extents.y, 0, 0, - draw_extents->x1, - draw_extents->y1, - draw_extents->x2 - draw_extents->x1, - draw_extents->y2 - draw_extents->y1); + extents.x, extents.y, + extents.width, extents.height); + _cairo_pattern_fini (&pattern.base); + _cairo_pattern_fini (&intermediate_pattern.base); BAIL2: cairo_surface_destroy (intermediate); BAIL1: - pixman_region_destroy (draw_region); - BAIL0: ; } else { - status = _cairo_unscaled_font_show_glyphs (gstate->font, - &sc, - gstate->operator, pattern.source, - gstate->surface, - -pattern.source_offset.x, - -pattern.source_offset.y, - transformed_glyphs, num_glyphs); + _cairo_gstate_pattern_init_copy (gstate, &pattern, gstate->pattern); + + status = _cairo_font_show_glyphs (gstate->font, + gstate->operator, &pattern.base, + gstate->surface, + extents.x, extents.y, + extents.x, extents.y, + extents.width, extents.height, + transformed_glyphs, num_glyphs); + + _cairo_pattern_fini (&pattern.base); } - _cairo_pattern_fini (&pattern); - CLEANUP_GLYPHS: free (transformed_glyphs); @@ -2635,9 +2544,6 @@ _cairo_gstate_glyph_path (cairo_gstate_t *gstate, cairo_status_t status; int i; cairo_glyph_t *transformed_glyphs = NULL; - cairo_font_scale_t sc; - - _build_font_scale (gstate, &sc); transformed_glyphs = malloc (num_glyphs * sizeof(cairo_glyph_t)); if (transformed_glyphs == NULL) @@ -2651,9 +2557,9 @@ _cairo_gstate_glyph_path (cairo_gstate_t *gstate, &(transformed_glyphs[i].y)); } - status = _cairo_unscaled_font_glyph_path (gstate->font, &sc, - transformed_glyphs, num_glyphs, - &gstate->path); + status = _cairo_font_glyph_path (gstate->font, + transformed_glyphs, num_glyphs, + &gstate->path); free (transformed_glyphs); return status; diff --git a/gfx/cairo/cairo/src/cairo_hull.c b/gfx/cairo/cairo/src/cairo_hull.c index 99b16d1ae3ac..c93d70625388 100644 --- a/gfx/cairo/cairo/src/cairo_hull.c +++ b/gfx/cairo/cairo/src/cairo_hull.c @@ -31,7 +31,7 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ #include "cairoint.h" diff --git a/gfx/cairo/cairo/src/cairo_image_surface.c b/gfx/cairo/cairo/src/cairo_image_surface.c index 14e30f695a79..9745b3150005 100644 --- a/gfx/cairo/cairo/src/cairo_image_surface.c +++ b/gfx/cairo/cairo/src/cairo_image_surface.c @@ -31,7 +31,7 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ #include "cairoint.h" @@ -54,7 +54,8 @@ _cairo_format_bpp (cairo_format_t format) } static cairo_image_surface_t * -_cairo_image_surface_create_for_pixman_image (pixman_image_t *pixman_image) +_cairo_image_surface_create_for_pixman_image (pixman_image_t *pixman_image, + cairo_format_t format) { cairo_image_surface_t *surface; @@ -66,6 +67,7 @@ _cairo_image_surface_create_for_pixman_image (pixman_image_t *pixman_image) surface->pixman_image = pixman_image; + surface->format = format; surface->data = (char *) pixman_image_get_data (pixman_image); surface->owns_data = 0; @@ -105,7 +107,8 @@ _cairo_image_surface_create_with_masks (char *data, if (pixman_image == NULL) return NULL; - surface = _cairo_image_surface_create_for_pixman_image (pixman_image); + surface = _cairo_image_surface_create_for_pixman_image (pixman_image, + (cairo_format_t)-1); return surface; } @@ -130,6 +133,20 @@ _create_pixman_format (cairo_format_t format) } } +/** + * cairo_image_surface_create: + * @format: format of pixels in the surface to create + * @width: width of the surface, in pixels + * @height: height of the surface, in pixels + * + * Creates an image surface of the specified format and + * dimensions. The initial contents of the surface is undefined; you + * must explicitely clear the buffer, using, for example, + * cairo_rectangle() and cairo_fill() if you want it cleared. + * + * Return value: the newly created surface, or %NULL if it couldn't + * be created because of lack of memory + **/ cairo_surface_t * cairo_image_surface_create (cairo_format_t format, int width, @@ -150,11 +167,33 @@ cairo_image_surface_create (cairo_format_t format, if (pixman_image == NULL) return NULL; - surface = _cairo_image_surface_create_for_pixman_image (pixman_image); + surface = _cairo_image_surface_create_for_pixman_image (pixman_image, format); return &surface->base; } +/** + * cairo_image_surface_create_for_data: + * @data: a pointer to a buffer supplied by the application + * in which to write contents. + * @format: the format of pixels in the buffer + * @width: the width of the image to be stored in the buffer + * @height: the height of the image to be stored in the buffer + * @stride: the number of bytes between the start of rows + * in the buffer. Having this be specified separate from @width + * allows for padding at the end of rows, or for writing + * to a subportion of a larger image. + * + * Creates an image surface for the provided pixel data. The output + * buffer must be kept around until the #cairo_surface_t is destroyed + * or cairo_surface_finish() is called on the surface. The initial + * contents of @buffer will be used as the inital image contents; you + * must explicitely clear the buffer, using, for example, + * cairo_rectangle() and cairo_fill() if you want it cleared. + * + * Return value: the newly created surface, or %NULL if it couldn't + * be created because of lack of memory + **/ cairo_surface_t * cairo_image_surface_create_for_data (char *data, cairo_format_t format, @@ -180,7 +219,7 @@ cairo_image_surface_create_for_data (char *data, if (pixman_image == NULL) return NULL; - surface = _cairo_image_surface_create_for_pixman_image (pixman_image); + surface = _cairo_image_surface_create_for_pixman_image (pixman_image, format); return &surface->base; } @@ -224,33 +263,66 @@ _cairo_image_surface_pixels_per_inch (void *abstract_surface) return 96.0; } -static cairo_image_surface_t * -_cairo_image_surface_get_image (void *abstract_surface) -{ - cairo_image_surface_t *surface = abstract_surface; - - cairo_surface_reference (&surface->base); - - return surface; -} - static cairo_status_t -_cairo_image_surface_set_image (void *abstract_surface, - cairo_image_surface_t *image) +_cairo_image_surface_acquire_source_image (void *abstract_surface, + cairo_image_surface_t **image_out, + void **image_extra) { - if (image == abstract_surface) - return CAIRO_STATUS_SUCCESS; - - /* XXX: This case has not yet been implemented. We'll lie for now. */ + *image_out = abstract_surface; + return CAIRO_STATUS_SUCCESS; } +static void +_cairo_image_surface_release_source_image (void *abstract_surface, + cairo_image_surface_t *image, + void *image_extra) +{ +} + static cairo_status_t -_cairo_image_abstract_surface_set_matrix (void *abstract_surface, - cairo_matrix_t *matrix) +_cairo_image_surface_acquire_dest_image (void *abstract_surface, + cairo_rectangle_t *interest_rect, + cairo_image_surface_t **image_out, + cairo_rectangle_t *image_rect_out, + void **image_extra) { cairo_image_surface_t *surface = abstract_surface; - return _cairo_image_surface_set_matrix (surface, matrix); + + image_rect_out->x = 0; + image_rect_out->y = 0; + image_rect_out->width = surface->width; + image_rect_out->height = surface->height; + + *image_out = surface; + + return CAIRO_STATUS_SUCCESS; +} + +static void +_cairo_image_surface_release_dest_image (void *abstract_surface, + cairo_rectangle_t *interest_rect, + cairo_image_surface_t *image, + cairo_rectangle_t *image_rect, + void *image_extra) +{ +} + +static cairo_status_t +_cairo_image_surface_clone_similar (void *abstract_surface, + cairo_surface_t *src, + cairo_surface_t **clone_out) +{ + cairo_image_surface_t *surface = abstract_surface; + + if (src->backend == surface->base.backend) { + *clone_out = src; + cairo_surface_reference (src); + + return CAIRO_STATUS_SUCCESS; + } + + return CAIRO_INT_STATUS_UNSUPPORTED; } cairo_status_t @@ -276,14 +348,6 @@ _cairo_image_surface_set_matrix (cairo_image_surface_t *surface, return CAIRO_STATUS_SUCCESS; } -static cairo_status_t -_cairo_image_abstract_surface_set_filter (void *abstract_surface, cairo_filter_t filter) -{ - cairo_image_surface_t *surface = abstract_surface; - - return _cairo_image_surface_set_filter (surface, filter); -} - cairo_status_t _cairo_image_surface_set_filter (cairo_image_surface_t *surface, cairo_filter_t filter) { @@ -314,13 +378,6 @@ _cairo_image_surface_set_filter (cairo_image_surface_t *surface, cairo_filter_t return CAIRO_STATUS_SUCCESS; } -static cairo_status_t -_cairo_image_abstract_surface_set_repeat (void *abstract_surface, int repeat) -{ - cairo_image_surface_t *surface = abstract_surface; - return _cairo_image_surface_set_repeat (surface, repeat); -} - cairo_status_t _cairo_image_surface_set_repeat (cairo_image_surface_t *surface, int repeat) { @@ -329,6 +386,34 @@ _cairo_image_surface_set_repeat (cairo_image_surface_t *surface, int repeat) return CAIRO_STATUS_SUCCESS; } +static cairo_int_status_t +_cairo_image_surface_set_attributes (cairo_image_surface_t *surface, + cairo_surface_attributes_t *attributes) +{ + cairo_int_status_t status; + + status = _cairo_image_surface_set_matrix (surface, &attributes->matrix); + if (status) + return status; + + switch (attributes->extend) { + case CAIRO_EXTEND_NONE: + _cairo_image_surface_set_repeat (surface, 0); + break; + case CAIRO_EXTEND_REPEAT: + _cairo_image_surface_set_repeat (surface, 1); + break; + case CAIRO_EXTEND_REFLECT: + /* XXX: Obviously wrong. */ + _cairo_image_surface_set_repeat (surface, 1); + break; + } + + status = _cairo_image_surface_set_filter (surface, attributes->filter); + + return status; +} + static pixman_operator_t _pixman_operator (cairo_operator_t operator) { @@ -368,8 +453,8 @@ _pixman_operator (cairo_operator_t operator) static cairo_int_status_t _cairo_image_surface_composite (cairo_operator_t operator, - cairo_surface_t *generic_src, - cairo_surface_t *generic_mask, + cairo_pattern_t *src_pattern, + cairo_pattern_t *mask_pattern, void *abstract_dst, int src_x, int src_y, @@ -380,26 +465,61 @@ _cairo_image_surface_composite (cairo_operator_t operator, unsigned int width, unsigned int height) { - cairo_image_surface_t *dst = abstract_dst; - cairo_image_surface_t *src = (cairo_image_surface_t *) generic_src; - cairo_image_surface_t *mask = (cairo_image_surface_t *) generic_mask; + cairo_surface_attributes_t src_attr, mask_attr; + cairo_image_surface_t *dst = abstract_dst; + cairo_image_surface_t *src; + cairo_image_surface_t *mask; + cairo_int_status_t status; - if (generic_src->backend != dst->base.backend || - (generic_mask && (generic_mask->backend != dst->base.backend))) + status = _cairo_pattern_acquire_surfaces (src_pattern, mask_pattern, + &dst->base, + src_x, src_y, + mask_x, mask_y, + width, height, + (cairo_surface_t **) &src, + (cairo_surface_t **) &mask, + &src_attr, &mask_attr); + if (status) + return status; + + status = _cairo_image_surface_set_attributes (src, &src_attr); + if (CAIRO_OK (status)) { - return CAIRO_INT_STATUS_UNSUPPORTED; + if (mask) + { + status = _cairo_image_surface_set_attributes (mask, &mask_attr); + if (CAIRO_OK (status)) + pixman_composite (_pixman_operator (operator), + src->pixman_image, + mask->pixman_image, + dst->pixman_image, + src_x + src_attr.x_offset, + src_y + src_attr.y_offset, + mask_x + mask_attr.x_offset, + mask_y + mask_attr.y_offset, + dst_x, dst_y, + width, height); + } + else + { + pixman_composite (_pixman_operator (operator), + src->pixman_image, + NULL, + dst->pixman_image, + src_x + src_attr.x_offset, + src_y + src_attr.y_offset, + 0, 0, + dst_x, dst_y, + width, height); + } } - pixman_composite (_pixman_operator (operator), - src->pixman_image, - mask ? mask->pixman_image : NULL, - dst->pixman_image, - src_x, src_y, - mask_x, mask_y, - dst_x, dst_y, - width, height); - - return CAIRO_STATUS_SUCCESS; + if (mask) + _cairo_pattern_release_surface (&dst->base, &mask->base, &mask_attr); + + _cairo_pattern_release_surface (&dst->base, &src->base, &src_attr); + + return status; } static cairo_int_status_t @@ -427,24 +547,56 @@ _cairo_image_surface_fill_rectangles (void *abstract_surface, static cairo_int_status_t _cairo_image_surface_composite_trapezoids (cairo_operator_t operator, - cairo_surface_t *generic_src, + cairo_pattern_t *pattern, void *abstract_dst, - int x_src, - int y_src, + int src_x, + int src_y, + int dst_x, + int dst_y, + unsigned int width, + unsigned int height, cairo_trapezoid_t *traps, int num_traps) { - cairo_image_surface_t *dst = abstract_dst; - cairo_image_surface_t *src = (cairo_image_surface_t *) generic_src; + cairo_surface_attributes_t attributes; + cairo_image_surface_t *dst = abstract_dst; + cairo_image_surface_t *src; + cairo_int_status_t status; + int render_reference_x, render_reference_y; + int render_src_x, render_src_y; - if (generic_src->backend != dst->base.backend) - return CAIRO_INT_STATUS_UNSUPPORTED; + status = _cairo_pattern_acquire_surface (pattern, &dst->base, + src_x, src_y, width, height, + (cairo_surface_t **) &src, + &attributes); + if (status) + return status; - /* XXX: The pixman_trapezoid_t cast is evil and needs to go away somehow. */ - pixman_composite_trapezoids (operator, src->pixman_image, dst->pixman_image, - x_src, y_src, (pixman_trapezoid_t *) traps, num_traps); + if (traps[0].left.p1.y < traps[0].left.p2.y) { + render_reference_x = _cairo_fixed_integer_floor (traps[0].left.p1.x); + render_reference_y = _cairo_fixed_integer_floor (traps[0].left.p1.y); + } else { + render_reference_x = _cairo_fixed_integer_floor (traps[0].left.p2.x); + render_reference_y = _cairo_fixed_integer_floor (traps[0].left.p2.y); + } - return CAIRO_STATUS_SUCCESS; + render_src_x = src_x + render_reference_x - dst_x; + render_src_y = src_y + render_reference_y - dst_y; + + /* XXX: The pixman_trapezoid_t cast is evil and needs to go away + * somehow. */ + status = _cairo_image_surface_set_attributes (src, &attributes); + if (CAIRO_OK (status)) + pixman_composite_trapezoids (operator, + src->pixman_image, + dst->pixman_image, + render_src_x + attributes.x_offset, + render_src_y + attributes.y_offset, + (pixman_trapezoid_t *) traps, num_traps); + + _cairo_pattern_release_surface (&dst->base, &src->base, &attributes); + + return status; } static cairo_int_status_t @@ -490,41 +642,34 @@ _cairo_image_surface_set_clip_region (cairo_image_surface_t *surface, return CAIRO_STATUS_SUCCESS; } -static cairo_int_status_t -_cairo_image_abstract_surface_create_pattern (void *abstract_surface, - cairo_pattern_t *pattern, - cairo_box_t *box) +/** + * _cairo_surface_is_image: + * @surface: a #cairo_surface_t + * + * Checks if a surface is an #cairo_image_surface_t + * + * Return value: True if the surface is an image surface + **/ +int +_cairo_surface_is_image (cairo_surface_t *surface) { - cairo_image_surface_t *image; - - /* Fall back to general pattern creation for surface patterns. */ - if (pattern->type == CAIRO_PATTERN_SURFACE) - return CAIRO_INT_STATUS_UNSUPPORTED; - - image = _cairo_pattern_get_image (pattern, box); - if (image) { - pattern->source = &image->base; - - return CAIRO_STATUS_SUCCESS; - } else - return CAIRO_STATUS_NO_MEMORY; + return surface->backend == &cairo_image_surface_backend; } - + static const cairo_surface_backend_t cairo_image_surface_backend = { _cairo_image_surface_create_similar, _cairo_image_abstract_surface_destroy, _cairo_image_surface_pixels_per_inch, - _cairo_image_surface_get_image, - _cairo_image_surface_set_image, - _cairo_image_abstract_surface_set_matrix, - _cairo_image_abstract_surface_set_filter, - _cairo_image_abstract_surface_set_repeat, + _cairo_image_surface_acquire_source_image, + _cairo_image_surface_release_source_image, + _cairo_image_surface_acquire_dest_image, + _cairo_image_surface_release_dest_image, + _cairo_image_surface_clone_similar, _cairo_image_surface_composite, _cairo_image_surface_fill_rectangles, _cairo_image_surface_composite_trapezoids, _cairo_image_surface_copy_page, _cairo_image_surface_show_page, _cairo_image_abstract_surface_set_clip_region, - _cairo_image_abstract_surface_create_pattern, NULL /* show_glyphs */ }; diff --git a/gfx/cairo/cairo/src/cairo_matrix.c b/gfx/cairo/cairo/src/cairo_matrix.c index b964b688ce22..88e536e8af29 100644 --- a/gfx/cairo/cairo/src/cairo_matrix.c +++ b/gfx/cairo/cairo/src/cairo_matrix.c @@ -31,7 +31,7 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ #define _GNU_SOURCE @@ -54,6 +54,14 @@ _cairo_matrix_scalar_multiply (cairo_matrix_t *matrix, double scalar); static void _cairo_matrix_compute_adjoint (cairo_matrix_t *matrix); +/** + * cairo_matrix_create: + * + * Creates a new identity matrix. + * + * Return value: a newly created matrix; free with cairo_matrix_destroy(), + * or %NULL if memory couldn't be allocated. + **/ cairo_matrix_t * cairo_matrix_create (void) { @@ -80,6 +88,12 @@ _cairo_matrix_fini (cairo_matrix_t *matrix) /* nothing to do here */ } +/** + * cairo_matrix_destroy: + * @matrix: a #cairo_matrix_t + * + * Frees a matrix created with cairo_matrix_create. + **/ void cairo_matrix_destroy (cairo_matrix_t *matrix) { @@ -87,6 +101,15 @@ cairo_matrix_destroy (cairo_matrix_t *matrix) free (matrix); } +/** + * cairo_matrix_copy: + * @matrix: a #cairo_matrix_t + * @other: another #cairo_ + * + * Modifies @matrix to be identical to @other. + * + * Return value: %CAIRO_STATUS_SUCCESS, always. + **/ cairo_status_t cairo_matrix_copy (cairo_matrix_t *matrix, const cairo_matrix_t *other) { @@ -96,6 +119,14 @@ cairo_matrix_copy (cairo_matrix_t *matrix, const cairo_matrix_t *other) } slim_hidden_def(cairo_matrix_copy); +/** + * cairo_matrix_set_identity: + * @matrix: a #cairo_matrix_t + * + * Modifies @matrix to be an identity transformation. + * + * Return value: %CAIRO_STATUS_SUCCESS, always. + **/ cairo_status_t cairo_matrix_set_identity (cairo_matrix_t *matrix) { @@ -105,6 +136,26 @@ cairo_matrix_set_identity (cairo_matrix_t *matrix) } slim_hidden_def(cairo_matrix_set_identity); +/** + * cairo_matrix_set_affine: + * @matrix: a cairo_matrix_t + * @a: a component of the affine transformation + * @b: b component of the affine transformation + * @c: c component of the affine transformation + * @d: d component of the affine transformation + * @tx: X translation component of the affine transformation + * @ty: Y translation component of the affine transformation + * + * Sets @matrix to be the affine transformation given by + * @a, b, @c, @d, @tx, @ty. The transformation is given + * by: + * + * x_new = x * a + y * c + tx; + * y_new = x * b + y * d + ty; + * + * + * Return value: %CAIRO_STATUS_SUCCESS, always. + **/ cairo_status_t cairo_matrix_set_affine (cairo_matrix_t *matrix, double a, double b, @@ -119,6 +170,21 @@ cairo_matrix_set_affine (cairo_matrix_t *matrix, } slim_hidden_def(cairo_matrix_set_affine); +/** + * cairo_matrix_get_affine: + * @matrix: a @cairo_matrix_t + * @a: location to store a component of affine transformation, or %NULL + * @b: location to store b component of affine transformation, or %NULL + * @c: location to store c component of affine transformation, or %NULL + * @d: location to store d component of affine transformation, or %NULL + * @tx: location to store X-translation component of affine transformation, or %NULL + * @ty: location to store Y-translation component of affine transformation, or %NULL + * + * Gets the matrix values for the affine tranformation that @matrix represents. + * See cairo_matrix_set_affine(). + * + * Return value: %CAIRO_STATUS_SUCCESS, always. + **/ cairo_status_t cairo_matrix_get_affine (cairo_matrix_t *matrix, double *a, double *b, @@ -153,6 +219,18 @@ _cairo_matrix_set_translate (cairo_matrix_t *matrix, tx, ty); } +/** + * cairo_matrix_translate: + * @matrix: a cairo_matrix_t + * @tx: amount to rotate in the X direction + * @ty: amount to rotate in the Y direction + * + * Applies a translation by @tx, @ty to the transformation in + * @matrix. The new transformation is given by first translating by + * @tx, @ty then applying the original transformation + * + * Return value: %CAIRO_STATUS_SUCCESS, always. + **/ cairo_status_t cairo_matrix_translate (cairo_matrix_t *matrix, double tx, double ty) { @@ -173,6 +251,18 @@ _cairo_matrix_set_scale (cairo_matrix_t *matrix, 0, 0); } +/** + * cairo_matrix_scale: + * @matrix: a #cairo_matrix_t + * @sx: Scale factor in the X direction + * @sy: Scale factor in the Y direction + * + * Applies scaling by @tx, @ty to the transformation in + * @matrix. The new transformation is given by first scaling by @sx + * and @sy then applying the original transformation + * + * Return value: %CAIRO_STATUS_SUCCESS, always. + **/ cairo_status_t cairo_matrix_scale (cairo_matrix_t *matrix, double sx, double sy) { @@ -202,6 +292,21 @@ _cairo_matrix_set_rotate (cairo_matrix_t *matrix, 0, 0); } +/** + * cairo_matrix_rotate: + * @matrix: a @cairo_matrix_t + * @radians: angle of rotation, in radians. Angles are defined + * so that an angle of 90 degrees (%M_PI radians) rotates the + * positive X axis into the positive Y axis. With the default + * Cairo choice of axis orientation, positive rotations are + * clockwise. + * + * Applies rotation by @radians to the transformation in + * @matrix. The new transformation is given by first rotating by + * @radians then applying the original transformation + * + * Return value: %CAIRO_STATUS_SUCCESS, always. + **/ cairo_status_t cairo_matrix_rotate (cairo_matrix_t *matrix, double radians) { @@ -212,6 +317,19 @@ cairo_matrix_rotate (cairo_matrix_t *matrix, double radians) return cairo_matrix_multiply (matrix, &tmp, matrix); } +/** + * cairo_matrix_multiply: + * @result: a @cairo_matrix_t in which to store the result + * @a: a @cairo_matrix_t + * @b: a @cairo_matrix_t + * + * Multiplies the affine transformations in @a and @b together + * and stores the result in @result. The resulting transformation + * is given by first applying the transformation in @b then + * applying the transformation in @a. + * + * Return value: %CAIRO_STATUS_SUCCESS, always. + **/ cairo_status_t cairo_matrix_multiply (cairo_matrix_t *result, const cairo_matrix_t *a, const cairo_matrix_t *b) { @@ -238,6 +356,27 @@ cairo_matrix_multiply (cairo_matrix_t *result, const cairo_matrix_t *a, const ca } slim_hidden_def(cairo_matrix_multiply); +/** + * cairo_matrix_transform_distance: + * @matrix: a @cairo_matrix_t + * @dx: a distance in the X direction. An in/out parameter + * @dy: a distance in the Y direction. An in/out parameter + * + * Transforms the vector (@dx,@dy) by @matrix. Translation is + * ignored. In terms of the components of the affine transformation: + * + * + * dx2 = dx1 * a + dy1 * c; + * dy2 = dx1 * b + dy1 * d; + * + * + * Affine transformations are position invariant, so the same vector + * always transforms to the same vector. If (@x1,@y1) transforms + * to (@x2,@y2) then (@x1+@dx1,@y1+@dy1) will transform to + * (@x1+@dx2,@y1+@dy2) for all values of @x1 and @x2. + * + * Return value: %CAIRO_STATUS_SUCCESS, always. + **/ cairo_status_t cairo_matrix_transform_distance (cairo_matrix_t *matrix, double *dx, double *dy) { @@ -255,6 +394,16 @@ cairo_matrix_transform_distance (cairo_matrix_t *matrix, double *dx, double *dy) } slim_hidden_def(cairo_matrix_transform_distance); +/** + * cairo_matrix_transform_point: + * @matrix: a @cairo_matrix_t + * @x: X position. An in/out parameter + * @y: Y position. An in/out parameter + * + * Transforms the point (@x, @y) by @matrix. + * + * Return value: %CAIRO_STATUS_SUCCESS, always. + **/ cairo_status_t cairo_matrix_transform_point (cairo_matrix_t *matrix, double *x, double *y) { @@ -351,6 +500,19 @@ _cairo_matrix_compute_adjoint (cairo_matrix_t *matrix) c*ty - d*tx, b*tx - a*ty); } +/** + * cairo_matrix_invert: + * @matrix: a @cairo_matrix_t + * + * Changes @matrix to be the inverse of it's original value. Not + * all transformation matrices have inverses; if the matrix + * collapses points together (it is degenerate), + * then it has no inverse and this function will fail. + * + * Returns: If @matrix has an inverse, modifies @matrix to + * be the inverse matrix and returns %CAIRO_STATUS_SUCCESS. Otherwise, + * returns %CAIRO_STATUS_INVALID_MATRIX. + **/ cairo_status_t cairo_matrix_invert (cairo_matrix_t *matrix) { @@ -458,7 +620,7 @@ _cairo_matrix_compute_scale_factors (cairo_matrix_t *matrix, double *sx, double return CAIRO_STATUS_SUCCESS; } -int +cairo_bool_t _cairo_matrix_is_integer_translation(cairo_matrix_t *mat, int *itx, int *ity) { @@ -477,7 +639,7 @@ _cairo_matrix_is_integer_translation(cairo_matrix_t *mat, if (ok) { *itx = _cairo_fixed_integer_part(ttx); *ity = _cairo_fixed_integer_part(tty); - return 1; + return TRUE; } - return 0; + return FALSE; } diff --git a/gfx/cairo/cairo/src/cairo_path.c b/gfx/cairo/cairo/src/cairo_path.c index 36c25d6374c7..8314f601c763 100644 --- a/gfx/cairo/cairo/src/cairo_path.c +++ b/gfx/cairo/cairo/src/cairo_path.c @@ -31,7 +31,7 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ #include @@ -100,6 +100,7 @@ _cairo_path_init_copy (cairo_path_t *path, cairo_path_t *other) for (other_op = other->op_head; other_op; other_op = other_op->next) { op = _cairo_path_op_buf_create (); if (op == NULL) { + _cairo_path_fini(path); return CAIRO_STATUS_NO_MEMORY; } *op = *other_op; @@ -109,6 +110,7 @@ _cairo_path_init_copy (cairo_path_t *path, cairo_path_t *other) for (other_arg = other->arg_head; other_arg; other_arg = other_arg->next) { arg = _cairo_path_arg_buf_create (); if (arg == NULL) { + _cairo_path_fini(path); return CAIRO_STATUS_NO_MEMORY; } *arg = *other_arg; diff --git a/gfx/cairo/cairo/src/cairo_path_bounds.c b/gfx/cairo/cairo/src/cairo_path_bounds.c index cfcdd97ee57a..7c5772a820bf 100644 --- a/gfx/cairo/cairo/src/cairo_path_bounds.c +++ b/gfx/cairo/cairo/src/cairo_path_bounds.c @@ -31,7 +31,7 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ #include "cairoint.h" diff --git a/gfx/cairo/cairo/src/cairo_path_fill.c b/gfx/cairo/cairo/src/cairo_path_fill.c index 6c6ebd976759..dc79b6b96dbd 100644 --- a/gfx/cairo/cairo/src/cairo_path_fill.c +++ b/gfx/cairo/cairo/src/cairo_path_fill.c @@ -31,7 +31,7 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ #include "cairoint.h" diff --git a/gfx/cairo/cairo/src/cairo_path_stroke.c b/gfx/cairo/cairo/src/cairo_path_stroke.c index ad022037027a..08b38090277d 100644 --- a/gfx/cairo/cairo/src/cairo_path_stroke.c +++ b/gfx/cairo/cairo/src/cairo_path_stroke.c @@ -31,7 +31,7 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ #include "cairoint.h" diff --git a/gfx/cairo/cairo/src/cairo_pattern.c b/gfx/cairo/cairo/src/cairo_pattern.c index 6cb981458025..283c36dbd32b 100644 --- a/gfx/cairo/cairo/src/cairo_pattern.c +++ b/gfx/cairo/cairo/src/cairo_pattern.c @@ -21,58 +21,108 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * Author: David Reveman + * Author: David Reveman */ #include "cairoint.h" +typedef void (*cairo_shader_function_t) (unsigned char *color0, + unsigned char *color1, + cairo_fixed_t factor, + uint32_t *pixel); + +typedef struct _cairo_shader_color_stop { + cairo_fixed_t offset; + cairo_fixed_48_16_t scale; + int id; + unsigned char color_char[4]; +} cairo_shader_color_stop_t; + +typedef struct _cairo_shader_op { + cairo_shader_color_stop_t *stops; + int n_stops; + cairo_extend_t extend; + cairo_shader_function_t shader_function; +} cairo_shader_op_t; + #define MULTIPLY_COLORCOMP(c1, c2) \ ((unsigned char) \ ((((unsigned char) (c1)) * (int) ((unsigned char) (c2))) / 0xff)) -void -_cairo_pattern_init (cairo_pattern_t *pattern) +static void +_cairo_pattern_init (cairo_pattern_t *pattern, cairo_pattern_type_t type) { + pattern->type = type; pattern->ref_count = 1; - - pattern->extend = CAIRO_EXTEND_DEFAULT; - pattern->filter = CAIRO_FILTER_DEFAULT; - - _cairo_color_init (&pattern->color); + pattern->extend = CAIRO_EXTEND_DEFAULT; + pattern->filter = CAIRO_FILTER_DEFAULT; + pattern->alpha = 1.0; _cairo_matrix_init (&pattern->matrix); +} - pattern->stops = NULL; - pattern->n_stops = 0; +static cairo_status_t +_cairo_gradient_pattern_init_copy (cairo_gradient_pattern_t *pattern, + cairo_gradient_pattern_t *other) +{ + if (other->base.type == CAIRO_PATTERN_LINEAR) + { + cairo_linear_pattern_t *dst = (cairo_linear_pattern_t *) pattern; + cairo_linear_pattern_t *src = (cairo_linear_pattern_t *) other; + + *dst = *src; + } + else + { + cairo_radial_pattern_t *dst = (cairo_radial_pattern_t *) pattern; + cairo_radial_pattern_t *src = (cairo_radial_pattern_t *) other; + + *dst = *src; + } - pattern->type = CAIRO_PATTERN_SOLID; + if (other->n_stops) + { + pattern->stops = malloc (other->n_stops * sizeof (cairo_color_stop_t)); + if (!pattern->stops) + return CAIRO_STATUS_NO_MEMORY; + + memcpy (pattern->stops, other->stops, + other->n_stops * sizeof (cairo_color_stop_t)); + } - pattern->source = NULL; - pattern->source_offset.x = 0.0; - pattern->source_offset.y = 0.0; + return CAIRO_STATUS_SUCCESS; } cairo_status_t _cairo_pattern_init_copy (cairo_pattern_t *pattern, cairo_pattern_t *other) { - *pattern = *other; + switch (other->type) { + case CAIRO_PATTERN_SOLID: { + cairo_solid_pattern_t *dst = (cairo_solid_pattern_t *) pattern; + cairo_solid_pattern_t *src = (cairo_solid_pattern_t *) other; - pattern->ref_count = 1; - - if (pattern->n_stops) { - pattern->stops = - malloc (sizeof (cairo_color_stop_t) * pattern->n_stops); - if (pattern->stops == NULL) - return CAIRO_STATUS_NO_MEMORY; - memcpy (pattern->stops, other->stops, - sizeof (cairo_color_stop_t) * other->n_stops); + *dst = *src; + } break; + case CAIRO_PATTERN_SURFACE: { + cairo_surface_pattern_t *dst = (cairo_surface_pattern_t *) pattern; + cairo_surface_pattern_t *src = (cairo_surface_pattern_t *) other; + + *dst = *src; + cairo_surface_reference (dst->surface); + } break; + case CAIRO_PATTERN_LINEAR: + case CAIRO_PATTERN_RADIAL: { + cairo_gradient_pattern_t *dst = (cairo_gradient_pattern_t *) pattern; + cairo_gradient_pattern_t *src = (cairo_gradient_pattern_t *) other; + cairo_status_t status; + + status = _cairo_gradient_pattern_init_copy (dst, src); + if (status) + return status; + } break; } - - if (pattern->source) - cairo_surface_reference (other->source); - - if (pattern->type == CAIRO_PATTERN_SURFACE) - cairo_surface_reference (other->u.surface.surface); + + pattern->ref_count = 1; return CAIRO_STATUS_SUCCESS; } @@ -80,110 +130,145 @@ _cairo_pattern_init_copy (cairo_pattern_t *pattern, cairo_pattern_t *other) void _cairo_pattern_fini (cairo_pattern_t *pattern) { - if (pattern->n_stops) - free (pattern->stops); - - if (pattern->type == CAIRO_PATTERN_SURFACE) { - /* show_surface require us to restore surface matrix, repeat - attribute, filter type */ - if (pattern->source) { - cairo_surface_set_matrix (pattern->source, - &pattern->u.surface.save_matrix); - cairo_surface_set_repeat (pattern->source, - pattern->u.surface.save_repeat); - cairo_surface_set_filter (pattern->source, - pattern->u.surface.save_filter); - } - cairo_surface_destroy (pattern->u.surface.surface); + switch (pattern->type) { + case CAIRO_PATTERN_SOLID: + break; + case CAIRO_PATTERN_SURFACE: { + cairo_surface_pattern_t *fini = (cairo_surface_pattern_t *) pattern; + + cairo_surface_destroy (fini->surface); + } break; + case CAIRO_PATTERN_LINEAR: + case CAIRO_PATTERN_RADIAL: { + cairo_gradient_pattern_t *fini = (cairo_gradient_pattern_t *) pattern; + + if (fini->n_stops) + free (fini->stops); + } break; } - - if (pattern->source) - cairo_surface_destroy (pattern->source); } void -_cairo_pattern_init_solid (cairo_pattern_t *pattern, - double red, double green, double blue) +_cairo_pattern_init_solid (cairo_solid_pattern_t *pattern, + double red, + double green, + double blue) { - _cairo_pattern_init (pattern); + _cairo_pattern_init (&pattern->base, CAIRO_PATTERN_SOLID); + + pattern->red = red; + pattern->green = green; + pattern->blue = blue; +} - pattern->type = CAIRO_PATTERN_SOLID; - _cairo_color_set_rgb (&pattern->color, red, green, blue); +void +_cairo_pattern_init_for_surface (cairo_surface_pattern_t *pattern, + cairo_surface_t *surface) +{ + _cairo_pattern_init (&pattern->base, CAIRO_PATTERN_SURFACE); + + pattern->surface = surface; + cairo_surface_reference (surface); +} + +static void +_cairo_pattern_init_gradient (cairo_gradient_pattern_t *pattern, + cairo_pattern_type_t type) +{ + _cairo_pattern_init (&pattern->base, type); + + pattern->stops = 0; + pattern->n_stops = 0; +} + +void +_cairo_pattern_init_linear (cairo_linear_pattern_t *pattern, + double x0, double y0, double x1, double y1) +{ + _cairo_pattern_init_gradient (&pattern->base, CAIRO_PATTERN_LINEAR); + + pattern->point0.x = x0; + pattern->point0.y = y0; + pattern->point1.x = x1; + pattern->point1.y = y1; +} + +void +_cairo_pattern_init_radial (cairo_radial_pattern_t *pattern, + double cx0, double cy0, double radius0, + double cx1, double cy1, double radius1) +{ + _cairo_pattern_init_gradient (&pattern->base, CAIRO_PATTERN_RADIAL); + + pattern->center0.x = cx0; + pattern->center0.y = cy0; + pattern->radius0 = fabs (radius0); + pattern->center1.x = cx1; + pattern->center1.y = cy1; + pattern->radius1 = fabs (radius1); } cairo_pattern_t * _cairo_pattern_create_solid (double red, double green, double blue) { - cairo_pattern_t *pattern; + cairo_solid_pattern_t *pattern; - pattern = malloc (sizeof (cairo_pattern_t)); + pattern = malloc (sizeof (cairo_solid_pattern_t)); if (pattern == NULL) return NULL; _cairo_pattern_init_solid (pattern, red, green, blue); - return pattern; + return &pattern->base; } cairo_pattern_t * cairo_pattern_create_for_surface (cairo_surface_t *surface) { - cairo_pattern_t *pattern; + cairo_surface_pattern_t *pattern; - pattern = malloc (sizeof (cairo_pattern_t)); + pattern = malloc (sizeof (cairo_surface_pattern_t)); if (pattern == NULL) return NULL; - _cairo_pattern_init (pattern); - - pattern->type = CAIRO_PATTERN_SURFACE; - pattern->u.surface.surface = surface; - cairo_surface_reference (surface); + _cairo_pattern_init_for_surface (pattern, surface); - return pattern; + /* this will go away when we completely remove the surface attributes */ + if (surface->repeat) + pattern->base.extend = CAIRO_EXTEND_REPEAT; + else + pattern->base.extend = CAIRO_EXTEND_DEFAULT; + + return &pattern->base; } cairo_pattern_t * cairo_pattern_create_linear (double x0, double y0, double x1, double y1) { - cairo_pattern_t *pattern; + cairo_linear_pattern_t *pattern; - pattern = malloc (sizeof (cairo_pattern_t)); + pattern = malloc (sizeof (cairo_linear_pattern_t)); if (pattern == NULL) return NULL; - _cairo_pattern_init (pattern); + _cairo_pattern_init_linear (pattern, x0, y0, x1, y1); - pattern->type = CAIRO_PATTERN_LINEAR; - pattern->u.linear.point0.x = x0; - pattern->u.linear.point0.y = y0; - pattern->u.linear.point1.x = x1; - pattern->u.linear.point1.y = y1; - - return pattern; + return &pattern->base.base; } cairo_pattern_t * cairo_pattern_create_radial (double cx0, double cy0, double radius0, double cx1, double cy1, double radius1) { - cairo_pattern_t *pattern; + cairo_radial_pattern_t *pattern; - pattern = malloc (sizeof (cairo_pattern_t)); + pattern = malloc (sizeof (cairo_radial_pattern_t)); if (pattern == NULL) return NULL; - _cairo_pattern_init (pattern); - - pattern->type = CAIRO_PATTERN_RADIAL; - pattern->u.radial.center0.x = cx0; - pattern->u.radial.center0.y = cy0; - pattern->u.radial.radius0 = fabs (radius0); - pattern->u.radial.center1.x = cx1; - pattern->u.radial.center1.y = cy1; - pattern->u.radial.radius1 = fabs (radius1); + _cairo_pattern_init_radial (pattern, cx0, cy0, radius0, cx1, cy1, radius1); - return pattern; + return &pattern->base.base; } void @@ -209,37 +294,19 @@ cairo_pattern_destroy (cairo_pattern_t *pattern) free (pattern); } -static int -_cairo_pattern_stop_compare (const void *elem1, const void *elem2) -{ - return - (((cairo_color_stop_t *) elem1)->offset == - ((cairo_color_stop_t *) elem2)->offset) ? - /* equal offsets, sort on id */ - ((((cairo_color_stop_t *) elem1)->id < - ((cairo_color_stop_t *) elem2)->id) ? -1 : 1) : - /* sort on offset */ - ((((cairo_color_stop_t *) elem1)->offset < - ((cairo_color_stop_t *) elem2)->offset) ? -1 : 1); -} - -cairo_status_t -cairo_pattern_add_color_stop (cairo_pattern_t *pattern, - double offset, - double red, double green, double blue, - double alpha) +static cairo_status_t +_cairo_pattern_add_color_stop (cairo_gradient_pattern_t *pattern, + double offset, + double red, + double green, + double blue, + double alpha) { cairo_color_stop_t *stop; - int i; - - _cairo_restrict_value (&offset, 0.0, 1.0); - _cairo_restrict_value (&red, 0.0, 1.0); - _cairo_restrict_value (&green, 0.0, 1.0); - _cairo_restrict_value (&blue, 0.0, 1.0); pattern->n_stops++; pattern->stops = realloc (pattern->stops, - sizeof (cairo_color_stop_t) * pattern->n_stops); + pattern->n_stops * sizeof (cairo_color_stop_t)); if (pattern->stops == NULL) { pattern->n_stops = 0; @@ -249,41 +316,51 @@ cairo_pattern_add_color_stop (cairo_pattern_t *pattern, stop = &pattern->stops[pattern->n_stops - 1]; stop->offset = _cairo_fixed_from_double (offset); - stop->id = pattern->n_stops; - stop->color_char[0] = red * 0xff; - stop->color_char[1] = green * 0xff; - stop->color_char[2] = blue * 0xff; - stop->color_char[3] = alpha * 0xff; - - /* sort stops in ascending order */ - qsort (pattern->stops, pattern->n_stops, sizeof (cairo_color_stop_t), - _cairo_pattern_stop_compare); - - for (i = 0; i < pattern->n_stops - 1; i++) { - pattern->stops[i + 1].scale = - pattern->stops[i + 1].offset - pattern->stops[i].offset; - if (pattern->stops[i + 1].scale == 65536) - pattern->stops[i + 1].scale = 0; - } + _cairo_color_init (&stop->color); + _cairo_color_set_rgb (&stop->color, red, green, blue); + _cairo_color_set_alpha (&stop->color, alpha); return CAIRO_STATUS_SUCCESS; } +cairo_status_t +cairo_pattern_add_color_stop (cairo_pattern_t *pattern, + double offset, + double red, + double green, + double blue, + double alpha) +{ + if (pattern->type != CAIRO_PATTERN_LINEAR && + pattern->type != CAIRO_PATTERN_RADIAL) + { + /* XXX: CAIRO_STATUS_INVALID_PATTERN? */ + return CAIRO_STATUS_SUCCESS; + } + + _cairo_restrict_value (&offset, 0.0, 1.0); + _cairo_restrict_value (&red, 0.0, 1.0); + _cairo_restrict_value (&green, 0.0, 1.0); + _cairo_restrict_value (&blue, 0.0, 1.0); + _cairo_restrict_value (&alpha, 0.0, 1.0); + + return _cairo_pattern_add_color_stop ((cairo_gradient_pattern_t *) pattern, + offset, + red, green, blue, + alpha); +} + cairo_status_t cairo_pattern_set_matrix (cairo_pattern_t *pattern, cairo_matrix_t *matrix) { - cairo_matrix_copy (&pattern->matrix, matrix); - - return CAIRO_STATUS_SUCCESS; + return cairo_matrix_copy (&pattern->matrix, matrix); } cairo_status_t cairo_pattern_get_matrix (cairo_pattern_t *pattern, cairo_matrix_t *matrix) { - cairo_matrix_copy (matrix, &pattern->matrix); - - return CAIRO_STATUS_SUCCESS; + return cairo_matrix_copy (matrix, &pattern->matrix); } cairo_status_t @@ -316,9 +393,20 @@ cairo_pattern_get_extend (cairo_pattern_t *pattern) cairo_status_t _cairo_pattern_get_rgb (cairo_pattern_t *pattern, - double *red, double *green, double *blue) + double *red, + double *green, + double *blue) { - _cairo_color_get_rgb (&pattern->color, red, green, blue); + + if (pattern->type == CAIRO_PATTERN_SOLID) + { + cairo_solid_pattern_t *solid = (cairo_solid_pattern_t *) pattern; + + *red = solid->red; + *green = solid->green; + *blue = solid->blue; + } else + *red = *green = *blue = 1.0; return CAIRO_STATUS_SUCCESS; } @@ -326,63 +414,16 @@ _cairo_pattern_get_rgb (cairo_pattern_t *pattern, void _cairo_pattern_set_alpha (cairo_pattern_t *pattern, double alpha) { - int i; - - _cairo_color_set_alpha (&pattern->color, alpha); - - for (i = 0; i < pattern->n_stops; i++) - pattern->stops[i].color_char[3] = - MULTIPLY_COLORCOMP (pattern->stops[i].color_char[3], alpha * 0xff); -} - -void -_cairo_pattern_set_source_offset (cairo_pattern_t *pattern, - double x, double y) -{ - pattern->source_offset.x = x; - pattern->source_offset.y = y; + pattern->alpha = alpha; } void _cairo_pattern_transform (cairo_pattern_t *pattern, - cairo_matrix_t *ctm_inverse) + cairo_matrix_t *ctm_inverse) { cairo_matrix_multiply (&pattern->matrix, ctm_inverse, &pattern->matrix); } -void -_cairo_pattern_prepare_surface (cairo_pattern_t *pattern) -{ - cairo_matrix_t device_to_source; - cairo_matrix_t user_to_source; - - /* should the surface matrix interface be remove from the API? - for now we multiple the surface matrix with the pattern matrix */ - cairo_surface_get_matrix (pattern->u.surface.surface, &user_to_source); - cairo_matrix_multiply (&device_to_source, &pattern->matrix, - &user_to_source); - cairo_surface_set_matrix (pattern->source, &device_to_source); - - /* storing original surface matrix in pattern */ - pattern->u.surface.save_matrix = user_to_source; - - /* storing original surface repeat mode in pattern */ - pattern->u.surface.save_repeat = pattern->source->repeat; - - /* what do we do with extend types pad and reflect? */ - if (pattern->extend == CAIRO_EXTEND_REPEAT - || pattern->source->repeat == 1) - cairo_surface_set_repeat (pattern->source, 1); - else - cairo_surface_set_repeat (pattern->source, 0); - - /* storing original surface filter in pattern */ - pattern->u.surface.save_filter = - cairo_surface_get_filter (pattern->source); - - cairo_surface_set_filter (pattern->source, pattern->filter); -} - #define INTERPOLATE_COLOR_NEAREST(c1, c2, factor) \ ((factor < 32768)? c1: c2) @@ -390,7 +431,7 @@ static void _cairo_pattern_shader_nearest (unsigned char *color0, unsigned char *color1, cairo_fixed_t factor, - int *pixel) + uint32_t *pixel) { *pixel = ((INTERPOLATE_COLOR_NEAREST (color0[3], color1[3], factor) << 24) | @@ -408,7 +449,7 @@ static void _cairo_pattern_shader_linear (unsigned char *color0, unsigned char *color1, cairo_fixed_t factor, - int *pixel) + uint32_t *pixel) { *pixel = ((INTERPOLATE_COLOR_LINEAR (color0[3], color1[3], factor) << 24) | (INTERPOLATE_COLOR_LINEAR (color0[0], color1[0], factor) << 16) | @@ -422,7 +463,7 @@ static void _cairo_pattern_shader_gaussian (unsigned char *color0, unsigned char *color1, cairo_fixed_t factor, - int *pixel) + uint32_t *pixel) { double f = ((double) factor) / 65536.0; @@ -436,17 +477,59 @@ _cairo_pattern_shader_gaussian (unsigned char *color0, #undef INTERPOLATE_COLOR_LINEAR -void -_cairo_pattern_shader_init (cairo_pattern_t *pattern, - cairo_shader_op_t *op) +static int +_cairo_shader_color_stop_compare (const void *elem1, const void *elem2) { - op->stops = pattern->stops; - op->n_stops = pattern->n_stops - 1; - op->min_offset = pattern->stops[0].offset; - op->max_offset = pattern->stops[op->n_stops].offset; - op->extend = pattern->extend; - - switch (pattern->filter) { + cairo_shader_color_stop_t *s1 = (cairo_shader_color_stop_t *) elem1; + cairo_shader_color_stop_t *s2 = (cairo_shader_color_stop_t *) elem2; + + return + (s1->offset == s2->offset) ? + /* equal offsets, sort on id */ + ((s1->id < s2->id) ? -1 : 1) : + /* sort on offset */ + ((s1->offset < s2->offset) ? -1 : 1); +} + +static cairo_status_t +_cairo_pattern_shader_init (cairo_gradient_pattern_t *pattern, + cairo_shader_op_t *op) +{ + int i; + + op->stops = malloc (pattern->n_stops * sizeof (cairo_shader_color_stop_t)); + if (!op->stops) + return CAIRO_STATUS_NO_MEMORY; + + for (i = 0; i < pattern->n_stops; i++) + { + op->stops[i].color_char[0] = pattern->stops[i].color.red * 0xff; + op->stops[i].color_char[1] = pattern->stops[i].color.green * 0xff; + op->stops[i].color_char[2] = pattern->stops[i].color.blue * 0xff; + op->stops[i].color_char[3] = pattern->stops[i].color.alpha * + pattern->base.alpha * 0xff; + op->stops[i].offset = pattern->stops[i].offset; + op->stops[i].id = i; + } + + /* sort stops in ascending order */ + qsort (op->stops, pattern->n_stops, sizeof (cairo_shader_color_stop_t), + _cairo_shader_color_stop_compare); + + for (i = 0; i < pattern->n_stops - 1; i++) + { + op->stops[i + 1].scale = op->stops[i + 1].offset - op->stops[i].offset; + if (op->stops[i + 1].scale == 65536) + op->stops[i + 1].scale = 0; + } + + op->n_stops = pattern->n_stops; + op->extend = pattern->base.extend; + + /* XXX: this is wrong, the filter should not be used for selecting + color stop interpolation function. function should always be 'linear' + and filter should be used for computing pixels. */ + switch (pattern->base.filter) { case CAIRO_FILTER_FAST: case CAIRO_FILTER_NEAREST: op->shader_function = _cairo_pattern_shader_nearest; @@ -460,15 +543,56 @@ _cairo_pattern_shader_init (cairo_pattern_t *pattern, op->shader_function = _cairo_pattern_shader_linear; break; } + + return CAIRO_STATUS_SUCCESS; } -void -_cairo_pattern_calc_color_at_pixel (cairo_shader_op_t *op, - cairo_fixed_t factor, - int *pixel) +static void +_cairo_pattern_shader_fini (cairo_shader_op_t *op) +{ + if (op->stops) + free (op->stops); +} + +/* Find two color stops bounding the given offset. If the given offset + * is before the first or after the last stop offset, the nearest + * offset is returned twice. + */ +static void +_cairo_shader_op_find_color_stops (cairo_shader_op_t *op, + cairo_fixed_t offset, + cairo_shader_color_stop_t *stops[2]) { int i; - + + /* Before first stop. */ + if (offset <= op->stops[0].offset) { + stops[0] = &op->stops[0]; + stops[1] = &op->stops[0]; + return; + } + + /* Between two stops. */ + for (i = 0; i < op->n_stops - 1; i++) { + if (offset <= op->stops[i + 1].offset) { + stops[0] = &op->stops[i]; + stops[1] = &op->stops[i + 1]; + return; + } + } + + /* After last stop. */ + stops[0] = &op->stops[op->n_stops - 1]; + stops[1] = &op->stops[op->n_stops - 1]; +} + +static void +_cairo_pattern_calc_color_at_pixel (cairo_shader_op_t *op, + cairo_fixed_t factor, + uint32_t *pixel) +{ + cairo_shader_color_stop_t *stops[2]; + switch (op->extend) { case CAIRO_EXTEND_REPEAT: factor -= factor & 0xffff0000; @@ -485,96 +609,158 @@ _cairo_pattern_calc_color_at_pixel (cairo_shader_op_t *op, break; } - if (factor < op->min_offset) - factor = op->min_offset; - else if (factor > op->max_offset) - factor = op->max_offset; - - for (i = 0; i < op->n_stops; i++) { - if (factor <= op->stops[i + 1].offset) { + _cairo_shader_op_find_color_stops (op, factor, stops); + + /* take offset as new 0 of coordinate system */ + factor -= stops[0]->offset; - /* take offset as new 0 of coordinate system */ - factor -= op->stops[i].offset; + /* difference between two offsets == 0, abrubt change */ + if (stops[1]->scale) + factor = ((cairo_fixed_48_16_t) factor << 16) / + stops[1]->scale; + + op->shader_function (stops[0]->color_char, + stops[1]->color_char, + factor, pixel); - /* difference between two offsets == 0, abrubt change */ - if (op->stops[i + 1].scale) - factor = ((cairo_fixed_48_16_t) factor << 16) / - op->stops[i + 1].scale; - - op->shader_function (op->stops[i].color_char, - op->stops[i + 1].color_char, - factor, pixel); - - /* multiply alpha */ - if (((unsigned char) (*pixel >> 24)) != 0xff) { - *pixel = (*pixel & 0xff000000) | - (MULTIPLY_COLORCOMP (*pixel >> 16, *pixel >> 24) << 16) | - (MULTIPLY_COLORCOMP (*pixel >> 8, *pixel >> 24) << 8) | - (MULTIPLY_COLORCOMP (*pixel >> 0, *pixel >> 24) << 0); - } - break; - } + /* multiply alpha */ + if (((unsigned char) (*pixel >> 24)) != 0xff) { + *pixel = (*pixel & 0xff000000) | + (MULTIPLY_COLORCOMP (*pixel >> 16, *pixel >> 24) << 16) | + (MULTIPLY_COLORCOMP (*pixel >> 8, *pixel >> 24) << 8) | + (MULTIPLY_COLORCOMP (*pixel >> 0, *pixel >> 24) << 0); } } -static void -_cairo_image_data_set_linear (cairo_pattern_t *pattern, - double offset_x, - double offset_y, - int *pixels, - int width, - int height) +static cairo_status_t +_cairo_image_data_set_linear (cairo_linear_pattern_t *pattern, + double offset_x, + double offset_y, + uint32_t *pixels, + int width, + int height) { int x, y; cairo_point_double_t point0, point1; - double px, py, ex, ey; double a, b, c, d, tx, ty; - double length, start, angle, fx, fy, factor; + double scale, start, dx, dy, factor; cairo_shader_op_t op; + cairo_status_t status; - _cairo_pattern_shader_init (pattern, &op); + status = _cairo_pattern_shader_init (&pattern->base, &op); + if (status) + return status; - point0.x = pattern->u.linear.point0.x; - point0.y = pattern->u.linear.point0.y; - point1.x = pattern->u.linear.point1.x; - point1.y = pattern->u.linear.point1.y; + /* We compute the position in the linear gradient for + * a point q as: + * + * [q . (p1 - p0) - p0 . (p1 - p0)] / (p1 - p0) ^ 2 + * + * The computation is done in pattern space. The + * calculation could be heavily optimized by using the + * fact that 'factor' increases linearly in both + * directions. + */ + point0.x = pattern->point0.x; + point0.y = pattern->point0.y; + point1.x = pattern->point1.x; + point1.y = pattern->point1.y; - cairo_matrix_get_affine (&pattern->matrix, &a, &b, &c, &d, &tx, &ty); - - length = sqrt ((point1.x - point0.x) * (point1.x - point0.x) + - (point1.y - point0.y) * (point1.y - point0.y)); - length = (length) ? 1.0 / length : CAIRO_MAXSHORT; + cairo_matrix_get_affine (&pattern->base.base.matrix, + &a, &b, &c, &d, &tx, &ty); - angle = -atan2 (point1.y - point0.y, point1.x - point0.x); - fx = cos (angle); - fy = -sin (angle); - - start = fx * point0.x; - start += fy * point0.y; + dx = point1.x - point0.x; + dy = point1.y - point0.y; + scale = dx * dx + dy * dy; + scale = (scale) ? 1.0 / scale : 1.0; + + start = dx * point0.x + dy * point0.y; for (y = 0; y < height; y++) { for (x = 0; x < width; x++) { - px = x + offset_x; - py = y + offset_y; + double qx_device = x + offset_x; + double qy_device = y + offset_y; - /* transform fragment */ - ex = a * px + c * py + tx; - ey = b * px + d * py + ty; + /* transform fragment into pattern space */ + double qx = a * qx_device + c * qy_device + tx; + double qy = b * qx_device + d * qy_device + ty; - factor = ((fx * ex + fy * ey) - start) * length; + factor = ((dx * qx + dy * qy) - start) * scale; _cairo_pattern_calc_color_at_pixel (&op, factor * 65536, pixels++); } } + + _cairo_pattern_shader_fini (&op); + + return CAIRO_STATUS_SUCCESS; } static void -_cairo_image_data_set_radial (cairo_pattern_t *pattern, - double offset_x, - double offset_y, - int *pixels, - int width, - int height) +_cairo_linear_pattern_classify (cairo_linear_pattern_t *pattern, + double offset_x, + double offset_y, + int width, + int height, + cairo_bool_t *is_horizontal, + cairo_bool_t *is_vertical) +{ + cairo_point_double_t point0, point1; + double a, b, c, d, tx, ty; + double scale, start, dx, dy; + cairo_fixed_t factors[3]; + int i; + + /* To classidy a pattern as horizontal or vertical, we first + * compute the (fixed point) factors at the corners of the + * pattern. We actually only need 3/4 corners, so we skip the + * fourth. + */ + point0.x = pattern->point0.x; + point0.y = pattern->point0.y; + point1.x = pattern->point1.x; + point1.y = pattern->point1.y; + + cairo_matrix_get_affine (&pattern->base.base.matrix, + &a, &b, &c, &d, &tx, &ty); + + dx = point1.x - point0.x; + dy = point1.y - point0.y; + scale = dx * dx + dy * dy; + scale = (scale) ? 1.0 / scale : 1.0; + + start = dx * point0.x + dy * point0.y; + + for (i = 0; i < 3; i++) { + double qx_device = (i % 2) * (width - 1) + offset_x; + double qy_device = (i / 2) * (height - 1) + offset_y; + + /* transform fragment into pattern space */ + double qx = a * qx_device + c * qy_device + tx; + double qy = b * qx_device + d * qy_device + ty; + + factors[i] = _cairo_fixed_from_double (((dx * qx + dy * qy) - start) * scale); + } + + /* We consider a pattern to be vertical if the fixed point factor + * at the two upper corners is the same. We could accept a small + * change, but determining what change is acceptable would require + * sorting the stops in the pattern and looking at the differences. + * + * Horizontal works the same way with the two left corners. + */ + + *is_vertical = factors[1] == factors[0]; + *is_horizontal = factors[2] == factors[0]; +} + +static cairo_status_t +_cairo_image_data_set_radial (cairo_radial_pattern_t *pattern, + double offset_x, + double offset_y, + uint32_t *pixels, + int width, + int height) { int x, y, aligned_circles; cairo_point_double_t c0, c1; @@ -584,15 +770,18 @@ _cairo_image_data_set_radial (cairo_pattern_t *pattern, c0_c1_x, c0_c1_y, c0_c1, angle_c0, c1_y, y_x, c0_y, c0_x, r1_2, denumerator, fraction, factor; cairo_shader_op_t op; + cairo_status_t status; - _cairo_pattern_shader_init (pattern, &op); + status = _cairo_pattern_shader_init (&pattern->base, &op); + if (status) + return status; - c0.x = pattern->u.radial.center0.x; - c0.y = pattern->u.radial.center0.y; - r0 = pattern->u.radial.radius0; - c1.x = pattern->u.radial.center1.x; - c1.y = pattern->u.radial.center1.y; - r1 = pattern->u.radial.radius1; + c0.x = pattern->center0.x; + c0.y = pattern->center0.y; + r0 = pattern->radius0; + c1.x = pattern->center1.x; + c1.y = pattern->center1.y; + r1 = pattern->radius1; if (c0.x != c1.x || c0.y != c1.y) { aligned_circles = 0; @@ -606,7 +795,8 @@ _cairo_image_data_set_radial (cairo_pattern_t *pattern, r1_2 = c0_c1 = 0.0; /* shut up compiler */ } - cairo_matrix_get_affine (&pattern->matrix, &a, &b, &c, &d, &tx, &ty); + cairo_matrix_get_affine (&pattern->base.base.matrix, + &a, &b, &c, &d, &tx, &ty); for (y = 0; y < height; y++) { for (x = 0; x < width; x++) { @@ -682,70 +872,454 @@ _cairo_image_data_set_radial (cairo_pattern_t *pattern, _cairo_pattern_calc_color_at_pixel (&op, factor * 65536, pixels++); } } + + _cairo_pattern_shader_fini (&op); + + return CAIRO_STATUS_SUCCESS; } -cairo_image_surface_t * -_cairo_pattern_get_image (cairo_pattern_t *pattern, cairo_box_t *box) +static cairo_int_status_t +_cairo_pattern_acquire_surface_for_gradient (cairo_gradient_pattern_t *pattern, + cairo_surface_t *dst, + int x, + int y, + unsigned int width, + unsigned int height, + cairo_surface_t **out, + cairo_surface_attributes_t *attr) { - cairo_surface_t *surface; + cairo_image_surface_t *image; + cairo_status_t status; + uint32_t *data; + cairo_bool_t repeat = FALSE; + if (pattern->base.type == CAIRO_PATTERN_LINEAR) { + cairo_bool_t is_horizontal; + cairo_bool_t is_vertical; + + _cairo_linear_pattern_classify ((cairo_linear_pattern_t *)pattern, + x, y, width, height, + &is_horizontal, &is_vertical); + if (is_horizontal) { + height = 1; + repeat = TRUE; + } + if (is_vertical) { + width = 1; + repeat = TRUE; + } + } + + data = malloc (width * height * 4); + if (!data) + return CAIRO_STATUS_NO_MEMORY; + + if (pattern->base.type == CAIRO_PATTERN_LINEAR) + { + cairo_linear_pattern_t *linear = (cairo_linear_pattern_t *) pattern; + + status = _cairo_image_data_set_linear (linear, x, y, data, + width, height); + } + else + { + cairo_radial_pattern_t *radial = (cairo_radial_pattern_t *) pattern; + + status = _cairo_image_data_set_radial (radial, x, y, data, + width, height); + } + + if (status) { + free (data); + return status; + } + + image = (cairo_image_surface_t *) + cairo_image_surface_create_for_data ((char *) data, + CAIRO_FORMAT_ARGB32, + width, height, + width * 4); + + if (image == NULL) { + free (data); + return CAIRO_STATUS_NO_MEMORY; + } + + _cairo_image_surface_assume_ownership_of_data (image); + + status = _cairo_surface_clone_similar (dst, &image->base, out); + + cairo_surface_destroy (&image->base); + + attr->x_offset = -x; + attr->y_offset = -y; + cairo_matrix_set_identity (&attr->matrix); + attr->extend = repeat ? CAIRO_EXTEND_REPEAT : CAIRO_EXTEND_NONE; + attr->filter = CAIRO_FILTER_NEAREST; + attr->acquired = FALSE; + + return status; +} + +static cairo_int_status_t +_cairo_pattern_acquire_surface_for_solid (cairo_solid_pattern_t *pattern, + cairo_surface_t *dst, + int x, + int y, + unsigned int width, + unsigned int height, + cairo_surface_t **out, + cairo_surface_attributes_t *attribs) +{ + cairo_color_t color; + + _cairo_color_init (&color); + _cairo_color_set_rgb (&color, pattern->red, pattern->green, pattern->blue); + _cairo_color_set_alpha (&color, pattern->base.alpha); + + *out = _cairo_surface_create_similar_solid (dst, + CAIRO_FORMAT_ARGB32, + 1, 1, + &color); + + if (*out == NULL) + return CAIRO_STATUS_NO_MEMORY; + + attribs->x_offset = attribs->y_offset = 0; + cairo_matrix_set_identity (&attribs->matrix); + attribs->extend = CAIRO_EXTEND_REPEAT; + attribs->filter = CAIRO_FILTER_NEAREST; + attribs->acquired = FALSE; + + return CAIRO_STATUS_SUCCESS; +} + + +/** + * _cairo_pattern_is_opaque + * + * Convenience function to determine whether a pattern has an opaque + * alpha value. This is done by testing whether the pattern's alpha + * value when converted to a byte is 255, so if a backend actually + * supported deep alpha channels this function might not do the right + * thing. + * + * Note that for a gradient or surface pattern, the overall resulting + * alpha for the pattern can be non-opaque even this function returns + * %TRUE, since the resulting alpha is the multiplication of the + * alpha of the gradient or surface with the pattern's alpha. In + * the future, alpha will be moved from the base pattern to the + * solid pattern subtype, at which point this function should + * probably be renamed to _cairo_pattern_is_opaque_solid() + * + * Return value: %TRUE if the pattern is opaque + **/ +cairo_bool_t +_cairo_pattern_is_opaque (cairo_pattern_t *pattern) +{ + return (pattern->alpha >= ((double)0xff00 / (double)0xffff)); +} + +static cairo_int_status_t +_cairo_pattern_acquire_surface_for_surface (cairo_surface_pattern_t *pattern, + cairo_surface_t *dst, + int x, + int y, + unsigned int width, + unsigned int height, + cairo_surface_t **out, + cairo_surface_attributes_t *attr) +{ + cairo_int_status_t status; + + attr->acquired = FALSE; + + /* handle pattern opacity */ + if (!_cairo_pattern_is_opaque (&pattern->base)) + { + cairo_surface_pattern_t tmp; + cairo_color_t color; + + _cairo_color_init (&color); + _cairo_color_set_alpha (&color, pattern->base.alpha); + + *out = _cairo_surface_create_similar_solid (dst, + CAIRO_FORMAT_ARGB32, + width, height, + &color); + if (*out == NULL) + return CAIRO_STATUS_NO_MEMORY; + + status = _cairo_pattern_init_copy (&tmp.base, &pattern->base); + if (CAIRO_OK (status)) + { + tmp.base.alpha = 1.0; + status = _cairo_surface_composite (CAIRO_OPERATOR_IN, + &tmp.base, + NULL, + *out, + x, y, 0, 0, 0, 0, + width, height); + + _cairo_pattern_fini (&tmp.base); + } + + if (status) { + cairo_surface_destroy (*out); + return status; + } + + attr->x_offset = -x; + attr->y_offset = -y; + attr->extend = CAIRO_EXTEND_NONE; + attr->filter = CAIRO_FILTER_NEAREST; + + cairo_matrix_set_identity (&attr->matrix); + } + else + { + int tx, ty; + + if (_cairo_surface_is_image (dst)) + { + cairo_image_surface_t *image; + + status = _cairo_surface_acquire_source_image (pattern->surface, + &image, + &attr->extra); + if (CAIRO_OK (status)) + *out = &image->base; + + attr->acquired = TRUE; + } + else + status = _cairo_surface_clone_similar (dst, pattern->surface, out); + + attr->extend = pattern->base.extend; + attr->filter = pattern->base.filter; + if (_cairo_matrix_is_integer_translation (&pattern->base.matrix, + &tx, &ty)) + { + cairo_matrix_set_identity (&attr->matrix); + attr->x_offset = tx; + attr->y_offset = ty; + } + else + { + attr->matrix = pattern->base.matrix; + attr->x_offset = attr->y_offset = 0; + } + } + + return status; +} + +/** + * _cairo_pattern_acquire_surface: + * @pattern: a #cairo_pattern_t + * @dst: destination surface + * @x: X coordinate in source corresponding to left side of destination area + * @y: Y coordinate in source corresponding to top side of destination area + * @width: width of destination area + * @height: height of destination area + * @surface_out: location to store a pointer to a surface + * @attributes: surface attributes that destination backend should apply to + * the returned surface + * + * A convenience function to obtain a surface to use as the source for + * drawing on @dst. + * + * Return value: %CAIRO_STATUS_SUCCESS if a surface was stored in @surface_out. + **/ +cairo_int_status_t +_cairo_pattern_acquire_surface (cairo_pattern_t *pattern, + cairo_surface_t *dst, + int x, + int y, + unsigned int width, + unsigned int height, + cairo_surface_t **surface_out, + cairo_surface_attributes_t *attributes) +{ switch (pattern->type) { + case CAIRO_PATTERN_SOLID: { + cairo_solid_pattern_t *src = (cairo_solid_pattern_t *) pattern; + + return _cairo_pattern_acquire_surface_for_solid (src, dst, + x, y, width, height, + surface_out, + attributes); + } break; case CAIRO_PATTERN_LINEAR: case CAIRO_PATTERN_RADIAL: { - char *data; - double x = box->p1.x >> 16; - double y = box->p1.y >> 16; - int width = ((box->p2.x + 65535) >> 16) - (box->p1.x >> 16); - int height = ((box->p2.y + 65535) >> 16) - (box->p1.y >> 16); - - data = malloc (width * height * 4); - if (!data) - return NULL; - - if (pattern->type == CAIRO_PATTERN_RADIAL) - _cairo_image_data_set_radial (pattern, x, y, (int *) data, - width, height); - else - _cairo_image_data_set_linear (pattern, x, y, (int *) data, - width, height); + cairo_gradient_pattern_t *src = (cairo_gradient_pattern_t *) pattern; - _cairo_pattern_set_source_offset (pattern, x, y); + /* fast path for gradients with less than 2 color stops */ + if (src->n_stops < 2) + { + cairo_solid_pattern_t solid; - surface = cairo_image_surface_create_for_data (data, - CAIRO_FORMAT_ARGB32, - width, height, - width * 4); - - if (surface) - _cairo_image_surface_assume_ownership_of_data ( - (cairo_image_surface_t *) surface); - } - break; - case CAIRO_PATTERN_SOLID: - surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 1, 1); - if (surface) { - _cairo_surface_fill_rectangle (surface, - CAIRO_OPERATOR_SRC, - &pattern->color, 0, 0, 1, 1); - cairo_surface_set_repeat (surface, 1); + if (src->n_stops) + { + _cairo_pattern_init_solid (&solid, + src->stops->color.red, + src->stops->color.green, + src->stops->color.blue); + _cairo_pattern_set_alpha (&solid.base, + src->stops->color.alpha); + } + else + { + _cairo_pattern_init_solid (&solid, 0.0, 0.0, 0.0); + _cairo_pattern_set_alpha (&solid.base, 0.0); + } + + return _cairo_pattern_acquire_surface_for_solid (&solid, dst, + x, y, + width, height, + surface_out, + attributes); } - break; - case CAIRO_PATTERN_SURFACE: { - cairo_image_surface_t *image; - - image = _cairo_surface_get_image (pattern->u.surface.surface); - if (image) - surface = &image->base; else - surface = NULL; - + return _cairo_pattern_acquire_surface_for_gradient (src, dst, + x, y, + width, height, + surface_out, + attributes); + } break; + case CAIRO_PATTERN_SURFACE: { + cairo_surface_pattern_t *src = (cairo_surface_pattern_t *) pattern; + + return _cairo_pattern_acquire_surface_for_surface (src, dst, + x, y, width, height, + surface_out, + attributes); + } break; } - break; - default: - surface = NULL; - break; - } - - return (cairo_image_surface_t *) surface; + + return CAIRO_INT_STATUS_UNSUPPORTED; +} + +/** + * _cairo_pattern_release_surface: + * @pattern: a #cairo_pattern_t + * @info: pointer to #cairo_surface_attributes_t filled in by + * _cairo_pattern_acquire_surface + * + * Releases resources obtained by _cairo_pattern_acquire_surface. + **/ +void +_cairo_pattern_release_surface (cairo_surface_t *dst, + cairo_surface_t *surface, + cairo_surface_attributes_t *attributes) +{ + if (attributes->acquired) + _cairo_surface_release_source_image (dst, + (cairo_image_surface_t *) surface, + attributes->extra); + else + cairo_surface_destroy (surface); +} + +cairo_int_status_t +_cairo_pattern_acquire_surfaces (cairo_pattern_t *src, + cairo_pattern_t *mask, + cairo_surface_t *dst, + int src_x, + int src_y, + int mask_x, + int mask_y, + unsigned int width, + unsigned int height, + cairo_surface_t **src_out, + cairo_surface_t **mask_out, + cairo_surface_attributes_t *src_attributes, + cairo_surface_attributes_t *mask_attributes) +{ + cairo_int_status_t status; + + cairo_pattern_union_t tmp; + cairo_bool_t src_opaque, mask_opaque; + double src_alpha, mask_alpha; + + src_opaque = _cairo_pattern_is_opaque (src); + mask_opaque = !mask || _cairo_pattern_is_opaque (mask); + + /* For surface patterns, we move any translucency from src->alpha + * to mask->alpha so we can use the source unchanged. Otherwise we + * move the translucency from mask->alpha to src->alpha so that + * we can drop the mask if possible. + */ + if (src->type == CAIRO_PATTERN_SURFACE) + { + if (mask) { + mask_opaque = mask_opaque && src_opaque; + mask_alpha = mask->alpha * src->alpha; + } else { + mask_opaque = src_opaque; + mask_alpha = src->alpha; + } + + src_alpha = 1.0; + src_opaque = TRUE; + } + else + { + if (mask) + { + src_opaque = mask_opaque && src_opaque; + src_alpha = mask->alpha * src->alpha; + /* FIXME: This needs changing when we support RENDER + * style 4-channel masks. + */ + if (mask->type == CAIRO_PATTERN_SOLID) + mask = NULL; + } else + src_alpha = src->alpha; + + mask_alpha = 1.0; + mask_opaque = TRUE; + } + + _cairo_pattern_init_copy (&tmp.base, src); + _cairo_pattern_set_alpha (&tmp.base, src_alpha); + + status = _cairo_pattern_acquire_surface (&tmp.base, dst, + src_x, src_y, + width, height, + src_out, src_attributes); + + _cairo_pattern_fini (&tmp.base); + + if (status) + return status; + + if (mask || !mask_opaque) + { + if (mask) + _cairo_pattern_init_copy (&tmp.base, mask); + else + _cairo_pattern_init_solid (&tmp.solid, 0.0, 0.0, 0.0); + + _cairo_pattern_set_alpha (&tmp.base, mask_alpha); + + status = _cairo_pattern_acquire_surface (&tmp.base, dst, + mask_x, mask_y, + width, height, + mask_out, mask_attributes); + + _cairo_pattern_fini (&tmp.base); + + if (status) + { + _cairo_pattern_release_surface (dst, *src_out, src_attributes); + return status; + } + } + else + { + *mask_out = NULL; + } + + return CAIRO_STATUS_SUCCESS; } - diff --git a/gfx/cairo/cairo/src/cairo_pdf_surface.c b/gfx/cairo/cairo/src/cairo_pdf_surface.c index 23230aa742f9..fee918355280 100644 --- a/gfx/cairo/cairo/src/cairo_pdf_surface.c +++ b/gfx/cairo/cairo/src/cairo_pdf_surface.c @@ -36,9 +36,8 @@ #include "cairoint.h" #include "cairo-pdf.h" -/* XXX: This seems broken to me. What about users without freetype - * that want to use a cairo PDF surface? */ -#include "cairo-ft.h" +/* XXX: Eventually, we need to handle other font backends */ +#include "cairo-ft-private.h" #include #include FT_FREETYPE_H @@ -54,10 +53,6 @@ * - Why doesn't pages inherit /alpha%d GS dictionaries from the Pages * object? * - * - Why isn't the pattern passed to composite traps instead of - * pattern->source? If composite traps needs an image or a surface it - * can call create_pattern(). - * * - We embed an image in the stream each time it's composited. We * could add generation counters to surfaces and remember the stream * ID for a particular generation for a particular surface. @@ -183,9 +178,6 @@ struct cairo_pdf_surface { double width_inches; double height_inches; - /* HACK: Non-null if this surface was created for a pattern. */ - cairo_pattern_t *pattern; - cairo_pdf_document_t *document; cairo_pdf_stream_t *current_stream; @@ -240,8 +232,6 @@ static const cairo_surface_backend_t cairo_pdf_surface_backend; #define ARRAY_LENGTH(a) ( (sizeof (a)) / (sizeof ((a)[0])) ) #define SFNT_VERSION 0x00010000 -#define OFFSET_TABLE_SIZE 12 -#define TABLE_DIRECTORY_ENTRY_SIZE 16 #ifdef WORDS_BIGENDIAN @@ -300,19 +290,15 @@ cairo_pdf_font_destroy (cairo_pdf_font_t *font) } static cairo_pdf_font_t * -cairo_pdf_ft_font_create (cairo_pdf_document_t *document, - cairo_unscaled_font_t *unscaled_font, - cairo_font_scale_t *scale) +cairo_pdf_ft_font_create (cairo_pdf_document_t *document, + cairo_unscaled_font_t *unscaled_font) { - cairo_font_t scaled_font; FT_Face face; cairo_pdf_ft_font_t *font; unsigned long size; int i, j; - /* FIXME: Why do I have to pass a scaled font to get the FT_Face? */ - _cairo_font_init (&scaled_font, scale, unscaled_font); - face = cairo_ft_font_face (&scaled_font); + face = _cairo_ft_unscaled_font_lock_face (unscaled_font); /* We currently only support freetype truetype fonts. */ size = 0; @@ -333,7 +319,8 @@ cairo_pdf_ft_font_create (cairo_pdf_document_t *document, if (_cairo_array_grow_by (&font->output, 4096) != CAIRO_STATUS_SUCCESS) goto fail1; - font->face = face; + font->base.unscaled_font = unscaled_font; + _cairo_unscaled_font_reference (unscaled_font); font->glyphs = calloc (face->num_glyphs + 1, sizeof (ft_subset_glyph_t)); if (font->glyphs == NULL) goto fail2; @@ -364,6 +351,8 @@ cairo_pdf_ft_font_create (cairo_pdf_document_t *document, if (font->base.widths == NULL) goto fail5; + _cairo_ft_unscaled_font_unlock_face (unscaled_font); + font->status = CAIRO_STATUS_SUCCESS; return &font->base; @@ -447,7 +436,7 @@ cairo_pdf_ft_font_write_cmap_table (cairo_pdf_ft_font_t *font, unsigned long tag cairo_pdf_ft_font_write_be16 (font, 0); cairo_pdf_ft_font_write_be16 (font, 1); - cairo_pdf_ft_font_write_be16 (font, 0); + cairo_pdf_ft_font_write_be16 (font, 1); cairo_pdf_ft_font_write_be16 (font, 0); cairo_pdf_ft_font_write_be32 (font, 12); @@ -764,12 +753,15 @@ cairo_pdf_ft_font_generate (void *abstract_font, unsigned long start, end, next, checksum; int i; + font->face = _cairo_ft_unscaled_font_lock_face (font->base.unscaled_font); + if (cairo_pdf_ft_font_write_offset_table (font)) - return font->status; + goto fail; start = cairo_pdf_ft_font_align_output (font); end = start; + end = 0; for (i = 0; i < ARRAY_LENGTH (truetype_tables); i++) { if (truetype_tables[i].write (font, truetype_tables[i].tag)) goto fail; @@ -789,6 +781,9 @@ cairo_pdf_ft_font_generate (void *abstract_font, *length = _cairo_array_num_elements (&font->output); fail: + _cairo_ft_unscaled_font_unlock_face (font->base.unscaled_font); + font->face = NULL; + return font->status; } @@ -947,14 +942,13 @@ _cairo_pdf_surface_create_for_document (cairo_pdf_document_t *document, surface->width_inches = width_inches; surface->height_inches = height_inches; - surface->pattern = NULL; _cairo_pdf_document_reference (document); surface->document = document; _cairo_array_init (&surface->streams, sizeof (cairo_pdf_stream_t *)); _cairo_array_init (&surface->patterns, sizeof (cairo_pdf_resource_t)); _cairo_array_init (&surface->xobjects, sizeof (cairo_pdf_resource_t)); _cairo_array_init (&surface->alphas, sizeof (double)); - _cairo_array_init (&surface->fonts, sizeof (cairo_pdf_font_t)); + _cairo_array_init (&surface->fonts, sizeof (cairo_pdf_resource_t)); return &surface->base; } @@ -1102,38 +1096,46 @@ _cairo_pdf_surface_ensure_stream (cairo_pdf_surface_t *surface) } } -static cairo_image_surface_t * -_cairo_pdf_surface_get_image (void *abstract_surface) -{ - return NULL; -} - static cairo_status_t -_cairo_pdf_surface_set_image (void *abstract_surface, - cairo_image_surface_t *image) +_cairo_pdf_surface_acquire_source_image (void *abstract_surface, + cairo_image_surface_t **image_out, + void **image_extra) { return CAIRO_INT_STATUS_UNSUPPORTED; } -static cairo_status_t -_cairo_pdf_surface_set_matrix (void *abstract_surface, - cairo_matrix_t *matrix) +static void +_cairo_pdf_surface_release_source_image (void *abstract_surface, + cairo_image_surface_t *image, + void *image_extra) { - return CAIRO_STATUS_SUCCESS; } static cairo_status_t -_cairo_pdf_surface_set_filter (void *abstract_surface, - cairo_filter_t filter) +_cairo_pdf_surface_acquire_dest_image (void *abstract_surface, + cairo_rectangle_t *interest_rect, + cairo_image_surface_t **image_out, + cairo_rectangle_t *image_rect, + void **image_extra) +{ + return CAIRO_INT_STATUS_UNSUPPORTED; +} + +static void +_cairo_pdf_surface_release_dest_image (void *abstract_surface, + cairo_rectangle_t *interest_rect, + cairo_image_surface_t *image, + cairo_rectangle_t *image_rect, + void *image_extra) { - return CAIRO_STATUS_SUCCESS; } static cairo_status_t -_cairo_pdf_surface_set_repeat (void *abstract_surface, - int repeat) +_cairo_pdf_surface_clone_similar (void *abstract_surface, + cairo_surface_t *src, + cairo_surface_t **clone_out) { - return CAIRO_STATUS_SUCCESS; + return CAIRO_INT_STATUS_UNSUPPORTED; } static void * @@ -1210,23 +1212,34 @@ emit_image_data (cairo_pdf_document_t *document, } static cairo_int_status_t -_cairo_pdf_surface_composite_image (cairo_pdf_surface_t *dst, - cairo_image_surface_t *image) +_cairo_pdf_surface_composite_image (cairo_pdf_surface_t *dst, + cairo_surface_pattern_t *pattern) { cairo_pdf_document_t *document = dst->document; FILE *file = document->file; unsigned id; cairo_matrix_t i2u; + cairo_status_t status; + cairo_image_surface_t *image; + cairo_surface_t *src; + void *image_extra; + + src = pattern->surface; + status = _cairo_surface_acquire_source_image (src, &image, &image_extra); + if (!CAIRO_OK (status)) + return status; id = emit_image_data (dst->document, image); - if (id == 0) - return CAIRO_STATUS_NO_MEMORY; + if (id == 0) { + status = CAIRO_STATUS_NO_MEMORY; + goto bail; + } _cairo_pdf_surface_add_xobject (dst, id); _cairo_pdf_surface_ensure_stream (dst); - cairo_matrix_copy (&i2u, &image->base.matrix); + cairo_matrix_copy (&i2u, &pattern->base.matrix); cairo_matrix_invert (&i2u); cairo_matrix_translate (&i2u, 0, image->height); cairo_matrix_scale (&i2u, image->width, -image->height); @@ -1238,7 +1251,10 @@ _cairo_pdf_surface_composite_image (cairo_pdf_surface_t *dst, i2u.m[2][0], i2u.m[2][1], id); - return CAIRO_STATUS_SUCCESS; + bail: + _cairo_surface_release_source_image (src, image, image_extra); + + return status; } /* The contents of the surface is already transformed into PDF units, @@ -1253,20 +1269,19 @@ _cairo_pdf_surface_composite_image (cairo_pdf_surface_t *dst, static cairo_int_status_t _cairo_pdf_surface_composite_pdf (cairo_pdf_surface_t *dst, - cairo_pdf_surface_t *src, - int width, int height) + cairo_surface_pattern_t *pattern) { cairo_pdf_document_t *document = dst->document; FILE *file = document->file; cairo_matrix_t i2u; cairo_pdf_stream_t *stream; int num_streams, i; - - if (src->pattern != NULL) - return CAIRO_STATUS_SUCCESS; + cairo_pdf_surface_t *src; _cairo_pdf_surface_ensure_stream (dst); + src = (cairo_pdf_surface_t *) pattern->surface; + cairo_matrix_copy (&i2u, &src->base.matrix); cairo_matrix_invert (&i2u); cairo_matrix_scale (&i2u, @@ -1297,8 +1312,8 @@ _cairo_pdf_surface_composite_pdf (cairo_pdf_surface_t *dst, static cairo_int_status_t _cairo_pdf_surface_composite (cairo_operator_t operator, - cairo_surface_t *generic_src, - cairo_surface_t *generic_mask, + cairo_pattern_t *src_pattern, + cairo_pattern_t *mask_pattern, void *abstract_dst, int src_x, int src_y, @@ -1310,17 +1325,18 @@ _cairo_pdf_surface_composite (cairo_operator_t operator, unsigned int height) { cairo_pdf_surface_t *dst = abstract_dst; - cairo_pdf_surface_t *src; - cairo_image_surface_t *image; + cairo_surface_pattern_t *src = (cairo_surface_pattern_t *) src_pattern; - if (generic_src->backend == &cairo_pdf_surface_backend) { - src = (cairo_pdf_surface_t *) generic_src; - return _cairo_pdf_surface_composite_pdf (dst, src, width, height); - } - else { - image = _cairo_surface_get_image (generic_src); - return _cairo_pdf_surface_composite_image (dst, image); - } + if (mask_pattern) + return CAIRO_STATUS_SUCCESS; + + if (src_pattern->type != CAIRO_PATTERN_SURFACE) + return CAIRO_STATUS_SUCCESS; + + if (src->surface->backend == &cairo_pdf_surface_backend) + return _cairo_pdf_surface_composite_pdf (dst, src); + else + return _cairo_pdf_surface_composite_image (dst, src); } static cairo_int_status_t @@ -1335,9 +1351,6 @@ _cairo_pdf_surface_fill_rectangles (void *abstract_surface, FILE *file = document->file; int i; - if (surface->pattern != NULL) - return CAIRO_STATUS_SUCCESS; - _cairo_pdf_surface_ensure_stream (surface); fprintf (file, @@ -1355,23 +1368,44 @@ _cairo_pdf_surface_fill_rectangles (void *abstract_surface, } static void -emit_tiling_pattern (cairo_operator_t operator, - cairo_pdf_surface_t *dst, - cairo_pattern_t *pattern) +emit_solid_pattern (cairo_pdf_surface_t *surface, + cairo_solid_pattern_t *pattern) +{ + cairo_pdf_document_t *document = surface->document; + FILE *file = document->file; + unsigned int alpha; + + alpha = _cairo_pdf_surface_add_alpha (surface, pattern->base.alpha); + _cairo_pdf_surface_ensure_stream (surface); + fprintf (file, + "%f %f %f rg /a%d gs\r\n", + pattern->red, + pattern->green, + pattern->blue, + alpha); +} + +static void +emit_surface_pattern (cairo_pdf_surface_t *dst, + cairo_surface_pattern_t *pattern) { cairo_pdf_document_t *document = dst->document; FILE *file = document->file; cairo_pdf_stream_t *stream; cairo_image_surface_t *image; + void *image_extra; + cairo_status_t status; char entries[250]; unsigned int id, alpha; cairo_matrix_t pm; - if (pattern->u.surface.surface->backend == &cairo_pdf_surface_backend) { + if (pattern->surface->backend == &cairo_pdf_surface_backend) { return; } - - image = _cairo_surface_get_image (pattern->u.surface.surface); + + status = _cairo_surface_acquire_source_image (pattern->surface, &image, &image_extra); + if (!CAIRO_OK (status)) + return; _cairo_pdf_document_close_stream (document); @@ -1382,7 +1416,7 @@ emit_tiling_pattern (cairo_operator_t operator, cairo_matrix_set_identity (&pm); cairo_matrix_scale (&pm, image->width, image->height); - cairo_matrix_copy (&pm, &pattern->matrix); + cairo_matrix_copy (&pm, &pattern->base.matrix); cairo_matrix_invert (&pm); snprintf (entries, sizeof entries, @@ -1401,6 +1435,8 @@ emit_tiling_pattern (cairo_operator_t operator, stream = _cairo_pdf_document_open_stream (document, entries); + /* FIXME: emit code to show surface here. */ + _cairo_pdf_surface_add_pattern (dst, stream->id); _cairo_pdf_surface_ensure_stream (dst); @@ -1408,10 +1444,12 @@ emit_tiling_pattern (cairo_operator_t operator, fprintf (file, "/Pattern cs /res%d scn /a%d gs\r\n", stream->id, alpha); + + _cairo_surface_release_source_image (pattern->surface, image, image_extra); } static unsigned int -emit_pattern_stops (cairo_pdf_surface_t *surface, cairo_pattern_t *pattern) +emit_pattern_stops (cairo_pdf_surface_t *surface, cairo_gradient_pattern_t *pattern) { cairo_pdf_document_t *document = surface->document; FILE *file = document->file; @@ -1430,12 +1468,12 @@ emit_pattern_stops (cairo_pdf_surface_t *surface, cairo_pattern_t *pattern) "stream\r\n", function_id); - fputc (pattern->stops[0].color_char[0], file); - fputc (pattern->stops[0].color_char[1], file); - fputc (pattern->stops[0].color_char[2], file); - fputc (pattern->stops[1].color_char[0], file); - fputc (pattern->stops[1].color_char[1], file); - fputc (pattern->stops[1].color_char[2], file); + fputc (pattern->stops[0].color.red * 0xff, file); + fputc (pattern->stops[0].color.green * 0xff, file); + fputc (pattern->stops[0].color.blue * 0xff, file); + fputc (pattern->stops[1].color.red * 0xff, file); + fputc (pattern->stops[1].color.green * 0xff, file); + fputc (pattern->stops[1].color.blue * 0xff, file); fprintf (file, "\r\n" @@ -1446,7 +1484,7 @@ emit_pattern_stops (cairo_pdf_surface_t *surface, cairo_pattern_t *pattern) } static void -emit_linear_pattern (cairo_pdf_surface_t *surface, cairo_pattern_t *pattern) +emit_linear_pattern (cairo_pdf_surface_t *surface, cairo_linear_pattern_t *pattern) { cairo_pdf_document_t *document = surface->document; FILE *file = document->file; @@ -1456,16 +1494,16 @@ emit_linear_pattern (cairo_pdf_surface_t *surface, cairo_pattern_t *pattern) _cairo_pdf_document_close_stream (document); - function_id = emit_pattern_stops (surface, pattern); + function_id = emit_pattern_stops (surface, &pattern->base); - cairo_matrix_copy (&p2u, &pattern->matrix); + cairo_matrix_copy (&p2u, &pattern->base.base.matrix); cairo_matrix_invert (&p2u); - x0 = pattern->u.linear.point0.x; - y0 = pattern->u.linear.point0.y; + x0 = pattern->point0.x; + y0 = pattern->point0.y; cairo_matrix_transform_point (&p2u, &x0, &y0); - x1 = pattern->u.linear.point1.x; - y1 = pattern->u.linear.point1.y; + x1 = pattern->point1.x; + y1 = pattern->point1.y; cairo_matrix_transform_point (&p2u, &x1, &y1); pattern_id = _cairo_pdf_document_new_object (document); @@ -1479,16 +1517,14 @@ emit_linear_pattern (cairo_pdf_surface_t *surface, cairo_pattern_t *pattern) " /ColorSpace /DeviceRGB\r\n" " /Coords [ %f %f %f %f ]\r\n" " /Function %d 0 R\r\n" - " /Extend [ %s %s ]\r\n" + " /Extend [ true true ]\r\n" " >>\r\n" ">>\r\n" "endobj\r\n", pattern_id, document->height_inches * document->y_ppi, x0, y0, x1, y1, - function_id, - (1 || pattern->extend) ? "true" : "false", - (1 || pattern->extend) ? "true" : "false"); + function_id); _cairo_pdf_surface_add_pattern (surface, pattern_id); @@ -1502,7 +1538,7 @@ emit_linear_pattern (cairo_pdf_surface_t *surface, cairo_pattern_t *pattern) } static void -emit_radial_pattern (cairo_pdf_surface_t *surface, cairo_pattern_t *pattern) +emit_radial_pattern (cairo_pdf_surface_t *surface, cairo_radial_pattern_t *pattern) { cairo_pdf_document_t *document = surface->document; FILE *file = document->file; @@ -1512,24 +1548,31 @@ emit_radial_pattern (cairo_pdf_surface_t *surface, cairo_pattern_t *pattern) _cairo_pdf_document_close_stream (document); - function_id = emit_pattern_stops (surface, pattern); + function_id = emit_pattern_stops (surface, &pattern->base); - cairo_matrix_copy (&p2u, &pattern->matrix); + cairo_matrix_copy (&p2u, &pattern->base.base.matrix); cairo_matrix_invert (&p2u); - x0 = pattern->u.radial.center0.x; - y0 = pattern->u.radial.center0.y; - r0 = pattern->u.radial.radius0; + x0 = pattern->center0.x; + y0 = pattern->center0.y; + r0 = pattern->radius0; cairo_matrix_transform_point (&p2u, &x0, &y0); - x1 = pattern->u.radial.center1.x; - y1 = pattern->u.radial.center1.y; - r1 = pattern->u.radial.radius1; + x1 = pattern->center1.x; + y1 = pattern->center1.y; + r1 = pattern->radius1; cairo_matrix_transform_point (&p2u, &x1, &y1); /* FIXME: This is surely crack, but how should you scale a radius * in a non-orthogonal coordinate system? */ cairo_matrix_transform_distance (&p2u, &r0, &r1); + /* FIXME: There is a difference between the cairo gradient extend + * semantics and PDF extend semantics. PDFs extend=false means + * that nothing is painted outside the gradient boundaries, + * whereas cairo takes this to mean that the end color is padded + * to infinity. Setting extend=true in PDF gives the cairo default + * behavoir, not yet sure how to implement the cairo mirror and + * repeat behaviour. */ pattern_id = _cairo_pdf_document_new_object (document); fprintf (file, "%d 0 obj\r\n" @@ -1541,16 +1584,14 @@ emit_radial_pattern (cairo_pdf_surface_t *surface, cairo_pattern_t *pattern) " /ColorSpace /DeviceRGB\r\n" " /Coords [ %f %f %f %f %f %f ]\r\n" " /Function %d 0 R\r\n" - " /Extend [ %s %s ]\r\n" + " /Extend [ true true ]\r\n" " >>\r\n" ">>\r\n" "endobj\r\n", pattern_id, document->height_inches * document->y_ppi, x0, y0, r0, x1, y1, r1, - function_id, - (1 || pattern->extend) ? "true" : "false", - (1 || pattern->extend) ? "true" : "false"); + function_id); _cairo_pdf_surface_add_pattern (surface, pattern_id); @@ -1563,6 +1604,28 @@ emit_radial_pattern (cairo_pdf_surface_t *surface, cairo_pattern_t *pattern) pattern_id, alpha); } +static void +emit_pattern (cairo_pdf_surface_t *surface, cairo_pattern_t *pattern) +{ + switch (pattern->type) { + case CAIRO_PATTERN_SOLID: + emit_solid_pattern (surface, (cairo_solid_pattern_t *) pattern); + break; + + case CAIRO_PATTERN_SURFACE: + emit_surface_pattern (surface, (cairo_surface_pattern_t *) pattern); + break; + + case CAIRO_PATTERN_LINEAR: + emit_linear_pattern (surface, (cairo_linear_pattern_t *) pattern); + break; + + case CAIRO_PATTERN_RADIAL: + emit_radial_pattern (surface, (cairo_radial_pattern_t *) pattern); + break; + } +} + static double intersect (cairo_line_t *line, cairo_fixed_t y) { @@ -1574,60 +1637,23 @@ intersect (cairo_line_t *line, cairo_fixed_t y) static cairo_int_status_t _cairo_pdf_surface_composite_trapezoids (cairo_operator_t operator, - cairo_surface_t *generic_src, + cairo_pattern_t *pattern, void *abstract_dst, int x_src, int y_src, + int x_dst, + int y_dst, + unsigned int width, + unsigned int height, cairo_trapezoid_t *traps, int num_traps) { cairo_pdf_surface_t *surface = abstract_dst; - cairo_pdf_surface_t *source = (cairo_pdf_surface_t *) generic_src; cairo_pdf_document_t *document = surface->document; - cairo_pattern_t *pattern; FILE *file = document->file; int i; - unsigned int alpha; - /* FIXME: we really just want the original pattern here, not a - * source surface. */ - pattern = source->pattern; - - if (source->base.backend != &cairo_pdf_surface_backend) { - printf ("_cairo_pdf_surface_composite_trapezoids: not a pdf source\r"); - return CAIRO_STATUS_SUCCESS; - } - - if (pattern == NULL) { - printf ("_cairo_pdf_surface_composite_trapezoids: " - "non-pattern pdf source\r"); - return CAIRO_STATUS_SUCCESS; - } - - switch (pattern->type) { - case CAIRO_PATTERN_SOLID: - alpha = _cairo_pdf_surface_add_alpha (surface, pattern->color.alpha); - _cairo_pdf_surface_ensure_stream (surface); - fprintf (file, - "%f %f %f rg /a%d gs\r\n", - pattern->color.red, - pattern->color.green, - pattern->color.blue, - alpha); - break; - - case CAIRO_PATTERN_SURFACE: - emit_tiling_pattern (operator, surface, pattern); - break; - - case CAIRO_PATTERN_LINEAR: - emit_linear_pattern (surface, pattern); - break; - - case CAIRO_PATTERN_RADIAL: - emit_radial_pattern (surface, pattern ); - break; - } + emit_pattern (surface, pattern); /* After the above switch the current stream should belong to this * surface, so no need to _cairo_pdf_surface_ensure_stream() */ @@ -1686,59 +1712,48 @@ _cairo_pdf_surface_set_clip_region (void *abstract_surface, return CAIRO_INT_STATUS_UNSUPPORTED; } -static cairo_int_status_t -_cairo_pdf_surface_create_pattern (void *abstract_surface, - cairo_pattern_t *pattern, - cairo_box_t *extents) -{ - cairo_pdf_surface_t *surface = abstract_surface; - cairo_pdf_surface_t *source; - - source = (cairo_pdf_surface_t *) - _cairo_pdf_surface_create_for_document (surface->document, 0, 0); - source->pattern = pattern; - pattern->source = &source->base; - - return CAIRO_STATUS_SUCCESS; -} - static cairo_pdf_font_t * _cairo_pdf_document_get_font (cairo_pdf_document_t *document, - cairo_unscaled_font_t *unscaled_font, - cairo_font_scale_t *scale) + cairo_font_t *font) { - cairo_pdf_font_t *font; + cairo_unscaled_font_t *unscaled_font; + cairo_pdf_font_t *pdf_font; unsigned int num_fonts, i; + unscaled_font = _cairo_ft_font_get_unscaled_font (font); + num_fonts = _cairo_array_num_elements (&document->fonts); for (i = 0; i < num_fonts; i++) { - _cairo_array_copy_element (&document->fonts, i, &font); - if (font->unscaled_font == unscaled_font) - return font; + _cairo_array_copy_element (&document->fonts, i, &pdf_font); + if (pdf_font->unscaled_font == unscaled_font) + return pdf_font; } /* FIXME: Figure out here which font backend is in use and call * the appropriate constructor. */ - font = cairo_pdf_ft_font_create (document, unscaled_font, scale); - if (font == NULL) + pdf_font = cairo_pdf_ft_font_create (document, unscaled_font); + if (pdf_font == NULL) return NULL; - if (_cairo_array_append (&document->fonts, &font, 1) == NULL) { - cairo_pdf_font_destroy (font); + if (_cairo_array_append (&document->fonts, &pdf_font, 1) == NULL) { + cairo_pdf_font_destroy (pdf_font); return NULL; } - return font; + return pdf_font; } static cairo_status_t -_cairo_pdf_surface_show_glyphs (cairo_unscaled_font_t *font, - cairo_font_scale_t *scale, +_cairo_pdf_surface_show_glyphs (cairo_font_t *font, cairo_operator_t operator, - cairo_surface_t *source, + cairo_pattern_t *pattern, void *abstract_surface, int source_x, int source_y, + int dest_x, + int dest_y, + unsigned int width, + unsigned int height, const cairo_glyph_t *glyphs, int num_glyphs) { @@ -1748,23 +1763,23 @@ _cairo_pdf_surface_show_glyphs (cairo_unscaled_font_t *font, cairo_pdf_font_t *pdf_font; int i, index; - pdf_font = _cairo_pdf_document_get_font (document, font, scale); + pdf_font = _cairo_pdf_document_get_font (document, font); if (pdf_font == NULL) return CAIRO_STATUS_NO_MEMORY; - _cairo_pdf_surface_ensure_stream (surface); + emit_pattern (surface, pattern); - fprintf (file, "0 0 0 rg BT /res%u 1 Tf", pdf_font->font_id); + fprintf (file, "BT /res%u 1 Tf", pdf_font->font_id); for (i = 0; i < num_glyphs; i++) { index = cairo_pdf_font_use_glyph (pdf_font, glyphs[i].index); fprintf (file, - " %f %f %f %f %f %f Tm (%c) Tj", - scale->matrix[0][0], - scale->matrix[0][1], - scale->matrix[1][0], - -scale->matrix[1][1], + " %f %f %f %f %f %f Tm (\\%o) Tj", + font->scale.matrix[0][0], + font->scale.matrix[0][1], + font->scale.matrix[1][0], + -font->scale.matrix[1][1], glyphs[i].x, glyphs[i].y, index); @@ -1780,18 +1795,17 @@ static const cairo_surface_backend_t cairo_pdf_surface_backend = { _cairo_pdf_surface_create_similar, _cairo_pdf_surface_destroy, _cairo_pdf_surface_pixels_per_inch, - _cairo_pdf_surface_get_image, - _cairo_pdf_surface_set_image, - _cairo_pdf_surface_set_matrix, - _cairo_pdf_surface_set_filter, - _cairo_pdf_surface_set_repeat, + _cairo_pdf_surface_acquire_source_image, + _cairo_pdf_surface_release_source_image, + _cairo_pdf_surface_acquire_dest_image, + _cairo_pdf_surface_release_dest_image, + _cairo_pdf_surface_clone_similar, _cairo_pdf_surface_composite, _cairo_pdf_surface_fill_rectangles, _cairo_pdf_surface_composite_trapezoids, _cairo_pdf_surface_copy_page, _cairo_pdf_surface_show_page, _cairo_pdf_surface_set_clip_region, - _cairo_pdf_surface_create_pattern, _cairo_pdf_surface_show_glyphs }; @@ -1930,8 +1944,8 @@ _cairo_pdf_document_write_fonts (cairo_pdf_document_t *document) fprintf (file, "%d 0 obj\r\n" "<< /Type /FontDescriptor\r\n" - " /FontName /%s\r\n" - " /Flags 32\r\n" + " /FontName /7%s\r\n" + " /Flags 4\r\n" " /FontBBox [ %ld %ld %ld %ld ]\r\n" " /ItalicAngle 0\r\n" " /Ascent %ld\r\n" diff --git a/gfx/cairo/cairo/src/cairo_pen.c b/gfx/cairo/cairo/src/cairo_pen.c index f365091dc8db..6ecaa00b3aed 100644 --- a/gfx/cairo/cairo/src/cairo_pen.c +++ b/gfx/cairo/cairo/src/cairo_pen.c @@ -31,7 +31,7 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ #include "cairoint.h" diff --git a/gfx/cairo/cairo/src/cairo_png_surface.c b/gfx/cairo/cairo/src/cairo_png_surface.c index 2279b07a981a..1ae745cb59a6 100644 --- a/gfx/cairo/cairo/src/cairo_png_surface.c +++ b/gfx/cairo/cairo/src/cairo_png_surface.c @@ -32,7 +32,7 @@ * * Contributor(s): * Olivier Andrieu - * Carl D. Worth + * Carl D. Worth */ #include @@ -185,62 +185,65 @@ _cairo_png_surface_pixels_per_inch (void *abstract_surface) return 96.0; } -static cairo_image_surface_t * -_cairo_png_surface_get_image (void *abstract_surface) +static cairo_status_t +_cairo_png_surface_acquire_source_image (void *abstract_surface, + cairo_image_surface_t **image_out, + void **image_extra) { cairo_png_surface_t *surface = abstract_surface; + + *image_out = surface->image; - cairo_surface_reference (&surface->image->base); + return CAIRO_STATUS_SUCCESS; +} - return surface->image; +static void +_cairo_png_surface_release_source_image (void *abstract_surface, + cairo_image_surface_t *image, + void *image_extra) +{ } static cairo_status_t -_cairo_png_surface_set_image (void *abstract_surface, - cairo_image_surface_t *image) +_cairo_png_surface_acquire_dest_image (void *abstract_surface, + cairo_rectangle_t *interest_rect, + cairo_image_surface_t **image_out, + cairo_rectangle_t *image_rect, + void **image_extra) { cairo_png_surface_t *surface = abstract_surface; + + image_rect->x = 0; + image_rect->y = 0; + image_rect->width = surface->image->width; + image_rect->height = surface->image->height; + + *image_out = surface->image; - if (image == surface->image) - return CAIRO_STATUS_SUCCESS; + return CAIRO_STATUS_SUCCESS; +} - /* XXX: Need to call _cairo_image_surface_set_image here, but it's - not implemented yet. */ +static void +_cairo_png_surface_release_dest_image (void *abstract_surface, + cairo_rectangle_t *interest_rect, + cairo_image_surface_t *image, + cairo_rectangle_t *image_rect, + void *image_extra) +{ +} +static cairo_status_t +_cairo_png_surface_clone_similar (void *abstract_surface, + cairo_surface_t *src, + cairo_surface_t **clone_out) +{ return CAIRO_INT_STATUS_UNSUPPORTED; } -static cairo_status_t -_cairo_png_surface_set_matrix (void *abstract_surface, - cairo_matrix_t *matrix) -{ - cairo_png_surface_t *surface = abstract_surface; - - return _cairo_image_surface_set_matrix (surface->image, matrix); -} - -static cairo_status_t -_cairo_png_surface_set_filter (void *abstract_surface, - cairo_filter_t filter) -{ - cairo_png_surface_t *surface = abstract_surface; - - return _cairo_image_surface_set_filter (surface->image, filter); -} - -static cairo_status_t -_cairo_png_surface_set_repeat (void *abstract_surface, - int repeat) -{ - cairo_png_surface_t *surface = abstract_surface; - - return _cairo_image_surface_set_repeat (surface->image, repeat); -} - static cairo_int_status_t _cairo_png_surface_composite (cairo_operator_t operator, - cairo_surface_t *generic_src, - cairo_surface_t *generic_mask, + cairo_pattern_t *src, + cairo_pattern_t *mask, void *abstract_dst, int src_x, int src_y, @@ -266,10 +269,14 @@ _cairo_png_surface_fill_rectangles (void *abstract_surface, static cairo_int_status_t _cairo_png_surface_composite_trapezoids (cairo_operator_t operator, - cairo_surface_t *generic_src, + cairo_pattern_t *pattern, void *abstract_dst, - int x_src, - int y_src, + int src_x, + int src_y, + int dst_x, + int dst_y, + unsigned int width, + unsigned int height, cairo_trapezoid_t *traps, int num_traps) { @@ -297,18 +304,20 @@ _cairo_png_surface_copy_page (void *abstract_surface) rows[i] = surface->image->data + i * surface->image->stride; png = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - if (png == NULL) - return CAIRO_STATUS_NO_MEMORY; + if (png == NULL) { + status = CAIRO_STATUS_NO_MEMORY; + goto BAIL1; + } info = png_create_info_struct (png); if (info == NULL) { - png_destroy_write_struct (&png, NULL); - return CAIRO_STATUS_NO_MEMORY; + status = CAIRO_STATUS_NO_MEMORY; + goto BAIL2; } if (setjmp (png_jmpbuf (png))) { status = CAIRO_STATUS_NO_MEMORY; - goto BAIL; + goto BAIL2; } png_init_io (png, surface->file); @@ -332,7 +341,7 @@ _cairo_png_surface_copy_page (void *abstract_surface) break; default: status = CAIRO_STATUS_NULL_POINTER; - goto BAIL; + goto BAIL2; } png_set_IHDR (png, info, @@ -365,9 +374,9 @@ _cairo_png_surface_copy_page (void *abstract_surface) surface->copied = 1; -BAIL: +BAIL2: png_destroy_write_struct (&png, &info); - +BAIL1: free (rows); return status; @@ -397,29 +406,20 @@ _cairo_png_surface_set_clip_region (void *abstract_surface, return _cairo_image_surface_set_clip_region (surface->image, region); } -static cairo_int_status_t -_cairo_png_surface_create_pattern (void *abstract_surface, - cairo_pattern_t *pattern, - cairo_box_t *extents) -{ - return CAIRO_INT_STATUS_UNSUPPORTED; -} - static const cairo_surface_backend_t cairo_png_surface_backend = { _cairo_png_surface_create_similar, _cairo_png_surface_destroy, _cairo_png_surface_pixels_per_inch, - _cairo_png_surface_get_image, - _cairo_png_surface_set_image, - _cairo_png_surface_set_matrix, - _cairo_png_surface_set_filter, - _cairo_png_surface_set_repeat, + _cairo_png_surface_acquire_source_image, + _cairo_png_surface_release_source_image, + _cairo_png_surface_acquire_dest_image, + _cairo_png_surface_release_dest_image, + _cairo_png_surface_clone_similar, _cairo_png_surface_composite, _cairo_png_surface_fill_rectangles, _cairo_png_surface_composite_trapezoids, _cairo_png_surface_copy_page, _cairo_png_surface_show_page, _cairo_png_surface_set_clip_region, - _cairo_png_surface_create_pattern, NULL /* show_glyphs */ }; diff --git a/gfx/cairo/cairo/src/cairo_polygon.c b/gfx/cairo/cairo/src/cairo_polygon.c index e858580333bc..59c615da2ac8 100644 --- a/gfx/cairo/cairo/src/cairo_polygon.c +++ b/gfx/cairo/cairo/src/cairo_polygon.c @@ -31,7 +31,7 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ #include diff --git a/gfx/cairo/cairo/src/cairo_ps_surface.c b/gfx/cairo/cairo/src/cairo_ps_surface.c index 4da8162c7d8b..4a45fc6792f4 100644 --- a/gfx/cairo/cairo/src/cairo_ps_surface.c +++ b/gfx/cairo/cairo/src/cairo_ps_surface.c @@ -31,7 +31,7 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ #include "cairoint.h" @@ -42,6 +42,22 @@ static const cairo_surface_backend_t cairo_ps_surface_backend; +/** + * cairo_set_target_ps: + * @cr: a #cairo_t + * @file: an open, writeable file + * @width_inches: width of the output page, in inches + * @height_inches: height of the output page, in inches + * @x_pixels_per_inch: X resolution to use for image fallbacks; + * not all Cairo drawing can be represented in a postscript + * file, so Cairo will write out images for some portions + * of the output. + * @y_pixels_per_inch: Y resolution to use for image fallbacks. + * + * Directs output for a #cairo_t to a postscript file. The file must + * be kept open until the #cairo_t is destroyed or set to have a + * different target, and then must be closed by the application. + **/ void cairo_set_target_ps (cairo_t *cr, FILE *file, @@ -192,62 +208,65 @@ _cairo_ps_surface_pixels_per_inch (void *abstract_surface) return surface->y_ppi; } -static cairo_image_surface_t * -_cairo_ps_surface_get_image (void *abstract_surface) +static cairo_status_t +_cairo_ps_surface_acquire_source_image (void *abstract_surface, + cairo_image_surface_t **image_out, + void **image_extra) { cairo_ps_surface_t *surface = abstract_surface; + + *image_out = surface->image; - cairo_surface_reference (&surface->image->base); + return CAIRO_STATUS_SUCCESS; +} - return surface->image; +static void +_cairo_ps_surface_release_source_image (void *abstract_surface, + cairo_image_surface_t *image, + void *image_extra) +{ } static cairo_status_t -_cairo_ps_surface_set_image (void *abstract_surface, - cairo_image_surface_t *image) +_cairo_ps_surface_acquire_dest_image (void *abstract_surface, + cairo_rectangle_t *interest_rect, + cairo_image_surface_t **image_out, + cairo_rectangle_t *image_rect, + void **image_extra) { cairo_ps_surface_t *surface = abstract_surface; + + image_rect->x = 0; + image_rect->y = 0; + image_rect->width = surface->image->width; + image_rect->height = surface->image->height; + + *image_out = surface->image; - if (image == surface->image) - return CAIRO_STATUS_SUCCESS; + return CAIRO_STATUS_SUCCESS; +} - /* XXX: Need to call _cairo_image_surface_set_image here, but it's - not implemented yet. */ +static void +_cairo_ps_surface_release_dest_image (void *abstract_surface, + cairo_rectangle_t *interest_rect, + cairo_image_surface_t *image, + cairo_rectangle_t *image_rect, + void *image_extra) +{ +} +static cairo_status_t +_cairo_ps_surface_clone_similar (void *abstract_surface, + cairo_surface_t *src, + cairo_surface_t **clone_out) +{ return CAIRO_INT_STATUS_UNSUPPORTED; } -static cairo_status_t -_cairo_ps_surface_set_matrix (void *abstract_surface, - cairo_matrix_t *matrix) -{ - cairo_ps_surface_t *surface = abstract_surface; - - return _cairo_image_surface_set_matrix (surface->image, matrix); -} - -static cairo_status_t -_cairo_ps_surface_set_filter (void *abstract_surface, - cairo_filter_t filter) -{ - cairo_ps_surface_t *surface = abstract_surface; - - return _cairo_image_surface_set_filter (surface->image, filter); -} - -static cairo_status_t -_cairo_ps_surface_set_repeat (void *abstract_surface, - int repeat) -{ - cairo_ps_surface_t *surface = abstract_surface; - - return _cairo_image_surface_set_repeat (surface->image, repeat); -} - static cairo_int_status_t _cairo_ps_surface_composite (cairo_operator_t operator, - cairo_surface_t *generic_src, - cairo_surface_t *generic_mask, + cairo_pattern_t *src, + cairo_pattern_t *mask, void *abstract_dst, int src_x, int src_y, @@ -273,10 +292,14 @@ _cairo_ps_surface_fill_rectangles (void *abstract_surface, static cairo_int_status_t _cairo_ps_surface_composite_trapezoids (cairo_operator_t operator, - cairo_surface_t *generic_src, + cairo_pattern_t *generic_src, void *abstract_dst, int x_src, int y_src, + int x_dst, + int y_dst, + unsigned int width, + unsigned int height, cairo_trapezoid_t *traps, int num_traps) { @@ -294,12 +317,10 @@ _cairo_ps_surface_copy_page (void *abstract_surface) int i, x, y; - cairo_surface_t *white_surface; + cairo_solid_pattern_t white_pattern; char *rgb, *compressed; long rgb_size, compressed_size; - cairo_color_t white; - rgb_size = 3 * width * height; rgb = malloc (rgb_size); if (rgb == NULL) { @@ -316,26 +337,19 @@ _cairo_ps_surface_copy_page (void *abstract_surface) /* PostScript can not represent the alpha channel, so we blend the current image over a white RGB surface to eliminate it. */ - white_surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, 1, 1); - if (white_surface == NULL) { - status = CAIRO_STATUS_NO_MEMORY; - goto BAIL2; - } - _cairo_color_init (&white); - _cairo_surface_fill_rectangle (white_surface, - CAIRO_OPERATOR_SRC, - &white, - 0, 0, 1, 1); - cairo_surface_set_repeat (white_surface, 1); + _cairo_pattern_init_solid (&white_pattern, 1.0, 1.0, 1.0); + _cairo_surface_composite (CAIRO_OPERATOR_OVER_REVERSE, - white_surface, + &white_pattern.base, NULL, &surface->image->base, 0, 0, 0, 0, 0, 0, width, height); + + _cairo_pattern_fini (&white_pattern.base); i = 0; for (y = 0; y < height; y++) { @@ -379,8 +393,6 @@ _cairo_ps_surface_copy_page (void *abstract_surface) /* Page footer */ fprintf (file, "%%%%EndPage\n"); - cairo_surface_destroy (white_surface); - BAIL2: free (compressed); BAIL1: free (rgb); @@ -412,29 +424,20 @@ _cairo_ps_surface_set_clip_region (void *abstract_surface, return _cairo_image_surface_set_clip_region (surface->image, region); } -static cairo_int_status_t -_cairo_ps_surface_create_pattern (void *abstract_surface, - cairo_pattern_t *pattern, - cairo_box_t *extents) -{ - return CAIRO_INT_STATUS_UNSUPPORTED; -} - static const cairo_surface_backend_t cairo_ps_surface_backend = { _cairo_ps_surface_create_similar, _cairo_ps_surface_destroy, _cairo_ps_surface_pixels_per_inch, - _cairo_ps_surface_get_image, - _cairo_ps_surface_set_image, - _cairo_ps_surface_set_matrix, - _cairo_ps_surface_set_filter, - _cairo_ps_surface_set_repeat, + _cairo_ps_surface_acquire_source_image, + _cairo_ps_surface_release_source_image, + _cairo_ps_surface_acquire_dest_image, + _cairo_ps_surface_release_dest_image, + _cairo_ps_surface_clone_similar, _cairo_ps_surface_composite, _cairo_ps_surface_fill_rectangles, _cairo_ps_surface_composite_trapezoids, _cairo_ps_surface_copy_page, _cairo_ps_surface_show_page, _cairo_ps_surface_set_clip_region, - _cairo_ps_surface_create_pattern, NULL /* show_glyphs */ }; diff --git a/gfx/cairo/cairo/src/cairo_quartz_surface.c b/gfx/cairo/cairo/src/cairo_quartz_surface.c index 674e49923963..668ce7bb9d7f 100644 --- a/gfx/cairo/cairo/src/cairo_quartz_surface.c +++ b/gfx/cairo/cairo/src/cairo_quartz_surface.c @@ -1,6 +1,6 @@ /* cairo - a vector graphics library with display and print output * - * Copyright 2004 Calum Robinson + * Copyright © 2004 Calum Robinson * * This library is free software; you can redistribute it and/or * modify it either under the terms of the GNU Lesser General Public @@ -35,67 +35,34 @@ #include "cairoint.h" #include "cairo-quartz.h" +#include "cairo-quartz-private.h" -#pragma mark Types - -typedef struct cairo_quartz_surface { - cairo_surface_t base; - - CGContextRef context; - - int width; - int height; - - cairo_image_surface_t *image; - - CGImageRef cgImage; -} cairo_quartz_surface_t; - - - - - -#pragma mark Private functions - - - - -void ImageDataReleaseFunc(void *info, const void *data, size_t size) +static void +ImageDataReleaseFunc(void *info, const void *data, size_t size) { - if (data != NULL) - { - free((void *)data); + if (data != NULL) { + free((void *) data); } } - - -#pragma mark Public functions - - - - - void -cairo_set_target_quartz_context( cairo_t *cr, - CGContextRef context, - int width, - int height) +cairo_set_target_quartz_context(cairo_t * cr, + CGContextRef context, + int width, int height) { cairo_surface_t *surface; - - + + if (cr->status && cr->status != CAIRO_STATUS_NO_TARGET_SURFACE) return; - + surface = cairo_quartz_surface_create(context, width, height); - if (surface == NULL) - { + if (surface == NULL) { cr->status = CAIRO_STATUS_NO_MEMORY; return; } - + cairo_set_target_surface(cr, surface); /* cairo_set_target_surface takes a reference, so we must destroy ours */ @@ -103,203 +70,201 @@ cairo_set_target_quartz_context( cairo_t *cr, } -static cairo_surface_t * -_cairo_quartz_surface_create_similar( void *abstract_src, - cairo_format_t format, - int drawable, - int width, - int height) +static cairo_surface_t *_cairo_quartz_surface_create_similar(void + *abstract_src, + cairo_format_t + format, + int drawable, + int width, + int height) { return NULL; } -static void -_cairo_quartz_surface_destroy(void *abstract_surface) +static void _cairo_quartz_surface_destroy(void *abstract_surface) { cairo_quartz_surface_t *surface = abstract_surface; - - + + if (surface->image) + cairo_surface_destroy(surface->image); + if (surface->cgImage) - { - CGImageRelease(surface->cgImage); - } - + CGImageRelease(surface->cgImage); free(surface); } -static double -_cairo_quartz_surface_pixels_per_inch(void *abstract_surface) +static double _cairo_quartz_surface_pixels_per_inch(void *abstract_surface) { - - // TODO - get this from CGDirectDisplay somehow? return 96.0; } -static cairo_image_surface_t * -_cairo_quartz_surface_get_image(void *abstract_surface) +static cairo_status_t +_cairo_quartz_surface_acquire_source_image(void *abstract_surface, + cairo_image_surface_t **image_out, + void **image_extra) { - cairo_quartz_surface_t *surface = abstract_surface; - CGColorSpaceRef colorSpace; - void *imageData; - UInt32 imageDataSize, rowBytes; - CGDataProviderRef dataProvider; - - + cairo_quartz_surface_t *surface = abstract_surface; + CGColorSpaceRef colorSpace; + void *imageData; + UInt32 imageDataSize, rowBytes; + CGDataProviderRef dataProvider; + // We keep a cached (cairo_image_surface_t *) in the cairo_quartz_surface_t // struct. If the window is ever drawn to without going through Cairo, then // we would need to refetch the pixel data from the window into the cached // image surface. - if (surface->image) - { + if (surface->image) { cairo_surface_reference(&surface->image->base); - return surface->image; + *image_out = surface->image; + return CAIRO_STATUS_SUCCESS; } - + colorSpace = CGColorSpaceCreateDeviceRGB(); - - + + rowBytes = surface->width * 4; imageDataSize = rowBytes * surface->height; imageData = malloc(imageDataSize); - - dataProvider = CGDataProviderCreateWithData(NULL, imageData, imageDataSize, ImageDataReleaseFunc); - - surface->cgImage = CGImageCreate( surface->width, - surface->height, - 8, - 32, - rowBytes, - colorSpace, - kCGImageAlphaPremultipliedFirst, - dataProvider, - NULL, - false, - kCGRenderingIntentDefault); - - + + dataProvider = + CGDataProviderCreateWithData(NULL, imageData, imageDataSize, + ImageDataReleaseFunc); + + surface->cgImage = CGImageCreate(surface->width, + surface->height, + 8, + 32, + rowBytes, + colorSpace, + kCGImageAlphaPremultipliedFirst, + dataProvider, + NULL, + false, kCGRenderingIntentDefault); + CGColorSpaceRelease(colorSpace); CGDataProviderRelease(dataProvider); - - + surface->image = (cairo_image_surface_t *) - cairo_image_surface_create_for_data( imageData, - CAIRO_FORMAT_ARGB32, - surface->width, - surface->height, - rowBytes); - - + cairo_image_surface_create_for_data(imageData, + CAIRO_FORMAT_ARGB32, + surface->width, + surface->height, rowBytes); + + // Set the image surface Cairo state to match our own. _cairo_image_surface_set_repeat(surface->image, surface->base.repeat); - _cairo_image_surface_set_matrix(surface->image, &(surface->base.matrix)); - + _cairo_image_surface_set_matrix(surface->image, + &(surface->base.matrix)); - return surface->image; + *image_out = surface->image; + *image_extra = NULL; + + return CAIRO_STATUS_SUCCESS; +} + + +static void +_cairo_quartz_surface_release_source_image(void *abstract_surface, + cairo_image_surface_t * image, + void *image_extra) +{ } static cairo_status_t -_cairo_quartz_surface_set_image( void *abstract_surface, - cairo_image_surface_t *image) +_cairo_quartz_surface_acquire_dest_image(void *abstract_surface, + cairo_rectangle_t * interest_rect, + cairo_image_surface_t ** + image_out, + cairo_rectangle_t * image_rect, + void **image_extra) { - cairo_quartz_surface_t *surface = abstract_surface; - cairo_status_t status; - - - if (surface->image == image) - { - CGRect rect; - - - rect = CGRectMake(0, 0, surface->width, surface->height); - - CGContextDrawImage(surface->context, rect, surface->cgImage); - + cairo_quartz_surface_t *surface = abstract_surface; + + image_rect->x = 0; + image_rect->y = 0; + image_rect->width = surface->image->width; + image_rect->height = surface->image->height; + + *image_out = surface->image; + + return CAIRO_STATUS_SUCCESS; +} + + +static void +_cairo_quartz_surface_release_dest_image(void *abstract_surface, + cairo_rectangle_t * + intersect_rect, + cairo_image_surface_t * image, + cairo_rectangle_t * image_rect, + void *image_extra) +{ + cairo_quartz_surface_t *surface = abstract_surface; + + if (surface->image == image) { + CGRect rect; + + rect = CGRectMake(0, 0, surface->width, surface->height); + + CGContextDrawImage(surface->context, rect, surface->cgImage); + memset(surface->image->data, 0, surface->width * surface->height * 4); - - status = CAIRO_STATUS_SUCCESS; } - else - { - // TODO - set_image from something other than what we returned from get_image - status = CAIRO_STATUS_NO_TARGET_SURFACE; - } - - - return status; } static cairo_status_t -_cairo_quartz_surface_set_matrix(void *abstract_surface, cairo_matrix_t *matrix) -{ - cairo_quartz_surface_t *surface = abstract_surface; - - return _cairo_image_surface_set_matrix(surface->image, matrix); -} - - -static cairo_status_t -_cairo_quartz_surface_set_filter(void *abstract_surface, cairo_filter_t filter) -{ - cairo_quartz_surface_t *surface = abstract_surface; - - return _cairo_image_surface_set_filter(surface->image, filter); -} - - -static cairo_status_t -_cairo_quartz_surface_set_repeat(void *abstract_surface, int repeat) -{ - cairo_quartz_surface_t *surface = abstract_surface; - - return _cairo_image_surface_set_repeat(surface->image, repeat); -} - - -static cairo_int_status_t -_cairo_quartz_surface_composite( cairo_operator_t operator, - cairo_surface_t *generic_src, - cairo_surface_t *generic_mask, - void *abstract_dst, - int src_x, - int src_y, - int mask_x, - int mask_y, - int dst_x, - int dst_y, - unsigned int width, - unsigned int height) +_cairo_quartz_surface_clone_similar(void *surface, + cairo_surface_t * src, + cairo_surface_t ** clone_out) { return CAIRO_INT_STATUS_UNSUPPORTED; } static cairo_int_status_t -_cairo_quartz_surface_fill_rectangles( void *abstract_surface, - cairo_operator_t operator, - const cairo_color_t *color, - cairo_rectangle_t *rects, - int num_rects) +_cairo_quartz_surface_composite(cairo_operator_t operator, + cairo_surface_t * generic_src, + cairo_surface_t * generic_mask, + void *abstract_dst, + int src_x, + int src_y, + int mask_x, + int mask_y, + int dst_x, + int dst_y, + unsigned int width, unsigned int height) { return CAIRO_INT_STATUS_UNSUPPORTED; } static cairo_int_status_t -_cairo_quartz_surface_composite_trapezoids( cairo_operator_t operator, - cairo_surface_t *generic_src, - void *abstract_dst, - int xSrc, - int ySrc, - cairo_trapezoid_t *traps, - int num_traps) +_cairo_quartz_surface_fill_rectangles(void *abstract_surface, + cairo_operator_t operator, + const cairo_color_t * color, + cairo_rectangle_t * rects, + int num_rects) +{ + return CAIRO_INT_STATUS_UNSUPPORTED; +} + + +static cairo_int_status_t +_cairo_quartz_surface_composite_trapezoids(cairo_operator_t operator, + cairo_surface_t * generic_src, + void *abstract_dst, + int xSrc, + int ySrc, + cairo_trapezoid_t * traps, + int num_traps) { return CAIRO_INT_STATUS_UNSUPPORTED; } @@ -320,8 +285,8 @@ _cairo_quartz_surface_show_page(void *abstract_surface) static cairo_int_status_t -_cairo_quartz_surface_set_clip_region( void *abstract_surface, - pixman_region16_t *region) +_cairo_quartz_surface_set_clip_region(void *abstract_surface, + pixman_region16_t * region) { cairo_quartz_surface_t *surface = abstract_surface; @@ -329,10 +294,19 @@ _cairo_quartz_surface_set_clip_region( void *abstract_surface, } -static cairo_int_status_t -_cairo_quartz_surface_create_pattern( void *abstract_surface, - cairo_pattern_t *pattern, - cairo_box_t *extents) +static cairo_status_t +_cairo_quartz_surface_show_glyphs(cairo_font_t * font, + cairo_operator_t operator, + cairo_pattern_t * pattern, + void *abstract_surface, + int source_x, + int source_y, + int dest_x, + int dest_y, + unsigned int width, + unsigned int height, + const cairo_glyph_t * glyphs, + int num_glyphs) { return CAIRO_INT_STATUS_UNSUPPORTED; } @@ -342,52 +316,41 @@ static const struct _cairo_surface_backend cairo_quartz_surface_backend = { _cairo_quartz_surface_create_similar, _cairo_quartz_surface_destroy, _cairo_quartz_surface_pixels_per_inch, - _cairo_quartz_surface_get_image, - _cairo_quartz_surface_set_image, - _cairo_quartz_surface_set_matrix, - _cairo_quartz_surface_set_filter, - _cairo_quartz_surface_set_repeat, + _cairo_quartz_surface_acquire_source_image, + _cairo_quartz_surface_release_source_image, + _cairo_quartz_surface_acquire_dest_image, + _cairo_quartz_surface_release_dest_image, + _cairo_quartz_surface_clone_similar, _cairo_quartz_surface_composite, _cairo_quartz_surface_fill_rectangles, _cairo_quartz_surface_composite_trapezoids, _cairo_quartz_surface_copy_page, _cairo_quartz_surface_show_page, _cairo_quartz_surface_set_clip_region, - _cairo_quartz_surface_create_pattern + _cairo_quartz_surface_show_glyphs }; -cairo_surface_t * -cairo_quartz_surface_create( CGContextRef context, - int width, - int height) +cairo_surface_t *cairo_quartz_surface_create(CGContextRef context, + int width, int height) { cairo_quartz_surface_t *surface; - - + surface = malloc(sizeof(cairo_quartz_surface_t)); if (surface == NULL) return NULL; - + _cairo_surface_init(&surface->base, &cairo_quartz_surface_backend); - - - surface->context = context; - - surface->width = width; - surface->height = height; - - surface->image = NULL; - - surface->cgImage = NULL; - - - // Set up the image surface which Cairo draws into and we blit to & from. - surface->image = _cairo_quartz_surface_get_image(surface); - - - return (cairo_surface_t *)surface; + + surface->context = context; + surface->width = width; + surface->height = height; + surface->image = NULL; + surface->cgImage = NULL; + + // Set up the image surface which Cairo draws into and we blit to & from. + void *foo; + _cairo_quartz_surface_acquire_source_image(surface, &surface->image, &foo); + + return (cairo_surface_t *) surface; } - - -DEPRECATE (cairo_surface_create_for_drawable, cairo_quartz_surface_create); diff --git a/gfx/cairo/cairo/src/cairo_slope.c b/gfx/cairo/cairo/src/cairo_slope.c index 1a149798803a..a2edec0381d9 100644 --- a/gfx/cairo/cairo/src/cairo_slope.c +++ b/gfx/cairo/cairo/src/cairo_slope.c @@ -31,7 +31,7 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ #include "cairoint.h" diff --git a/gfx/cairo/cairo/src/cairo_spline.c b/gfx/cairo/cairo/src/cairo_spline.c index ff290d9dddbd..5119a8e2b672 100644 --- a/gfx/cairo/cairo/src/cairo_spline.c +++ b/gfx/cairo/cairo/src/cairo_spline.c @@ -31,7 +31,7 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ #include "cairoint.h" diff --git a/gfx/cairo/cairo/src/cairo_surface.c b/gfx/cairo/cairo/src/cairo_surface.c index a457d206207f..330d58b1e734 100644 --- a/gfx/cairo/cairo/src/cairo_surface.c +++ b/gfx/cairo/cairo/src/cairo_surface.c @@ -31,7 +31,7 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ #include @@ -151,16 +151,151 @@ _cairo_surface_pixels_per_inch (cairo_surface_t *surface) return surface->backend->pixels_per_inch (surface); } -cairo_image_surface_t * -_cairo_surface_get_image (cairo_surface_t *surface) +/** + * _cairo_surface_acquire_source_image: + * @surface: a #cairo_surface_t + * @image_out: location to store a pointer to an image surface that includes at least + * the intersection of @interest_rect with the visible area of @surface. + * This surface could be @surface itself, a surface held internal to @surface, + * or it could be a new surface with a copy of the relevant portion of @surface. + * @image_extra: location to store image specific backend data + * + * Gets an image surface to use when drawing as a fallback when drawing with + * @surface as a source. _cairo_surface_release_source_image() must be called + * when finished. + * + * Return value: %CAIRO_STATUS_SUCCESS if a an image was stored in @image_out. + * %CAIRO_INT_STATUS_UNSUPPORTED if an image cannot be retrieved for the specified + * surface. Or %CAIRO_STATUS_NO_MEMORY. + **/ +cairo_private cairo_status_t +_cairo_surface_acquire_source_image (cairo_surface_t *surface, + cairo_image_surface_t **image_out, + void **image_extra) { - return surface->backend->get_image (surface); + return surface->backend->acquire_source_image (surface, image_out, image_extra); } -cairo_status_t -_cairo_surface_set_image (cairo_surface_t *surface, cairo_image_surface_t *image) +/** + * _cairo_surface_release_source_image: + * @surface: a #cairo_surface_t + * @image_extra: same as return from the matching _cairo_surface_acquire_dest_image() + * + * Releases any resources obtained with _cairo_surface_acquire_source_image() + **/ +cairo_private void +_cairo_surface_release_source_image (cairo_surface_t *surface, + cairo_image_surface_t *image, + void *image_extra) { - return surface->backend->set_image (surface, image); + surface->backend->release_source_image (surface, image, image_extra); +} + +/** + * _cairo_surface_acquire_dest_image: + * @surface: a #cairo_surface_t + * @interest_rect: area of @surface for which fallback drawing is being done. + * A value of %NULL indicates that the entire surface is desired. + * @image_out: location to store a pointer to an image surface that includes at least + * the intersection of @interest_rect with the visible area of @surface. + * This surface could be @surface itself, a surface held internal to @surface, + * or it could be a new surface with a copy of the relevant portion of @surface. + * @image_rect: location to store area of the original surface occupied + * by the surface stored in @image. + * @image_extra: location to store image specific backend data + * + * Retrieves a local image for a surface for implementing a fallback drawing + * operation. After calling this function, the implementation of the fallback + * drawing operation draws the primitive to the surface stored in @image_out + * then calls _cairo_surface_release_dest_fallback(), + * which, if a temporary surface was created, copies the bits back to the + * main surface and frees the temporary surface. + * + * Return value: %CAIRO_STATUS_SUCCESS or %CAIRO_STATUS_NO_MEMORY. + * %CAIRO_INT_STATUS_UNSUPPORTED can be returned but this will mean that + * the backend can't draw with fallbacks. It's possible for the routine + * to store NULL in @local_out and return %CAIRO_STATUS_SUCCESS; + * that indicates that no part of @interest_rect is visible, so no drawing + * is necessary. _cairo_surface_release_dest_fallback() should not be called in that + * case. + **/ +cairo_status_t +_cairo_surface_acquire_dest_image (cairo_surface_t *surface, + cairo_rectangle_t *interest_rect, + cairo_image_surface_t **image_out, + cairo_rectangle_t *image_rect, + void **image_extra) +{ + return surface->backend->acquire_dest_image (surface, interest_rect, + image_out, image_rect, image_extra); +} + +/** + * _cairo_surface_end_fallback: + * @surface: a #cairo_surface_t + * @interest_rect: same as passed to the matching _cairo_surface_acquire_dest_image() + * @image: same as returned from the matching _cairo_surface_acquire_dest_image() + * @image_rect: same as returned from the matching _cairo_surface_acquire_dest_image() + * @image_extra: same as return from the matching _cairo_surface_acquire_dest_image() + * + * Finishes the operation started with _cairo_surface_acquire_dest_image(), by, if + * necessary, copying the image from @image back to @surface and freeing any + * resources that were allocated. + **/ +void +_cairo_surface_release_dest_image (cairo_surface_t *surface, + cairo_rectangle_t *interest_rect, + cairo_image_surface_t *image, + cairo_rectangle_t *image_rect, + void *image_extra) +{ + surface->backend->release_dest_image (surface, interest_rect, + image, image_rect, image_extra); +} + +/** + * _cairo_surface_clone_similar: + * @surface: a #cairo_surface_t + * @src: the source image + * @clone_out: location to store a surface compatible with @surface + * and with contents identical to @src. The caller must call + * cairo_surface_destroy() on the result. + * + * Creates a surface with contents identical to @src but that + * can be used efficiently with @surface. If @surface and @src are + * already compatible then it may return a new reference to @src. + * + * Return value: %CAIRO_STATUS_SUCCESS if a surface was created and stored + * in @clone_out. Otherwise %CAIRO_INT_STATUS_UNSUPPORTED or another + * error like %CAIRO_STATUS_NO_MEMORY. + **/ +cairo_status_t +_cairo_surface_clone_similar (cairo_surface_t *surface, + cairo_surface_t *src, + cairo_surface_t **clone_out) +{ + cairo_status_t status; + cairo_image_surface_t *image; + void *image_extra; + + status = surface->backend->clone_similar (surface, src, clone_out); + if (status != CAIRO_INT_STATUS_UNSUPPORTED) + return status; + + status = _cairo_surface_acquire_source_image (src, &image, &image_extra); + if (status != CAIRO_STATUS_SUCCESS) + return status; + + status = surface->backend->clone_similar (surface, &image->base, clone_out); + + /* If the above failed point, we could implement a full fallback + * using acquire_dest_image, but that's going to be very + * inefficient compared to a backend-specific implementation of + * clone_similar() with an image source. So we don't bother + */ + + _cairo_surface_release_source_image (src, image, image_extra); + return status; } cairo_status_t @@ -169,9 +304,7 @@ cairo_surface_set_matrix (cairo_surface_t *surface, cairo_matrix_t *matrix) if (surface == NULL) return CAIRO_STATUS_NULL_POINTER; - cairo_matrix_copy (&surface->matrix, matrix); - - return surface->backend->set_matrix (surface, matrix); + return cairo_matrix_copy (&surface->matrix, matrix); } slim_hidden_def(cairo_surface_set_matrix); @@ -192,7 +325,7 @@ cairo_surface_set_filter (cairo_surface_t *surface, cairo_filter_t filter) return CAIRO_STATUS_NULL_POINTER; surface->filter = filter; - return surface->backend->set_filter (surface, filter); + return CAIRO_STATUS_SUCCESS; } cairo_filter_t @@ -224,14 +357,81 @@ cairo_surface_set_repeat (cairo_surface_t *surface, int repeat) surface->repeat = repeat; - return surface->backend->set_repeat (surface, repeat); + return CAIRO_STATUS_SUCCESS; } slim_hidden_def(cairo_surface_set_repeat); +typedef struct { + cairo_surface_t *dst; + cairo_rectangle_t extents; + cairo_image_surface_t *image; + cairo_rectangle_t image_rect; + void *image_extra; +} fallback_state_t; + +static cairo_status_t +_fallback_init (fallback_state_t *state, + cairo_surface_t *dst, + int x, + int y, + int width, + int height) +{ + state->extents.x = x; + state->extents.y = y; + state->extents.width = width; + state->extents.height = height; + + state->dst = dst; + + return _cairo_surface_acquire_dest_image (dst, &state->extents, + &state->image, &state->image_rect, &state->image_extra); +} + +static void +_fallback_cleanup (fallback_state_t *state) +{ + _cairo_surface_release_dest_image (state->dst, &state->extents, + state->image, &state->image_rect, state->image_extra); +} + +static cairo_status_t +_fallback_composite (cairo_operator_t operator, + cairo_pattern_t *src, + cairo_pattern_t *mask, + cairo_surface_t *dst, + int src_x, + int src_y, + int mask_x, + int mask_y, + int dst_x, + int dst_y, + unsigned int width, + unsigned int height) +{ + fallback_state_t state; + cairo_status_t status; + + status = _fallback_init (&state, dst, dst_x, dst_y, width, height); + if (!CAIRO_OK (status) || !state.image) + return status; + + state.image->base.backend->composite (operator, src, mask, + &state.image->base, + src_x, src_y, mask_x, mask_y, + dst_x - state.image_rect.x, + dst_y - state.image_rect.y, + width, height); + + _fallback_cleanup (&state); + + return status; +} + cairo_status_t _cairo_surface_composite (cairo_operator_t operator, - cairo_surface_t *src, - cairo_surface_t *mask, + cairo_pattern_t *src, + cairo_pattern_t *mask, cairo_surface_t *dst, int src_x, int src_y, @@ -243,7 +443,6 @@ _cairo_surface_composite (cairo_operator_t operator, unsigned int height) { cairo_int_status_t status; - cairo_image_surface_t *src_image, *mask_image = 0, *dst_image; status = dst->backend->composite (operator, src, mask, dst, @@ -254,28 +453,12 @@ _cairo_surface_composite (cairo_operator_t operator, if (status != CAIRO_INT_STATUS_UNSUPPORTED) return status; - src_image = _cairo_surface_get_image (src); - if (mask) - mask_image = _cairo_surface_get_image (mask); - dst_image = _cairo_surface_get_image (dst); - - dst_image->base.backend->composite (operator, - &src_image->base, - mask ? &mask_image->base : NULL, - dst_image, - src_x, src_y, - mask_x, mask_y, - dst_x, dst_y, - width, height); - - status = _cairo_surface_set_image (dst, dst_image); - - cairo_surface_destroy (&src_image->base); - if (mask) - cairo_surface_destroy (&mask_image->base); - cairo_surface_destroy (&dst_image->base); - - return status; + return _fallback_composite (operator, + src, mask, dst, + src_x, src_y, + mask_x, mask_y, + dst_x, dst_y, + width, height); } cairo_status_t @@ -297,6 +480,77 @@ _cairo_surface_fill_rectangle (cairo_surface_t *surface, return _cairo_surface_fill_rectangles (surface, operator, color, &rect, 1); } +static cairo_status_t +_fallback_fill_rectangles (cairo_surface_t *surface, + cairo_operator_t operator, + const cairo_color_t *color, + cairo_rectangle_t *rects, + int num_rects) +{ + fallback_state_t state; + cairo_rectangle_t *offset_rects = NULL; + cairo_status_t status; + int x1, y1, x2, y2; + int i; + + if (num_rects <= 0) + return CAIRO_STATUS_SUCCESS; + + /* Compute the bounds of the rectangles, so that we know what area of the + * destination surface to fetch + */ + x1 = rects[0].x; + y1 = rects[0].y; + x2 = rects[0].x + rects[0].width; + y2 = rects[0].y + rects[0].height; + + for (i = 1; i < num_rects; i++) { + if (rects[0].x < x1) + x1 = rects[0].x; + if (rects[0].y < y1) + y1 = rects[0].y; + + if (rects[0].x + rects[0].width > x2) + x2 = rects[0].x + rects[0].width; + if (rects[0].y + rects[0].height > y2) + y2 = rects[0].y + rects[0].height; + } + + status = _fallback_init (&state, surface, x1, y1, x2 - x1, y2 - y1); + if (!CAIRO_OK (status) || !state.image) + return status; + + /* If the fetched image isn't at 0,0, we need to offset the rectangles */ + + if (state.image_rect.x != 0 || state.image_rect.y != 0) { + offset_rects = malloc (sizeof (cairo_rectangle_t) * num_rects); + if (!offset_rects) { + status = CAIRO_STATUS_NO_MEMORY; + goto FAIL; + } + + for (i = 0; i < num_rects; i++) { + offset_rects[i].x = rects[i].x - state.image_rect.x; + offset_rects[i].y = rects[i].y - state.image_rect.y; + offset_rects[i].width = rects[i].width; + offset_rects[i].height = rects[i].height; + } + + rects = offset_rects; + } + + state.image->base.backend->fill_rectangles (&state.image->base, operator, color, + rects, num_rects); + + if (offset_rects) + free (offset_rects); + + FAIL: + _fallback_cleanup (&state); + + return status; +} + cairo_status_t _cairo_surface_fill_rectangles (cairo_surface_t *surface, cairo_operator_t operator, @@ -305,7 +559,6 @@ _cairo_surface_fill_rectangles (cairo_surface_t *surface, int num_rects) { cairo_int_status_t status; - cairo_image_surface_t *surface_image; if (num_rects == 0) return CAIRO_STATUS_SUCCESS; @@ -317,54 +570,105 @@ _cairo_surface_fill_rectangles (cairo_surface_t *surface, if (status != CAIRO_INT_STATUS_UNSUPPORTED) return status; - surface_image = _cairo_surface_get_image (surface); + return _fallback_fill_rectangles (surface, operator, color, rects, num_rects); +} - surface_image->base.backend->fill_rectangles (surface_image, - operator, - color, - rects, num_rects); +static cairo_status_t +_fallback_composite_trapezoids (cairo_operator_t operator, + cairo_pattern_t *pattern, + cairo_surface_t *dst, + int src_x, + int src_y, + int dst_x, + int dst_y, + unsigned int width, + unsigned int height, + cairo_trapezoid_t *traps, + int num_traps) +{ + fallback_state_t state; + cairo_trapezoid_t *offset_traps = NULL; + cairo_status_t status; + int i; - status = _cairo_surface_set_image (surface, surface_image); + status = _fallback_init (&state, dst, dst_x, dst_y, width, height); + if (!CAIRO_OK (status) || !state.image) + return status; - cairo_surface_destroy (&surface_image->base); + /* If the destination image isn't at 0,0, we need to offset the trapezoids */ + + if (state.image_rect.x != 0 || state.image_rect.y != 0) { + cairo_fixed_t xoff = _cairo_fixed_from_int (state.image_rect.x); + cairo_fixed_t yoff = _cairo_fixed_from_int (state.image_rect.y); + + offset_traps = malloc (sizeof (cairo_trapezoid_t) * num_traps); + if (!offset_traps) { + status = CAIRO_STATUS_NO_MEMORY; + goto FAIL; + } + + for (i = 0; i < num_traps; i++) { + offset_traps[i].top = traps[i].top - yoff; + offset_traps[i].bottom = traps[i].bottom - yoff; + offset_traps[i].left.p1.x = traps[i].left.p1.x - xoff; + offset_traps[i].left.p1.y = traps[i].left.p1.y - yoff; + offset_traps[i].left.p2.x = traps[i].left.p2.x - xoff; + offset_traps[i].left.p2.y = traps[i].left.p2.y - yoff; + offset_traps[i].right.p1.x = traps[i].right.p1.x - xoff; + offset_traps[i].right.p1.y = traps[i].right.p1.y - yoff; + offset_traps[i].right.p2.x = traps[i].right.p2.x - xoff; + offset_traps[i].right.p2.y = traps[i].right.p2.y - yoff; + } + + traps = offset_traps; + } + + state.image->base.backend->composite_trapezoids (operator, pattern, + &state.image->base, + src_x, src_y, + dst_x - state.image_rect.x, + dst_y - state.image_rect.y, + width, height, traps, num_traps); + if (offset_traps) + free (offset_traps); + + FAIL: + _fallback_cleanup (&state); + return status; } + cairo_status_t _cairo_surface_composite_trapezoids (cairo_operator_t operator, - cairo_surface_t *src, + cairo_pattern_t *pattern, cairo_surface_t *dst, - int x_src, - int y_src, + int src_x, + int src_y, + int dst_x, + int dst_y, + unsigned int width, + unsigned int height, cairo_trapezoid_t *traps, int num_traps) { cairo_int_status_t status; - cairo_image_surface_t *src_image, *dst_image; status = dst->backend->composite_trapezoids (operator, - src, dst, - x_src, y_src, + pattern, dst, + src_x, src_y, + dst_x, dst_y, + width, height, traps, num_traps); if (status != CAIRO_INT_STATUS_UNSUPPORTED) return status; - src_image = _cairo_surface_get_image (src); - dst_image = _cairo_surface_get_image (dst); - - dst_image->base.backend->composite_trapezoids (operator, - &src_image->base, - dst_image, - x_src, y_src, - traps, num_traps); - - status = _cairo_surface_set_image (dst, dst_image); - - cairo_surface_destroy (&src_image->base); - cairo_surface_destroy (&dst_image->base); - - return status; + return _fallback_composite_trapezoids (operator, pattern, dst, + src_x, src_y, + dst_x, dst_y, + width, height, + traps, num_traps); } cairo_status_t @@ -402,109 +706,3 @@ _cairo_surface_set_clip_region (cairo_surface_t *surface, pixman_region16_t *reg { return surface->backend->set_clip_region (surface, region); } - -cairo_status_t -_cairo_surface_create_pattern (cairo_surface_t *surface, - cairo_pattern_t *pattern, - cairo_box_t *box) -{ - cairo_int_status_t status; - - status = surface->backend->create_pattern (surface, pattern, box); - - /* The backend cannot accelerate this pattern, lets create an - unaccelerated source instead. */ - if (status == CAIRO_INT_STATUS_UNSUPPORTED) { - - status = CAIRO_STATUS_SUCCESS; - switch (pattern->type) { - case CAIRO_PATTERN_LINEAR: - case CAIRO_PATTERN_RADIAL: { - cairo_image_surface_t *image; - - image = _cairo_pattern_get_image (pattern, box); - if (image) { - pattern->source = &image->base; - - return CAIRO_STATUS_SUCCESS; - } else - return CAIRO_STATUS_NO_MEMORY; - - } break; - case CAIRO_PATTERN_SOLID: - pattern->source = - _cairo_surface_create_similar_solid (surface, - CAIRO_FORMAT_ARGB32, - 1, 1, - &pattern->color); - if (pattern->source) { - cairo_surface_set_repeat (pattern->source, 1); - - return CAIRO_STATUS_SUCCESS; - } else - return CAIRO_STATUS_NO_MEMORY; - break; - case CAIRO_PATTERN_SURFACE: - status = CAIRO_INT_STATUS_UNSUPPORTED; - - /* handle pattern opacity */ - if (pattern->color.alpha != 1.0) { - double x = box->p1.x >> 16; - double y = box->p1.y >> 16; - int width = ((box->p2.x + 65535) >> 16) - (box->p1.x >> 16); - int height = ((box->p2.y + 65535) >> 16) - (box->p1.y >> 16); - cairo_pattern_t alpha; - - pattern->source = - cairo_surface_create_similar (surface, - CAIRO_FORMAT_ARGB32, - width, height); - if (pattern->source) { - _cairo_pattern_init_solid (&alpha, 1.0, 1.0, 1.0); - _cairo_pattern_set_alpha (&alpha, pattern->color.alpha); - - status = _cairo_surface_create_pattern (pattern->source, - &alpha, box); - - if (status == CAIRO_STATUS_SUCCESS) { - int save_repeat = pattern->u.surface.surface->repeat; - - if (pattern->extend == CAIRO_EXTEND_REPEAT || - pattern->u.surface.surface->repeat == 1) - cairo_surface_set_repeat (pattern->u.surface.surface, 1); - else - cairo_surface_set_repeat (pattern->u.surface.surface, 0); - - status = - _cairo_surface_composite (CAIRO_OPERATOR_OVER, - pattern->u.surface.surface, - alpha.source, - pattern->source, - 0, 0, 0, 0, 0, 0, - width, height); - - cairo_surface_set_repeat (pattern->u.surface.surface, - save_repeat); - - if (status == CAIRO_STATUS_SUCCESS) - _cairo_pattern_set_source_offset (pattern, x, y); - else - cairo_surface_destroy (pattern->source); - } - - _cairo_pattern_fini (&alpha); - } - } - - if (status != CAIRO_STATUS_SUCCESS) { - pattern->source = pattern->u.surface.surface; - cairo_surface_reference (pattern->u.surface.surface); - - return CAIRO_STATUS_SUCCESS; - } - break; - } - } - - return status; -} diff --git a/gfx/cairo/cairo/src/cairo_traps.c b/gfx/cairo/cairo/src/cairo_traps.c index d17a2728154b..79c7e16b62b8 100644 --- a/gfx/cairo/cairo/src/cairo_traps.c +++ b/gfx/cairo/cairo/src/cairo_traps.c @@ -1,31 +1,42 @@ /* - * Copyright 2002 Keith Packard + * Copyright © 2002 Keith Packard * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. + * 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. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. + * 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 Keith Packard + * + * Contributor(s): + * Keith R. Packard + * Carl D. Worth * * 2002-07-15: Converted from XRenderCompositeDoublePoly to cairo_trap. Carl D. Worth */ #include "cairoint.h" -#define CAIRO_TRAPS_GROWTH_INC 10 - /* private functions */ static cairo_status_t @@ -52,12 +63,6 @@ _compare_cairo_edge_by_slope (const void *av, const void *bv); static cairo_fixed_16_16_t _compute_x (cairo_line_t *line, cairo_fixed_t y); -static double -_compute_inverse_slope (cairo_line_t *l); - -static double -_compute_x_intercept (cairo_line_t *l, double inverse_slope); - static int _line_segs_intersect_ceil (cairo_line_t *left, cairo_line_t *right, cairo_fixed_t *y_ret); @@ -68,6 +73,8 @@ _cairo_traps_init (cairo_traps_t *traps) traps->traps_size = 0; traps->traps = NULL; + traps->extents.p1.x = traps->extents.p1.y = CAIRO_MAXSHORT << 16; + traps->extents.p2.x = traps->extents.p2.y = CAIRO_MINSHORT << 16; } void @@ -93,7 +100,8 @@ _cairo_traps_add_trap (cairo_traps_t *traps, cairo_fixed_t top, cairo_fixed_t bo } if (traps->num_traps >= traps->traps_size) { - status = _cairo_traps_grow_by (traps, CAIRO_TRAPS_GROWTH_INC); + int inc = traps->traps_size ? traps->traps_size : 32; + status = _cairo_traps_grow_by (traps, inc); if (status) return status; } @@ -104,6 +112,28 @@ _cairo_traps_add_trap (cairo_traps_t *traps, cairo_fixed_t top, cairo_fixed_t bo trap->left = *left; trap->right = *right; + if (top < traps->extents.p1.y) + traps->extents.p1.y = top; + if (bottom > traps->extents.p2.y) + traps->extents.p2.y = bottom; + /* + * This isn't generally accurate, but it is close enough for + * this purpose. Assuming that the left and right segments always + * contain the trapezoid vertical extents, these compares will + * yield a containing box. Assuming that the points all come from + * the same figure which will eventually be completely drawn, then + * the compares will yield the correct overall extents + */ + if (left->p1.x < traps->extents.p1.x) + traps->extents.p1.x = left->p1.x; + if (left->p2.x < traps->extents.p1.x) + traps->extents.p1.x = left->p2.x; + + if (right->p1.x > traps->extents.p2.x) + traps->extents.p2.x = right->p1.x; + if (right->p2.x > traps->extents.p2.x) + traps->extents.p2.x = right->p2.x; + traps->num_traps++; return CAIRO_STATUS_SUCCESS; @@ -327,40 +357,132 @@ _compare_cairo_edge_by_current_x_slope (const void *av, const void *bv) sub-computations -- just a bunch of determinants. I haven't looked at complexity, (both are probably similar and it probably doesn't matter much anyway). + */ -static double -_det (double a, double b, double c, double d) +/* XXX: Keith's new intersection code is much cleaner, and uses + * sufficient precision for correctly sorting intersections according + * to the analysis in Hobby's paper. + * + * But, when we enable this code, some things are failing, (eg. the + * stars in test/fill_rule get filled wrong). This could indicate a + * bug in one of tree places: + * + * 1) The new intersection code in this file + * + * 2) cairo_wideint.c (which is only exercised here) + * + * 3) In the current tessellator, (where the old intersection + * code, with its mystic increments could be masking the bug). + * + * It will likely be easier to revisit this when the new tessellation + * code is in place. So, for now, we'll simply disable the new + * intersection code. + */ + +#define CAIRO_TRAPS_USE_NEW_INTERSECTION_CODE 0 + +#if CAIRO_TRAPS_USE_NEW_INTERSECTION_CODE +static const cairo_fixed_32_32_t +_det16_32 (cairo_fixed_16_16_t a, + cairo_fixed_16_16_t b, + cairo_fixed_16_16_t c, + cairo_fixed_16_16_t d) { - return a * d - b * c; + return _cairo_int64_sub (_cairo_int32x32_64_mul (a, d), + _cairo_int32x32_64_mul (b, c)); +} + +static const cairo_fixed_64_64_t +_det32_64 (cairo_fixed_32_32_t a, + cairo_fixed_32_32_t b, + cairo_fixed_32_32_t c, + cairo_fixed_32_32_t d) +{ + return _cairo_int128_sub (_cairo_int64x64_128_mul (a, d), + _cairo_int64x64_128_mul (b, c)); +} + +static const cairo_fixed_32_32_t +_fixed_16_16_to_fixed_32_32 (cairo_fixed_16_16_t a) +{ + return _cairo_int64_lsl (_cairo_int32_to_int64 (a), 16); } static int -_lines_intersect (cairo_line_t *l1, cairo_line_t *l2, cairo_fixed_t *y_intersection) +_line_segs_intersect_ceil (cairo_line_t *l1, cairo_line_t *l2, cairo_fixed_t *y_intersection) { - double dx1 = cairo_fixed_to_double (l1->p1.x - l1->p2.x); - double dy1 = cairo_fixed_to_double (l1->p1.y - l1->p2.y); + cairo_fixed_16_16_t dx1, dx2, dy1, dy2; + cairo_fixed_32_32_t den_det; + cairo_fixed_32_32_t l1_det, l2_det; + cairo_fixed_64_64_t num_det; + cairo_fixed_32_32_t intersect_32_32; + cairo_fixed_48_16_t intersect_48_16; + cairo_fixed_16_16_t intersect_16_16; + cairo_quorem128_t qr; - double dx2 = cairo_fixed_to_double (l2->p1.x - l2->p2.x); - double dy2 = cairo_fixed_to_double (l2->p1.y - l2->p2.y); - - double l1_det, l2_det; - - double den_det = _det (dx1, dy1, dx2, dy2); - - if (den_det == 0) + dx1 = l1->p1.x - l1->p2.x; + dy1 = l1->p1.y - l1->p2.y; + dx2 = l2->p1.x - l2->p2.x; + dy2 = l2->p1.y - l2->p2.y; + den_det = _det16_32 (dx1, dy1, + dx2, dy2); + + if (_cairo_int64_eq (den_det, _cairo_int32_to_int64(0))) return 0; - l1_det = _det (l1->p1.x, l1->p1.y, - l1->p2.x, l1->p2.y); - l2_det = _det (l2->p1.x, l2->p1.y, - l2->p2.x, l2->p2.y); + l1_det = _det16_32 (l1->p1.x, l1->p1.y, + l1->p2.x, l1->p2.y); + l2_det = _det16_32 (l2->p1.x, l2->p1.y, + l2->p2.x, l2->p2.y); - *y_intersection = _det (l1_det, dy1, - l2_det, dy2) / den_det; + + num_det = _det32_64 (l1_det, _fixed_16_16_to_fixed_32_32 (dy1), + l2_det, _fixed_16_16_to_fixed_32_32 (dy2)); + + /* + * Ok, this one is a bit tricky in fixed point, the denominator + * needs to be left with 32-bits of fraction so that the + * result of the divide ends up with 32-bits of fraction (64 - 32 = 32) + */ + qr = _cairo_int128_divrem (num_det, _cairo_int64_to_int128 (den_det)); + + intersect_32_32 = _cairo_int128_to_int64 (qr.quo); + + /* + * Find the ceiling of the quotient -- divrem returns + * the quotient truncated towards zero, so if the + * quotient should be positive (num_den and den_det have same sign) + * bump the quotient up by one. + */ + + if (_cairo_int128_ne (qr.rem, _cairo_int32_to_int128 (0)) && + (_cairo_int128_ge (num_det, _cairo_int32_to_int128 (0)) == + _cairo_int64_ge (den_det, _cairo_int32_to_int64 (0)))) + { + intersect_32_32 = _cairo_int64_add (intersect_32_32, + _cairo_int32_to_int64 (1)); + } + + /* + * Now convert from 32.32 to 48.16 and take the ceiling; + * this requires adding in 15 1 bits and shifting the result + */ + + intersect_32_32 = _cairo_int64_add (intersect_32_32, + _cairo_int32_to_int64 ((1 << 16) - 1)); + intersect_48_16 = _cairo_int64_rsa (intersect_32_32, 16); + + /* + * And drop the top bits + */ + intersect_16_16 = _cairo_int64_to_int32 (intersect_48_16); + + *y_intersection = intersect_16_16; return 1; } -*/ +#endif /* CAIRO_TRAPS_USE_NEW_INTERSECTION_CODE */ + static cairo_fixed_16_16_t _compute_x (cairo_line_t *line, cairo_fixed_t y) { @@ -371,6 +493,7 @@ _compute_x (cairo_line_t *line, cairo_fixed_t y) return line->p1.x + (ex / dy); } +#if ! CAIRO_TRAPS_USE_NEW_INTERSECTION_CODE static double _compute_inverse_slope (cairo_line_t *l) { @@ -460,6 +583,7 @@ _line_segs_intersect_ceil (cairo_line_t *l1, cairo_line_t *l2, cairo_fixed_t *y_ return 1; } +#endif /* CAIRO_TRAPS_USE_NEW_INTERSECTION_CODE */ /* The algorithm here is pretty simple: @@ -567,32 +691,32 @@ _cairo_traps_tessellate_polygon (cairo_traps_t *traps, return CAIRO_STATUS_SUCCESS; } -static int +static cairo_bool_t _cairo_trap_contains (cairo_trapezoid_t *t, cairo_point_t *pt) { cairo_slope_t slope_left, slope_pt, slope_right; if (t->top > pt->y) - return 0; + return FALSE; if (t->bottom < pt->y) - return 0; + return FALSE; _cairo_slope_init (&slope_left, &t->left.p1, &t->left.p2); _cairo_slope_init (&slope_pt, &t->left.p1, pt); if (_cairo_slope_compare (&slope_left, &slope_pt) < 0) - return 0; + return FALSE; _cairo_slope_init (&slope_right, &t->right.p1, &t->right.p2); _cairo_slope_init (&slope_pt, &t->right.p1, pt); if (_cairo_slope_compare (&slope_pt, &slope_right) < 0) - return 0; + return FALSE; - return 1; + return TRUE; } -int +cairo_bool_t _cairo_traps_contain (cairo_traps_t *traps, double x, double y) { int i; @@ -603,45 +727,14 @@ _cairo_traps_contain (cairo_traps_t *traps, double x, double y) for (i = 0; i < traps->num_traps; i++) { if (_cairo_trap_contains (&traps->traps[i], &point)) - return 1; + return TRUE; } - return 0; -} - -#define MIN(a,b) ((a) < (b) ? (a) : (b)) -#define MAX(a,b) ((a) > (b) ? (a) : (b)) - -static void -_cairo_trap_extents (cairo_trapezoid_t *t, cairo_box_t *extents) -{ - cairo_fixed_t x; - - if (t->top < extents->p1.y) - extents->p1.y = t->top; - - if (t->bottom > extents->p2.y) - extents->p2.y = t->bottom; - - x = MIN (_compute_x (&t->left, t->top), - _compute_x (&t->left, t->bottom)); - if (x < extents->p1.x) - extents->p1.x = x; - - x = MAX (_compute_x (&t->right, t->top), - _compute_x (&t->right, t->bottom)); - if (x > extents->p2.x) - extents->p2.x = x; + return FALSE; } void _cairo_traps_extents (cairo_traps_t *traps, cairo_box_t *extents) { - int i; - - extents->p1.x = extents->p1.y = CAIRO_MAXSHORT << 16; - extents->p2.x = extents->p2.y = CAIRO_MINSHORT << 16; - - for (i = 0; i < traps->num_traps; i++) - _cairo_trap_extents (&traps->traps[i], extents); + *extents = traps->extents; } diff --git a/gfx/cairo/cairo/src/cairo_unicode.c b/gfx/cairo/cairo/src/cairo_unicode.c new file mode 100644 index 000000000000..92201391a3c6 --- /dev/null +++ b/gfx/cairo/cairo/src/cairo_unicode.c @@ -0,0 +1,340 @@ +/* cairo_unicode.c: Unicode conversion routines + * + * The code in this file is derived from GLib's gutf8.c and + * ultimately from libunicode. It is relicensed under the + * dual LGPL/MPL with permission of the original authors. + * + * Copyright © 1999 Tom Tromey + * 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 cairo_unicode.c as distributed with the + * cairo graphics library. + * + * The Initial Developer of the Original Code is Tom Tromey. + * and Red Hat, Inc. + * + * Contributor(s): + * Owen Taylor + */ + +#include + +#include + +#define UTF8_COMPUTE(Char, Mask, Len) \ + if (Char < 128) \ + { \ + Len = 1; \ + Mask = 0x7f; \ + } \ + else if ((Char & 0xe0) == 0xc0) \ + { \ + Len = 2; \ + Mask = 0x1f; \ + } \ + else if ((Char & 0xf0) == 0xe0) \ + { \ + Len = 3; \ + Mask = 0x0f; \ + } \ + else if ((Char & 0xf8) == 0xf0) \ + { \ + Len = 4; \ + Mask = 0x07; \ + } \ + else if ((Char & 0xfc) == 0xf8) \ + { \ + Len = 5; \ + Mask = 0x03; \ + } \ + else if ((Char & 0xfe) == 0xfc) \ + { \ + Len = 6; \ + Mask = 0x01; \ + } \ + else \ + Len = -1; + +#define UTF8_LENGTH(Char) \ + ((Char) < 0x80 ? 1 : \ + ((Char) < 0x800 ? 2 : \ + ((Char) < 0x10000 ? 3 : \ + ((Char) < 0x200000 ? 4 : \ + ((Char) < 0x4000000 ? 5 : 6))))) + + +#define UTF8_GET(Result, Chars, Count, Mask, Len) \ + (Result) = (Chars)[0] & (Mask); \ + for ((Count) = 1; (Count) < (Len); ++(Count)) \ + { \ + if (((Chars)[(Count)] & 0xc0) != 0x80) \ + { \ + (Result) = -1; \ + break; \ + } \ + (Result) <<= 6; \ + (Result) |= ((Chars)[(Count)] & 0x3f); \ + } + +#define UNICODE_VALID(Char) \ + ((Char) < 0x110000 && \ + (((Char) & 0xFFFFF800) != 0xD800) && \ + ((Char) < 0xFDD0 || (Char) > 0xFDEF) && \ + ((Char) & 0xFFFE) != 0xFFFE) + + +static const char utf8_skip_data[256] = { + 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, + 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, + 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, + 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, + 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, + 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, + 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, + 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1 +}; + +#define UTF8_NEXT_CHAR(p) (char *)((p) + utf8_skip_data[*(unsigned char *)(p)]) + +/* Converts a sequence of bytes encoded as UTF-8 to a Unicode character. + * If @p does not point to a valid UTF-8 encoded character, results are + * undefined. + **/ +static uint32_t +_utf8_get_char (const char *p) +{ + int i, mask = 0, len; + uint32_t result; + unsigned char c = (unsigned char) *p; + + UTF8_COMPUTE (c, mask, len); + if (len == -1) + return (uint32_t)-1; + UTF8_GET (result, p, i, mask, len); + + return result; +} + +/* Like _utf8_get_char, but take a maximum length + * and return (uint32_t)-2 on incomplete trailing character + */ +static uint32_t +_utf8_get_char_extended (const char *p, + long max_len) +{ + int i, len; + uint32_t wc = (unsigned char) *p; + + if (wc < 0x80) { + return wc; + } else if (wc < 0xc0) { + return (uint32_t)-1; + } else if (wc < 0xe0) { + len = 2; + wc &= 0x1f; + } else if (wc < 0xf0) { + len = 3; + wc &= 0x0f; + } else if (wc < 0xf8) { + len = 4; + wc &= 0x07; + } else if (wc < 0xfc) { + len = 5; + wc &= 0x03; + } else if (wc < 0xfe) { + len = 6; + wc &= 0x01; + } else { + return (uint32_t)-1; + } + + if (max_len >= 0 && len > max_len) { + for (i = 1; i < max_len; i++) { + if ((((unsigned char *)p)[i] & 0xc0) != 0x80) + return (uint32_t)-1; + } + return (uint32_t)-2; + } + + for (i = 1; i < len; ++i) { + uint32_t ch = ((unsigned char *)p)[i]; + + if ((ch & 0xc0) != 0x80) { + if (ch) + return (uint32_t)-1; + else + return (uint32_t)-2; + } + + wc <<= 6; + wc |= (ch & 0x3f); + } + + if (UTF8_LENGTH(wc) != len) + return (uint32_t)-1; + + return wc; +} + +/** + * _cairo_utf8_to_utf32: + * @str: an UTF-8 string + * @len: length of @str in bytes, or -1 if it is nul-terminated. + * If @len is supplied and the string has an embedded nul + * byte, only the portion before the nul byte is converted. + * @result: location to store a pointer to a newly allocated UTF-32 + * string (always native endian). Free with free(). A 0 + * word will be written after the last character. + * @items_written: location to store number of 32-bit words + * written. (Not including the trailing 0) + * + * Converts a UTF-8 string to UCS-4. UCS-4 is an encoding of Unicode + * with 1 32-bit word per character. The string is validated to + * consist entirely of valid Unicode characters. + * + * Return value: %CAIRO_STATUS_SUCCESS if the entire string was + * succesfully converted. %CAIRO_STATUS_INVALID_STRING if an + * an invalid sequence was found. + **/ +cairo_status_t +_cairo_utf8_to_ucs4 (const char *str, + int len, + uint32_t **result, + int *items_written) +{ + uint32_t *str32 = NULL; + int n_chars, i; + const char *in; + + in = str; + n_chars = 0; + while ((len < 0 || str + len - in > 0) && *in) + { + uint32_t wc = _utf8_get_char_extended (in, str + len - in); + if (wc & 0x80000000 || !UNICODE_VALID (wc)) + return CAIRO_STATUS_INVALID_STRING; + + n_chars++; + if (n_chars == INT_MAX) + return CAIRO_STATUS_INVALID_STRING; + + in = UTF8_NEXT_CHAR (in); + } + + str32 = malloc (sizeof (uint32_t) * (n_chars + 1)); + if (!str32) + return CAIRO_STATUS_NO_MEMORY; + + in = str; + for (i=0; i < n_chars; i++) { + str32[i] = _utf8_get_char (in); + in = UTF8_NEXT_CHAR (in); + } + str32[i] = 0; + + *result = str32; + if (items_written) + *items_written = n_chars; + + return CAIRO_STATUS_SUCCESS; +} + +/** + * _cairo_utf8_to_utf16: + * @str: an UTF-8 string + * @len: length of @str in bytes, or -1 if it is nul-terminated. + * If @len is supplied and the string has an embedded nul + * byte, only the portion before the nul byte is converted. + * @result: location to store a pointer to a newly allocated UTF-16 + * string (always native endian). Free with free(). A 0 + * word will be written after the last character. + * @items_written: location to store number of 16-bit words + * written. (Not including the trailing 0) + * + * Converts a UTF-8 string to UTF-16. UTF-16 is an encoding of Unicode + * where characters are represented either as a single 16-bit word, or + * as a pair of 16-bit "surrogates". The string is validated to + * consist entirely of valid Unicode characters. + * + * Return value: %CAIRO_STATUS_SUCCESS if the entire string was + * succesfully converted. %CAIRO_STATUS_INVALID_STRING if an + * an invalid sequence was found. + **/ +cairo_status_t +_cairo_utf8_to_utf16 (const char *str, + int len, + uint16_t **result, + int *items_written) +{ + uint16_t *str16 = NULL; + int n16, i; + const char *in; + + in = str; + n16 = 0; + while ((len < 0 || str + len - in > 0) && *in) { + uint32_t wc = _utf8_get_char_extended (in, str + len - in); + if (wc & 0x80000000 || !UNICODE_VALID (wc)) + return CAIRO_STATUS_INVALID_STRING; + + if (wc < 0x10000) + n16 += 1; + else + n16 += 2; + + if (n16 == INT_MAX - 1 || n16 == INT_MAX) + return CAIRO_STATUS_INVALID_STRING; + + in = UTF8_NEXT_CHAR (in); + } + + + str16 = malloc (sizeof (uint16_t) * (n16 + 1)); + if (!str16) + return CAIRO_STATUS_NO_MEMORY; + + in = str; + for (i = 0; i < n16;) { + uint32_t wc = _utf8_get_char (in); + + if (wc < 0x10000) { + str16[i++] = wc; + } else { + str16[i++] = (wc - 0x10000) / 0x400 + 0xd800; + str16[i++] = (wc - 0x10000) % 0x400 + 0xdc00; + } + + in = UTF8_NEXT_CHAR (in); + } + + str16[i] = 0; + + *result = str16; + if (items_written) + *items_written = n16; + + return CAIRO_STATUS_SUCCESS; +} diff --git a/gfx/cairo/cairo/src/cairo_win32_font.c b/gfx/cairo/cairo/src/cairo_win32_font.c new file mode 100644 index 000000000000..02f0cffd61cb --- /dev/null +++ b/gfx/cairo/cairo/src/cairo_win32_font.c @@ -0,0 +1,1252 @@ +/* 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. + * + * Contributor(s): + */ + +#include +#include + +#include "cairo-win32-private.h" + +#ifndef SPI_GETFONTSMOOTHINGTYPE +#define SPI_GETFONTSMOOTHINGTYPE 0x200a +#endif +#ifndef FE_FONTSMOOTHINGCLEARTYPE +#define FE_FONTSMOOTHINGCLEARTYPE 2 +#endif +#ifndef CLEARTYPE_QUALITY +#define CLEARTYPE_QUALITY 5 +#endif + +const cairo_font_backend_t cairo_win32_font_backend; + +#define LOGICAL_SCALE 32 + +typedef struct { + cairo_font_t base; + + LOGFONTW logfont; + + BYTE quality; + + /* We do drawing and metrics computation in a "logical space" which + * is similar to font space, except that it is scaled by a factor + * of the (desired font size) * (LOGICAL_SCALE). The multiplication + * by LOGICAL_SCALE allows for sub-pixel precision. + */ + double logical_scale; + + /* The size we should actually request the font at from Windows; differs + * from the logical_scale because it is quantized for orthogonal + * transformations + */ + double logical_size; + + /* Transformations from device <=> logical space + */ + cairo_matrix_t logical_to_device; + cairo_matrix_t device_to_logical; + + /* We special case combinations of 90-degree-rotations, scales and + * flips ... that is transformations that take the axes to the + * axes. If preserve_axes is true, then swap_axes/swap_x/swap_y + * encode the 8 possibilities for orientation (4 rotation angles with + * and without a flip), and scale_x, scale_y the scale components. + */ + cairo_bool_t preserve_axes; + cairo_bool_t swap_axes; + cairo_bool_t swap_x; + cairo_bool_t swap_y; + double x_scale; + double y_scale; + + /* The size of the design unit of the font + */ + int em_square; + + HFONT scaled_font; + HFONT unscaled_font; + +} cairo_win32_font_t; + +#define NEARLY_ZERO(d) (fabs(d) < (1. / 65536.)) + +static void +_compute_transform (cairo_win32_font_t *font, + cairo_font_scale_t *sc) +{ + if (NEARLY_ZERO (sc->matrix[0][1]) && NEARLY_ZERO (sc->matrix[1][0])) { + font->preserve_axes = TRUE; + font->x_scale = sc->matrix[0][0]; + font->swap_x = (sc->matrix[0][0] < 0); + font->y_scale = sc->matrix[1][1]; + font->swap_y = (sc->matrix[1][1] < 0); + font->swap_axes = FALSE; + + } else if (NEARLY_ZERO (sc->matrix[0][0]) && NEARLY_ZERO (sc->matrix[1][1])) { + font->preserve_axes = TRUE; + font->x_scale = sc->matrix[0][1]; + font->swap_x = (sc->matrix[0][1] < 0); + font->y_scale = sc->matrix[1][0]; + font->swap_y = (sc->matrix[1][0] < 0); + font->swap_axes = TRUE; + + } else { + font->preserve_axes = FALSE; + font->swap_x = font->swap_y = font->swap_axes = FALSE; + } + + if (font->preserve_axes) { + if (font->swap_x) + font->x_scale = - font->x_scale; + if (font->swap_y) + font->y_scale = - font->y_scale; + + font->logical_scale = LOGICAL_SCALE * font->y_scale; + font->logical_size = LOGICAL_SCALE * floor (font->y_scale + 0.5); + } + + /* The font matrix has x and y "scale" components which we extract and + * use as character scale values. + */ + cairo_matrix_set_affine (&font->logical_to_device, + sc->matrix[0][0], + sc->matrix[0][1], + sc->matrix[1][0], + sc->matrix[1][1], + 0, 0); + + if (!font->preserve_axes) { + _cairo_matrix_compute_scale_factors (&font->logical_to_device, + &font->x_scale, &font->y_scale, + TRUE); /* XXX: Handle vertical text */ + + font->logical_size = floor (LOGICAL_SCALE * font->y_scale + 0.5); + font->logical_scale = LOGICAL_SCALE * font->y_scale; + } + + cairo_matrix_scale (&font->logical_to_device, + 1.0 / font->logical_scale, 1.0 / font->logical_scale); + + font->device_to_logical = font->logical_to_device; + if (!CAIRO_OK (cairo_matrix_invert (&font->device_to_logical))) + cairo_matrix_set_identity (&font->device_to_logical); +} + +static BYTE +_get_system_quality (void) +{ + BOOL font_smoothing; + + if (!SystemParametersInfo (SPI_GETFONTSMOOTHING, 0, &font_smoothing, 0)) { + _cairo_win32_print_gdi_error ("_get_system_quality"); + return FALSE; + } + + if (font_smoothing) { + OSVERSIONINFO version_info; + + version_info.dwOSVersionInfoSize = sizeof (OSVERSIONINFO); + + if (!GetVersionEx (&version_info)) { + _cairo_win32_print_gdi_error ("_get_system_quality"); + return FALSE; + } + + if (version_info.dwMajorVersion > 5 || + (version_info.dwMajorVersion == 5 && + version_info.dwMinorVersion >= 1)) { /* XP or newer */ + UINT smoothing_type; + + if (!SystemParametersInfo (SPI_GETFONTSMOOTHINGTYPE, + 0, &smoothing_type, 0)) { + _cairo_win32_print_gdi_error ("_get_system_quality"); + return FALSE; + } + + if (smoothing_type == FE_FONTSMOOTHINGCLEARTYPE) + return CLEARTYPE_QUALITY; + } + + return ANTIALIASED_QUALITY; + } else + return DEFAULT_QUALITY; +} + +static cairo_font_t * +_win32_font_create (LOGFONTW *logfont, + cairo_font_scale_t *scale) +{ + cairo_win32_font_t *f; + + f = malloc (sizeof(cairo_win32_font_t)); + if (f == NULL) + return NULL; + + f->logfont = *logfont; + f->quality = _get_system_quality (); + f->em_square = 0; + f->scaled_font = NULL; + f->unscaled_font = NULL; + + _compute_transform (f, scale); + + _cairo_font_init ((cairo_font_t *)f, scale, &cairo_win32_font_backend); + + return (cairo_font_t *)f; +} + +static cairo_status_t +_win32_font_set_world_transform (cairo_win32_font_t *font, + HDC hdc) +{ + XFORM xform; + + xform.eM11 = font->logical_to_device.m[0][0]; + xform.eM21 = font->logical_to_device.m[1][0]; + xform.eM12 = font->logical_to_device.m[0][1]; + xform.eM22 = font->logical_to_device.m[1][1]; + xform.eDx = font->logical_to_device.m[2][0]; + xform.eDy = font->logical_to_device.m[2][1]; + + if (!SetWorldTransform (hdc, &xform)) + return _cairo_win32_print_gdi_error ("_win32_font_set_world_transform"); + + return CAIRO_STATUS_SUCCESS; +} + +static cairo_status_t +_win32_font_set_identity_transform (HDC hdc) +{ + if (!ModifyWorldTransform (hdc, NULL, MWT_IDENTITY)) + return _cairo_win32_print_gdi_error ("_win32_font_set_identity_transform"); + + return CAIRO_STATUS_SUCCESS; +} + +static HDC +_get_global_font_dc (void) +{ + static HDC hdc; + + if (!hdc) { + hdc = CreateCompatibleDC (NULL); + if (!hdc) { + _cairo_win32_print_gdi_error ("_get_global_font_dc"); + return NULL; + } + + if (!SetGraphicsMode (hdc, GM_ADVANCED)) { + _cairo_win32_print_gdi_error ("_get_global_font_dc"); + DeleteDC (hdc); + return NULL; + } + } + + return hdc; +} + +static HFONT +_win32_font_get_scaled_font (cairo_win32_font_t *font) +{ + if (!font->scaled_font) { + LOGFONTW logfont = font->logfont; + logfont.lfHeight = font->logical_size; + logfont.lfWidth = 0; + logfont.lfEscapement = 0; + logfont.lfOrientation = 0; + logfont.lfQuality = font->quality; + + font->scaled_font = CreateFontIndirectW (&logfont); + if (!font->scaled_font) { + _cairo_win32_print_gdi_error ("_win32_font_get_scaled_font"); + return NULL; + } + } + + return font->scaled_font; +} + +static HFONT +_win32_font_get_unscaled_font (cairo_win32_font_t *font, + HDC hdc) +{ + if (!font->unscaled_font) { + OUTLINETEXTMETRIC *otm; + unsigned int otm_size; + HFONT scaled_font; + LOGFONTW logfont; + + scaled_font = _win32_font_get_scaled_font (font); + if (!scaled_font) + return NULL; + + if (!SelectObject (hdc, scaled_font)) { + _cairo_win32_print_gdi_error ("_win32_font_get_unscaled_font:SelectObject"); + return NULL; + } + + otm_size = GetOutlineTextMetrics (hdc, 0, NULL); + if (!otm_size) { + _cairo_win32_print_gdi_error ("_win32_font_get_unscaled_font:GetOutlineTextMetrics"); + return NULL; + } + + otm = malloc (otm_size); + if (!otm) + return NULL; + + if (!GetOutlineTextMetrics (hdc, otm_size, otm)) { + _cairo_win32_print_gdi_error ("_win32_font_get_unscaled_font:GetOutlineTextMetrics"); + free (otm); + return NULL; + } + + font->em_square = otm->otmEMSquare; + free (otm); + + logfont = font->logfont; + logfont.lfHeight = font->em_square; + logfont.lfWidth = 0; + logfont.lfEscapement = 0; + logfont.lfOrientation = 0; + logfont.lfQuality = font->quality; + + font->unscaled_font = CreateFontIndirectW (&logfont); + if (!font->unscaled_font) { + _cairo_win32_print_gdi_error ("_win32_font_get_unscaled_font:CreateIndirect"); + return NULL; + } + } + + return font->unscaled_font; +} + +static cairo_status_t +_cairo_win32_font_select_unscaled_font (cairo_font_t *font, + HDC hdc) +{ + cairo_status_t status; + HFONT hfont; + HFONT old_hfont = NULL; + + hfont = _win32_font_get_unscaled_font ((cairo_win32_font_t *)font, hdc); + if (!hfont) + return CAIRO_STATUS_NO_MEMORY; + + old_hfont = SelectObject (hdc, hfont); + if (!old_hfont) + return _cairo_win32_print_gdi_error ("_cairo_win32_font_select_unscaled_font"); + + status = _win32_font_set_identity_transform (hdc); + if (!CAIRO_OK (status)) { + SelectObject (hdc, old_hfont); + return status; + } + + SetMapMode (hdc, MM_TEXT); + + return CAIRO_STATUS_SUCCESS; +} + +static void +_cairo_win32_font_done_unscaled_font (cairo_font_t *font) +{ +} + +/* implement the font backend interface */ + +static cairo_status_t +_cairo_win32_font_create (const char *family, + cairo_font_slant_t slant, + cairo_font_weight_t weight, + cairo_font_scale_t *scale, + cairo_font_t **font_out) +{ + LOGFONTW logfont; + cairo_font_t *font; + uint16_t *face_name; + int face_name_len; + cairo_status_t status; + + status = _cairo_utf8_to_utf16 (family, -1, &face_name, &face_name_len); + if (!CAIRO_OK (status)) + return status; + + if (face_name_len > LF_FACESIZE - 1) { + free (face_name); + return CAIRO_STATUS_INVALID_STRING; + } + + memcpy (logfont.lfFaceName, face_name, sizeof (uint16_t) * (face_name_len + 1)); + free (face_name); + + logfont.lfHeight = 0; /* filled in later */ + logfont.lfWidth = 0; /* filled in later */ + logfont.lfEscapement = 0; /* filled in later */ + logfont.lfOrientation = 0; /* filled in later */ + + switch (weight) { + case CAIRO_FONT_WEIGHT_NORMAL: + default: + logfont.lfWeight = FW_NORMAL; + break; + case CAIRO_FONT_WEIGHT_BOLD: + logfont.lfWeight = FW_BOLD; + break; + } + + switch (slant) { + case CAIRO_FONT_SLANT_NORMAL: + default: + logfont.lfItalic = FALSE; + break; + case CAIRO_FONT_SLANT_ITALIC: + case CAIRO_FONT_SLANT_OBLIQUE: + logfont.lfItalic = TRUE; + break; + } + + logfont.lfUnderline = FALSE; + logfont.lfStrikeOut = FALSE; + /* The docs for LOGFONT discourage using this, since the + * interpretation is locale-specific, but it's not clear what + * would be a better alternative. + */ + logfont.lfCharSet = DEFAULT_CHARSET; + logfont.lfOutPrecision = OUT_DEFAULT_PRECIS; + logfont.lfClipPrecision = CLIP_DEFAULT_PRECIS; + logfont.lfQuality = DEFAULT_QUALITY; /* filled in later */ + logfont.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; + + if (!logfont.lfFaceName) + return CAIRO_STATUS_NO_MEMORY; + + font = _win32_font_create (&logfont, scale); + if (!font) + return CAIRO_STATUS_NO_MEMORY; + + *font_out = font; + + return CAIRO_STATUS_SUCCESS; +} + +static void +_cairo_win32_font_destroy_font (void *abstract_font) +{ + cairo_win32_font_t *font = abstract_font; + + if (font->scaled_font) + DeleteObject (font->scaled_font); + + if (font->unscaled_font) + DeleteObject (font->unscaled_font); + + free (font); +} + +static void +_cairo_win32_font_destroy_unscaled_font (void *abstract_font) +{ +} + +static void +_cairo_win32_font_get_glyph_cache_key (void *abstract_font, + cairo_glyph_cache_key_t *key) +{ +} + +static cairo_status_t +_cairo_win32_font_text_to_glyphs (void *abstract_font, + const unsigned char *utf8, + cairo_glyph_t **glyphs, + int *num_glyphs) +{ + cairo_win32_font_t *font = abstract_font; + uint16_t *utf16; + int n16; + GCP_RESULTSW gcp_results; + unsigned int buffer_size, i; + WCHAR *glyph_indices = NULL; + int *dx = NULL; + cairo_status_t status = CAIRO_STATUS_SUCCESS; + double x_pos; + HDC hdc = NULL; + + status = _cairo_utf8_to_utf16 (utf8, -1, &utf16, &n16); + if (!CAIRO_OK (status)) + return status; + + gcp_results.lStructSize = sizeof (GCP_RESULTS); + gcp_results.lpOutString = NULL; + gcp_results.lpOrder = NULL; + gcp_results.lpCaretPos = NULL; + gcp_results.lpClass = NULL; + + buffer_size = MAX (n16 * 1.2, 16); /* Initially guess number of chars plus a few */ + if (buffer_size > INT_MAX) { + status = CAIRO_STATUS_NO_MEMORY; + goto FAIL1; + } + + hdc = _get_global_font_dc (); + if (!hdc) { + status = CAIRO_STATUS_NO_MEMORY; + goto FAIL1; + } + + status = cairo_win32_font_select_font (&font->base, hdc); + if (!CAIRO_OK (status)) + goto FAIL1; + + while (TRUE) { + if (glyph_indices) { + free (glyph_indices); + glyph_indices = NULL; + } + if (dx) { + free (dx); + dx = NULL; + } + + glyph_indices = malloc (sizeof (WCHAR) * buffer_size); + dx = malloc (sizeof (int) * buffer_size); + if (!glyph_indices || !dx) { + status = CAIRO_STATUS_NO_MEMORY; + goto FAIL2; + } + + gcp_results.nGlyphs = buffer_size; + gcp_results.lpDx = dx; + gcp_results.lpGlyphs = glyph_indices; + + if (!GetCharacterPlacementW (hdc, utf16, n16, + 0, + &gcp_results, + GCP_DIACRITIC | GCP_LIGATE | GCP_GLYPHSHAPE | GCP_REORDER)) { + status = _cairo_win32_print_gdi_error ("_cairo_win32_font_text_to_glyphs"); + goto FAIL2; + } + + if (gcp_results.lpDx && gcp_results.lpGlyphs) + break; + + /* Too small a buffer, try again */ + + buffer_size *= 1.5; + if (buffer_size > INT_MAX) { + status = CAIRO_STATUS_NO_MEMORY; + goto FAIL2; + } + } + + *num_glyphs = gcp_results.nGlyphs; + *glyphs = malloc (sizeof (cairo_glyph_t) * gcp_results.nGlyphs); + if (!*glyphs) { + status = CAIRO_STATUS_NO_MEMORY; + goto FAIL2; + } + + x_pos = 0; + for (i = 0; i < gcp_results.nGlyphs; i++) { + (*glyphs)[i].index = glyph_indices[i]; + (*glyphs)[i].x = x_pos ; + (*glyphs)[i].y = 0; + + x_pos += dx[i] / font->logical_scale; + } + + FAIL2: + if (glyph_indices) + free (glyph_indices); + if (dx) + free (dx); + + cairo_win32_font_done_font (&font->base); + + FAIL1: + free (utf16); + + return status; +} + +static cairo_status_t +_cairo_win32_font_font_extents (void *abstract_font, + cairo_font_extents_t *extents) +{ + cairo_win32_font_t *font = abstract_font; + cairo_status_t status; + TEXTMETRIC metrics; + HDC hdc; + + hdc = _get_global_font_dc (); + if (!hdc) + return CAIRO_STATUS_NO_MEMORY; + + if (font->preserve_axes) { + /* For 90-degree rotations (including 0), we get the metrics + * from the GDI in logical space, then convert back to font space + */ + status = cairo_win32_font_select_font (&font->base, hdc); + if (!CAIRO_OK (status)) + return status; + GetTextMetrics (hdc, &metrics); + cairo_win32_font_done_font (&font->base); + + extents->ascent = metrics.tmAscent / font->logical_scale; + extents->descent = metrics.tmDescent / font->logical_scale; + + extents->height = (metrics.tmHeight + metrics.tmExternalLeading) / font->logical_scale; + extents->max_x_advance = metrics.tmMaxCharWidth / font->logical_scale; + extents->max_y_advance = 0; + + } else { + /* For all other transformations, we use the design metrics + * of the font. The GDI results from GetTextMetrics() on a + * transformed font are inexplicably large and we want to + * avoid them. + */ + status = _cairo_win32_font_select_unscaled_font (&font->base, hdc); + if (!CAIRO_OK (status)) + return status; + GetTextMetrics (hdc, &metrics); + _cairo_win32_font_done_unscaled_font (&font->base); + + extents->ascent = (double)metrics.tmAscent / font->em_square; + extents->descent = metrics.tmDescent * font->em_square; + extents->height = (double)(metrics.tmHeight + metrics.tmExternalLeading) / font->em_square; + extents->max_x_advance = (double)(metrics.tmMaxCharWidth) / font->em_square; + extents->max_y_advance = 0; + + } + + return CAIRO_STATUS_SUCCESS; +} + +static cairo_status_t +_cairo_win32_font_glyph_extents (void *abstract_font, + cairo_glyph_t *glyphs, + int num_glyphs, + cairo_text_extents_t *extents) +{ + cairo_win32_font_t *font = abstract_font; + static const MAT2 matrix = { { 0, 1 }, { 0, 0 }, { 0, 0 }, { 0, 1 } }; + GLYPHMETRICS metrics; + cairo_status_t status; + HDC hdc; + + hdc = _get_global_font_dc (); + if (!hdc) + return CAIRO_STATUS_NO_MEMORY; + + /* We handle only the case num_glyphs == 1, glyphs[i].x == glyphs[0].y == 0. + * This is all that the calling code triggers, and the backend interface + * will eventually be changed to match + */ + assert (num_glyphs == 1); + + if (font->preserve_axes) { + /* If we aren't rotating / skewing the axes, then we get the metrics + * from the GDI in device space and convert to font space. + */ + status = cairo_win32_font_select_font (&font->base, hdc); + if (!CAIRO_OK (status)) + return status; + GetGlyphOutlineW (hdc, glyphs[0].index, GGO_METRICS | GGO_GLYPH_INDEX, + &metrics, 0, NULL, &matrix); + cairo_win32_font_done_font (&font->base); + + if (font->swap_axes) { + extents->x_bearing = - metrics.gmptGlyphOrigin.y / font->y_scale; + extents->y_bearing = metrics.gmptGlyphOrigin.x / font->x_scale; + extents->width = metrics.gmBlackBoxY / font->y_scale; + extents->height = metrics.gmBlackBoxX / font->x_scale; + extents->x_advance = metrics.gmCellIncY / font->x_scale; + extents->y_advance = metrics.gmCellIncX / font->y_scale; + } else { + extents->x_bearing = metrics.gmptGlyphOrigin.x / font->x_scale; + extents->y_bearing = - metrics.gmptGlyphOrigin.y / font->y_scale; + extents->width = metrics.gmBlackBoxX / font->x_scale; + extents->height = metrics.gmBlackBoxY / font->y_scale; + extents->x_advance = metrics.gmCellIncX / font->x_scale; + extents->y_advance = metrics.gmCellIncY / font->y_scale; + } + + if (font->swap_x) { + extents->x_bearing = (- extents->x_bearing - extents->width); + extents->x_advance = - extents->x_advance; + } + + if (font->swap_y) { + extents->y_bearing = (- extents->y_bearing - extents->height); + extents->y_advance = - extents->y_advance; + } + + } else { + /* For all other transformations, we use the design metrics + * of the font. + */ + status = _cairo_win32_font_select_unscaled_font (&font->base, hdc); + GetGlyphOutlineW (hdc, glyphs[0].index, GGO_METRICS | GGO_GLYPH_INDEX, + &metrics, 0, NULL, &matrix); + _cairo_win32_font_done_unscaled_font (&font->base); + + extents->x_bearing = (double)metrics.gmptGlyphOrigin.x / font->em_square; + extents->y_bearing = (double)metrics.gmptGlyphOrigin.y / font->em_square; + extents->width = (double)metrics.gmBlackBoxX / font->em_square; + extents->height = (double)metrics.gmBlackBoxY / font->em_square; + extents->x_advance = (double)metrics.gmCellIncX / font->em_square; + extents->y_advance = (double)metrics.gmCellIncY / font->em_square; + } + + return CAIRO_STATUS_SUCCESS; +} + + +static cairo_status_t +_cairo_win32_font_glyph_bbox (void *abstract_font, + const cairo_glyph_t *glyphs, + int num_glyphs, + cairo_box_t *bbox) +{ + static const MAT2 matrix = { { 0, 1 }, { 0, 0 }, { 0, 0 }, { 0, 1 } }; + cairo_win32_font_t *font = abstract_font; + int x1 = 0, x2 = 0, y1 = 0, y2 = 0; + + if (num_glyphs > 0) { + HDC hdc = _get_global_font_dc (); + GLYPHMETRICS metrics; + cairo_status_t status; + int i; + + if (!hdc) + return CAIRO_STATUS_NO_MEMORY; + + status = cairo_win32_font_select_font (&font->base, hdc); + if (!CAIRO_OK (status)) + return status; + + for (i = 0; i < num_glyphs; i++) { + int x = floor (0.5 + glyphs[i].x); + int y = floor (0.5 + glyphs[i].y); + + GetGlyphOutlineW (hdc, glyphs[i].index, GGO_METRICS | GGO_GLYPH_INDEX, + &metrics, 0, NULL, &matrix); + + if (i == 0 || x1 > x + metrics.gmptGlyphOrigin.x) + x1 = x + metrics.gmptGlyphOrigin.x; + if (i == 0 || y1 > y - metrics.gmptGlyphOrigin.y) + y1 = y - metrics.gmptGlyphOrigin.y; + if (i == 0 || x2 < x + metrics.gmptGlyphOrigin.x + metrics.gmBlackBoxX) + x2 = x + metrics.gmptGlyphOrigin.x + metrics.gmBlackBoxX; + if (i == 0 || y2 < y - metrics.gmptGlyphOrigin.y + metrics.gmBlackBoxY) + y2 = y - metrics.gmptGlyphOrigin.y + metrics.gmBlackBoxY; + } + + cairo_win32_font_done_font (&font->base); + } + + bbox->p1.x = _cairo_fixed_from_int (x1); + bbox->p1.y = _cairo_fixed_from_int (y1); + bbox->p2.x = _cairo_fixed_from_int (x2); + bbox->p2.y = _cairo_fixed_from_int (y2); + + return CAIRO_STATUS_SUCCESS; +} + +typedef struct { + cairo_win32_font_t *font; + HDC hdc; + + cairo_array_t glyphs; + cairo_array_t dx; + + int start_x; + int last_x; + int last_y; +} cairo_glyph_state_t; + +static void +_start_glyphs (cairo_glyph_state_t *state, + cairo_win32_font_t *font, + HDC hdc) +{ + state->hdc = hdc; + state->font = font; + + _cairo_array_init (&state->glyphs, sizeof (WCHAR)); + _cairo_array_init (&state->dx, sizeof (int)); +} + +static cairo_status_t +_flush_glyphs (cairo_glyph_state_t *state) +{ + int dx = 0; + if (!_cairo_array_append (&state->dx, &dx, 1)) + return CAIRO_STATUS_NO_MEMORY; + + if (!ExtTextOutW (state->hdc, + state->start_x, state->last_y, + ETO_GLYPH_INDEX, + NULL, + (WCHAR *)state->glyphs.elements, + state->glyphs.num_elements, + (int *)state->dx.elements)) { + return _cairo_win32_print_gdi_error ("_flush_glyphs"); + } + + _cairo_array_truncate (&state->glyphs, 0); + _cairo_array_truncate (&state->dx, 0); + + return CAIRO_STATUS_SUCCESS; +} + +static cairo_status_t +_add_glyph (cairo_glyph_state_t *state, + unsigned long index, + double device_x, + double device_y) +{ + double user_x = device_x; + double user_y = device_y; + WCHAR glyph_index = index; + int logical_x, logical_y; + + cairo_matrix_transform_point (&state->font->device_to_logical, &user_x, &user_y); + + logical_x = floor (user_x + 0.5); + logical_y = floor (user_y + 0.5); + + if (state->glyphs.num_elements > 0) { + int dx; + + if (logical_y != state->last_y) { + cairo_status_t status = _flush_glyphs (state); + if (!CAIRO_OK (status)) + return status; + state->start_x = logical_x; + } + + dx = logical_x - state->last_x; + if (!_cairo_array_append (&state->dx, &dx, 1)) + return CAIRO_STATUS_NO_MEMORY; + } else { + state->start_x = logical_x; + } + + state->last_x = logical_x; + state->last_y = logical_y; + + _cairo_array_append (&state->glyphs, &glyph_index, 1); + + return CAIRO_STATUS_SUCCESS; +} + +static void +_finish_glyphs (cairo_glyph_state_t *state) +{ + _flush_glyphs (state); + + _cairo_array_fini (&state->glyphs); + _cairo_array_fini (&state->dx); +} + +static cairo_status_t +_draw_glyphs_on_surface (cairo_win32_surface_t *surface, + cairo_win32_font_t *font, + COLORREF color, + int x_offset, + int y_offset, + const cairo_glyph_t *glyphs, + int num_glyphs) +{ + cairo_glyph_state_t state; + cairo_status_t status = CAIRO_STATUS_SUCCESS; + int i; + + if (!SaveDC (surface->dc)) + return _cairo_win32_print_gdi_error ("_draw_glyphs_on_surface:SaveDC"); + + status = cairo_win32_font_select_font (&font->base, surface->dc); + if (!CAIRO_OK (status)) + goto FAIL1; + + SetTextColor (surface->dc, color); + SetTextAlign (surface->dc, TA_BASELINE | TA_LEFT); + SetBkMode (surface->dc, TRANSPARENT); + + _start_glyphs (&state, font, surface->dc); + + for (i = 0; i < num_glyphs; i++) { + status = _add_glyph (&state, glyphs[i].index, + glyphs[i].x - x_offset, glyphs[i].y - y_offset); + if (!CAIRO_OK (status)) + goto FAIL2; + } + + FAIL2: + _finish_glyphs (&state); + cairo_win32_font_done_font (&font->base); + FAIL1: + RestoreDC (surface->dc, 1); + + return status; +} + +/* Duplicate the green channel of a 4-channel mask in the alpha channel, then + * invert the whole mask. + */ +static void +_compute_argb32_mask_alpha (cairo_win32_surface_t *mask_surface) +{ + cairo_image_surface_t *image = (cairo_image_surface_t *)mask_surface->image; + int i, j; + + for (i = 0; i < image->height; i++) { + uint32_t *p = (uint32_t *) (image->data + i * image->stride); + for (j = 0; j < image->width; j++) { + *p = 0xffffffff ^ (*p | ((*p & 0x0000ff00) << 16)); + p++; + } + } +} + +/* Invert a mask + */ +static void +_invert_argb32_mask (cairo_win32_surface_t *mask_surface) +{ + cairo_image_surface_t *image = (cairo_image_surface_t *)mask_surface->image; + int i, j; + + for (i = 0; i < image->height; i++) { + uint32_t *p = (uint32_t *) (image->data + i * image->stride); + for (j = 0; j < image->width; j++) { + *p = 0xffffffff ^ *p; + p++; + } + } +} + +/* Compute an alpha-mask from a monochrome RGB24 image + */ +static cairo_surface_t * +_compute_a8_mask (cairo_win32_surface_t *mask_surface) +{ + cairo_image_surface_t *image24 = (cairo_image_surface_t *)mask_surface->image; + cairo_image_surface_t *image8; + int i, j; + + image8 = (cairo_image_surface_t *)cairo_image_surface_create (CAIRO_FORMAT_A8, + image24->width, image24->height); + if (!image8) + return NULL; + + for (i = 0; i < image24->height; i++) { + uint32_t *p = (uint32_t *) (image24->data + i * image24->stride); + unsigned char *q = (unsigned char *) (image8->data + i * image8->stride); + + for (j = 0; j < image24->width; j++) { + *q = 255 - ((*p & 0x0000ff00) >> 8); + p++; + q++; + } + } + + return &image8->base; +} + +static cairo_status_t +_cairo_win32_font_show_glyphs (void *abstract_font, + cairo_operator_t operator, + cairo_pattern_t *pattern, + cairo_surface_t *generic_surface, + int source_x, + int source_y, + int dest_x, + int dest_y, + unsigned int width, + unsigned int height, + const cairo_glyph_t *glyphs, + int num_glyphs) +{ + cairo_win32_font_t *font = abstract_font; + cairo_win32_surface_t *surface = (cairo_win32_surface_t *)generic_surface; + cairo_status_t status; + + if (width == 0 || height == 0) + return CAIRO_STATUS_SUCCESS; + + if (_cairo_surface_is_win32 (generic_surface) && + surface->format == CAIRO_FORMAT_RGB24 && + operator == CAIRO_OPERATOR_OVER && + pattern->type == CAIRO_PATTERN_SOLID && + _cairo_pattern_is_opaque (pattern)) { + + cairo_solid_pattern_t *solid_pattern = (cairo_solid_pattern_t *)pattern; + + /* When compositing OVER on a GDI-understood surface, with a + * solid opaque color, we can just call ExtTextOut directly. + */ + COLORREF new_color; + + new_color = RGB (((int)(0xffff * solid_pattern->red)) >> 8, + ((int)(0xffff * solid_pattern->green)) >> 8, + ((int)(0xffff * solid_pattern->blue)) >> 8); + + status = _draw_glyphs_on_surface (surface, font, new_color, + 0, 0, + glyphs, num_glyphs); + + return status; + } else { + /* Otherwise, we need to draw using software fallbacks. We create a mask + * surface by drawing the the glyphs onto a DIB, black-on-white then + * inverting. GDI outputs gamma-corrected images so inverted black-on-white + * is very different from white-on-black. We favor the more common + * case where the final output is dark-on-light. + */ + cairo_win32_surface_t *tmp_surface; + cairo_surface_t *mask_surface; + cairo_surface_pattern_t mask; + RECT r; + + tmp_surface = (cairo_win32_surface_t *)_cairo_win32_surface_create_dib (CAIRO_FORMAT_ARGB32, width, height); + if (!tmp_surface) + return CAIRO_STATUS_NO_MEMORY; + + r.left = 0; + r.top = 0; + r.right = width; + r.bottom = height; + FillRect (tmp_surface->dc, &r, GetStockObject (WHITE_BRUSH)); + + _draw_glyphs_on_surface (tmp_surface, font, RGB (0, 0, 0), + dest_x, dest_y, + glyphs, num_glyphs); + + if (font->quality == CLEARTYPE_QUALITY) { + /* For ClearType, we need a 4-channel mask. If we are compositing on + * a surface with alpha, we need to compute the alpha channel of + * the mask (we just copy the green channel). But for a destination + * surface without alpha the alpha channel of the mask is ignored + */ + + if (surface->format != CAIRO_FORMAT_RGB24) + _compute_argb32_mask_alpha (tmp_surface); + else + _invert_argb32_mask (tmp_surface); + + mask_surface = &tmp_surface->base; + + /* XXX: Hacky, should expose this in cairo_image_surface */ + pixman_image_set_component_alpha (((cairo_image_surface_t *)tmp_surface->image)->pixman_image, TRUE); + + } else { + mask_surface = _compute_a8_mask (tmp_surface); + cairo_surface_destroy (&tmp_surface->base); + if (!mask_surface) + return CAIRO_STATUS_NO_MEMORY; + } + + /* For operator == OVER, no-cleartype, a possible optimization here is to + * draw onto an intermediate ARGB32 surface and alpha-blend that with the + * destination + */ + _cairo_pattern_init_for_surface (&mask, mask_surface); + + status = _cairo_surface_composite (operator, pattern, + &mask.base, + &surface->base, + source_x, source_y, + 0, 0, + dest_x, dest_y, + width, height); + + _cairo_pattern_fini (&mask.base); + + cairo_surface_destroy (mask_surface); + + return status; + } +} + +static cairo_status_t +_cairo_win32_font_glyph_path (void *abstract_font, + cairo_glyph_t *glyphs, + int num_glyphs, + cairo_path_t *path) +{ + return CAIRO_STATUS_SUCCESS; +} + +static cairo_status_t +_cairo_win32_font_create_glyph (cairo_image_glyph_cache_entry_t *val) +{ + return CAIRO_STATUS_NO_MEMORY; +} + +const cairo_font_backend_t cairo_win32_font_backend = { + _cairo_win32_font_create, + _cairo_win32_font_destroy_font, + _cairo_win32_font_destroy_unscaled_font, + _cairo_win32_font_font_extents, + _cairo_win32_font_text_to_glyphs, + _cairo_win32_font_glyph_extents, + _cairo_win32_font_glyph_bbox, + _cairo_win32_font_show_glyphs, + _cairo_win32_font_glyph_path, + _cairo_win32_font_get_glyph_cache_key, + _cairo_win32_font_create_glyph +}; + +/* implement the platform-specific interface */ + +/** + * cairo_win32_font_create_for_logfontw: + * @logfont: A #LOGFONTW structure specifying the font to use. + * The lfHeight, lfWidth, lfOrientation and lfEscapement + * fields of this structure are ignored; information from + * @scale will be used instead. + * @scale: The scale at which this font will be used. The + * scale is given by multiplying the font matrix (see + * cairo_transform_font()) by the current transformation matrix. + * The translation elements of the resulting matrix are ignored. + * + * Creates a new font for the Win32 font backend based on a + * #LOGFONT. This font can then be used with + * cairo_set_font(), cairo_font_glyph_extents(), or FreeType backend + * specific functions like cairo_win32_font_select_font(). + * + * Return value: a newly created #cairo_font_t. Free with + * cairo_font_destroy() when you are done using it. + **/ +cairo_font_t * +cairo_win32_font_create_for_logfontw (LOGFONTW *logfont, + cairo_matrix_t *scale) +{ + cairo_font_scale_t sc; + + cairo_matrix_get_affine (scale, + &sc.matrix[0][0], &sc.matrix[0][1], + &sc.matrix[1][0], &sc.matrix[1][1], + NULL, NULL); + + return _win32_font_create (logfont, &sc); +} + +/** + * cairo_win32_font_select_font: + * @font: A #cairo_font_t from the Win32 font backend. Such an + * object can be created with cairo_win32_font_create_for_logfontw(). + * @hdc: a device context + * + * Selects the font into the given device context and changes the + * map mode and world transformation of the device context to match + * that of the font. This function is intended for use when using + * layout APIs such as Uniscribe to do text layout with the + * Cairo font. After finishing using the device context, you must call + * cairo_win32_font_done_font() to release any resources allocated + * by this function. + * + * See cairo_win32_font_get_scale_factor() for converting logical + * coordinates from the device context to font space. + * + * Normally, calls to SaveDC() and RestoreDC() would be made around + * the use of this function to preserve the original graphics state. + * + * Return value: %CAIRO_STATUS_SUCCESS if the operation succeeded. + * otherwise an error such as %CAIRO_STATUS_NO_MEMORY and + * the device context is unchanged. + **/ +cairo_status_t +cairo_win32_font_select_font (cairo_font_t *font, + HDC hdc) +{ + cairo_status_t status; + HFONT hfont; + HFONT old_hfont = NULL; + int old_mode; + + hfont = _win32_font_get_scaled_font ((cairo_win32_font_t *)font); + if (!hfont) + return CAIRO_STATUS_NO_MEMORY; + + old_hfont = SelectObject (hdc, hfont); + if (!old_hfont) + return _cairo_win32_print_gdi_error ("cairo_win32_font_select_font"); + + old_mode = SetGraphicsMode (hdc, GM_ADVANCED); + if (!old_mode) { + status = _cairo_win32_print_gdi_error ("cairo_win32_font_select_font"); + SelectObject (hdc, old_hfont); + return status; + } + + status = _win32_font_set_world_transform ((cairo_win32_font_t *)font, hdc); + if (!CAIRO_OK (status)) { + SetGraphicsMode (hdc, old_mode); + SelectObject (hdc, old_hfont); + return status; + } + + SetMapMode (hdc, MM_TEXT); + + return CAIRO_STATUS_SUCCESS; +} + +/** + * cairo_win32_font_done_font: + * @font: A #cairo_font_t from the Win32 font backend. + * + * Releases any resources allocated by cairo_win32_font_select_font() + **/ +void +cairo_win32_font_done_font (cairo_font_t *font) +{ +} + +/** + * cairo_win32_font_get_scale_factor: + * @font: a #cairo_font_t from the Win32 font backend + * + * Gets a scale factor between logical coordinates in the coordinate + * space used by cairo_win32_font_select_font() and font space coordinates. + * + * Return value: factor to multiply logical units by to get font space + * coordinates. + **/ +double +cairo_win32_font_get_scale_factor (cairo_font_t *font) +{ + return 1. / ((cairo_win32_font_t *)font)->logical_scale; +} diff --git a/gfx/cairo/cairo/src/cairo_win32_surface.c b/gfx/cairo/cairo/src/cairo_win32_surface.c new file mode 100644 index 000000000000..dcfe6d04414d --- /dev/null +++ b/gfx/cairo/cairo/src/cairo_win32_surface.c @@ -0,0 +1,931 @@ +/* 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. + * + * Contributor(s): + * Owen Taylor + */ + +#include + +#include "cairo-win32-private.h" + +static const cairo_surface_backend_t cairo_win32_surface_backend; + +/** + * _cairo_win32_print_gdi_error: + * @context: context string to display along with the error + * + * Helper function to dump out a human readable form of the + * current error code. + * + * Return value: A Cairo status code for the error code + **/ +cairo_status_t +_cairo_win32_print_gdi_error (const char *context) +{ + void *lpMsgBuf; + DWORD last_error = GetLastError (); + + if (!FormatMessageA (FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + last_error, + MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR) &lpMsgBuf, + 0, NULL)) { + fprintf (stderr, "%s: Unknown GDI error", context); + } else { + fprintf (stderr, "%s: %s", context, (char *)lpMsgBuf); + + LocalFree (lpMsgBuf); + } + + /* We should switch off of last_status, but we'd either return + * CAIRO_STATUS_NO_MEMORY or CAIRO_STATUS_UNKNOWN_ERROR and there + * is no CAIRO_STATUS_UNKNOWN_ERROR. + */ + + return CAIRO_STATUS_NO_MEMORY; +} + +void +cairo_set_target_win32 (cairo_t *cr, + HDC hdc) +{ + cairo_surface_t *surface; + + if (cr->status && cr->status != CAIRO_STATUS_NO_TARGET_SURFACE) + return; + + surface = cairo_win32_surface_create (hdc); + if (surface == NULL) { + cr->status = CAIRO_STATUS_NO_MEMORY; + return; + } + + cairo_set_target_surface (cr, surface); + + /* cairo_set_target_surface takes a reference, so we must destroy ours */ + cairo_surface_destroy (surface); +} + +static cairo_status_t +_create_dc_and_bitmap (cairo_win32_surface_t *surface, + HDC original_dc, + cairo_format_t format, + int width, + int height, + char **bits_out, + int *rowstride_out) +{ + cairo_status_t status; + + BITMAPINFO *bitmap_info = NULL; + struct { + BITMAPINFOHEADER bmiHeader; + RGBQUAD bmiColors[2]; + } bmi_stack; + void *bits; + + int num_palette = 0; /* Quiet GCC */ + int i; + + surface->dc = NULL; + surface->bitmap = NULL; + + switch (format) { + case CAIRO_FORMAT_ARGB32: + case CAIRO_FORMAT_RGB24: + num_palette = 0; + break; + + case CAIRO_FORMAT_A8: + num_palette = 256; + break; + + case CAIRO_FORMAT_A1: + num_palette = 2; + break; + } + + if (num_palette > 2) { + bitmap_info = malloc (sizeof (BITMAPINFOHEADER) + num_palette * sizeof (RGBQUAD)); + if (!bitmap_info) + return CAIRO_STATUS_NO_MEMORY; + } else { + bitmap_info = (BITMAPINFO *)&bmi_stack; + } + + bitmap_info->bmiHeader.biSize = sizeof (BITMAPINFOHEADER); + bitmap_info->bmiHeader.biWidth = width; + bitmap_info->bmiHeader.biHeight = - height; /* top-down */ + bitmap_info->bmiHeader.biSizeImage = 0; + bitmap_info->bmiHeader.biXPelsPerMeter = 72. / 0.0254; /* unused here */ + bitmap_info->bmiHeader.biYPelsPerMeter = 72. / 0.0254; /* unused here */ + bitmap_info->bmiHeader.biPlanes = 1; + + switch (format) { + case CAIRO_FORMAT_ARGB32: + case CAIRO_FORMAT_RGB24: + bitmap_info->bmiHeader.biBitCount = 32; + bitmap_info->bmiHeader.biCompression = BI_RGB; + bitmap_info->bmiHeader.biClrUsed = 0; /* unused */ + bitmap_info->bmiHeader.biClrImportant = 0; + break; + + case CAIRO_FORMAT_A8: + bitmap_info->bmiHeader.biBitCount = 8; + bitmap_info->bmiHeader.biCompression = BI_RGB; + bitmap_info->bmiHeader.biClrUsed = 256; + bitmap_info->bmiHeader.biClrImportant = 0; + + for (i = 0; i < 256; i++) { + bitmap_info->bmiColors[i].rgbBlue = i; + bitmap_info->bmiColors[i].rgbGreen = i; + bitmap_info->bmiColors[i].rgbRed = i; + bitmap_info->bmiColors[i].rgbReserved = 0; + } + + break; + + case CAIRO_FORMAT_A1: + bitmap_info->bmiHeader.biBitCount = 1; + bitmap_info->bmiHeader.biCompression = BI_RGB; + bitmap_info->bmiHeader.biClrUsed = 2; + bitmap_info->bmiHeader.biClrImportant = 0; + + for (i = 0; i < 2; i++) { + bitmap_info->bmiColors[i].rgbBlue = i * 255; + bitmap_info->bmiColors[i].rgbGreen = i * 255; + bitmap_info->bmiColors[i].rgbRed = i * 255; + bitmap_info->bmiColors[i].rgbReserved = 0; + break; + } + } + + surface->dc = CreateCompatibleDC (original_dc); + if (!surface->dc) + goto FAIL; + + surface->bitmap = CreateDIBSection (surface->dc, + bitmap_info, + DIB_RGB_COLORS, + &bits, + NULL, 0); + if (!surface->bitmap) + goto FAIL; + + surface->saved_dc_bitmap = SelectObject (surface->dc, + surface->bitmap); + if (!surface->saved_dc_bitmap) + goto FAIL; + + if (bitmap_info && num_palette > 2) + free (bitmap_info); + + if (bits_out) + *bits_out = bits; + + if (rowstride_out) { + /* Windows bitmaps are padded to 16-bit (word) boundaries */ + switch (format) { + case CAIRO_FORMAT_ARGB32: + case CAIRO_FORMAT_RGB24: + *rowstride_out = 4 * width; + break; + + case CAIRO_FORMAT_A8: + *rowstride_out = (width + 1) & -2; + break; + + case CAIRO_FORMAT_A1: + *rowstride_out = ((width + 15) & -16) / 8; + break; + } + } + + return CAIRO_STATUS_SUCCESS; + + FAIL: + status = _cairo_win32_print_gdi_error ("_create_dc_and_bitmap"); + + if (bitmap_info && num_palette > 2) + free (bitmap_info); + + if (surface->saved_dc_bitmap) { + SelectObject (surface->dc, surface->saved_dc_bitmap); + surface->saved_dc_bitmap = NULL; + } + + if (surface->bitmap) { + DeleteObject (surface->bitmap); + surface->bitmap = NULL; + } + + if (surface->dc) { + DeleteDC (surface->dc); + surface->dc = NULL; + } + + return status; +} + +static cairo_surface_t * +_cairo_win32_surface_create_for_dc (HDC original_dc, + cairo_format_t format, + int drawable, + int width, + int height) +{ + cairo_win32_surface_t *surface; + char *bits; + int rowstride; + + surface = malloc (sizeof (cairo_win32_surface_t)); + if (!surface) + return NULL; + + if (_create_dc_and_bitmap (surface, original_dc, format, + width, height, + &bits, &rowstride) != CAIRO_STATUS_SUCCESS) + goto FAIL; + + surface->image = cairo_image_surface_create_for_data (bits, format, + width, height, rowstride); + if (!surface->image) + goto FAIL; + + surface->format = format; + + surface->clip_rect.x = 0; + surface->clip_rect.y = 0; + surface->clip_rect.width = width; + surface->clip_rect.height = height; + + surface->set_clip = 0; + surface->saved_clip = NULL; + + _cairo_surface_init (&surface->base, &cairo_win32_surface_backend); + + return (cairo_surface_t *)surface; + + FAIL: + if (surface->bitmap) { + SelectObject (surface->dc, surface->saved_dc_bitmap); + DeleteObject (surface->bitmap); + DeleteDC (surface->dc); + } + if (surface) + free (surface); + + return NULL; + +} + +static cairo_surface_t * +_cairo_win32_surface_create_similar (void *abstract_src, + cairo_format_t format, + int drawable, + int width, + int height) +{ + cairo_win32_surface_t *src = abstract_src; + + return _cairo_win32_surface_create_for_dc (src->dc, format, drawable, + width, height); +} + +/** + * _cairo_win32_surface_create_dib: + * @format: format of pixels in the surface to create + * @width: width of the surface, in pixels + * @height: height of the surface, in pixels + * + * Creates a device-independent-bitmap surface not associated with + * any particular existing surface or device context. The created + * bitmap will be unititialized. + * + * Return value: the newly created surface, or %NULL if it couldn't + * be created (probably because of lack of memory) + **/ +cairo_surface_t * +_cairo_win32_surface_create_dib (cairo_format_t format, + int width, + int height) +{ + return _cairo_win32_surface_create_for_dc (NULL, format, TRUE, + width, height); +} + +static void +_cairo_win32_surface_destroy (void *abstract_surface) +{ + cairo_win32_surface_t *surface = abstract_surface; + + if (surface->image) + cairo_surface_destroy (surface->image); + + if (surface->saved_clip) + DeleteObject (surface->saved_clip); + + /* If we created the Bitmap and DC, destroy them */ + if (surface->bitmap) { + SelectObject (surface->dc, surface->saved_dc_bitmap); + DeleteObject (surface->bitmap); + DeleteDC (surface->dc); + } + + free (surface); +} + +static double +_cairo_win32_surface_pixels_per_inch (void *abstract_surface) +{ + /* XXX: We should really get this value from somewhere */ + return 96.0; +} + +static cairo_status_t +_cairo_win32_surface_get_subimage (cairo_win32_surface_t *surface, + int x, + int y, + int width, + int height, + cairo_win32_surface_t **local_out) +{ + cairo_win32_surface_t *local; + cairo_status_t status; + + local = + (cairo_win32_surface_t *) _cairo_win32_surface_create_similar (surface, + surface->format, + 0, + width, height); + if (!local) + return CAIRO_STATUS_NO_MEMORY; + + if (!BitBlt (local->dc, + 0, 0, + width, height, + surface->dc, + x, y, + SRCCOPY)) + goto FAIL; + + *local_out = local; + + return CAIRO_STATUS_SUCCESS; + + FAIL: + status = _cairo_win32_print_gdi_error ("_cairo_win32_surface_get_subimage"); + + if (local) + cairo_surface_destroy (&local->base); + + return status; +} + +static cairo_status_t +_cairo_win32_surface_acquire_source_image (void *abstract_surface, + cairo_image_surface_t **image_out, + void **image_extra) +{ + cairo_win32_surface_t *surface = abstract_surface; + cairo_win32_surface_t *local = NULL; + cairo_status_t status; + + if (surface->image) { + *image_out = (cairo_image_surface_t *)surface->image; + *image_extra = NULL; + + return CAIRO_STATUS_SUCCESS; + } + + status = _cairo_win32_surface_get_subimage (abstract_surface, 0, 0, + surface->clip_rect.width, + surface->clip_rect.height, &local); + if (CAIRO_OK (status)) { + cairo_surface_set_filter (&local->base, surface->base.filter); + cairo_surface_set_matrix (&local->base, &surface->base.matrix); + cairo_surface_set_repeat (&local->base, surface->base.repeat); + + *image_out = (cairo_image_surface_t *)local->image; + *image_extra = local; + } + + return status; +} + +static void +_cairo_win32_surface_release_source_image (void *abstract_surface, + cairo_image_surface_t *image, + void *image_extra) +{ + cairo_win32_surface_t *local = image_extra; + + if (local) + cairo_surface_destroy ((cairo_surface_t *)local); +} + +static cairo_status_t +_cairo_win32_surface_acquire_dest_image (void *abstract_surface, + cairo_rectangle_t *interest_rect, + cairo_image_surface_t **image_out, + cairo_rectangle_t *image_rect, + void **image_extra) +{ + cairo_win32_surface_t *surface = abstract_surface; + cairo_win32_surface_t *local = NULL; + cairo_status_t status; + RECT clip_box; + int x1, y1, x2, y2; + + if (surface->image) { + image_rect->x = 0; + image_rect->y = 0; + image_rect->width = surface->clip_rect.width; + image_rect->height = surface->clip_rect.height; + + *image_out = (cairo_image_surface_t *)surface->image; + *image_extra = NULL; + + return CAIRO_STATUS_SUCCESS; + } + + if (GetClipBox (surface->dc, &clip_box) == ERROR) + return _cairo_win32_print_gdi_error ("_cairo_win3_surface_acquire_dest_image"); + + x1 = clip_box.left; + x2 = clip_box.right; + y1 = clip_box.top; + y2 = clip_box.bottom; + + if (interest_rect->x > x1) + x1 = interest_rect->x; + if (interest_rect->y > y1) + y1 = interest_rect->y; + if (interest_rect->x + interest_rect->width < x2) + x2 = interest_rect->x + interest_rect->width; + if (interest_rect->y + interest_rect->height < y2) + y2 = interest_rect->y + interest_rect->height; + + if (x1 >= x2 || y1 >= y2) { + *image_out = NULL; + *image_extra = NULL; + + return CAIRO_STATUS_SUCCESS; + } + + status = _cairo_win32_surface_get_subimage (abstract_surface, + x1, y1, x2 - x1, y2 - y1, + &local); + if (CAIRO_OK (status)) { + *image_out = (cairo_image_surface_t *)local->image; + *image_extra = local; + + image_rect->x = x1; + image_rect->y = y1; + image_rect->width = x2 - x1; + image_rect->height = y2 - y1; + } + + return status; +} + +static void +_cairo_win32_surface_release_dest_image (void *abstract_surface, + cairo_rectangle_t *interest_rect, + cairo_image_surface_t *image, + cairo_rectangle_t *image_rect, + void *image_extra) +{ + cairo_win32_surface_t *surface = abstract_surface; + cairo_win32_surface_t *local = image_extra; + + if (!local) + return; + + if (!BitBlt (surface->dc, + image_rect->x, image_rect->y, + image_rect->width, image_rect->height, + local->dc, + 0, 0, + SRCCOPY)) + _cairo_win32_print_gdi_error ("_cairo_win32_surface_release_dest_image"); + + cairo_surface_destroy ((cairo_surface_t *)local); +} + +static cairo_status_t +_cairo_win32_surface_clone_similar (void *surface, + cairo_surface_t *src, + cairo_surface_t **clone_out) +{ + return CAIRO_INT_STATUS_UNSUPPORTED; +} + +static cairo_int_status_t +_cairo_win32_surface_composite (cairo_operator_t operator, + cairo_pattern_t *pattern, + cairo_pattern_t *mask_pattern, + void *abstract_dst, + int src_x, + int src_y, + int mask_x, + int mask_y, + int dst_x, + int dst_y, + unsigned int width, + unsigned int height) +{ + cairo_win32_surface_t *dst = abstract_dst; + cairo_win32_surface_t *src; + cairo_surface_pattern_t *src_surface_pattern; + int alpha; + int integer_transform; + int itx, ity; + + if (pattern->type != CAIRO_PATTERN_SURFACE || + pattern->extend != CAIRO_EXTEND_NONE) + return CAIRO_INT_STATUS_UNSUPPORTED; + + if (mask_pattern) { + /* FIXME: When we fully support RENDER style 4-channel + * masks we need to check r/g/b != 1.0. + */ + if (mask_pattern->type != CAIRO_PATTERN_SOLID) + return CAIRO_INT_STATUS_UNSUPPORTED; + + alpha = (int)(0xffff * pattern->alpha * mask_pattern->alpha) >> 8; + } else { + alpha = (int)(0xffff * pattern->alpha) >> 8; + } + + src_surface_pattern = (cairo_surface_pattern_t *)pattern; + src = (cairo_win32_surface_t *)src_surface_pattern->surface; + + if (src->base.backend != dst->base.backend) + return CAIRO_INT_STATUS_UNSUPPORTED; + + integer_transform = _cairo_matrix_is_integer_translation (&pattern->matrix, &itx, &ity); + if (!integer_transform) + return CAIRO_INT_STATUS_UNSUPPORTED; + + if (alpha == 255 && + src->format == dst->format && + (operator == CAIRO_OPERATOR_SRC || + (src->format == CAIRO_FORMAT_RGB24 && operator == CAIRO_OPERATOR_OVER))) { + + if (!BitBlt (dst->dc, + dst_x, dst_y, + width, height, + src->dc, + src_x + itx, src_y + ity, + SRCCOPY)) + return _cairo_win32_print_gdi_error ("_cairo_win32_surface_composite"); + + return CAIRO_STATUS_SUCCESS; + + } else if (integer_transform && + (src->format == CAIRO_FORMAT_RGB24 || src->format == CAIRO_FORMAT_ARGB32) && + dst->format == CAIRO_FORMAT_RGB24 && + !src->base.repeat && + operator == CAIRO_OPERATOR_OVER) { + + BLENDFUNCTION blend_function; + + blend_function.BlendOp = AC_SRC_OVER; + blend_function.BlendFlags = 0; + blend_function.SourceConstantAlpha = alpha; + blend_function.AlphaFormat = src->format == CAIRO_FORMAT_ARGB32 ? AC_SRC_ALPHA : 0; + + if (!AlphaBlend (dst->dc, + dst_x, dst_y, + width, height, + src->dc, + src_x + itx, src_y + ity, + width, height, + blend_function)) + return _cairo_win32_print_gdi_error ("_cairo_win32_surface_composite"); + + return CAIRO_STATUS_SUCCESS; + } + + return CAIRO_INT_STATUS_UNSUPPORTED; +} + +static cairo_int_status_t +_cairo_win32_surface_fill_rectangles (void *abstract_surface, + cairo_operator_t operator, + const cairo_color_t *color, + cairo_rectangle_t *rects, + int num_rects) +{ + cairo_win32_surface_t *surface = abstract_surface; + cairo_status_t status; + COLORREF new_color; + HBRUSH new_brush; + int i; + + /* If we have a local image, use the fallback code; it will be as fast + * as calling out to GDI. + */ + if (surface->image) + return CAIRO_INT_STATUS_UNSUPPORTED; + + /* We could support possibly support more operators for color->alpha = 0xffff. + * for CAIRO_OPERATOR_SRC, alpha doesn't matter since we know the destination + * image doesn't have alpha. (surface->pixman_image is non-NULL for all + * surfaces with alpha.) + */ + if (operator != CAIRO_OPERATOR_SRC) + return CAIRO_INT_STATUS_UNSUPPORTED; + + new_color = RGB (color->red_short >> 8, color->green_short >> 8, color->blue_short >> 8); + + new_brush = CreateSolidBrush (new_color); + if (!new_brush) + return _cairo_win32_print_gdi_error ("_cairo_win32_surface_fill_rectangles"); + + for (i = 0; i < num_rects; i++) { + RECT rect; + + rect.left = rects[i].x; + rect.top = rects[i].y; + rect.right = rects[i].x + rects[i].width; + rect.bottom = rects[i].y + rects[i].height; + + if (!FillRect (surface->dc, &rect, new_brush)) + goto FAIL; + } + + DeleteObject (new_brush); + + return CAIRO_STATUS_SUCCESS; + + FAIL: + status = _cairo_win32_print_gdi_error ("_cairo_win32_surface_fill_rectangles"); + + DeleteObject (new_brush); + + return status; +} + +static cairo_int_status_t +_cairo_win32_surface_composite_trapezoids (cairo_operator_t operator, + cairo_pattern_t *pattern, + void *abstract_dst, + int src_x, + int src_y, + int dst_x, + int dst_y, + unsigned int width, + unsigned int height, + cairo_trapezoid_t *traps, + int num_traps) + +{ + return CAIRO_INT_STATUS_UNSUPPORTED; +} + +static cairo_int_status_t +_cairo_win32_surface_copy_page (void *abstract_surface) +{ + return CAIRO_INT_STATUS_UNSUPPORTED; +} + +static cairo_int_status_t +_cairo_win32_surface_show_page (void *abstract_surface) +{ + return CAIRO_INT_STATUS_UNSUPPORTED; +} + +static cairo_int_status_t +_cairo_win32_surface_set_clip_region (void *abstract_surface, + pixman_region16_t *region) +{ + cairo_win32_surface_t *surface = abstract_surface; + cairo_status_t status; + + /* If we are in-memory, then we set the clip on the image surface + * as well as on the underlying GDI surface. + */ + if (surface->image) + _cairo_surface_set_clip_region (surface->image, region); + + /* The semantics we want is that any clip set by Cairo combines + * is intersected with the clip on device context that the + * surface was created for. To implement this, we need to + * save the original clip when first setting a clip on surface. + */ + + if (region == NULL) { + /* Clear any clip set by Cairo, return to the original */ + + if (surface->set_clip) { + if (SelectClipRgn (surface->dc, surface->saved_clip) == ERROR) + return _cairo_win32_print_gdi_error ("_cairo_win32_surface_set_clip_region"); + + if (surface->saved_clip) { + DeleteObject (surface->saved_clip); + surface->saved_clip = NULL; + } + + surface->set_clip = 0; + } + + + return CAIRO_STATUS_SUCCESS; + + } else { + pixman_box16_t *boxes = pixman_region_rects (region); + int num_boxes = pixman_region_num_rects (region); + pixman_box16_t *extents = pixman_region_extents (region); + RGNDATA *data; + size_t data_size; + RECT *rects; + int i; + HRGN gdi_region; + + /* Create a GDI region for the cairo region */ + + data_size = sizeof (RGNDATAHEADER) + num_boxes * sizeof (RECT); + data = malloc (data_size); + if (!data) + return CAIRO_STATUS_NO_MEMORY; + rects = (RECT *)data->Buffer; + + data->rdh.dwSize = sizeof (RGNDATAHEADER); + data->rdh.iType = RDH_RECTANGLES; + data->rdh.nCount = num_boxes; + data->rdh.nRgnSize = num_boxes * sizeof (RECT); + data->rdh.rcBound.left = extents->x1; + data->rdh.rcBound.top = extents->y1; + data->rdh.rcBound.right = extents->x2; + data->rdh.rcBound.bottom = extents->y2; + + for (i = 0; i < num_boxes; i++) { + rects[i].left = boxes[i].x1; + rects[i].top = boxes[i].y1; + rects[i].right = boxes[i].x2; + rects[i].bottom = boxes[i].y2; + } + + gdi_region = ExtCreateRegion (NULL, data_size, data); + free (data); + + if (!gdi_region) + return CAIRO_STATUS_NO_MEMORY; + + if (surface->set_clip) { + /* Combine the new region with the original clip */ + + if (surface->saved_clip) { + if (CombineRgn (gdi_region, gdi_region, surface->saved_clip, RGN_AND) == ERROR) + goto FAIL; + } + + if (SelectClipRgn (surface->dc, gdi_region) == ERROR) + goto FAIL; + + } else { + /* Save the the current region */ + + surface->saved_clip = CreateRectRgn (0, 0, 0, 0); + if (!surface->saved_clip) { + goto FAIL; } + + /* This function has no error return! */ + if (GetClipRgn (surface->dc, surface->saved_clip) == 0) { /* No clip */ + DeleteObject (surface->saved_clip); + surface->saved_clip = NULL; + } + + if (ExtSelectClipRgn (surface->dc, gdi_region, RGN_AND) == ERROR) + goto FAIL; + + surface->set_clip = 1; + } + + DeleteObject (gdi_region); + return CAIRO_STATUS_SUCCESS; + + FAIL: + status = _cairo_win32_print_gdi_error ("_cairo_win32_surface_set_clip_region"); + DeleteObject (gdi_region); + return status; + } +} + +static cairo_status_t +_cairo_win32_surface_show_glyphs (cairo_font_t *font, + cairo_operator_t operator, + cairo_pattern_t *pattern, + void *abstract_surface, + int source_x, + int source_y, + int dest_x, + int dest_y, + unsigned int width, + unsigned int height, + const cairo_glyph_t *glyphs, + int num_glyphs) +{ + return CAIRO_INT_STATUS_UNSUPPORTED; +} + +cairo_surface_t * +cairo_win32_surface_create (HDC hdc) +{ + cairo_win32_surface_t *surface; + RECT rect; + + /* Try to figure out the drawing bounds for the Device context + */ + if (GetClipBox (hdc, &rect) == ERROR) { + _cairo_win32_print_gdi_error ("cairo_win32_surface_create"); + return NULL; + } + + surface = malloc (sizeof (cairo_win32_surface_t)); + if (!surface) + return NULL; + + surface->image = NULL; + surface->format = CAIRO_FORMAT_RGB24; + + surface->dc = hdc; + surface->bitmap = NULL; + + surface->clip_rect.x = rect.left; + surface->clip_rect.y = rect.top; + surface->clip_rect.width = rect.right - rect.left; + surface->clip_rect.height = rect.bottom - rect.top; + + surface->set_clip = 0; + surface->saved_clip = NULL; + + _cairo_surface_init (&surface->base, &cairo_win32_surface_backend); + + return (cairo_surface_t *)surface; +} + +/** + * _cairo_surface_is_win32: + * @surface: a #cairo_surface_t + * + * Checks if a surface is an #cairo_win32_surface_t + * + * Return value: True if the surface is an win32 surface + **/ +int +_cairo_surface_is_win32 (cairo_surface_t *surface) +{ + return surface->backend == &cairo_win32_surface_backend; +} + +static const cairo_surface_backend_t cairo_win32_surface_backend = { + _cairo_win32_surface_create_similar, + _cairo_win32_surface_destroy, + _cairo_win32_surface_pixels_per_inch, + _cairo_win32_surface_acquire_source_image, + _cairo_win32_surface_release_source_image, + _cairo_win32_surface_acquire_dest_image, + _cairo_win32_surface_release_dest_image, + _cairo_win32_surface_clone_similar, + _cairo_win32_surface_composite, + _cairo_win32_surface_fill_rectangles, + _cairo_win32_surface_composite_trapezoids, + _cairo_win32_surface_copy_page, + _cairo_win32_surface_show_page, + _cairo_win32_surface_set_clip_region, + _cairo_win32_surface_show_glyphs +}; diff --git a/gfx/cairo/cairo/src/cairo_xcb_surface.c b/gfx/cairo/cairo/src/cairo_xcb_surface.c index 758cf26de002..0694b77a2f3c 100644 --- a/gfx/cairo/cairo/src/cairo_xcb_surface.c +++ b/gfx/cairo/cairo/src/cairo_xcb_surface.c @@ -31,10 +31,11 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ #include "cairoint.h" +#include "cairo-xcb.h" cairo_surface_t * cairo_xcb_surface_create (XCBConnection *dpy, @@ -327,14 +328,17 @@ bytes_per_line(XCBConnection *c, int width, int bpp) return ((bpp * width + bitmap_pad - 1) & -bitmap_pad) >> 3; } -static cairo_image_surface_t * -_cairo_xcb_surface_get_image (void *abstract_surface) +static cairo_status_t +_get_image_surface (cairo_xcb_surface_t *surface, + cairo_rectangle_t *interest_rect, + cairo_image_surface_t **image_out, + cairo_rectangle_t *image_rect) { - cairo_xcb_surface_t *surface = abstract_surface; cairo_image_surface_t *image; XCBGetGeometryRep *geomrep; XCBGetImageRep *imagerep; int bpp; + int x1, y1, x2, y2; geomrep = XCBGetGeometryReply(surface->dpy, XCBGetGeometry(surface->dpy, surface->drawable), 0); if(!geomrep) @@ -344,11 +348,39 @@ _cairo_xcb_surface_get_image (void *abstract_surface) surface->height = geomrep->height; free(geomrep); + x1 = 0; + y1 = 0; + x2 = surface->width; + y2 = surface->height; + + if (interest_rect) { + if (interest_rect->x > x1) + x1 = interest_rect->x; + if (interest_rect->y > y1) + y1 = interest_rect->y; + if (interest_rect->x + interest_rect->width < x2) + x2 = interest_rect->x + interest_rect->width; + if (interest_rect->y + interest_rect->height < y2) + y2 = interest_rect->y + interest_rect->height; + + if (x1 >= x2 || y1 >= y2) { + *image_out = NULL; + return CAIRO_STATUS_SUCCESS; + } + } + + if (image_rect) { + image_rect->x = x1; + image_rect->y = y1; + image_rect->width = x2 - x1; + image_rect->height = y2 - y1; + } + imagerep = XCBGetImageReply(surface->dpy, XCBGetImage(surface->dpy, ZPixmap, surface->drawable, - 0, 0, - surface->width, surface->height, + x1, y1, + x2 - x1, y2 - y1, AllPlanes), 0); if(!imagerep) return 0; @@ -368,15 +400,15 @@ _cairo_xcb_surface_get_image (void *abstract_surface) image = _cairo_image_surface_create_with_masks (XCBGetImageData(imagerep), &masks, - surface->width, - surface->height, + x2 - x1, + y2 - y1, bytes_per_line(surface->dpy, surface->width, bpp)); } else { image = (cairo_image_surface_t *) cairo_image_surface_create_for_data (XCBGetImageData(imagerep), surface->format, - surface->width, - surface->height, + x2 - x1, + y2 - y1, bytes_per_line(surface->dpy, surface->width, bpp)); } @@ -388,7 +420,8 @@ _cairo_xcb_surface_get_image (void *abstract_surface) _cairo_image_surface_set_repeat (image, surface->base.repeat); _cairo_image_surface_set_matrix (image, &(surface->base.matrix)); - return image; + *image_out = image; + return CAIRO_STATUS_SUCCESS; } static void @@ -402,10 +435,11 @@ _cairo_xcb_surface_ensure_gc (cairo_xcb_surface_t *surface) } static cairo_status_t -_cairo_xcb_surface_set_image (void *abstract_surface, - cairo_image_surface_t *image) +_draw_image_surface (cairo_xcb_surface_t *surface, + cairo_image_surface_t *image, + int dst_x, + int dst_y) { - cairo_xcb_surface_t *surface = abstract_surface; int bpp, data_len; _cairo_xcb_surface_ensure_gc (surface); @@ -414,7 +448,7 @@ _cairo_xcb_surface_set_image (void *abstract_surface, XCBPutImage(surface->dpy, ZPixmap, surface->drawable, surface->gc, image->width, image->height, - /* dst_x */ 0, /* dst_y */ 0, + dst_x, dst_y, /* left_pad */ 0, image->depth, data_len, image->data); @@ -422,9 +456,107 @@ _cairo_xcb_surface_set_image (void *abstract_surface, } static cairo_status_t -_cairo_xcb_surface_set_matrix (void *abstract_surface, cairo_matrix_t *matrix) +_cairo_xcb_surface_acquire_source_image (void *abstract_surface, + cairo_image_surface_t **image_out, + void **image_extra) { cairo_xcb_surface_t *surface = abstract_surface; + cairo_image_surface_t *image; + cairo_status_t status; + + status = _get_image_surface (surface, NULL, &image, NULL); + if (status == CAIRO_STATUS_SUCCESS) { + cairo_surface_set_filter (&image->base, surface->base.filter); + cairo_surface_set_matrix (&image->base, &surface->base.matrix); + cairo_surface_set_repeat (&image->base, surface->base.repeat); + + *image_out = image; + } + + return status; +} + +static void +_cairo_xcb_surface_release_source_image (void *abstract_surface, + cairo_image_surface_t *image, + void *image_extra) +{ + cairo_surface_destroy (&image->base); +} + +static cairo_status_t +_cairo_xcb_surface_acquire_dest_image (void *abstract_surface, + cairo_rectangle_t *interest_rect, + cairo_image_surface_t **image_out, + cairo_rectangle_t *image_rect_out, + void **image_extra) +{ + cairo_xcb_surface_t *surface = abstract_surface; + cairo_image_surface_t *image; + cairo_status_t status; + + status = _get_image_surface (surface, interest_rect, &image, image_rect_out); + if (status == CAIRO_STATUS_SUCCESS) + *image_out = image; + + return status; +} + +static void +_cairo_xcb_surface_release_dest_image (void *abstract_surface, + cairo_rectangle_t *interest_rect, + cairo_image_surface_t *image, + cairo_rectangle_t *image_rect, + void *image_extra) +{ + cairo_xcb_surface_t *surface = abstract_surface; + + /* ignore errors */ + _draw_image_surface (surface, image, image_rect->x, image_rect->y); + + cairo_surface_destroy (&image->base); +} + +static cairo_status_t +_cairo_xcb_surface_clone_similar (void *abstract_surface, + cairo_surface_t *src, + cairo_surface_t **clone_out) +{ + cairo_xcb_surface_t *surface = abstract_surface; + cairo_xcb_surface_t *clone; + + if (src->backend == surface->base.backend ) { + cairo_xcb_surface_t *xcb_src = (cairo_xcb_surface_t *)src; + + if (xcb_src->dpy == surface->dpy) { + *clone_out = src; + cairo_surface_reference (src); + + return CAIRO_STATUS_SUCCESS; + } + } else if (_cairo_surface_is_image (src)) { + cairo_image_surface_t *image_src = (cairo_image_surface_t *)src; + + clone = (cairo_xcb_surface_t *) + _cairo_xcb_surface_create_similar (surface, image_src->format, 0, + image_src->width, image_src->height); + if (clone == NULL) + return CAIRO_STATUS_NO_MEMORY; + + _draw_image_surface (clone, image_src, 0, 0); + + *clone_out = &clone->base; + + return CAIRO_STATUS_SUCCESS; + } + + return CAIRO_INT_STATUS_UNSUPPORTED; +} + +static cairo_status_t +_cairo_xcb_surface_set_matrix (cairo_xcb_surface_t *surface, + cairo_matrix_t *matrix) +{ XCBRenderTRANSFORM xtransform; if (!surface->picture.xid) @@ -442,27 +574,42 @@ _cairo_xcb_surface_set_matrix (void *abstract_surface, cairo_matrix_t *matrix) xtransform.matrix32 = 0; xtransform.matrix33 = _cairo_fixed_from_double (1); - if (CAIRO_SURFACE_RENDER_HAS_PICTURE_TRANSFORM (surface)) + if (!CAIRO_SURFACE_RENDER_HAS_PICTURE_TRANSFORM (surface)) { - XCBRenderSetPictureTransform (surface->dpy, surface->picture, xtransform); - } else { - /* XXX: Need support here if using an old RENDER without support - for SetPictureTransform */ + static const XCBRenderTRANSFORM identity = { + 1 << 16, 0x00000, 0x00000, + 0x00000, 1 << 16, 0x00000, + 0x00000, 0x00000, 1 << 16 + }; + + if (memcmp (&xtransform, &identity, sizeof (XCBRenderTRANSFORM)) == 0) + return CAIRO_STATUS_SUCCESS; + + return CAIRO_INT_STATUS_UNSUPPORTED; } + + XCBRenderSetPictureTransform (surface->dpy, surface->picture, xtransform); return CAIRO_STATUS_SUCCESS; } static cairo_status_t -_cairo_xcb_surface_set_filter (void *abstract_surface, cairo_filter_t filter) +_cairo_xcb_surface_set_filter (cairo_xcb_surface_t *surface, + cairo_filter_t filter) { - cairo_xcb_surface_t *surface = abstract_surface; char *render_filter; - if (!(surface->picture.xid - && CAIRO_SURFACE_RENDER_HAS_FILTERS(surface))) + if (!surface->picture.xid) return CAIRO_STATUS_SUCCESS; - + + if (!CAIRO_SURFACE_RENDER_HAS_FILTERS (surface)) + { + if (filter == CAIRO_FILTER_FAST || filter == CAIRO_FILTER_NEAREST) + return CAIRO_STATUS_SUCCESS; + + return CAIRO_INT_STATUS_UNSUPPORTED; + } + switch (filter) { case CAIRO_FILTER_FAST: render_filter = "fast"; @@ -491,10 +638,8 @@ _cairo_xcb_surface_set_filter (void *abstract_surface, cairo_filter_t filter) } static cairo_status_t -_cairo_xcb_surface_set_repeat (void *abstract_surface, int repeat) +_cairo_xcb_surface_set_repeat (cairo_xcb_surface_t *surface, int repeat) { - cairo_xcb_surface_t *surface = abstract_surface; - CARD32 mask = XCBRenderCPRepeat; CARD32 pa[] = { repeat }; @@ -506,33 +651,32 @@ _cairo_xcb_surface_set_repeat (void *abstract_surface, int repeat) return CAIRO_STATUS_SUCCESS; } -static cairo_xcb_surface_t * -_cairo_xcb_surface_clone_similar (cairo_surface_t *src, - cairo_xcb_surface_t *template, - cairo_format_t format, - int depth) +static cairo_int_status_t +_cairo_xcb_surface_set_attributes (cairo_xcb_surface_t *surface, + cairo_surface_attributes_t *attributes) { - cairo_xcb_surface_t *clone; - cairo_image_surface_t *src_image; + cairo_int_status_t status; - src_image = _cairo_surface_get_image (src); + status = _cairo_xcb_surface_set_matrix (surface, &attributes->matrix); + if (status) + return status; + + switch (attributes->extend) { + case CAIRO_EXTEND_NONE: + _cairo_xcb_surface_set_repeat (surface, 0); + break; + case CAIRO_EXTEND_REPEAT: + _cairo_xcb_surface_set_repeat (surface, 1); + break; + case CAIRO_EXTEND_REFLECT: + return CAIRO_INT_STATUS_UNSUPPORTED; + } - clone = (cairo_xcb_surface_t *) - _cairo_xcb_surface_create_similar (template, format, 0, - src_image->width, - src_image->height); - if (clone == NULL) - return NULL; + status = _cairo_xcb_surface_set_filter (surface, attributes->filter); + if (status) + return status; - _cairo_xcb_surface_set_filter (clone, cairo_surface_get_filter(src)); - - _cairo_xcb_surface_set_image (clone, src_image); - - _cairo_xcb_surface_set_matrix (clone, &(src_image->base.matrix)); - - cairo_surface_destroy (&src_image->base); - - return clone; + return CAIRO_STATUS_SUCCESS; } static int @@ -574,65 +718,80 @@ _render_operator (cairo_operator_t operator) static cairo_int_status_t _cairo_xcb_surface_composite (cairo_operator_t operator, - cairo_surface_t *generic_src, - cairo_surface_t *generic_mask, - void *abstract_dst, - int src_x, - int src_y, - int mask_x, - int mask_y, - int dst_x, - int dst_y, - unsigned int width, - unsigned int height) + cairo_pattern_t *src_pattern, + cairo_pattern_t *mask_pattern, + void *abstract_dst, + int src_x, + int src_y, + int mask_x, + int mask_y, + int dst_x, + int dst_y, + unsigned int width, + unsigned int height) { - cairo_xcb_surface_t *dst = abstract_dst; - cairo_xcb_surface_t *src = (cairo_xcb_surface_t *) generic_src; - cairo_xcb_surface_t *mask = (cairo_xcb_surface_t *) generic_mask; - cairo_xcb_surface_t *src_clone = NULL; - cairo_xcb_surface_t *mask_clone = NULL; - XCBRenderPICTURE maskpict = { 0 }; - + cairo_surface_attributes_t src_attr, mask_attr; + cairo_xcb_surface_t *dst = abstract_dst; + cairo_xcb_surface_t *src; + cairo_xcb_surface_t *mask; + cairo_int_status_t status; if (!CAIRO_SURFACE_RENDER_HAS_COMPOSITE (dst)) return CAIRO_INT_STATUS_UNSUPPORTED; - if (generic_src->backend != dst->base.backend || src->dpy != dst->dpy) { - src_clone = _cairo_xcb_surface_clone_similar (generic_src, dst, - CAIRO_FORMAT_ARGB32, 32); - if (!src_clone) - return CAIRO_INT_STATUS_UNSUPPORTED; - src = src_clone; - } - if (generic_mask && (generic_mask->backend != dst->base.backend || mask->dpy != dst->dpy)) { - mask_clone = _cairo_xcb_surface_clone_similar (generic_mask, dst, - CAIRO_FORMAT_A8, 8); - if (!mask_clone) - return CAIRO_INT_STATUS_UNSUPPORTED; - mask = mask_clone; + status = _cairo_pattern_acquire_surfaces (src_pattern, mask_pattern, + &dst->base, + src_x, src_y, + mask_x, mask_y, + width, height, + (cairo_surface_t **) &src, + (cairo_surface_t **) &mask, + &src_attr, &mask_attr); + if (status) + return status; + + status = _cairo_xcb_surface_set_attributes (src, &src_attr); + if (CAIRO_OK (status)) + { + if (mask) + { + status = _cairo_xcb_surface_set_attributes (mask, &mask_attr); + if (CAIRO_OK (status)) + XCBRenderComposite (dst->dpy, + _render_operator (operator), + src->picture, + mask->picture, + dst->picture, + src_x + src_attr.x_offset, + src_y + src_attr.y_offset, + mask_x + mask_attr.x_offset, + mask_y + mask_attr.y_offset, + dst_x, dst_y, + width, height); + } + else + { + static XCBRenderPICTURE maskpict = { 0 }; + + XCBRenderComposite (dst->dpy, + _render_operator (operator), + src->picture, + maskpict, + dst->picture, + src_x + src_attr.x_offset, + src_y + src_attr.y_offset, + 0, 0, + dst_x, dst_y, + width, height); + } } - if(mask) - maskpict = mask->picture; + if (mask) + _cairo_pattern_release_surface (&dst->base, &mask->base, &mask_attr); + + _cairo_pattern_release_surface (&dst->base, &src->base, &src_attr); - XCBRenderComposite (dst->dpy, - _render_operator (operator), - src->picture, - maskpict, - dst->picture, - src_x, src_y, - mask_x, mask_y, - dst_x, dst_y, - width, height); - - /* XXX: This is messed up. If I can xcb_surface_create, then I - should be able to xcb_surface_destroy. */ - if (src_clone) - cairo_surface_destroy (&src_clone->base); - if (mask_clone) - cairo_surface_destroy (&mask_clone->base); - - return CAIRO_STATUS_SUCCESS; + return status; } static cairo_int_status_t @@ -664,42 +823,60 @@ _cairo_xcb_surface_fill_rectangles (void *abstract_surface, static cairo_int_status_t _cairo_xcb_surface_composite_trapezoids (cairo_operator_t operator, - cairo_surface_t *generic_src, - void *abstract_dst, - int xSrc, - int ySrc, - cairo_trapezoid_t *traps, - int num_traps) + cairo_pattern_t *pattern, + void *abstract_dst, + int src_x, + int src_y, + int dst_x, + int dst_y, + unsigned int width, + unsigned int height, + cairo_trapezoid_t *traps, + int num_traps) { - cairo_xcb_surface_t *dst = abstract_dst; - cairo_xcb_surface_t *src = (cairo_xcb_surface_t *) generic_src; - cairo_xcb_surface_t *src_clone = NULL; + cairo_surface_attributes_t attributes; + cairo_xcb_surface_t *dst = abstract_dst; + cairo_xcb_surface_t *src; + cairo_int_status_t status; + int render_reference_x, render_reference_y; + int render_src_x, render_src_y; if (!CAIRO_SURFACE_RENDER_HAS_TRAPEZOIDS (dst)) return CAIRO_INT_STATUS_UNSUPPORTED; - - if (generic_src->backend != dst->base.backend || src->dpy != dst->dpy) { - src_clone = _cairo_xcb_surface_clone_similar (generic_src, dst, - CAIRO_FORMAT_ARGB32, 32); - if (!src_clone) - return CAIRO_INT_STATUS_UNSUPPORTED; - src = src_clone; + + status = _cairo_pattern_acquire_surface (pattern, &dst->base, + src_x, src_y, width, height, + (cairo_surface_t **) &src, + &attributes); + if (status) + return status; + + if (traps[0].left.p1.y < traps[0].left.p2.y) { + render_reference_x = _cairo_fixed_integer_floor (traps[0].left.p1.x); + render_reference_y = _cairo_fixed_integer_floor (traps[0].left.p1.y); + } else { + render_reference_x = _cairo_fixed_integer_floor (traps[0].left.p2.x); + render_reference_y = _cairo_fixed_integer_floor (traps[0].left.p2.y); } - /* XXX: The XCBRenderTRAP cast is evil and needs to go away somehow. */ + render_src_x = src_x + render_reference_x - dst_x; + render_src_y = src_y + render_reference_y - dst_y; + + /* XXX: The XTrapezoid cast is evil and needs to go away somehow. */ /* XXX: format_from_cairo is slow. should cache something. */ - XCBRenderTrapezoids (dst->dpy, - _render_operator (operator), - src->picture, dst->picture, - format_from_cairo (dst->dpy, CAIRO_FORMAT_A8), - xSrc, ySrc, num_traps, (XCBRenderTRAP *) traps); + status = _cairo_xcb_surface_set_attributes (src, &attributes); + if (CAIRO_OK (status)) + XCBRenderTrapezoids (dst->dpy, + _render_operator (operator), + src->picture, dst->picture, + format_from_cairo (dst->dpy, CAIRO_FORMAT_A8), + render_src_x + attributes.x_offset, + render_src_y + attributes.y_offset, + num_traps, (XCBRenderTRAP *) traps); - /* XXX: This is messed up. If I can xcb_surface_create, then I - should be able to xcb_surface_destroy. */ - if (src_clone) - cairo_surface_destroy (&src_clone->base); + _cairo_pattern_release_surface (&dst->base, &src->base, &attributes); - return CAIRO_STATUS_SUCCESS; + return status; } static cairo_int_status_t @@ -722,30 +899,21 @@ _cairo_xcb_surface_set_clip_region (void *abstract_surface, return CAIRO_INT_STATUS_UNSUPPORTED; } -static cairo_int_status_t -_cairo_xcb_surface_create_pattern (void *abstract_surface, - cairo_pattern_t *pattern, - cairo_box_t *extents) -{ - return CAIRO_INT_STATUS_UNSUPPORTED; -} - static const cairo_surface_backend_t cairo_xcb_surface_backend = { _cairo_xcb_surface_create_similar, _cairo_xcb_surface_destroy, _cairo_xcb_surface_pixels_per_inch, - _cairo_xcb_surface_get_image, - _cairo_xcb_surface_set_image, - _cairo_xcb_surface_set_matrix, - _cairo_xcb_surface_set_filter, - _cairo_xcb_surface_set_repeat, + _cairo_xcb_surface_acquire_source_image, + _cairo_xcb_surface_release_source_image, + _cairo_xcb_surface_acquire_dest_image, + _cairo_xcb_surface_release_dest_image, + _cairo_xcb_surface_clone_similar, _cairo_xcb_surface_composite, _cairo_xcb_surface_fill_rectangles, _cairo_xcb_surface_composite_trapezoids, _cairo_xcb_surface_copy_page, _cairo_xcb_surface_show_page, _cairo_xcb_surface_set_clip_region, - _cairo_xcb_surface_create_pattern, NULL /* show_glyphs */ }; diff --git a/gfx/cairo/cairo/src/cairo_xlib_surface.c b/gfx/cairo/cairo/src/cairo_xlib_surface.c index d9d74f583e9a..3eaef57e54b5 100644 --- a/gfx/cairo/cairo/src/cairo_xlib_surface.c +++ b/gfx/cairo/cairo/src/cairo_xlib_surface.c @@ -31,12 +31,28 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ #include "cairoint.h" #include "cairo-xlib.h" +/** + * cairo_set_target_drawable: + * @cr: a #cairo_t + * @dpy: an X display + * @drawable: a window or pixmap on the default screen of @dpy + * + * Directs output for a #cairo_t to an Xlib drawable. @drawable must + * be a Window or Pixmap on the default screen of @dpy using the + * default colormap and visual. Using this function is slow because + * the function must retrieve information about @drawable from the X + * server. + + * The combination of cairo_xlib_surface_create() and + * cairo_set_target_surface() is somewhat more flexible, although + * it still is slow. + **/ void cairo_set_target_drawable (cairo_t *cr, Display *dpy, @@ -87,6 +103,8 @@ typedef struct _cairo_xlib_surface { #define CAIRO_SURFACE_RENDER_HAS_CREATE_PICTURE(surface) CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 0) #define CAIRO_SURFACE_RENDER_HAS_COMPOSITE(surface) CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 0) +#define CAIRO_SURFACE_RENDER_HAS_COMPOSITE_TEXT(surface) CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 0) + #define CAIRO_SURFACE_RENDER_HAS_FILL_RECTANGLE(surface) CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 1) #define CAIRO_SURFACE_RENDER_HAS_FILL_RECTANGLES(surface) CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 1) @@ -141,18 +159,13 @@ _cairo_xlib_surface_create_similar (void *abstract_src, Pixmap pix; cairo_xlib_surface_t *surface; - /* XXX: There's a pretty lame heuristic here. This assumes that - * all non-Render X servers do not support depth-32 pixmaps, (and - * that they do support depths 1, 8, and 24). Obviously, it would - * be much better to check the depths that are actually - * supported. */ - if (!dpy - || (!CAIRO_SURFACE_RENDER_HAS_COMPOSITE (src) - && format == CAIRO_FORMAT_ARGB32)) - { - return NULL; + /* As a good first approximation, if the display doesn't have COMPOSITE, + * we're better off using image surfaces for all temporary operations + */ + if (!CAIRO_SURFACE_RENDER_HAS_COMPOSITE(src)) { + return cairo_image_surface_create (format, width, height); } - + scr = DefaultScreen (dpy); pix = XCreatePixmap (dpy, DefaultRootWindow (dpy), @@ -196,15 +209,17 @@ _cairo_xlib_surface_pixels_per_inch (void *abstract_surface) return 96.0; } -static cairo_image_surface_t * -_cairo_xlib_surface_get_image (void *abstract_surface) +static cairo_status_t +_get_image_surface (cairo_xlib_surface_t *surface, + cairo_rectangle_t *interest_rect, + cairo_image_surface_t **image_out, + cairo_rectangle_t *image_rect) { - cairo_xlib_surface_t *surface = abstract_surface; cairo_image_surface_t *image; - XImage *ximage; Window root_ignore; int x_ignore, y_ignore, bwidth_ignore, depth_ignore; + int x1, y1, x2, y2; XGetGeometry (surface->dpy, surface->drawable, @@ -212,11 +227,39 @@ _cairo_xlib_surface_get_image (void *abstract_surface) &surface->width, &surface->height, &bwidth_ignore, &depth_ignore); + x1 = 0; + y1 = 0; + x2 = surface->width; + y2 = surface->height; + + if (interest_rect) { + if (interest_rect->x > x1) + x1 = interest_rect->x; + if (interest_rect->y > y1) + y1 = interest_rect->y; + if (interest_rect->x + interest_rect->width < x2) + x2 = interest_rect->x + interest_rect->width; + if (interest_rect->y + interest_rect->height < y2) + y2 = interest_rect->y + interest_rect->height; + + if (x1 >= x2 || y1 >= y2) { + *image_out = NULL; + return CAIRO_STATUS_SUCCESS; + } + } + + if (image_rect) { + image_rect->x = x1; + image_rect->y = y1; + image_rect->width = x2 - x1; + image_rect->height = y2 - y1; + } + /* XXX: This should try to use the XShm extension if availible */ ximage = XGetImage (surface->dpy, surface->drawable, - 0, 0, - surface->width, surface->height, + x1, y1, + x2 - x1, y2 - y1, AllPlanes, ZPixmap); if (surface->visual) { @@ -253,7 +296,8 @@ _cairo_xlib_surface_get_image (void *abstract_surface) _cairo_image_surface_set_repeat (image, surface->base.repeat); _cairo_image_surface_set_matrix (image, &(surface->base.matrix)); - return image; + *image_out = image; + return CAIRO_STATUS_SUCCESS; } static void @@ -266,10 +310,11 @@ _cairo_xlib_surface_ensure_gc (cairo_xlib_surface_t *surface) } static cairo_status_t -_cairo_xlib_surface_set_image (void *abstract_surface, - cairo_image_surface_t *image) +_draw_image_surface (cairo_xlib_surface_t *surface, + cairo_image_surface_t *image, + int dst_x, + int dst_y) { - cairo_xlib_surface_t *surface = abstract_surface; XImage *ximage; unsigned bitmap_pad; @@ -295,9 +340,8 @@ _cairo_xlib_surface_set_image (void *abstract_surface, _cairo_xlib_surface_ensure_gc (surface); XPutImage(surface->dpy, surface->drawable, surface->gc, - ximage, 0, 0, 0, 0, - surface->width, - surface->height); + ximage, 0, 0, dst_x, dst_y, + image->width, image->height); /* Foolish XDestroyImage thinks it can free my data, but I won't stand for it. */ @@ -305,17 +349,116 @@ _cairo_xlib_surface_set_image (void *abstract_surface, XDestroyImage (ximage); return CAIRO_STATUS_SUCCESS; + } static cairo_status_t -_cairo_xlib_surface_set_matrix (void *abstract_surface, cairo_matrix_t *matrix) +_cairo_xlib_surface_acquire_source_image (void *abstract_surface, + cairo_image_surface_t **image_out, + void **image_extra) { cairo_xlib_surface_t *surface = abstract_surface; + cairo_image_surface_t *image; + cairo_status_t status; + + status = _get_image_surface (surface, NULL, &image, NULL); + if (status == CAIRO_STATUS_SUCCESS) { + cairo_surface_set_filter (&image->base, surface->base.filter); + cairo_surface_set_matrix (&image->base, &surface->base.matrix); + cairo_surface_set_repeat (&image->base, surface->base.repeat); + + *image_out = image; + } + + return status; +} + +static void +_cairo_xlib_surface_release_source_image (void *abstract_surface, + cairo_image_surface_t *image, + void *image_extra) +{ + cairo_surface_destroy (&image->base); +} + +static cairo_status_t +_cairo_xlib_surface_acquire_dest_image (void *abstract_surface, + cairo_rectangle_t *interest_rect, + cairo_image_surface_t **image_out, + cairo_rectangle_t *image_rect_out, + void **image_extra) +{ + cairo_xlib_surface_t *surface = abstract_surface; + cairo_image_surface_t *image; + cairo_status_t status; + + status = _get_image_surface (surface, interest_rect, &image, image_rect_out); + if (status == CAIRO_STATUS_SUCCESS) + *image_out = image; + + return status; +} + +static void +_cairo_xlib_surface_release_dest_image (void *abstract_surface, + cairo_rectangle_t *interest_rect, + cairo_image_surface_t *image, + cairo_rectangle_t *image_rect, + void *image_extra) +{ + cairo_xlib_surface_t *surface = abstract_surface; + + /* ignore errors */ + _draw_image_surface (surface, image, image_rect->x, image_rect->y); + + cairo_surface_destroy (&image->base); +} + +static cairo_status_t +_cairo_xlib_surface_clone_similar (void *abstract_surface, + cairo_surface_t *src, + cairo_surface_t **clone_out) +{ + cairo_xlib_surface_t *surface = abstract_surface; + cairo_xlib_surface_t *clone; + + if (src->backend == surface->base.backend ) { + cairo_xlib_surface_t *xlib_src = (cairo_xlib_surface_t *)src; + + if (xlib_src->dpy == surface->dpy) { + *clone_out = src; + cairo_surface_reference (src); + + return CAIRO_STATUS_SUCCESS; + } + } else if (_cairo_surface_is_image (src)) { + cairo_image_surface_t *image_src = (cairo_image_surface_t *)src; + + clone = (cairo_xlib_surface_t *) + _cairo_xlib_surface_create_similar (surface, image_src->format, 0, + image_src->width, image_src->height); + if (clone == NULL) + return CAIRO_STATUS_NO_MEMORY; + + _draw_image_surface (clone, image_src, 0, 0); + + *clone_out = &clone->base; + + return CAIRO_STATUS_SUCCESS; + } + + return CAIRO_INT_STATUS_UNSUPPORTED; +} + +static cairo_status_t +_cairo_xlib_surface_set_matrix (cairo_xlib_surface_t *surface, + cairo_matrix_t *matrix) +{ XTransform xtransform; if (!surface->picture) return CAIRO_STATUS_SUCCESS; - + xtransform.matrix[0][0] = _cairo_fixed_from_double (matrix->m[0][0]); xtransform.matrix[0][1] = _cairo_fixed_from_double (matrix->m[1][0]); xtransform.matrix[0][2] = _cairo_fixed_from_double (matrix->m[2][0]); @@ -328,26 +471,41 @@ _cairo_xlib_surface_set_matrix (void *abstract_surface, cairo_matrix_t *matrix) xtransform.matrix[2][1] = 0; xtransform.matrix[2][2] = _cairo_fixed_from_double (1); - if (CAIRO_SURFACE_RENDER_HAS_PICTURE_TRANSFORM (surface)) + if (!CAIRO_SURFACE_RENDER_HAS_PICTURE_TRANSFORM (surface)) { - XRenderSetPictureTransform (surface->dpy, surface->picture, &xtransform); - } else { - /* XXX: Need support here if using an old RENDER without support - for SetPictureTransform */ + static const XTransform identity = { { + { 1 << 16, 0x00000, 0x00000 }, + { 0x00000, 1 << 16, 0x00000 }, + { 0x00000, 0x00000, 1 << 16 }, + } }; + + if (memcmp (&xtransform, &identity, sizeof (XTransform)) == 0) + return CAIRO_STATUS_SUCCESS; + + return CAIRO_INT_STATUS_UNSUPPORTED; } + XRenderSetPictureTransform (surface->dpy, surface->picture, &xtransform); + return CAIRO_STATUS_SUCCESS; } static cairo_status_t -_cairo_xlib_surface_set_filter (void *abstract_surface, cairo_filter_t filter) +_cairo_xlib_surface_set_filter (cairo_xlib_surface_t *surface, + cairo_filter_t filter) { - cairo_xlib_surface_t *surface = abstract_surface; char *render_filter; - if (!(surface->picture - && CAIRO_SURFACE_RENDER_HAS_FILTERS(surface))) + if (!surface->picture) return CAIRO_STATUS_SUCCESS; + + if (!CAIRO_SURFACE_RENDER_HAS_FILTERS (surface)) + { + if (filter == CAIRO_FILTER_FAST || filter == CAIRO_FILTER_NEAREST) + return CAIRO_STATUS_SUCCESS; + + return CAIRO_INT_STATUS_UNSUPPORTED; + } switch (filter) { case CAIRO_FILTER_FAST: @@ -377,11 +535,10 @@ _cairo_xlib_surface_set_filter (void *abstract_surface, cairo_filter_t filter) } static cairo_status_t -_cairo_xlib_surface_set_repeat (void *abstract_surface, int repeat) +_cairo_xlib_surface_set_repeat (cairo_xlib_surface_t *surface, int repeat) { - cairo_xlib_surface_t *surface = abstract_surface; - unsigned long mask; XRenderPictureAttributes pa; + unsigned long mask; if (!surface->picture) return CAIRO_STATUS_SUCCESS; @@ -394,33 +551,32 @@ _cairo_xlib_surface_set_repeat (void *abstract_surface, int repeat) return CAIRO_STATUS_SUCCESS; } -static cairo_xlib_surface_t * -_cairo_xlib_surface_clone_similar (cairo_surface_t *src, - cairo_xlib_surface_t *template, - cairo_format_t format, - int depth) +static cairo_int_status_t +_cairo_xlib_surface_set_attributes (cairo_xlib_surface_t *surface, + cairo_surface_attributes_t *attributes) { - cairo_xlib_surface_t *clone; - cairo_image_surface_t *src_image; + cairo_int_status_t status; - src_image = _cairo_surface_get_image (src); + status = _cairo_xlib_surface_set_matrix (surface, &attributes->matrix); + if (status) + return status; + + switch (attributes->extend) { + case CAIRO_EXTEND_NONE: + _cairo_xlib_surface_set_repeat (surface, 0); + break; + case CAIRO_EXTEND_REPEAT: + _cairo_xlib_surface_set_repeat (surface, 1); + break; + case CAIRO_EXTEND_REFLECT: + return CAIRO_INT_STATUS_UNSUPPORTED; + } - clone = (cairo_xlib_surface_t *) - _cairo_xlib_surface_create_similar (template, format, 0, - src_image->width, - src_image->height); - if (clone == NULL) - return NULL; + status = _cairo_xlib_surface_set_filter (surface, attributes->filter); + if (status) + return status; - _cairo_xlib_surface_set_filter (clone, cairo_surface_get_filter(src)); - - _cairo_xlib_surface_set_image (clone, src_image); - - _cairo_xlib_surface_set_matrix (clone, &(src_image->base.matrix)); - - cairo_surface_destroy (&src_image->base); - - return clone; + return CAIRO_STATUS_SUCCESS; } static int @@ -462,8 +618,8 @@ _render_operator (cairo_operator_t operator) static cairo_int_status_t _cairo_xlib_surface_composite (cairo_operator_t operator, - cairo_surface_t *generic_src, - cairo_surface_t *generic_mask, + cairo_pattern_t *src_pattern, + cairo_pattern_t *mask_pattern, void *abstract_dst, int src_x, int src_y, @@ -474,73 +630,66 @@ _cairo_xlib_surface_composite (cairo_operator_t operator, unsigned int width, unsigned int height) { - cairo_xlib_surface_t *dst = abstract_dst; - cairo_xlib_surface_t *src = (cairo_xlib_surface_t *) generic_src; - cairo_xlib_surface_t *mask = (cairo_xlib_surface_t *) generic_mask; - cairo_xlib_surface_t *src_clone = NULL; - cairo_xlib_surface_t *mask_clone = NULL; - XGCValues gc_values; - int src_x_off, src_y_off, dst_x_off, dst_y_off; + cairo_surface_attributes_t src_attr, mask_attr; + cairo_xlib_surface_t *dst = abstract_dst; + cairo_xlib_surface_t *src; + cairo_xlib_surface_t *mask; + cairo_int_status_t status; if (!CAIRO_SURFACE_RENDER_HAS_COMPOSITE (dst)) return CAIRO_INT_STATUS_UNSUPPORTED; - if (generic_src->backend != dst->base.backend || src->dpy != dst->dpy) { - src_clone = _cairo_xlib_surface_clone_similar (generic_src, dst, - CAIRO_FORMAT_ARGB32, 32); - if (!src_clone) - return CAIRO_INT_STATUS_UNSUPPORTED; - src = src_clone; - } - if (generic_mask && (generic_mask->backend != dst->base.backend || mask->dpy != dst->dpy)) { - mask_clone = _cairo_xlib_surface_clone_similar (generic_mask, dst, - CAIRO_FORMAT_A8, 8); - if (!mask_clone) - return CAIRO_INT_STATUS_UNSUPPORTED; - mask = mask_clone; + status = _cairo_pattern_acquire_surfaces (src_pattern, mask_pattern, + &dst->base, + src_x, src_y, + mask_x, mask_y, + width, height, + (cairo_surface_t **) &src, + (cairo_surface_t **) &mask, + &src_attr, &mask_attr); + if (status) + return status; + + status = _cairo_xlib_surface_set_attributes (src, &src_attr); + if (CAIRO_OK (status)) + { + if (mask) + { + status = _cairo_xlib_surface_set_attributes (mask, &mask_attr); + if (CAIRO_OK (status)) + XRenderComposite (dst->dpy, + _render_operator (operator), + src->picture, + mask->picture, + dst->picture, + src_x + src_attr.x_offset, + src_y + src_attr.y_offset, + mask_x + mask_attr.x_offset, + mask_y + mask_attr.y_offset, + dst_x, dst_y, + width, height); + } + else + { + XRenderComposite (dst->dpy, + _render_operator (operator), + src->picture, + 0, + dst->picture, + src_x + src_attr.x_offset, + src_y + src_attr.y_offset, + 0, 0, + dst_x, dst_y, + width, height); + } } - if (operator == CAIRO_OPERATOR_SRC - && !mask - && _cairo_matrix_is_integer_translation(&(src->base.matrix), - &src_x_off, &src_y_off) - && _cairo_matrix_is_integer_translation(&(dst->base.matrix), - &dst_x_off, &dst_y_off)) { - /* Fast path for copying "raw" areas. */ - _cairo_xlib_surface_ensure_gc (dst); - XGetGCValues(dst->dpy, dst->gc, GCGraphicsExposures, &gc_values); - XSetGraphicsExposures(dst->dpy, dst->gc, False); - XCopyArea(dst->dpy, - src->drawable, - dst->drawable, - dst->gc, - src_x + src_x_off, - src_y + src_y_off, - width, height, - dst_x + dst_x_off, - dst_y + dst_y_off); - XSetGraphicsExposures(dst->dpy, dst->gc, gc_values.graphics_exposures); + if (mask) + _cairo_pattern_release_surface (&dst->base, &mask->base, &mask_attr); + + _cairo_pattern_release_surface (&dst->base, &src->base, &src_attr); - } else { - XRenderComposite (dst->dpy, - _render_operator (operator), - src->picture, - mask ? mask->picture : 0, - dst->picture, - src_x, src_y, - mask_x, mask_y, - dst_x, dst_y, - width, height); - } - - /* XXX: This is messed up. If I can xlib_surface_create, then I - should be able to xlib_surface_destroy. */ - if (src_clone) - cairo_surface_destroy (&src_clone->base); - if (mask_clone) - cairo_surface_destroy (&mask_clone->base); - - return CAIRO_STATUS_SUCCESS; + return status; } static cairo_int_status_t @@ -572,41 +721,59 @@ _cairo_xlib_surface_fill_rectangles (void *abstract_surface, static cairo_int_status_t _cairo_xlib_surface_composite_trapezoids (cairo_operator_t operator, - cairo_surface_t *generic_src, + cairo_pattern_t *pattern, void *abstract_dst, - int xSrc, - int ySrc, + int src_x, + int src_y, + int dst_x, + int dst_y, + unsigned int width, + unsigned int height, cairo_trapezoid_t *traps, int num_traps) { - cairo_xlib_surface_t *dst = abstract_dst; - cairo_xlib_surface_t *src = (cairo_xlib_surface_t *) generic_src; - cairo_xlib_surface_t *src_clone = NULL; + cairo_surface_attributes_t attributes; + cairo_xlib_surface_t *dst = abstract_dst; + cairo_xlib_surface_t *src; + cairo_int_status_t status; + int render_reference_x, render_reference_y; + int render_src_x, render_src_y; if (!CAIRO_SURFACE_RENDER_HAS_TRAPEZOIDS (dst)) return CAIRO_INT_STATUS_UNSUPPORTED; - - if (generic_src->backend != dst->base.backend || src->dpy != dst->dpy) { - src_clone = _cairo_xlib_surface_clone_similar (generic_src, dst, - CAIRO_FORMAT_ARGB32, 32); - if (!src_clone) - return CAIRO_INT_STATUS_UNSUPPORTED; - src = src_clone; + + status = _cairo_pattern_acquire_surface (pattern, &dst->base, + src_x, src_y, width, height, + (cairo_surface_t **) &src, + &attributes); + if (status) + return status; + + if (traps[0].left.p1.y < traps[0].left.p2.y) { + render_reference_x = _cairo_fixed_integer_floor (traps[0].left.p1.x); + render_reference_y = _cairo_fixed_integer_floor (traps[0].left.p1.y); + } else { + render_reference_x = _cairo_fixed_integer_floor (traps[0].left.p2.x); + render_reference_y = _cairo_fixed_integer_floor (traps[0].left.p2.y); } + render_src_x = src_x + render_reference_x - dst_x; + render_src_y = src_y + render_reference_y - dst_y; + /* XXX: The XTrapezoid cast is evil and needs to go away somehow. */ - XRenderCompositeTrapezoids (dst->dpy, - _render_operator (operator), - src->picture, dst->picture, - XRenderFindStandardFormat (dst->dpy, PictStandardA8), - xSrc, ySrc, (XTrapezoid *) traps, num_traps); + status = _cairo_xlib_surface_set_attributes (src, &attributes); + if (CAIRO_OK (status)) + XRenderCompositeTrapezoids (dst->dpy, + _render_operator (operator), + src->picture, dst->picture, + XRenderFindStandardFormat (dst->dpy, PictStandardA8), + render_src_x + attributes.x_offset, + render_src_y + attributes.y_offset, + (XTrapezoid *) traps, num_traps); - /* XXX: This is messed up. If I can xlib_surface_create, then I - should be able to xlib_surface_destroy. */ - if (src_clone) - cairo_surface_destroy (&src_clone->base); + _cairo_pattern_release_surface (&dst->base, &src->base, &attributes); - return CAIRO_STATUS_SUCCESS; + return status; } static cairo_int_status_t @@ -685,22 +852,17 @@ _cairo_xlib_surface_set_clip_region (void *abstract_surface, return CAIRO_STATUS_SUCCESS; } -static cairo_int_status_t -_cairo_xlib_surface_create_pattern (void *abstract_surface, - cairo_pattern_t *pattern, - cairo_box_t *extents) -{ - return CAIRO_INT_STATUS_UNSUPPORTED; -} - static cairo_status_t -_cairo_xlib_surface_show_glyphs (cairo_unscaled_font_t *font, - cairo_font_scale_t *scale, +_cairo_xlib_surface_show_glyphs (cairo_font_t *font, cairo_operator_t operator, - cairo_surface_t *source, + cairo_pattern_t *pattern, void *abstract_surface, int source_x, int source_y, + int dest_x, + int dest_y, + unsigned int width, + unsigned int height, const cairo_glyph_t *glyphs, int num_glyphs); @@ -708,18 +870,17 @@ static const cairo_surface_backend_t cairo_xlib_surface_backend = { _cairo_xlib_surface_create_similar, _cairo_xlib_surface_destroy, _cairo_xlib_surface_pixels_per_inch, - _cairo_xlib_surface_get_image, - _cairo_xlib_surface_set_image, - _cairo_xlib_surface_set_matrix, - _cairo_xlib_surface_set_filter, - _cairo_xlib_surface_set_repeat, + _cairo_xlib_surface_acquire_source_image, + _cairo_xlib_surface_release_source_image, + _cairo_xlib_surface_acquire_dest_image, + _cairo_xlib_surface_release_dest_image, + _cairo_xlib_surface_clone_similar, _cairo_xlib_surface_composite, _cairo_xlib_surface_fill_rectangles, _cairo_xlib_surface_composite_trapezoids, _cairo_xlib_surface_copy_page, _cairo_xlib_surface_show_page, _cairo_xlib_surface_set_clip_region, - _cairo_xlib_surface_create_pattern, _cairo_xlib_surface_show_glyphs }; @@ -827,6 +988,7 @@ typedef struct { cairo_glyph_cache_key_t key; Glyph glyph; XGlyphInfo info; + int refcount; } glyphset_cache_entry_t; static Glyph @@ -854,17 +1016,18 @@ _xlib_glyphset_cache_create_entry (void *cache, _cairo_lock_global_image_glyph_cache (); im_cache = _cairo_get_global_image_glyph_cache (); - if (g == NULL || v == NULL ||g == NULL || im_cache == NULL) { + if (g == NULL || v == NULL || im_cache == NULL) { _cairo_unlock_global_image_glyph_cache (); return CAIRO_STATUS_NO_MEMORY; } - status = _cairo_cache_lookup (im_cache, key, (void **) (&im)); + status = _cairo_cache_lookup (im_cache, key, (void **) (&im), NULL); if (status != CAIRO_STATUS_SUCCESS || im == NULL) { _cairo_unlock_global_image_glyph_cache (); return CAIRO_STATUS_NO_MEMORY; } + v->refcount = 1; v->key = *k; _cairo_unscaled_font_reference (v->key.unscaled); @@ -925,6 +1088,12 @@ _xlib_glyphset_cache_create_entry (void *cache, return CAIRO_STATUS_SUCCESS; } +static void +_glyphset_cache_entry_reference (glyphset_cache_entry_t *e) +{ + e->refcount++; +} + static void _xlib_glyphset_cache_destroy_cache (void *cache) { @@ -940,6 +1109,9 @@ _xlib_glyphset_cache_destroy_entry (void *cache, void *entry) g = (glyphset_cache_t *) cache; v = (glyphset_cache_entry_t *) entry; + if (--v->refcount > 0) + return; + _cairo_unscaled_font_destroy (v->key.unscaled); XRenderFreeGlyphs (g->display, g->glyphset, &(v->glyph), 1); free (v); @@ -1014,8 +1186,7 @@ _get_glyphset_cache (Display *d) #define N_STACK_BUF 1024 static cairo_status_t -_cairo_xlib_surface_show_glyphs32 (cairo_unscaled_font_t *font, - cairo_font_scale_t *scale, +_cairo_xlib_surface_show_glyphs32 (cairo_font_t *font, cairo_operator_t operator, glyphset_cache_t *g, cairo_glyph_cache_key_t *key, @@ -1092,8 +1263,7 @@ _cairo_xlib_surface_show_glyphs32 (cairo_unscaled_font_t *font, static cairo_status_t -_cairo_xlib_surface_show_glyphs16 (cairo_unscaled_font_t *font, - cairo_font_scale_t *scale, +_cairo_xlib_surface_show_glyphs16 (cairo_font_t *font, cairo_operator_t operator, glyphset_cache_t *g, cairo_glyph_cache_key_t *key, @@ -1169,10 +1339,9 @@ _cairo_xlib_surface_show_glyphs16 (cairo_unscaled_font_t *font, } static cairo_status_t -_cairo_xlib_surface_show_glyphs8 (cairo_unscaled_font_t *font, - cairo_font_scale_t *scale, +_cairo_xlib_surface_show_glyphs8 (cairo_font_t *font, cairo_operator_t operator, - glyphset_cache_t *g, + glyphset_cache_t *g, cairo_glyph_cache_key_t *key, cairo_xlib_surface_t *src, cairo_xlib_surface_t *self, @@ -1247,27 +1416,44 @@ _cairo_xlib_surface_show_glyphs8 (cairo_unscaled_font_t *font, static cairo_status_t -_cairo_xlib_surface_show_glyphs (cairo_unscaled_font_t *font, - cairo_font_scale_t *scale, +_cairo_xlib_surface_show_glyphs (cairo_font_t *font, cairo_operator_t operator, - cairo_surface_t *source, + cairo_pattern_t *pattern, void *abstract_surface, int source_x, int source_y, + int dest_x, + int dest_y, + unsigned int width, + unsigned int height, const cairo_glyph_t *glyphs, int num_glyphs) { + cairo_surface_attributes_t attributes; + cairo_int_status_t status; unsigned int elt_size; cairo_xlib_surface_t *self = abstract_surface; - cairo_image_surface_t *tmp = NULL; - cairo_xlib_surface_t *src = NULL; + cairo_xlib_surface_t *src; glyphset_cache_t *g; - cairo_status_t status; cairo_glyph_cache_key_t key; glyphset_cache_entry_t **entries; glyphset_cache_entry_t *stack_entries [N_STACK_BUF]; int i; + if (!CAIRO_SURFACE_RENDER_HAS_COMPOSITE_TEXT (self)) + return CAIRO_INT_STATUS_UNSUPPORTED; + + status = _cairo_pattern_acquire_surface (pattern, &self->base, + source_x, source_y, width, height, + (cairo_surface_t **) &src, + &attributes); + if (status) + return status; + + status = _cairo_xlib_surface_set_attributes (src, &attributes); + if (status) + goto FAIL; + /* Acquire an entry array of suitable size. */ if (num_glyphs < N_STACK_BUF) { entries = stack_entries; @@ -1278,26 +1464,6 @@ _cairo_xlib_surface_show_glyphs (cairo_unscaled_font_t *font, goto FAIL; } - /* prep the source surface. */ - if (source->backend == self->base.backend) { - src = (cairo_xlib_surface_t *) source; - - } else { - tmp = _cairo_surface_get_image (source); - if (tmp == NULL) - goto FREE_ENTRIES; - - src = (cairo_xlib_surface_t *) - _cairo_surface_create_similar_scratch (&self->base, self->format, 1, - tmp->width, tmp->height); - - if (src == NULL) - goto FREE_TMP; - - if (_cairo_surface_set_image (&(src->base), tmp) != CAIRO_STATUS_SUCCESS) - goto FREE_SRC; - } - _lock_xlib_glyphset_caches (); g = _get_glyphset_cache (self->dpy); if (g == NULL) @@ -1305,15 +1471,23 @@ _cairo_xlib_surface_show_glyphs (cairo_unscaled_font_t *font, /* Work out the index size to use. */ elt_size = 8; - key.scale = *scale; - key.unscaled = font; + _cairo_font_get_glyph_cache_key (font, &key); for (i = 0; i < num_glyphs; ++i) { key.index = glyphs[i].index; - status = _cairo_cache_lookup (&g->base, &key, (void **) (&entries[i])); + status = _cairo_cache_lookup (&g->base, &key, (void **) (&entries[i]), NULL); if (status != CAIRO_STATUS_SUCCESS || entries[i] == NULL) goto UNLOCK; + /* Referencing the glyph entries we use prevents them from + * being freed if lookup of later entries causes them to + * be ejected from the cache. It would be more efficient + * (though more complex) to prevent them from being ejected + * from the cache at all, so they could get reused later + * in the same string. + */ + _glyphset_cache_entry_reference (entries[i]); + if (elt_size == 8 && entries[i]->glyph > 0xff) elt_size = 16; if (elt_size == 16 && entries[i]->glyph > 0xffff) { @@ -1325,43 +1499,32 @@ _cairo_xlib_surface_show_glyphs (cairo_unscaled_font_t *font, /* Call the appropriate sub-function. */ if (elt_size == 8) - status = _cairo_xlib_surface_show_glyphs8 (font, scale, operator, g, &key, src, self, - source_x, source_y, + status = _cairo_xlib_surface_show_glyphs8 (font, operator, g, &key, src, self, + source_x + attributes.x_offset, + source_y + attributes.y_offset, glyphs, entries, num_glyphs); else if (elt_size == 16) - status = _cairo_xlib_surface_show_glyphs16 (font, scale, operator, g, &key, src, self, - source_x, source_y, + status = _cairo_xlib_surface_show_glyphs16 (font, operator, g, &key, src, self, + source_x + attributes.x_offset, + source_y + attributes.y_offset, glyphs, entries, num_glyphs); else - status = _cairo_xlib_surface_show_glyphs32 (font, scale, operator, g, &key, src, self, - source_x, source_y, + status = _cairo_xlib_surface_show_glyphs32 (font, operator, g, &key, src, self, + source_x + attributes.x_offset, + source_y + attributes.y_offset, glyphs, entries, num_glyphs); - _unlock_xlib_glyphset_caches (); - - if (tmp != NULL) { - cairo_surface_destroy (&(src->base)); - cairo_surface_destroy (&(tmp->base)); - } - - if (num_glyphs >= N_STACK_BUF) - free (entries); - - return status; + for (i = 0; i < num_glyphs; ++i) + _xlib_glyphset_cache_destroy_entry (g, entries[i]); UNLOCK: _unlock_xlib_glyphset_caches (); - FREE_SRC: - cairo_surface_destroy (&(src->base)); - - FREE_TMP: - cairo_surface_destroy (&(tmp->base)); - - FREE_ENTRIES: if (num_glyphs >= N_STACK_BUF) free (entries); FAIL: - return CAIRO_STATUS_NO_MEMORY; + _cairo_pattern_release_surface (&self->base, &src->base, &attributes); + + return status; } diff --git a/gfx/cairo/cairo/src/cairoint.h b/gfx/cairo/cairo/src/cairoint.h index 9f64eb73de8d..861f3ef9131f 100644 --- a/gfx/cairo/cairo/src/cairoint.h +++ b/gfx/cairo/cairo/src/cairoint.h @@ -31,7 +31,7 @@ * California. * * Contributor(s): - * Carl D. Worth + * Carl D. Worth */ /* @@ -39,7 +39,7 @@ * and constitute no kind of standard. If you need any of these * functions, please drop me a note. Either the library needs new * functionality, or there's a way to do what you need using the - * existing published interfaces. cworth@isi.edu + * existing published interfaces. cworth@cworth.org */ #ifndef _CAIROINT_H_ @@ -58,7 +58,7 @@ #if defined (__SVR4) && defined (__sun) # include #else -# if defined (__OpenBSD__) || defined (_AIX) +# if defined (__OpenBSD__) # include # else # include @@ -117,6 +117,17 @@ #define __attribute__(x) #endif +#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#define MAX(a, b) ((a) > (b) ? (a) : (b)) + +#ifndef FALSE +#define FALSE 0 +#endif + +#ifndef TRUE +#define TRUE 1 +#endif + #include "cairo-wideint.h" typedef int32_t cairo_fixed_16_16_t; @@ -175,6 +186,8 @@ typedef enum cairo_int_status { CAIRO_INT_STATUS_UNSUPPORTED } cairo_int_status_t; +#define CAIRO_OK(status) ((status) == CAIRO_STATUS_SUCCESS) + typedef enum cairo_path_op { CAIRO_PATH_OP_MOVE_TO = 0, CAIRO_PATH_OP_LINE_TO = 1, @@ -382,43 +395,49 @@ _cairo_cache_destroy (cairo_cache_t *cache); cairo_private cairo_status_t _cairo_cache_lookup (cairo_cache_t *cache, - void *key, - void **entry_return); + void *key, + void **entry_return, + int *created_entry); + +cairo_private cairo_status_t +_cairo_cache_remove (cairo_cache_t *cache, + void *key); + +cairo_private void * +_cairo_cache_random_entry (cairo_cache_t *cache, + int (*predicate) (void*)); cairo_private unsigned long _cairo_hash_string (const char *c); #define CAIRO_IMAGE_GLYPH_CACHE_MEMORY_DEFAULT 0x100000 #define CAIRO_XLIB_GLYPH_CACHE_MEMORY_DEFAULT 0x100000 -#define CAIRO_FONT_CACHE_NUM_FONTS_DEFAULT 20 -#define CAIRO_FT_CACHE_NUM_FONTS_DEFAULT 20 typedef struct { - double matrix[2][2]; + double matrix[2][2]; } cairo_font_scale_t; struct _cairo_font_backend; +/* + * A cairo_unscaled_font_t is just an opaque handle we use in the + * glyph cache. + */ typedef struct { int refcount; const struct _cairo_font_backend *backend; } cairo_unscaled_font_t; -/* - * A cairo_font contains a pointer to a cairo_unscaled_font_t and a scale - * matrix. These are the things the user holds references to. - */ - struct _cairo_font { int refcount; - cairo_font_scale_t scale; - cairo_unscaled_font_t *unscaled; + cairo_font_scale_t scale; /* font space => device space */ + const struct _cairo_font_backend *backend; }; -/* cairo_font.c is responsible for two global caches: +/* cairo_font.c is responsible for a global glyph cache: * - * - font entries: [[[base], name, weight, slant], cairo_unscaled_font_t ] - * - glyph entries: [[[base], cairo_font_t, index], image, size, extents ] + * - glyph entries: [[[base], cairo_unscaled_font_t, scale, flags, index], + * image, size, extents] * * Surfaces may build their own glyph caches if they have surface-specific * glyph resources to maintain; those caches can feed off of the global @@ -429,6 +448,7 @@ typedef struct { cairo_cache_entry_base_t base; cairo_unscaled_font_t *unscaled; cairo_font_scale_t scale; + int flags; unsigned long index; } cairo_glyph_cache_key_t; @@ -461,49 +481,52 @@ _cairo_glyph_cache_keys_equal (void *cache, /* the font backend interface */ typedef struct _cairo_font_backend { - cairo_unscaled_font_t *(*create) (const char *family, + cairo_status_t (*create) (const char *family, cairo_font_slant_t slant, - cairo_font_weight_t weight); + cairo_font_weight_t weight, + cairo_font_scale_t *scale, + cairo_font_t **font); - void (*destroy) (void *font); + void (*destroy_font) (void *font); + void (*destroy_unscaled_font) (void *font); cairo_status_t (*font_extents) (void *font, - cairo_font_scale_t *scale, cairo_font_extents_t *extents); cairo_status_t (*text_to_glyphs) (void *font, - cairo_font_scale_t *scale, const unsigned char *utf8, cairo_glyph_t **glyphs, int *num_glyphs); cairo_status_t (*glyph_extents) (void *font, - cairo_font_scale_t *scale, cairo_glyph_t *glyphs, int num_glyphs, cairo_text_extents_t *extents); cairo_status_t (*glyph_bbox) (void *font, - cairo_font_scale_t *scale, const cairo_glyph_t *glyphs, int num_glyphs, cairo_box_t *bbox); cairo_status_t (*show_glyphs) (void *font, - cairo_font_scale_t *scale, cairo_operator_t operator, - cairo_surface_t *source, + cairo_pattern_t *pattern, cairo_surface_t *surface, int source_x, int source_y, + int dest_x, + int dest_y, + unsigned int width, + unsigned int height, const cairo_glyph_t *glyphs, int num_glyphs); cairo_status_t (*glyph_path) (void *font, - cairo_font_scale_t *scale, cairo_glyph_t *glyphs, int num_glyphs, cairo_path_t *path); + void (*get_glyph_cache_key) (void *font, + cairo_glyph_cache_key_t *key); cairo_status_t (*create_glyph) (cairo_image_glyph_cache_entry_t *entry); @@ -516,6 +539,12 @@ extern const cairo_private struct _cairo_font_backend cairo_ft_font_backend; #endif +#ifdef CAIRO_HAS_WIN32_FONT + +extern const cairo_private struct _cairo_font_backend cairo_win32_font_backend; + +#endif + #ifdef CAIRO_HAS_ATSUI_FONT extern const cairo_private struct _cairo_font_backend cairo_atsui_font_backend; @@ -536,35 +565,40 @@ typedef struct _cairo_surface_backend { double (*pixels_per_inch) (void *surface); - /* XXX: We could use a better name than get_image here. Something - to suggest the fact that the function will create a new - surface, (and hence that it needs to be destroyed). Perhaps - clone_image or maybe simply clone? */ + cairo_status_t + (* acquire_source_image) (void *abstract_surface, + cairo_image_surface_t **image_out, + void **image_extra); - cairo_image_surface_t * - (*get_image) (void *surface); + void + (* release_source_image) (void *abstract_surface, + cairo_image_surface_t *image, + void *image_extra); cairo_status_t - (*set_image) (void *surface, - cairo_image_surface_t *image); + (*acquire_dest_image) (void *abstract_surface, + cairo_rectangle_t *interest_rect, + cairo_image_surface_t **image_out, + cairo_rectangle_t *image_rect, + void **image_extra); + void + (*release_dest_image) (void *abstract_surface, + cairo_rectangle_t *interest_rect, + cairo_image_surface_t *image, + cairo_rectangle_t *image_rect, + void *image_extra); + cairo_status_t - (*set_matrix) (void *surface, - cairo_matrix_t *matrix); - - cairo_status_t - (*set_filter) (void *surface, - cairo_filter_t filter); - - cairo_status_t - (*set_repeat) (void *surface, - int repeat); - + (*clone_similar) (void *surface, + cairo_surface_t *src, + cairo_surface_t **clone_out); + /* XXX: dst should be the first argument for consistency */ cairo_int_status_t (*composite) (cairo_operator_t operator, - cairo_surface_t *src, - cairo_surface_t *mask, + cairo_pattern_t *src, + cairo_pattern_t *mask, void *dst, int src_x, int src_y, @@ -585,10 +619,14 @@ typedef struct _cairo_surface_backend { /* XXX: dst should be the first argument for consistency */ cairo_int_status_t (*composite_trapezoids) (cairo_operator_t operator, - cairo_surface_t *src, + cairo_pattern_t *pattern, void *dst, - int xSrc, - int ySrc, + int src_x, + int src_y, + int dst_x, + int dst_y, + unsigned int width, + unsigned int height, cairo_trapezoid_t *traps, int num_traps); @@ -601,24 +639,22 @@ typedef struct _cairo_surface_backend { cairo_int_status_t (*set_clip_region) (void *surface, pixman_region16_t *region); - cairo_int_status_t - (*create_pattern) (void *surface, - cairo_pattern_t *pattern, - cairo_box_t *extents); - /* * This is an optional entry to let the surface manage its own glyph * resources. If null, the font will be asked to render against this * surface, using image surfaces as glyphs. */ cairo_status_t - (*show_glyphs) (cairo_unscaled_font_t *font, - cairo_font_scale_t *scale, + (*show_glyphs) (cairo_font_t *font, cairo_operator_t operator, - cairo_surface_t *source, + cairo_pattern_t *pattern, void *surface, int source_x, int source_y, + int dest_x, + int dest_y, + unsigned int width, + unsigned int height, const cairo_glyph_t *glyphs, int num_glyphs); } cairo_surface_backend_t; @@ -649,6 +685,7 @@ struct _cairo_image_surface { cairo_surface_t base; /* libic-specific fields */ + cairo_format_t format; char *data; int owns_data; @@ -690,60 +727,77 @@ typedef enum { typedef struct _cairo_color_stop { cairo_fixed_t offset; - cairo_fixed_48_16_t scale; - int id; - unsigned char color_char[4]; + cairo_color_t color; } cairo_color_stop_t; -typedef void (*cairo_shader_function_t) (unsigned char *color0, - unsigned char *color1, - cairo_fixed_t factor, - int *pixel); - -typedef struct _cairo_shader_op { - cairo_color_stop_t *stops; - int n_stops; - cairo_fixed_t min_offset; - cairo_fixed_t max_offset; - cairo_extend_t extend; - cairo_shader_function_t shader_function; -} cairo_shader_op_t; - struct _cairo_pattern { - unsigned int ref_count; - + cairo_pattern_type_t type; + unsigned int ref_count; + cairo_matrix_t matrix; + cairo_filter_t filter; + cairo_extend_t extend; + double alpha; +}; + +typedef struct _cairo_solid_pattern { + cairo_pattern_t base; + + double red, green, blue; +} cairo_solid_pattern_t; + +typedef struct _cairo_surface_pattern { + cairo_pattern_t base; + + cairo_surface_t *surface; +} cairo_surface_pattern_t; + +typedef struct _cairo_gradient_pattern { + cairo_pattern_t base; + + cairo_color_stop_t *stops; + int n_stops; +} cairo_gradient_pattern_t; + +typedef struct _cairo_linear_pattern { + cairo_gradient_pattern_t base; + + cairo_point_double_t point0; + cairo_point_double_t point1; +} cairo_linear_pattern_t; + +typedef struct _cairo_radial_pattern { + cairo_gradient_pattern_t base; + + cairo_point_double_t center0; + cairo_point_double_t center1; + double radius0; + double radius1; +} cairo_radial_pattern_t; + +typedef union { + cairo_gradient_pattern_t base; + + cairo_linear_pattern_t linear; + cairo_radial_pattern_t radial; +} cairo_gradient_pattern_union_t; + +typedef union { + cairo_pattern_t base; + + cairo_solid_pattern_t solid; + cairo_surface_pattern_t surface; + cairo_gradient_pattern_union_t gradient; +} cairo_pattern_union_t; + +typedef struct _cairo_surface_attributes { + cairo_matrix_t matrix; cairo_extend_t extend; cairo_filter_t filter; - cairo_matrix_t matrix; - - cairo_color_stop_t *stops; - int n_stops; - - cairo_color_t color; - - cairo_surface_t *source; - cairo_point_double_t source_offset; - - cairo_pattern_type_t type; - union { - struct { - cairo_surface_t *surface; - cairo_matrix_t save_matrix; - int save_repeat; - cairo_filter_t save_filter; - } surface; - struct { - cairo_point_double_t point0; - cairo_point_double_t point1; - } linear; - struct { - cairo_point_double_t center0; - cairo_point_double_t center1; - double radius0; - double radius1; - } radial; - } u; -}; + int x_offset; + int y_offset; + cairo_bool_t acquired; + void *extra; +} cairo_surface_attributes_t; typedef struct _cairo_traps { cairo_trapezoid_t *traps; @@ -755,19 +809,21 @@ typedef struct _cairo_traps { #define CAIRO_FONT_SLANT_DEFAULT CAIRO_FONT_SLANT_NORMAL #define CAIRO_FONT_WEIGHT_DEFAULT CAIRO_FONT_WEIGHT_NORMAL -#ifdef CAIRO_HAS_FT_FONT +#if defined (CAIRO_HAS_WIN32_FONT) -#define CAIRO_FONT_FAMILY_DEFAULT "serif" +#define CAIRO_FONT_FAMILY_DEFAULT "Arial" +#define CAIRO_FONT_BACKEND_DEFAULT &cairo_win32_font_backend -/* XXX: Platform-specific. Other platforms may want a different default */ -#define CAIRO_FONT_BACKEND_DEFAULT &cairo_ft_font_backend - -#elif defined(CAIRO_HAS_ATSUI_FONT) +#elif defined (CAIRO_HAS_ATSUI_FONT) #define CAIRO_FONT_FAMILY_DEFAULT "Monaco" - #define CAIRO_FONT_BACKEND_DEFAULT &cairo_atsui_font_backend +#elif defined (CAIRO_HAS_FT_FONT) + +#define CAIRO_FONT_FAMILY_DEFAULT "serif" +#define CAIRO_FONT_BACKEND_DEFAULT &cairo_ft_font_backend + #endif #define CAIRO_GSTATE_OPERATOR_DEFAULT CAIRO_OPERATOR_OVER @@ -781,10 +837,7 @@ typedef struct _cairo_traps { /* Need a name distinct from the cairo_clip function */ typedef struct _cairo_clip_rec { - int x; - int y; - int width; - int height; + cairo_rectangle_t rect; pixman_region16_t *region; cairo_surface_t *surface; } cairo_clip_rec_t; @@ -806,7 +859,11 @@ typedef struct _cairo_gstate { int num_dashes; double dash_offset; - cairo_unscaled_font_t *font; + char *font_family; /* NULL means CAIRO_FONT_FAMILY_DEFAULT; */ + cairo_font_slant_t font_slant; + cairo_font_weight_t font_weight; + + cairo_font_t *font; /* Specific to the current CTM */ cairo_surface_t *surface; @@ -877,7 +934,7 @@ _cairo_fixed_integer_ceil (cairo_fixed_t f); cairo_private cairo_gstate_t * _cairo_gstate_create (void); -cairo_private void +cairo_private cairo_status_t _cairo_gstate_init (cairo_gstate_t *gstate); cairo_private cairo_status_t @@ -1095,13 +1152,13 @@ cairo_private cairo_status_t _cairo_gstate_in_stroke (cairo_gstate_t *gstate, double x, double y, - int *inside_ret); + cairo_bool_t *inside_ret); cairo_private cairo_status_t _cairo_gstate_in_fill (cairo_gstate_t *gstate, double x, double y, - int *inside_ret); + cairo_bool_t *inside_ret); cairo_private cairo_status_t _cairo_gstate_init_clip (cairo_gstate_t *gstate); @@ -1128,6 +1185,10 @@ cairo_private cairo_status_t _cairo_gstate_scale_font (cairo_gstate_t *gstate, double scale); +cairo_private void +_cairo_gstate_current_font_scale (cairo_gstate_t *gstate, + cairo_font_scale_t *sc); + cairo_private cairo_status_t _cairo_gstate_transform_font (cairo_gstate_t *gstate, cairo_matrix_t *matrix); @@ -1186,26 +1247,29 @@ cairo_private void _cairo_color_set_rgb (cairo_color_t *color, double red, double green, double blue); cairo_private void -_cairo_color_get_rgb (cairo_color_t *color, double *red, double *green, double *blue); +_cairo_color_get_rgb (const cairo_color_t *color, + double *red, double *green, double *blue); cairo_private void _cairo_color_set_alpha (cairo_color_t *color, double alpha); /* cairo_font.c */ -cairo_private cairo_unscaled_font_t * -_cairo_unscaled_font_create (const char *family, - cairo_font_slant_t slant, - cairo_font_weight_t weight); +cairo_private cairo_status_t +_cairo_font_create (const char *family, + cairo_font_slant_t slant, + cairo_font_weight_t weight, + cairo_font_scale_t *sc, + cairo_font_t **font); cairo_private void -_cairo_font_init (cairo_font_t *scaled, - cairo_font_scale_t *scale, - cairo_unscaled_font_t *unscaled); +_cairo_font_init (cairo_font_t *font, + cairo_font_scale_t *scale, + const cairo_font_backend_t *backend); -cairo_private cairo_status_t -_cairo_unscaled_font_init (cairo_unscaled_font_t *font, - const struct _cairo_font_backend *backend); +cairo_private void +_cairo_unscaled_font_init (cairo_unscaled_font_t *font, + const struct _cairo_font_backend *backend); cairo_private void _cairo_unscaled_font_reference (cairo_unscaled_font_t *font); @@ -1214,48 +1278,56 @@ cairo_private void _cairo_unscaled_font_destroy (cairo_unscaled_font_t *font); cairo_private cairo_status_t -_cairo_unscaled_font_font_extents (cairo_unscaled_font_t *font, - cairo_font_scale_t *scale, - cairo_font_extents_t *extents); +_cairo_font_font_extents (cairo_font_t *font, + cairo_font_extents_t *extents); cairo_private cairo_status_t -_cairo_unscaled_font_text_to_glyphs (cairo_unscaled_font_t *font, - cairo_font_scale_t *scale, - const unsigned char *utf8, - cairo_glyph_t **glyphs, - int *num_glyphs); +_cairo_font_text_to_glyphs (cairo_font_t *font, + const unsigned char *utf8, + cairo_glyph_t **glyphs, + int *num_glyphs); cairo_private cairo_status_t -_cairo_unscaled_font_glyph_extents (cairo_unscaled_font_t *font, - cairo_font_scale_t *scale, - cairo_glyph_t *glyphs, - int num_glyphs, - cairo_text_extents_t *extents); +_cairo_font_glyph_extents (cairo_font_t *font, + cairo_glyph_t *glyphs, + int num_glyphs, + cairo_text_extents_t *extents); cairo_private cairo_status_t -_cairo_unscaled_font_glyph_bbox (cairo_unscaled_font_t *font, - cairo_font_scale_t *size, - cairo_glyph_t *glyphs, - int num_glyphs, - cairo_box_t *bbox); +_cairo_font_glyph_bbox (cairo_font_t *font, + cairo_glyph_t *glyphs, + int num_glyphs, + cairo_box_t *bbox); cairo_private cairo_status_t -_cairo_unscaled_font_show_glyphs (cairo_unscaled_font_t *font, - cairo_font_scale_t *size, - cairo_operator_t operator, - cairo_surface_t *source, - cairo_surface_t *surface, - int source_x, - int source_y, - cairo_glyph_t *glyphs, - int num_glyphs); +_cairo_font_show_glyphs (cairo_font_t *font, + cairo_operator_t operator, + cairo_pattern_t *source, + cairo_surface_t *surface, + int source_x, + int source_y, + int dest_x, + int dest_y, + unsigned int widht, + unsigned int height, + cairo_glyph_t *glyphs, + int num_glyphs); cairo_private cairo_status_t -_cairo_unscaled_font_glyph_path (cairo_unscaled_font_t *font, - cairo_font_scale_t *size, - cairo_glyph_t *glyphs, - int num_glyphs, - cairo_path_t *path); +_cairo_font_glyph_path (cairo_font_t *font, + cairo_glyph_t *glyphs, + int num_glyphs, + cairo_path_t *path); + +cairo_private cairo_status_t +_cairo_font_glyph_path (cairo_font_t *font, + cairo_glyph_t *glyphs, + int num_glyphs, + cairo_path_t *path); + +cairo_private void +_cairo_font_get_glyph_cache_key (cairo_font_t *font, + cairo_glyph_cache_key_t *key); /* cairo_hull.c */ cairo_private cairo_status_t @@ -1364,8 +1436,8 @@ _cairo_surface_fill_rectangle (cairo_surface_t *surface, cairo_private cairo_status_t _cairo_surface_composite (cairo_operator_t operator, - cairo_surface_t *src, - cairo_surface_t *mask, + cairo_pattern_t *src, + cairo_pattern_t *mask, cairo_surface_t *dst, int src_x, int src_y, @@ -1385,10 +1457,14 @@ _cairo_surface_fill_rectangles (cairo_surface_t *surface, cairo_private cairo_status_t _cairo_surface_composite_trapezoids (cairo_operator_t operator, - cairo_surface_t *src, + cairo_pattern_t *pattern, cairo_surface_t *dst, - int xSrc, - int ySrc, + int src_x, + int src_y, + int dst_x, + int dst_y, + unsigned int width, + unsigned int height, cairo_trapezoid_t *traps, int ntraps); @@ -1401,21 +1477,38 @@ _cairo_surface_show_page (cairo_surface_t *surface); cairo_private double _cairo_surface_pixels_per_inch (cairo_surface_t *surface); -cairo_private cairo_image_surface_t * -_cairo_surface_get_image (cairo_surface_t *surface); +cairo_private cairo_status_t +_cairo_surface_acquire_source_image (cairo_surface_t *surface, + cairo_image_surface_t **image_out, + void **image_extra); + +cairo_private void +_cairo_surface_release_source_image (cairo_surface_t *surface, + cairo_image_surface_t *image, + void *image_extra); cairo_private cairo_status_t -_cairo_surface_set_image (cairo_surface_t *surface, - cairo_image_surface_t *image); +_cairo_surface_acquire_dest_image (cairo_surface_t *surface, + cairo_rectangle_t *interest_rect, + cairo_image_surface_t **image_out, + cairo_rectangle_t *image_rect, + void **image_extra); + +cairo_private void +_cairo_surface_release_dest_image (cairo_surface_t *surface, + cairo_rectangle_t *interest_rect, + cairo_image_surface_t *image, + cairo_rectangle_t *image_rect, + void *image_extra); + +cairo_private cairo_status_t +_cairo_surface_clone_similar (cairo_surface_t *surface, + cairo_surface_t *src, + cairo_surface_t **clone_out); cairo_private cairo_status_t _cairo_surface_set_clip_region (cairo_surface_t *surface, pixman_region16_t *region); -cairo_private cairo_status_t -_cairo_surface_create_pattern (cairo_surface_t *surface, - cairo_pattern_t *pattern, - cairo_box_t *extents); - /* cairo_image_surface.c */ cairo_private cairo_image_surface_t * @@ -1444,6 +1537,9 @@ cairo_private cairo_int_status_t _cairo_image_surface_set_clip_region (cairo_image_surface_t *surface, pixman_region16_t *region); +cairo_private int +_cairo_surface_is_image (cairo_surface_t *surface); + /* cairo_pen.c */ cairo_private cairo_status_t _cairo_pen_init (cairo_pen_t *pen, double radius, cairo_gstate_t *gstate); @@ -1549,7 +1645,7 @@ _cairo_matrix_compute_eigen_values (cairo_matrix_t *matrix, double *lambda1, dou cairo_private cairo_status_t _cairo_matrix_compute_scale_factors (cairo_matrix_t *matrix, double *sx, double *sy, int x_major); -cairo_private int +cairo_private cairo_bool_t _cairo_matrix_is_integer_translation(cairo_matrix_t *matrix, int *itx, int *ity); /* cairo_traps.c */ @@ -1590,18 +1686,29 @@ cairo_private int _cairo_slope_counter_clockwise (cairo_slope_t *a, cairo_slope_t *b); /* cairo_pattern.c */ -cairo_private void -_cairo_pattern_init (cairo_pattern_t *pattern); cairo_private cairo_status_t _cairo_pattern_init_copy (cairo_pattern_t *pattern, cairo_pattern_t *other); cairo_private void -_cairo_pattern_fini (cairo_pattern_t *pattern); +_cairo_pattern_init_solid (cairo_solid_pattern_t *pattern, + double red, double green, double blue); cairo_private void -_cairo_pattern_init_solid (cairo_pattern_t *pattern, - double red, double green, double blue); +_cairo_pattern_init_for_surface (cairo_surface_pattern_t *pattern, + cairo_surface_t *surface); + +cairo_private void +_cairo_pattern_init_linear (cairo_linear_pattern_t *pattern, + double x0, double y0, double x1, double y1); + +cairo_private void +_cairo_pattern_init_radial (cairo_radial_pattern_t *pattern, + double cx0, double cy0, double radius0, + double cx1, double cy1, double radius1); + +cairo_private void +_cairo_pattern_fini (cairo_pattern_t *pattern); cairo_private cairo_pattern_t * _cairo_pattern_create_solid (double red, double green, double blue); @@ -1613,28 +1720,57 @@ _cairo_pattern_get_rgb (cairo_pattern_t *pattern, cairo_private void _cairo_pattern_set_alpha (cairo_pattern_t *pattern, double alpha); -cairo_private void -_cairo_pattern_set_source_offset (cairo_pattern_t *pattern, - double x, double y); - cairo_private void _cairo_pattern_transform (cairo_pattern_t *pattern, cairo_matrix_t *ctm_inverse); -cairo_private void -_cairo_pattern_prepare_surface (cairo_pattern_t *pattern); +cairo_private cairo_bool_t +_cairo_pattern_is_opaque (cairo_pattern_t *pattern); + +cairo_private cairo_int_status_t +_cairo_pattern_acquire_surface (cairo_pattern_t *pattern, + cairo_surface_t *dst, + int x, + int y, + unsigned int width, + unsigned int height, + cairo_surface_t **surface_out, + cairo_surface_attributes_t *attributes); cairo_private void -_cairo_pattern_shader_init (cairo_pattern_t *pattern, - cairo_shader_op_t *op); +_cairo_pattern_release_surface (cairo_surface_t *dst, + cairo_surface_t *surface, + cairo_surface_attributes_t *attributes); -cairo_private void -_cairo_pattern_calc_color_at_pixel (cairo_shader_op_t *op, - cairo_fixed_t factor, - int *pixel); +cairo_private cairo_int_status_t +_cairo_pattern_acquire_surfaces (cairo_pattern_t *src, + cairo_pattern_t *mask, + cairo_surface_t *dst, + int src_x, + int src_y, + int mask_x, + int mask_y, + unsigned int width, + unsigned int height, + cairo_surface_t **src_out, + cairo_surface_t **mask_out, + cairo_surface_attributes_t *src_attributes, + cairo_surface_attributes_t *mask_attributes); -cairo_private cairo_image_surface_t * -_cairo_pattern_get_image (cairo_pattern_t *pattern, cairo_box_t *box); + +/* cairo_unicode.c */ + +cairo_private cairo_status_t +_cairo_utf8_to_ucs4 (const char *str, + int len, + uint32_t **result, + int *items_written); + +cairo_private cairo_status_t +_cairo_utf8_to_utf16 (const char *str, + int len, + uint16_t **result, + int *items_written); /* Avoid unnecessary PLT entries. */ diff --git a/gfx/cairo/cairo/test/Makefile.am b/gfx/cairo/cairo/test/Makefile.am index e7fd3fd6b6a2..04d42e2d6277 100644 --- a/gfx/cairo/cairo/test/Makefile.am +++ b/gfx/cairo/cairo/test/Makefile.am @@ -3,18 +3,27 @@ TESTS = \ fill_rule \ leaky_polygon \ line_width \ +linear_gradient \ move_to_show_surface \ text_cache_crash \ -text_rotate +text_rotate \ +coverage \ +clip_twice \ +pixman_rotate -# And all new test go here too. I really don't like having to repeat +# And all new tests go here too. I really don't like having to repeat # this list. Anyone know a good way to avoid it? Can I use a wildcard # here? -EXTRA_DIST = \ -fill_rule-ref.png \ -leaky_polygon-ref.png \ -line_width-ref.png \ -move_to_show_surface-ref.png +EXTRA_DIST = \ +fill_rule-ref.png \ +leaky_polygon-ref.png \ +line_width-ref.png \ +linear_gradient-ref.png \ +move_to_show_surface-ref.png \ +coverage-ref.png \ +clip_twice-ref.png \ +pixman_rotate-ref.png \ +romedalen.png # Once we can draw the text_rotate.c test case correctly, we should # create and add text_rotate-ref.png to the list of reference PNGs. @@ -29,6 +38,7 @@ move_to_show_surface-ref.png # be fixed before the code is committed. XFAIL_TESTS = \ move_to_show_surface \ +pixman_rotate \ text_rotate check_PROGRAMS = $(TESTS) @@ -42,6 +52,8 @@ INCLUDES = -D_GNU_SOURCE -I$(srcdir) $(CAIRO_CFLAGS) -I$(srcdir)/../src AM_LDFLAGS = $(CAIRO_LIBS) ../src/libcairo.la cairo_test_lib =\ +buffer_diff.c \ +buffer_diff.h \ cairo_test.c \ cairo_test.h \ read_png.c \ @@ -57,8 +69,15 @@ xmalloc.h fill_rule_SOURCES = fill_rule.c $(cairo_test_lib) leaky_polygon_SOURCES = leaky_polygon.c $(cairo_test_lib) line_width_SOURCES = line_width.c $(cairo_test_lib) +linear_gradient_SOURCES = linear_gradient.c $(cairo_test_lib) move_to_show_surface_SOURCES = move_to_show_surface.c $(cairo_test_lib) text_cache_crash_SOURCES = text_cache_crash.c $(cairo_test_lib) text_rotate_SOURCES = text_rotate.c $(cairo_test_lib) +coverage_SOURCES = coverage.c $(cairo_test_lib) +clip_twice_SOURCES = clip_twice.c $(cairo_test_lib) +pixman_rotate_SOURCES = pixman_rotate.c $(cairo_test_lib) -CLEANFILES = *-out.png *-diff.png +noinst_PROGRAMS = imagediff +imagediff_SOURCES = imagediff.c $(cairo_test_lib) + +CLEANFILES = *-out.png *-diff.png *.log diff --git a/gfx/cairo/cairo/test/Makefile.in b/gfx/cairo/cairo/test/Makefile.in index 158e03a1a8d0..f2bbb663ad4c 100644 --- a/gfx/cairo/cairo/test/Makefile.in +++ b/gfx/cairo/cairo/test/Makefile.in @@ -13,7 +13,8 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -SOURCES = $(fill_rule_SOURCES) $(leaky_polygon_SOURCES) $(line_width_SOURCES) $(move_to_show_surface_SOURCES) $(text_cache_crash_SOURCES) $(text_rotate_SOURCES) + +SOURCES = $(clip_twice_SOURCES) $(coverage_SOURCES) $(fill_rule_SOURCES) $(imagediff_SOURCES) $(leaky_polygon_SOURCES) $(line_width_SOURCES) $(linear_gradient_SOURCES) $(move_to_show_surface_SOURCES) $(pixman_rotate_SOURCES) $(text_cache_crash_SOURCES) $(text_rotate_SOURCES) srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -38,33 +39,54 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = $(am__EXEEXT_1) +noinst_PROGRAMS = imagediff$(EXEEXT) subdir = test DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = am__EXEEXT_1 = fill_rule$(EXEEXT) leaky_polygon$(EXEEXT) \ - line_width$(EXEEXT) move_to_show_surface$(EXEEXT) \ - text_cache_crash$(EXEEXT) text_rotate$(EXEEXT) -am__objects_1 = cairo_test.$(OBJEXT) read_png.$(OBJEXT) \ - write_png.$(OBJEXT) xmalloc.$(OBJEXT) + line_width$(EXEEXT) linear_gradient$(EXEEXT) \ + move_to_show_surface$(EXEEXT) text_cache_crash$(EXEEXT) \ + text_rotate$(EXEEXT) coverage$(EXEEXT) clip_twice$(EXEEXT) \ + pixman_rotate$(EXEEXT) +PROGRAMS = $(noinst_PROGRAMS) +am__objects_1 = buffer_diff.$(OBJEXT) cairo_test.$(OBJEXT) \ + read_png.$(OBJEXT) write_png.$(OBJEXT) xmalloc.$(OBJEXT) +am_clip_twice_OBJECTS = clip_twice.$(OBJEXT) $(am__objects_1) +clip_twice_OBJECTS = $(am_clip_twice_OBJECTS) +clip_twice_LDADD = $(LDADD) +am_coverage_OBJECTS = coverage.$(OBJEXT) $(am__objects_1) +coverage_OBJECTS = $(am_coverage_OBJECTS) +coverage_LDADD = $(LDADD) am_fill_rule_OBJECTS = fill_rule.$(OBJEXT) $(am__objects_1) fill_rule_OBJECTS = $(am_fill_rule_OBJECTS) fill_rule_LDADD = $(LDADD) +am_imagediff_OBJECTS = imagediff.$(OBJEXT) $(am__objects_1) +imagediff_OBJECTS = $(am_imagediff_OBJECTS) +imagediff_LDADD = $(LDADD) am_leaky_polygon_OBJECTS = leaky_polygon.$(OBJEXT) $(am__objects_1) leaky_polygon_OBJECTS = $(am_leaky_polygon_OBJECTS) leaky_polygon_LDADD = $(LDADD) am_line_width_OBJECTS = line_width.$(OBJEXT) $(am__objects_1) line_width_OBJECTS = $(am_line_width_OBJECTS) line_width_LDADD = $(LDADD) +am_linear_gradient_OBJECTS = linear_gradient.$(OBJEXT) \ + $(am__objects_1) +linear_gradient_OBJECTS = $(am_linear_gradient_OBJECTS) +linear_gradient_LDADD = $(LDADD) am_move_to_show_surface_OBJECTS = move_to_show_surface.$(OBJEXT) \ $(am__objects_1) move_to_show_surface_OBJECTS = $(am_move_to_show_surface_OBJECTS) move_to_show_surface_LDADD = $(LDADD) +am_pixman_rotate_OBJECTS = pixman_rotate.$(OBJEXT) $(am__objects_1) +pixman_rotate_OBJECTS = $(am_pixman_rotate_OBJECTS) +pixman_rotate_LDADD = $(LDADD) am_text_cache_crash_OBJECTS = text_cache_crash.$(OBJEXT) \ $(am__objects_1) text_cache_crash_OBJECTS = $(am_text_cache_crash_OBJECTS) @@ -83,12 +105,18 @@ LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \ CCLD = $(CC) LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(fill_rule_SOURCES) $(leaky_polygon_SOURCES) \ - $(line_width_SOURCES) $(move_to_show_surface_SOURCES) \ - $(text_cache_crash_SOURCES) $(text_rotate_SOURCES) -DIST_SOURCES = $(fill_rule_SOURCES) $(leaky_polygon_SOURCES) \ - $(line_width_SOURCES) $(move_to_show_surface_SOURCES) \ - $(text_cache_crash_SOURCES) $(text_rotate_SOURCES) +SOURCES = $(clip_twice_SOURCES) $(coverage_SOURCES) \ + $(fill_rule_SOURCES) $(imagediff_SOURCES) \ + $(leaky_polygon_SOURCES) $(line_width_SOURCES) \ + $(linear_gradient_SOURCES) $(move_to_show_surface_SOURCES) \ + $(pixman_rotate_SOURCES) $(text_cache_crash_SOURCES) \ + $(text_rotate_SOURCES) +DIST_SOURCES = $(clip_twice_SOURCES) $(coverage_SOURCES) \ + $(fill_rule_SOURCES) $(imagediff_SOURCES) \ + $(leaky_polygon_SOURCES) $(line_width_SOURCES) \ + $(linear_gradient_SOURCES) $(move_to_show_surface_SOURCES) \ + $(pixman_rotate_SOURCES) $(text_cache_crash_SOURCES) \ + $(text_rotate_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -117,6 +145,10 @@ CAIRO_HAS_PS_SURFACE_FALSE = @CAIRO_HAS_PS_SURFACE_FALSE@ CAIRO_HAS_PS_SURFACE_TRUE = @CAIRO_HAS_PS_SURFACE_TRUE@ CAIRO_HAS_QUARTZ_SURFACE_FALSE = @CAIRO_HAS_QUARTZ_SURFACE_FALSE@ CAIRO_HAS_QUARTZ_SURFACE_TRUE = @CAIRO_HAS_QUARTZ_SURFACE_TRUE@ +CAIRO_HAS_WIN32_FONT_FALSE = @CAIRO_HAS_WIN32_FONT_FALSE@ +CAIRO_HAS_WIN32_FONT_TRUE = @CAIRO_HAS_WIN32_FONT_TRUE@ +CAIRO_HAS_WIN32_SURFACE_FALSE = @CAIRO_HAS_WIN32_SURFACE_FALSE@ +CAIRO_HAS_WIN32_SURFACE_TRUE = @CAIRO_HAS_WIN32_SURFACE_TRUE@ CAIRO_HAS_XCB_SURFACE_FALSE = @CAIRO_HAS_XCB_SURFACE_FALSE@ CAIRO_HAS_XCB_SURFACE_TRUE = @CAIRO_HAS_XCB_SURFACE_TRUE@ CAIRO_HAS_XLIB_SURFACE_FALSE = @CAIRO_HAS_XLIB_SURFACE_FALSE@ @@ -139,6 +171,8 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ @@ -147,11 +181,15 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ FT_FONT_FEATURE = @FT_FONT_FEATURE@ GLITZ_CFLAGS = @GLITZ_CFLAGS@ GLITZ_LIBS = @GLITZ_LIBS@ GLITZ_REQUIRES = @GLITZ_REQUIRES@ GLITZ_SURFACE_FEATURE = @GLITZ_SURFACE_FEATURE@ +GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +HTML_DIR = @HTML_DIR@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -193,6 +231,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ VERSION_INFO = @VERSION_INFO@ +WIN32_FONT_FEATURE = @WIN32_FONT_FEATURE@ +WIN32_SURFACE_FEATURE = @WIN32_SURFACE_FEATURE@ XCB_CFLAGS = @XCB_CFLAGS@ XCB_LIBS = @XCB_LIBS@ XCB_SURFACE_FEATURE = @XCB_SURFACE_FEATURE@ @@ -253,19 +293,28 @@ TESTS = \ fill_rule \ leaky_polygon \ line_width \ +linear_gradient \ move_to_show_surface \ text_cache_crash \ -text_rotate +text_rotate \ +coverage \ +clip_twice \ +pixman_rotate -# And all new test go here too. I really don't like having to repeat +# And all new tests go here too. I really don't like having to repeat # this list. Anyone know a good way to avoid it? Can I use a wildcard # here? EXTRA_DIST = \ -fill_rule-ref.png \ -leaky_polygon-ref.png \ -line_width-ref.png \ -move_to_show_surface-ref.png +fill_rule-ref.png \ +leaky_polygon-ref.png \ +line_width-ref.png \ +linear_gradient-ref.png \ +move_to_show_surface-ref.png \ +coverage-ref.png \ +clip_twice-ref.png \ +pixman_rotate-ref.png \ +romedalen.png # Once we can draw the text_rotate.c test case correctly, we should @@ -281,6 +330,7 @@ move_to_show_surface-ref.png # be fixed before the code is committed. XFAIL_TESTS = \ move_to_show_surface \ +pixman_rotate \ text_rotate @@ -291,6 +341,8 @@ text_rotate INCLUDES = -D_GNU_SOURCE -I$(srcdir) $(CAIRO_CFLAGS) -I$(srcdir)/../src AM_LDFLAGS = $(CAIRO_LIBS) ../src/libcairo.la cairo_test_lib = \ +buffer_diff.c \ +buffer_diff.h \ cairo_test.c \ cairo_test.h \ read_png.c \ @@ -307,10 +359,15 @@ xmalloc.h fill_rule_SOURCES = fill_rule.c $(cairo_test_lib) leaky_polygon_SOURCES = leaky_polygon.c $(cairo_test_lib) line_width_SOURCES = line_width.c $(cairo_test_lib) +linear_gradient_SOURCES = linear_gradient.c $(cairo_test_lib) move_to_show_surface_SOURCES = move_to_show_surface.c $(cairo_test_lib) text_cache_crash_SOURCES = text_cache_crash.c $(cairo_test_lib) text_rotate_SOURCES = text_rotate.c $(cairo_test_lib) -CLEANFILES = *-out.png *-diff.png +coverage_SOURCES = coverage.c $(cairo_test_lib) +clip_twice_SOURCES = clip_twice.c $(cairo_test_lib) +pixman_rotate_SOURCES = pixman_rotate.c $(cairo_test_lib) +imagediff_SOURCES = imagediff.c $(cairo_test_lib) +CLEANFILES = *-out.png *-diff.png *.log all: all-am .SUFFIXES: @@ -351,18 +408,40 @@ clean-checkPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done + +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +clip_twice$(EXEEXT): $(clip_twice_OBJECTS) $(clip_twice_DEPENDENCIES) + @rm -f clip_twice$(EXEEXT) + $(LINK) $(clip_twice_LDFLAGS) $(clip_twice_OBJECTS) $(clip_twice_LDADD) $(LIBS) +coverage$(EXEEXT): $(coverage_OBJECTS) $(coverage_DEPENDENCIES) + @rm -f coverage$(EXEEXT) + $(LINK) $(coverage_LDFLAGS) $(coverage_OBJECTS) $(coverage_LDADD) $(LIBS) fill_rule$(EXEEXT): $(fill_rule_OBJECTS) $(fill_rule_DEPENDENCIES) @rm -f fill_rule$(EXEEXT) $(LINK) $(fill_rule_LDFLAGS) $(fill_rule_OBJECTS) $(fill_rule_LDADD) $(LIBS) +imagediff$(EXEEXT): $(imagediff_OBJECTS) $(imagediff_DEPENDENCIES) + @rm -f imagediff$(EXEEXT) + $(LINK) $(imagediff_LDFLAGS) $(imagediff_OBJECTS) $(imagediff_LDADD) $(LIBS) leaky_polygon$(EXEEXT): $(leaky_polygon_OBJECTS) $(leaky_polygon_DEPENDENCIES) @rm -f leaky_polygon$(EXEEXT) $(LINK) $(leaky_polygon_LDFLAGS) $(leaky_polygon_OBJECTS) $(leaky_polygon_LDADD) $(LIBS) line_width$(EXEEXT): $(line_width_OBJECTS) $(line_width_DEPENDENCIES) @rm -f line_width$(EXEEXT) $(LINK) $(line_width_LDFLAGS) $(line_width_OBJECTS) $(line_width_LDADD) $(LIBS) +linear_gradient$(EXEEXT): $(linear_gradient_OBJECTS) $(linear_gradient_DEPENDENCIES) + @rm -f linear_gradient$(EXEEXT) + $(LINK) $(linear_gradient_LDFLAGS) $(linear_gradient_OBJECTS) $(linear_gradient_LDADD) $(LIBS) move_to_show_surface$(EXEEXT): $(move_to_show_surface_OBJECTS) $(move_to_show_surface_DEPENDENCIES) @rm -f move_to_show_surface$(EXEEXT) $(LINK) $(move_to_show_surface_LDFLAGS) $(move_to_show_surface_OBJECTS) $(move_to_show_surface_LDADD) $(LIBS) +pixman_rotate$(EXEEXT): $(pixman_rotate_OBJECTS) $(pixman_rotate_DEPENDENCIES) + @rm -f pixman_rotate$(EXEEXT) + $(LINK) $(pixman_rotate_LDFLAGS) $(pixman_rotate_OBJECTS) $(pixman_rotate_LDADD) $(LIBS) text_cache_crash$(EXEEXT): $(text_cache_crash_OBJECTS) $(text_cache_crash_DEPENDENCIES) @rm -f text_cache_crash$(EXEEXT) $(LINK) $(text_cache_crash_LDFLAGS) $(text_cache_crash_OBJECTS) $(text_cache_crash_LDADD) $(LIBS) @@ -376,11 +455,17 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffer_diff.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clip_twice.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coverage.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fill_rule.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imagediff.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/leaky_polygon.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/line_width.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linear_gradient.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/move_to_show_surface.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixman_rotate.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read_png.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text_cache_crash.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text_rotate.Po@am__quote@ @@ -570,7 +655,7 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am -all-am: Makefile +all-am: Makefile $(PROGRAMS) installdirs: install: install-am install-exec: install-exec-am @@ -600,7 +685,7 @@ maintainer-clean-generic: clean: clean-am clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ - mostlyclean-am + clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -649,13 +734,13 @@ ps-am: uninstall-am: uninstall-info-am .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + clean-checkPROGRAMS clean-generic clean-libtool \ + clean-noinstPROGRAMS ctags distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-info-am diff --git a/gfx/cairo/cairo/test/buffer_diff.c b/gfx/cairo/cairo/test/buffer_diff.c new file mode 100644 index 000000000000..07abd62a34a8 --- /dev/null +++ b/gfx/cairo/cairo/test/buffer_diff.c @@ -0,0 +1,73 @@ +/* imagediff - Compare two images + * + * Copyright © 2004 Richard D. Worth + * + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without + * fee, provided that the above copyright notice appear in all copies + * and that both that copyright notice and this permission notice + * appear in supporting documentation, and that the name of Richard Worth + * not be used in advertising or publicity pertaining to distribution + * of the software without specific, written prior permission. + * Richard Worth makes no representations about the suitability of this + * software for any purpose. It is provided "as is" without express + * or implied warranty. + * + * RICHARD WORTH DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN + * NO EVENT SHALL RICHARD WORTH BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Author: Richard D. Worth */ + +#include "buffer_diff.h" + +/* Image comparison code courttesy of Richard Worth. + * Returns number of pixels changed. + * Also fills out a "diff" image intended to visually show where the + * images differ. + */ +int +buffer_diff (char *buf_a, char *buf_b, char *buf_diff, + int width, int height, int stride) +{ + int x, y; + int total_pixels_changed = 0; + unsigned char *row_a, *row_b, *row; + + for (y = 0; y < height; y++) + { + row_a = buf_a + y * stride; + row_b = buf_b + y * stride; + row = buf_diff + y * stride; + for (x = 0; x < width; x++) + { + int channel; + unsigned char value_a, value_b; + int pixel_changed = 0; + for (channel = 0; channel < 4; channel++) + { + double diff; + value_a = row_a[x * 4 + channel]; + value_b = row_b[x * 4 + channel]; + if (value_a != value_b) + pixel_changed = 1; + diff = value_a - value_b; + row[x * 4 + channel] = 128 + diff / 3.0; + } + if (pixel_changed) { + total_pixels_changed++; + } else { + row[x*4+0] = 0; + row[x*4+1] = 0; + row[x*4+2] = 0; + } + row[x * 4 + 3] = 0xff; /* Set ALPHA to 100% (opaque) */ + } + } + + return total_pixels_changed; +} diff --git a/gfx/cairo/cairo/test/buffer_diff.h b/gfx/cairo/cairo/test/buffer_diff.h new file mode 100644 index 000000000000..9ee51c3cf37d --- /dev/null +++ b/gfx/cairo/cairo/test/buffer_diff.h @@ -0,0 +1,38 @@ +/* imagediff - Compare two images + * + * Copyright © 2004 Richard D. Worth + * + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without + * fee, provided that the above copyright notice appear in all copies + * and that both that copyright notice and this permission notice + * appear in supporting documentation, and that the name of Richard Worth + * not be used in advertising or publicity pertaining to distribution + * of the software without specific, written prior permission. + * Richard Worth makes no representations about the suitability of this + * software for any purpose. It is provided "as is" without express + * or implied warranty. + * + * RICHARD WORTH DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN + * NO EVENT SHALL RICHARD WORTH BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Author: Richard D. Worth */ + +#ifndef BUFFER_DIFF_H +#define BUFFER_DIFF_H + +/* Image comparison code courttesy of Richard Worth. + * Returns number of pixels changed. + * Also fills out a "diff" image intended to visually show where the + * images differ. + */ +int +buffer_diff (char *buf_a, char *buf_b, char *buf_diff, + int width, int height, int stride); + +#endif diff --git a/gfx/cairo/cairo/test/cairo_test.c b/gfx/cairo/cairo/test/cairo_test.c index 2364570a2f20..06f7672fda43 100644 --- a/gfx/cairo/cairo/test/cairo_test.c +++ b/gfx/cairo/cairo/test/cairo_test.c @@ -32,10 +32,12 @@ #include "cairo_test.h" +#include "buffer_diff.h" #include "read_png.h" #include "write_png.h" #include "xmalloc.h" +#define CAIRO_TEST_LOG_SUFFIX ".log" #define CAIRO_TEST_PNG_SUFFIX "-out.png" #define CAIRO_TEST_REF_SUFFIX "-ref.png" #define CAIRO_TEST_DIFF_SUFFIX "-diff.png" @@ -43,9 +45,10 @@ static void xasprintf (char **strp, const char *fmt, ...) { +#ifdef HAVE_VASPRINTF va_list va; int ret; - + va_start (va, fmt); ret = vasprintf (strp, fmt, va); va_end (va); @@ -54,53 +57,42 @@ xasprintf (char **strp, const char *fmt, ...) fprintf (stderr, "Out of memory\n"); exit (1); } +#else /* !HAVE_VASNPRINTF */ +#define BUF_SIZE 1024 + va_list va; + char buffer[BUF_SIZE]; + int ret; + + va_start (va, fmt); + ret = vsnprintf (buffer, sizeof(buffer), fmt, va); + va_end (va); + + if (ret < 0) { + fprintf (stderr, "Failure in vsnprintf\n"); + exit (1); + } + + if (strlen (buffer) == sizeof(buffer) - 1) { + fprintf (stderr, "Overflowed fixed buffer\n"); + exit (1); + } + + *strp = strdup (buffer); + if (!*strp) { + fprintf (stderr, "Out of memory\n"); + exit (1); + } +#endif /* !HAVE_VASNPRINTF */ } -/* Image comparison code courttesy of Richard Worth. - * Returns number of pixels changed. - * Also fills out a "diff" image intended to visually show where the - * images differ. - */ -static int -image_diff (char *buf_a, char *buf_b, char *buf_diff, - int width, int height, int stride) +static void +xunlink (const char *pathname) { - int x, y; - int total_pixels_changed = 0; - unsigned char *row_a, *row_b, *row; - - for (y = 0; y < height; y++) - { - row_a = buf_a + y * stride; - row_b = buf_b + y * stride; - row = buf_diff + y * stride; - for (x = 0; x < width; x++) - { - int channel; - unsigned char value_a, value_b; - int pixel_changed = 0; - for (channel = 0; channel < 4; channel++) - { - double diff; - value_a = row_a[x * 4 + channel]; - value_b = row_b[x * 4 + channel]; - if (value_a != value_b) - pixel_changed = 1; - diff = value_a - value_b; - row[x * 4 + channel] = 128 + diff / 3.0; - } - if (pixel_changed) { - total_pixels_changed++; - } else { - row[x*4+0] = 0; - row[x*4+1] = 0; - row[x*4+2] = 0; - } - row[x * 4 + 3] = 0xff; /* Set ALPHA to 100% (opaque) */ - } + if (unlink (pathname) < 0 && errno != ENOENT) { + fprintf (stderr, " Error: Cannot remove %s: %s\n", + pathname, strerror (errno)); + exit (1); } - - return total_pixels_changed; } cairo_test_status_t @@ -109,12 +101,14 @@ cairo_test (cairo_test_t *test, cairo_test_draw_function_t draw) cairo_t *cr; int stride; unsigned char *png_buf, *ref_buf, *diff_buf; - char *png_name, *ref_name, *diff_name; + char *log_name, *png_name, *ref_name, *diff_name; char *srcdir; int pixels_changed; int ref_width, ref_height, ref_stride; read_png_status_t png_status; cairo_test_status_t ret; + FILE *png_file; + FILE *log_file; /* The cairo part of the test is the easiest part */ cr = cairo_create (); @@ -142,57 +136,68 @@ cairo_test (cairo_test_t *test, cairo_test_draw_function_t draw) srcdir = getenv ("srcdir"); if (!srcdir) srcdir = "."; + xasprintf (&log_name, "%s%s", test->name, CAIRO_TEST_LOG_SUFFIX); xasprintf (&png_name, "%s%s", test->name, CAIRO_TEST_PNG_SUFFIX); xasprintf (&ref_name, "%s/%s%s", srcdir, test->name, CAIRO_TEST_REF_SUFFIX); xasprintf (&diff_name, "%s%s", test->name, CAIRO_TEST_DIFF_SUFFIX); - write_png_argb32 (png_buf, png_name, test->width, test->height, stride); + png_file = fopen (png_name, "w"); + write_png_argb32 (png_buf, png_file, test->width, test->height, stride); + fclose (png_file); + + xunlink (log_name); ref_buf = NULL; png_status = (read_png_argb32 (ref_name, &ref_buf, &ref_width, &ref_height, &ref_stride)); if (png_status) { + log_file = fopen (log_name, "a"); switch (png_status) { case READ_PNG_FILE_NOT_FOUND: - fprintf (stderr, " Error: No reference image found: %s\n", ref_name); + fprintf (log_file, "Error: No reference image found: %s\n", ref_name); break; case READ_PNG_FILE_NOT_PNG: - fprintf (stderr, " Error: %s is not a png image\n", ref_name); + fprintf (log_file, "Error: %s is not a png image\n", ref_name); break; default: - fprintf (stderr, " Error: Failed to read %s\n", ref_name); + fprintf (log_file, "Error: Failed to read %s\n", ref_name); } + fclose (log_file); ret = CAIRO_TEST_FAILURE; goto BAIL; + } else { } if (test->width != ref_width || test->height != ref_height) { - fprintf (stderr, - " Error: Image size mismatch: (%dx%d) vs. (%dx%d)\n" - " for %s vs %s\n", + log_file = fopen (log_name, "a"); + fprintf (log_file, + "Error: Image size mismatch: (%dx%d) vs. (%dx%d)\n" + " for %s vs %s\n", test->width, test->height, ref_width, ref_height, png_name, ref_name); + fclose (log_file); + ret = CAIRO_TEST_FAILURE; goto BAIL; } - pixels_changed = image_diff (png_buf, ref_buf, diff_buf, - test->width, test->height, stride); + pixels_changed = buffer_diff (png_buf, ref_buf, diff_buf, + test->width, test->height, stride); if (pixels_changed) { - fprintf (stderr, " Error: %d pixels differ from reference image %s\n", + log_file = fopen (log_name, "a"); + fprintf (log_file, "Error: %d pixels differ from reference image %s\n", pixels_changed, ref_name); - write_png_argb32 (diff_buf, diff_name, test->width, test->height, stride); + png_file = fopen (diff_name, "w"); + write_png_argb32 (diff_buf, png_file, test->width, test->height, stride); + fclose (png_file); + fclose (log_file); + ret = CAIRO_TEST_FAILURE; goto BAIL; } else { - if (unlink (diff_name) < 0 && errno != ENOENT) { - fprintf (stderr, " Error: Cannot remove %s: %s\n", - diff_name, strerror (errno)); - ret = CAIRO_TEST_FAILURE; - goto BAIL; - } + xunlink (diff_name); } ret = CAIRO_TEST_SUCCESS; @@ -201,9 +206,42 @@ BAIL: free (png_buf); free (ref_buf); free (diff_buf); + free (log_name); free (png_name); free (ref_name); free (diff_name); return ret; } + +cairo_pattern_t * +cairo_test_create_png_pattern (cairo_t *cr, const char *filename) +{ + cairo_surface_t *image; + cairo_pattern_t *pattern; + unsigned char *buffer; + int w, h, stride; + read_png_status_t status; + char *srcdir = getenv ("srcdir"); + + status = read_png_argb32 (filename, &buffer, &w,&h, &stride); + if (status != READ_PNG_SUCCESS) { + if (srcdir) { + char *srcdir_filename; + xasprintf (&srcdir_filename, "%s/%s", srcdir, filename); + status = read_png_argb32 (srcdir_filename, &buffer, &w,&h, &stride); + free (srcdir_filename); + } + } + if (status != READ_PNG_SUCCESS) + return NULL; + + image = cairo_surface_create_for_image (buffer, CAIRO_FORMAT_ARGB32, + w, h, stride); + + cairo_surface_set_repeat (image, 1); + + pattern = cairo_pattern_create_for_surface (image); + + return pattern; +} diff --git a/gfx/cairo/cairo/test/cairo_test.h b/gfx/cairo/cairo/test/cairo_test.h index 58936d568e96..912ce89172de 100644 --- a/gfx/cairo/cairo/test/cairo_test.h +++ b/gfx/cairo/cairo/test/cairo_test.h @@ -47,5 +47,9 @@ typedef void (*cairo_test_draw_function_t) (cairo_t *cr, int width, int height) cairo_test_status_t cairo_test (cairo_test_t *test, cairo_test_draw_function_t draw); +cairo_pattern_t * +cairo_test_create_png_pattern (cairo_t *cr, const char *filename); + + #endif diff --git a/gfx/cairo/cairo/test/clip_twice-ref.png b/gfx/cairo/cairo/test/clip_twice-ref.png new file mode 100644 index 0000000000000000000000000000000000000000..ab0ae1aeb158439e272bd6fa7f158ef68918d812 GIT binary patch literal 751 zcmVo?{X6x6vN;h z)Z%}SZB?MW327z!A_YD{`W7}$@>ZI&0XuVW(E#26GuNbyuQuYZiC?AhizB9voe^-u#4po<@+(+B_1AcXiadfqdl~o$+|DQ7jr1US0ktD-pd1Wn zF9V-}Tl!dDoB_|EdZ-DaG+=uk1_!_$T^uo8C_m6Fhmt(^&Rn+UCpCFo?!m6pB12)o zMT3zyyh2&bw1^Ncfvp9Iesb+k-Pq|vdQWmr5LQ5`K{%5Kn8`GGBdCDZ5|n<)#uiEn z$z9)Lv!DW^Rl=J*K$L0oLSlgW@KGH8+5`qvzqw;ArLZ(TvmOt!! zTwn?&is7~Q`UllPD5NToYf4T~QAdD)|X;2#Q|D!aZyqS-T$!Sm+(5g&+ z{e#ocsz^sG3<%-r50PsT8W76UA0n>;p#dR1{UI_!-j=T%&T_oVnb(HhB)$ z;p!nIPl293*2wf+PF-gha{E7^b_C@Wy!M1BhGf-!y#8hGxLo>o1HfL9v6rN#{xvzn hFbu;m48t&{liz|Wz$EgXkFx*(002ovPDHLkV1kx7Pu2hc literal 0 HcmV?d00001 diff --git a/gfx/cairo/cairo/test/clip_twice.c b/gfx/cairo/cairo/test/clip_twice.c new file mode 100644 index 000000000000..00215e62c648 --- /dev/null +++ b/gfx/cairo/cairo/test/clip_twice.c @@ -0,0 +1,72 @@ +/* + * Copyright © 2005 Red Hat, Inc. + * + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without + * fee, provided that the above copyright notice appear in all copies + * and that both that copyright notice and this permission notice + * appear in supporting documentation, and that the name of + * Red Hat, Inc. not be used in advertising or publicity pertaining to + * distribution of the software without specific, written prior + * permission. Red Hat, Inc. makes no representations about the + * suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL RED HAT, INC. BE LIABLE FOR ANY SPECIAL, + * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR + * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Author: Kristian Høgsberg + */ + +#include "cairo_test.h" + +#define WIDTH 64 +#define HEIGHT 64 + +cairo_test_t test = { + "clip_twice", + "Verifies that the clip mask is updated correctly when it constructed by setting the clip path twice.", + WIDTH, HEIGHT +}; + +static void +draw (cairo_t *cr, int width, int height) +{ + cairo_set_alpha (cr, 1.0); + cairo_new_path (cr); + cairo_arc (cr, WIDTH / 2, HEIGHT / 2, WIDTH / 3, 0, 2 * M_PI); + cairo_clip (cr); + + cairo_new_path (cr); + cairo_move_to (cr, 0, 0); + cairo_line_to (cr, WIDTH / 4, HEIGHT / 2); + cairo_line_to (cr, 0, HEIGHT); + cairo_line_to (cr, WIDTH, HEIGHT); + cairo_line_to (cr, 3 * WIDTH / 4, HEIGHT / 2); + cairo_line_to (cr, WIDTH, 0); + cairo_close_path (cr); + cairo_clip (cr); + + cairo_set_rgb_color (cr, 0, 0, 0.6); + + cairo_new_path (cr); + cairo_move_to (cr, 0, 0); + cairo_line_to (cr, 0, HEIGHT); + cairo_line_to (cr, WIDTH / 2, 3 * HEIGHT / 4); + cairo_line_to (cr, WIDTH, HEIGHT); + cairo_line_to (cr, WIDTH, 0); + cairo_line_to (cr, WIDTH / 2, HEIGHT / 4); + cairo_close_path (cr); + cairo_fill (cr); +} + +int +main (void) +{ + return cairo_test (&test, draw); +} diff --git a/gfx/cairo/cairo/test/coverage-ref.png b/gfx/cairo/cairo/test/coverage-ref.png new file mode 100644 index 0000000000000000000000000000000000000000..9b71040576462d94767ed4591bd9153654ef30b2 GIT binary patch literal 44324 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 literal 0 HcmV?d00001 diff --git a/gfx/cairo/cairo/test/coverage.c b/gfx/cairo/cairo/test/coverage.c new file mode 100644 index 000000000000..00c86a1d551a --- /dev/null +++ b/gfx/cairo/cairo/test/coverage.c @@ -0,0 +1,182 @@ +/* + * Copyright © 2005 Red Hat, Inc. + * + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without + * fee, provided that the above copyright notice appear in all copies + * and that both that copyright notice and this permission notice + * appear in supporting documentation, and that the name of + * Red Hat, Inc. not be used in advertising or publicity pertaining to + * distribution of the software without specific, written prior + * permission. Red Hat, Inc. makes no representations about the + * suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL RED HAT, INC. BE LIABLE FOR ANY SPECIAL, + * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR + * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Author: Kristian Høgsberg + */ + +#include +#include "cairo_test.h" + +#define WIDTH 64 +#define HEIGHT 64 +#define PAD 10 + +/* XXX The test image uses Bitstream Vera Sans as the font - how do we + * ensure that it's available? Can we ship it with this test? */ + +const char fontname[] = "Bitstream Vera Sans"; +const int fontsize = 40; +const char png_filename[] = "romedalen.png"; + +static void +set_solid_pattern (cairo_t *cr, int x, int y) +{ + cairo_set_rgb_color (cr, 0, 0, 0.6); + cairo_set_alpha (cr, 1.0); +} + +static void +set_translucent_pattern (cairo_t *cr, int x, int y) +{ + cairo_set_rgb_color (cr, 0, 0, 0.6); + cairo_set_alpha (cr, 0.5); +} + +static void +set_gradient_pattern (cairo_t *cr, int x, int y) +{ + cairo_pattern_t *pattern; + + pattern = + cairo_pattern_create_linear (x, y, x + WIDTH, y + HEIGHT); + cairo_pattern_add_color_stop (pattern, 0, 1, 1, 1, 1); + cairo_pattern_add_color_stop (pattern, 1, 0, 0, 0.4, 1); + cairo_set_pattern (cr, pattern); + cairo_set_alpha (cr, 1); +} + +static void +set_image_pattern (cairo_t *cr, int x, int y) +{ + cairo_pattern_t *pattern; + + pattern = cairo_test_create_png_pattern (cr, png_filename); + cairo_set_pattern (cr, pattern); + cairo_set_alpha (cr, 1); +} + +static void +set_translucent_image_pattern (cairo_t *cr, int x, int y) +{ + cairo_pattern_t *pattern; + + pattern = cairo_test_create_png_pattern (cr, png_filename); + cairo_set_pattern (cr, pattern); + cairo_set_alpha (cr, 0.5); +} + +static void +draw_text (cairo_t *cr, int x, int y) +{ + cairo_rel_move_to (cr, 0, fontsize); + cairo_show_text (cr, "Aa"); +} + +static void +draw_polygon (cairo_t *cr, int x, int y) +{ + cairo_new_path (cr); + cairo_move_to (cr, x, y); + cairo_line_to (cr, x, y + HEIGHT); + cairo_line_to (cr, x + WIDTH / 2, y + 3 * HEIGHT / 4); + cairo_line_to (cr, x + WIDTH, y + HEIGHT); + cairo_line_to (cr, x + WIDTH, y); + cairo_line_to (cr, x + WIDTH / 2, y + HEIGHT / 4); + cairo_close_path (cr); + cairo_fill (cr); +} + +static void (*pattern_funcs[])(cairo_t *cr, int x, int y) = { + set_solid_pattern, + set_translucent_pattern, + set_gradient_pattern, + set_image_pattern, + set_translucent_image_pattern +}; + +static void (*draw_funcs[])(cairo_t *cr, int x, int y) = { + draw_text, + draw_polygon, +}; + +#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0])) +#define IMAGE_WIDTH (ARRAY_SIZE (pattern_funcs) * (WIDTH + PAD) + PAD) +#define IMAGE_HEIGHT (ARRAY_SIZE (draw_funcs) * (HEIGHT + PAD) * 2 + PAD) + +static cairo_test_t test = { + "coverage", + "Various coverage test of cairo", + IMAGE_WIDTH, IMAGE_HEIGHT +}; + + +static void +draw (cairo_t *cr, int width, int height) +{ + /* TODO: pattern fill, gradient fill, clipping, gradient clipping, + path+solid alpha mask clipping */ + + int i, j, x, y; + + cairo_select_font (cr, fontname, + CAIRO_FONT_SLANT_NORMAL, + CAIRO_FONT_WEIGHT_BOLD); + cairo_scale_font (cr, fontsize); + + for (j = 0; j < ARRAY_SIZE (draw_funcs); j++) { + for (i = 0; i < ARRAY_SIZE (pattern_funcs); i++) { + x = i * (WIDTH + PAD) + PAD; + y = j * (HEIGHT + PAD) + PAD; + cairo_move_to (cr, x, y); + pattern_funcs[i] (cr, x, y); + draw_funcs[j] (cr, x, y); + } + } + + for (j = 0; j < ARRAY_SIZE (draw_funcs); j++) { + for (i = 0; i < ARRAY_SIZE (pattern_funcs); i++) { + x = i * (WIDTH + PAD) + PAD; + y = (ARRAY_SIZE (draw_funcs) + j) * (HEIGHT + PAD) + PAD; + + cairo_save (cr); + + cairo_set_alpha (cr, 1.0); + cairo_new_path (cr); + cairo_arc (cr, x + WIDTH / 2, y + HEIGHT / 2, + WIDTH / 3, 0, 2 * M_PI); + cairo_clip (cr); + + cairo_move_to (cr, x, y); + pattern_funcs[i] (cr, x, y); + draw_funcs[j] (cr, x, y); + + cairo_restore (cr); + + } + } +} + +int +main (void) +{ + return cairo_test (&test, draw); +} diff --git a/gfx/cairo/cairo/test/imagediff.c b/gfx/cairo/cairo/test/imagediff.c new file mode 100644 index 000000000000..36962f11fb00 --- /dev/null +++ b/gfx/cairo/cairo/test/imagediff.c @@ -0,0 +1,84 @@ +/* imagediff - Compare two images + * + * Copyright © 2004 Richard D. Worth + * + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without + * fee, provided that the above copyright notice appear in all copies + * and that both that copyright notice and this permission notice + * appear in supporting documentation, and that the name of Richard Worth + * not be used in advertising or publicity pertaining to distribution + * of the software without specific, written prior permission. + * Richard Worth makes no representations about the suitability of this + * software for any purpose. It is provided "as is" without express + * or implied warranty. + * + * RICHARD WORTH DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN + * NO EVENT SHALL RICHARD WORTH BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Author: Richard D. Worth */ + +#include +#include + +#include "buffer_diff.h" +#include "read_png.h" +#include "write_png.h" +#include "xmalloc.h" + +int +main (int argc, char *argv[]) +{ + unsigned char *buffer_a; + unsigned int width_a, height_a, stride_a; + unsigned char *buffer_b; + unsigned int width_b, height_b, stride_b; + + unsigned char *buffer; + unsigned int width, height, stride; + int buffer_size, total_pixels_changed; + + if (argc < 2) { + fprintf (stderr, "Usage: %s image1.png image2.png\n", argv[0]); + fprintf (stderr, "Computes an output image designed to present a \"visual diff\" such that even\n"); + fprintf (stderr, "small errors in single pixels are readily apparent in the output.\n"); + fprintf (stderr, "The output image is written on stdout.\n"); + exit (1); + } + + read_png_argb32 (argv[1], &buffer_a, &width_a, &height_a, &stride_a); + read_png_argb32 (argv[2], &buffer_b, &width_b, &height_b, &stride_b); + + if ((width_a == width_b) && (height_a == height_b) && (stride_a == stride_b)) + { + width = width_a; + height = height_a; + stride = stride_a; + } else { + fprintf (stderr, "Error. Both images must be the same size\n"); + return 1; + } + + buffer_size = stride * height; + buffer = xmalloc (buffer_size); + + total_pixels_changed = buffer_diff (buffer_a, buffer_b, buffer, + width_a, height_a, stride_a); + + + if (total_pixels_changed) + fprintf (stderr, "Total pixels changed: %d\n", total_pixels_changed); + write_png_argb32 (buffer, stdout, width, height, stride); + + free (buffer); + + return 0; +} + + + diff --git a/gfx/cairo/cairo/test/linear_gradient-ref.png b/gfx/cairo/cairo/test/linear_gradient-ref.png new file mode 100644 index 0000000000000000000000000000000000000000..77904144d50fd38a70da37b78d7a1efff9e102c2 GIT binary patch literal 12724 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 z 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 literal 0 HcmV?d00001 diff --git a/gfx/cairo/cairo/test/linear_gradient.c b/gfx/cairo/cairo/test/linear_gradient.c new file mode 100644 index 000000000000..189b50065b05 --- /dev/null +++ b/gfx/cairo/cairo/test/linear_gradient.c @@ -0,0 +1,141 @@ +/* + * Copyright © 2005 Red Hat, Inc. + * + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without + * fee, provided that the above copyright notice appear in all copies + * and that both that copyright notice and this permission notice + * appear in supporting documentation, and that the name of + * Red Hat, Inc. not be used in advertising or publicity pertaining to + * distribution of the software without specific, written prior + * permission. Red Hat, Inc. makes no representations about the + * suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL RED HAT, INC. BE LIABLE FOR ANY SPECIAL, + * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR + * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Author: Owen Taylor + */ + +#include "cairo_test.h" +#include "stdio.h" + +/* The test matrix is + * + * A) Horizontal B) 5° C) 45° D) Vertical + * 1) Rotated 0° 2) Rotated 45° C) Rotated 90° + * a) 2 stop b) 3 stop + * + * A1a B1a C1a D1a + * A2a B2a C2a D2a + * A3a B3a C3a D3a + * A1b B1b C1b D1b + * A2b B2b C2b D2b + * A3b B3b C3b D3b + */ + +static const double gradient_angles[] = { 0, 45, 90 }; +#define N_GRADIENT_ANGLES 3 +static const double rotate_angles[] = { 0, 45, 90 }; +#define N_ROTATE_ANGLES 3 +static const int n_stops[] = { 2, 3 }; +#define N_N_STOPS 2 + +#define UNIT_SIZE 75 +#define UNIT_SIZE 75 +#define PAD 5 + +#define WIDTH N_GRADIENT_ANGLES * UNIT_SIZE + (N_GRADIENT_ANGLES + 1) * PAD +#define HEIGHT N_N_STOPS * N_ROTATE_ANGLES * UNIT_SIZE + (N_N_STOPS * N_ROTATE_ANGLES + 1) * PAD + +cairo_test_t test = { + "linear_gradient", + "Tests the drawing of linear gradients", + WIDTH, HEIGHT +}; + +static void +draw_unit (cairo_t *cr, + double gradient_angle, + double rotate_angle, + int n_stops) +{ + cairo_pattern_t *pattern; + + cairo_rectangle (cr, 0, 0, 1, 1); + cairo_clip (cr); + cairo_new_path(cr); + + cairo_set_rgb_color (cr, 0.0, 0.0, 0.0); + cairo_rectangle (cr, 0, 0, 1, 1); + cairo_fill (cr); + + cairo_translate (cr, 0.5, 0.5); + cairo_scale (cr, 1 / 1.5, 1 / 1.5); + cairo_rotate (cr, rotate_angle); + + pattern = cairo_pattern_create_linear (-0.5 * cos (gradient_angle), -0.5 * sin (gradient_angle), + 0.5 * cos (gradient_angle), 0.5 * sin (gradient_angle)); + + if (n_stops == 2) { + cairo_pattern_add_color_stop (pattern, 0., + 0.3, 0.3, 0.3, + 1.0); + cairo_pattern_add_color_stop (pattern, 1., + 1.0, 1.0, 1.0, + 1.0); + } else { + cairo_pattern_add_color_stop (pattern, 0., + 1.0, 0.0, 0.0, + 1.0); + cairo_pattern_add_color_stop (pattern, 0.5, + 1.0, 1.0, 1.0, + 1.0); + cairo_pattern_add_color_stop (pattern, 1., + 0.0, 0.0, 1.0, + 1.0); + } + + cairo_set_pattern (cr, pattern); + cairo_pattern_destroy (pattern); + cairo_rectangle (cr, -0.5, -0.5, 1, 1); + cairo_fill (cr); +} + +static void +draw (cairo_t *cr, int width, int height) +{ + int i, j, k; + + cairo_set_rgb_color (cr, 0.5, 0.5, 0.5); + cairo_rectangle (cr, 0, 0, width, height); + cairo_fill (cr); + + for (i = 0; i < N_GRADIENT_ANGLES; i++) + for (j = 0; j < N_ROTATE_ANGLES; j++) + for (k = 0; k < N_N_STOPS; k++) { + cairo_save (cr); + cairo_translate (cr, + PAD + (PAD + UNIT_SIZE) * i, + PAD + (PAD + UNIT_SIZE) * (N_ROTATE_ANGLES * k + j)); + cairo_scale (cr, UNIT_SIZE, UNIT_SIZE); + + draw_unit (cr, + gradient_angles[i] * M_PI / 180., + rotate_angles[j] * M_PI / 180., + n_stops[k]); + cairo_restore (cr); + } +} + +int +main (void) +{ + return cairo_test (&test, draw); +} diff --git a/gfx/cairo/cairo/test/pixman_rotate-ref.png b/gfx/cairo/cairo/test/pixman_rotate-ref.png new file mode 100644 index 0000000000000000000000000000000000000000..7e47a4d8f52eec624af0eff8b651e32ca2c4a6ff GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoY)RhkE)4%caKYZ?lYt^TJzX3_ zD(1Ysb&&IrgMh=u&WOg^$eyVYJ+(KTY&hrbarr5De|LN2x6K<=W-gTe~DWM4f_{CVn literal 0 HcmV?d00001 diff --git a/gfx/cairo/cairo/test/pixman_rotate.c b/gfx/cairo/cairo/test/pixman_rotate.c new file mode 100644 index 000000000000..6a64a9a77c42 --- /dev/null +++ b/gfx/cairo/cairo/test/pixman_rotate.c @@ -0,0 +1,78 @@ +#include +#include +#include +#include + +#include +#include +#include + +#include "cairo_test.h" + +#define WIDTH 32 +#define HEIGHT WIDTH + +#define IMAGE_WIDTH (3 * WIDTH) +#define IMAGE_HEIGHT IMAGE_WIDTH + +cairo_test_t test = { + "pixman_rotate", + "Exposes pixman off-by-one error when rotating", + IMAGE_WIDTH, IMAGE_HEIGHT +}; + +/* Draw the word cairo at NUM_TEXT different angles */ +static void +draw (cairo_t *cr, int width, int height) +{ + cairo_surface_t *target, *stamp; + + target = cairo_current_target_surface (cr); + cairo_surface_reference (target); + + stamp = cairo_surface_create_similar (target, CAIRO_FORMAT_ARGB32, + WIDTH, HEIGHT); + cairo_set_target_surface (cr, stamp); + cairo_new_path (cr); + cairo_rectangle (cr, WIDTH / 4, HEIGHT / 4, WIDTH / 2, HEIGHT / 2); + cairo_set_rgb_color (cr, 1, 0, 0); + cairo_set_alpha (cr, 0.8); + cairo_fill (cr); + + cairo_rectangle (cr, 0, 0, WIDTH, HEIGHT); + cairo_set_line_width (cr, 2); + cairo_set_rgb_color (cr, 0, 0, 0); + cairo_set_alpha (cr, 1); + cairo_stroke (cr); + + cairo_set_target_surface (cr, target); + + /* Draw a translucent rectangle for reference where the rotated + * image should be. */ + cairo_new_path (cr); + cairo_rectangle (cr, WIDTH, HEIGHT, WIDTH, HEIGHT); + cairo_set_rgb_color (cr, 1, 1, 0); + cairo_set_alpha (cr, 0.3); + cairo_fill (cr); + +#if 1 /* Set to 0 to generate reference image */ + cairo_translate (cr, 2 * WIDTH, 2 * HEIGHT); + cairo_rotate (cr, M_PI); +#else + cairo_translate (cr, WIDTH, HEIGHT); +#endif + + cairo_set_alpha (cr, 1); + cairo_show_surface (cr, stamp, WIDTH + 2, HEIGHT + 2); + + cairo_show_page (cr); + + cairo_surface_destroy (stamp); + cairo_surface_destroy (target); +} + +int +main (void) +{ + return cairo_test (&test, draw); +} diff --git a/gfx/cairo/cairo/test/read_png.c b/gfx/cairo/cairo/test/read_png.c index 23f91e8318bf..e7e2a92caa13 100644 --- a/gfx/cairo/cairo/test/read_png.c +++ b/gfx/cairo/cairo/test/read_png.c @@ -47,9 +47,9 @@ premultiply_data (png_structp png, unsigned char alpha = base[3]; unsigned long p; - red = (unsigned) red * (unsigned) alpha / 255; - green = (unsigned) green * (unsigned) alpha / 255; - blue = (unsigned) blue * (unsigned) alpha / 255; + red = ((unsigned) red * (unsigned) alpha + 127) / 255; + green = ((unsigned) green * (unsigned) alpha + 127) / 255; + blue = ((unsigned) blue * (unsigned) alpha + 127) / 255; p = (alpha << 24) | (red << 16) | (green << 8) | (blue << 0); memcpy (base, &p, sizeof (unsigned long)); } diff --git a/gfx/cairo/cairo/test/romedalen.png b/gfx/cairo/cairo/test/romedalen.png new file mode 100644 index 0000000000000000000000000000000000000000..0c41eb0cfd29177c4ff83b4bcf99f7bec6a96c97 GIT binary patch literal 80944 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%0Agh7a)>cPiR96c-o4u~89Ah|m928c{( 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 KMNUMnLSTY`L)R4m literal 0 HcmV?d00001 diff --git a/gfx/cairo/cairo/test/write_png.c b/gfx/cairo/cairo/test/write_png.c index 2ea29d0624d6..0ff5bcd3a9ab 100644 --- a/gfx/cairo/cairo/test/write_png.c +++ b/gfx/cairo/cairo/test/write_png.c @@ -1,5 +1,5 @@ /* - * Copyright 2003 USC, Information Sciences Institute + * Copyright © 2003 USC, Information Sciences Institute * * Permission to use, copy, modify, distribute, and sell this software * and its documentation for any purpose is hereby granted without @@ -22,7 +22,7 @@ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * Author: Carl D. Worth + * Author: Carl D. Worth */ #include @@ -46,26 +46,24 @@ unpremultiply_data (png_structp png, png_row_infop row_info, png_bytep data) if (alpha == 0) { b[0] = b[1] = b[2] = b[3] = 0; } else { - b[0] = (((pixel & 0x0000ff) >> 0) * 255) / alpha; - b[1] = (((pixel & 0x00ff00) >> 8) * 255) / alpha; - b[2] = (((pixel & 0xff0000) >> 16) * 255) / alpha; + b[0] = (((pixel & 0x0000ff) >> 0) * 255 + alpha / 2) / alpha; + b[1] = (((pixel & 0x00ff00) >> 8) * 255 + alpha / 2) / alpha; + b[2] = (((pixel & 0xff0000) >> 16) * 255 + alpha / 2) / alpha; b[3] = alpha; } } } void -write_png_argb32 (char *buffer, char *filename, +write_png_argb32 (char *buffer, FILE *file, int width, int height, int stride) { - FILE *f; int i; png_struct *png; png_info *info; png_byte **rows; png_color_16 white; - f = fopen (filename, "w"); rows = malloc (height * sizeof(png_byte*)); for (i = 0; i < height; i++) { @@ -75,7 +73,7 @@ write_png_argb32 (char *buffer, char *filename, png = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); info = png_create_info_struct (png); - png_init_io (png, f); + png_init_io (png, file); png_set_IHDR (png, info, width, height, 8, PNG_COLOR_TYPE_RGB_ALPHA, @@ -98,5 +96,4 @@ write_png_argb32 (char *buffer, char *filename, png_destroy_write_struct (&png, &info); free (rows); - fclose (f); } diff --git a/gfx/cairo/cairo/test/write_png.h b/gfx/cairo/cairo/test/write_png.h index a71ca6a32c30..fe0e92b20b9b 100644 --- a/gfx/cairo/cairo/test/write_png.h +++ b/gfx/cairo/cairo/test/write_png.h @@ -1,5 +1,5 @@ /* - * Copyright 2003 USC, Information Sciences Institute + * Copyright © 2003 USC, Information Sciences Institute * * Permission to use, copy, modify, distribute, and sell this software * and its documentation for any purpose is hereby granted without @@ -29,7 +29,7 @@ #define WRITE_PNG_H void -write_png_argb32 (char *buffer, char *filename, +write_png_argb32 (char *buffer, FILE * file, int width, int height, int stride); #endif diff --git a/gfx/cairo/font-backend.diff b/gfx/cairo/font-backend.diff deleted file mode 100644 index 5005d768d5c8..000000000000 --- a/gfx/cairo/font-backend.diff +++ /dev/null @@ -1,24 +0,0 @@ -Index: configure.in -=================================================================== -RCS file: /cvsroot/mozilla/gfx/cairo/cairo/configure.in,v -retrieving revision 1.1 -diff -u -8 -p -u -r1.1 configure.in ---- configure.in 24 Feb 2005 20:08:53 -0000 1.1 -+++ configure.in 8 Mar 2005 18:12:11 -0000 -@@ -367,8 +367,16 @@ echo " PDF: $use_pdf" - echo " PNG: $use_png" - echo " glitz: $use_glitz" - echo "" - echo "and the following font backends:" - echo " freetype: $use_freetype" - echo " atsui: $use_atsui" - echo "" - -+if test x"$use_freetype" != "xyes" && \ -+ test x"$use_atsui" != "xyes" ; then -+ -+ AC_MSG_ERROR([Cairo requires at least one font backend. -+ Please install freetype and fontconfig, then try again: -+ http://freetype.org/ http://fontconfig.org/ -+ ]) -+fi diff --git a/gfx/cairo/libpixman/ChangeLog b/gfx/cairo/libpixman/ChangeLog index d98fad90e46f..193edbe27a7a 100644 --- a/gfx/cairo/libpixman/ChangeLog +++ b/gfx/cairo/libpixman/ChangeLog @@ -1,3 +1,95 @@ +2005-03-07 Carl Worth + + * RELEASING: Add notes on using -head suffix for PIXMAN_VERSION. + + * NEWS: Add notes for snapshot 0.1.4. + + * configure.in: Increment version to 0.1.4. + +2005-03-04 Carl Worth + + * src/ictrap.c (pixman_composite_trapezoids): Intersect bounds of + trapezoids with the bounds of the destination surface before + creating an intermediate surface. + +2005-03-04 Carl Worth + + * src/ictrap.c (pixman_composite_trapezoids): Add comment from + xserver's mitrap.c. + +2005-03-04 David Reveman + + * src/pixman.h: + * src/ictrap.c: Add pixman_add_trapezoids. + +2005-03-03 Carl Worth + + * src/icimage.c (miIsSolidAlpha): Port from render/mipict.c. + + * src/ictrap.c (pixman_composite_trapezoids): Merge in + optimization from render/mitrap.c for op==ADD and solid alpha src. + +2005-03-03 Carl Worth + + * src/pixman-xserver-compat.h (BoxRec, BoxPtr, Bool, TRUE, FALSE): + Add a few more things that might be helpful when moving more files + over from xserver. + +2005-03-03 Carl Worth + + * src/icint.h: + * src/ictrap.c: Move definitions of MIN and MAX macros from + ictrap.c to icint.h. + +2005-03-03 Carl Worth + + * src/ictrap.c (pixman_composite_trapezoids): Remove dead "if + (!format)" code which also makes things more in synch with the + server's mitrap.c. + +2005-03-03 Carl Worth + + * src/ictrap.c: Restore original copyright and license which must + have been inadvertently changed. + +2005-03-02 Carl Worth + + * src/pixman-xserver-compat.h: Fix comment to clarify that + libpixman regards the xserver repository as its canonical upstream + for some files. + + * src/ic.c, src/icblt.c, src/icbltone.c, src/iccolor.c, + src/iccompose.c, src/icformat.c, src/icimage.c, src/icimage.h, + src/icint.h, src/icpixels.c, src/icrect.c, src/icrop.h, + src/icstipple.c, src/ictransform.c, src/ictrap.c, src/ictri.c, + src/icutil.c, src/pixman.h, src/slim_internal.h: Convert file + encodings from ISO-8859 to UTF-8. + +2005-02-21 Carl Worth + + * src/renderedge.h: Add only-just-better-than-ASCII-art diagram + showing all macros used in locating sub-pixel sample rows/columns. + + * src/renderedge.h (RenderEdgeStepSmall, RenderEdgeStepBig): Add + missing protective parentheses around macro parameter usage. + +2005-02-21 Carl Worth + + * src/ic.c: + * src/icint.h: Move definition of __inline for non-gcc from ic.c + to icint.h so it applies to more code in the implementation. + +2005-02-06 Owen Taylor + + * configure.in: Add AC_PREREQ(2.54) to help the Debian + auto-guess-which-configure-version hack. + +2005-01-26 Carl Worth + + * src/pixman.h: Use 32-bits for pixman_bits_t, even on 64-bit + platforms. This should fix bug #2335 as well as rendering problems + seen on 64-bit platforms. + 2005-01-21 Carl Worth * NEWS: Add notes for snapshot 0.1.3. diff --git a/gfx/cairo/libpixman/Makefile.in b/gfx/cairo/libpixman/Makefile.in index 8b770b7ec850..f0de1c8c11c6 100644 --- a/gfx/cairo/libpixman/Makefile.in +++ b/gfx/cairo/libpixman/Makefile.in @@ -40,7 +40,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/libpixman.pc.in $(top_srcdir)/configure AUTHORS \ COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \ - depcomp install-sh ltmain.sh missing mkinstalldirs + depcomp install-sh ltmain.sh missing subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in @@ -48,7 +48,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = libpixman.pc SOURCES = diff --git a/gfx/cairo/libpixman/NEWS b/gfx/cairo/libpixman/NEWS index e39172a6d712..62d00554644c 100644 --- a/gfx/cairo/libpixman/NEWS +++ b/gfx/cairo/libpixman/NEWS @@ -1,3 +1,25 @@ +Snapshot 0.1.4 (2005-03-07 Carl Worth ) +========================================================== +API Addition +------------ +Add new function: + + void + pixman_add_trapezoids (pixman_image_t *dst, + int x_off, + int y_off, + const pixman_trapezoid_t *traps, + int ntraps); + +Performance improvement +----------------------- +Restrict size of intermediate surface used while compositing +trapezoids based on the bounds of the desination surface. + +Bug fixes +--------- +Fix rendering on 64-bit platforms. + Snapshot 0.1.3 (2005-01-21 Carl Worth ) ========================================================== Performance improvements diff --git a/gfx/cairo/libpixman/configure b/gfx/cairo/libpixman/configure index 1a253b485f18..ac777b37460e 100755 --- a/gfx/cairo/libpixman/configure +++ b/gfx/cairo/libpixman/configure @@ -1499,7 +1499,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Package version number, (as distinct from shared library version) -LIBPIXMAN_VERSION=0.1.3 +LIBPIXMAN_VERSION=0.1.4 # libtool shared library version diff --git a/gfx/cairo/libpixman/configure.in b/gfx/cairo/libpixman/configure.in index 105417c750f1..4e76e12a6e72 100644 --- a/gfx/cairo/libpixman/configure.in +++ b/gfx/cairo/libpixman/configure.in @@ -1,11 +1,13 @@ # Process this file with autoconf to produce a configure script. +AC_PREREQ(2.54) + AC_INIT(src/pixman.h) dnl =========================================================================== # Package version number, (as distinct from shared library version) -LIBPIXMAN_VERSION=0.1.3 +LIBPIXMAN_VERSION=0.1.4 # libtool shared library version diff --git a/gfx/cairo/libpixman/depcomp b/gfx/cairo/libpixman/depcomp index edb5d38efdb2..11e2d3bfe1cf 100755 --- a/gfx/cairo/libpixman/depcomp +++ b/gfx/cairo/libpixman/depcomp @@ -1,7 +1,9 @@ #! /bin/sh - # depcomp - compile a program generating dependencies as side-effects -# Copyright 1999, 2000, 2003 Free Software Foundation, Inc. + +scriptversion=2004-05-31.23 + +# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,22 +27,45 @@ # Originally written by Alexandre Oliva . +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: depcomp [--help] [--version] PROGRAM [ARGS] + +Run PROGRAMS ARGS to compile a file, generating dependencies +as side-effects. + +Environment variables: + depmode Dependency tracking mode. + source Source file read by `PROGRAMS ARGS'. + object Object file output by `PROGRAMS ARGS'. + DEPDIR directory where to store dependencies. + depfile Dependency file to output. + tmpdepfile Temporary file to use when outputing dependencies. + libtool Whether libtool is used (yes/no). + +Report bugs to . +EOF + exit 0 + ;; + -v | --v*) + echo "depcomp $scriptversion" + exit 0 + ;; +esac + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 fi -# `libtool' can also be set to `yes' or `no'. - -if test -z "$depfile"; then - base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'` - dir=`echo "$object" | sed 's,/.*$,/,'` - if test "$dir" = "$object"; then - dir= - fi - # FIXME: should be _deps on DOS. - depfile="$dir.deps/$base" -fi +# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. +depfile=${depfile-`echo "$object" | + sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" @@ -262,26 +287,35 @@ tru64) base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then + # Dependencies are output in .lo.d with libtool 1.4. + # With libtool 1.5 they are output both in $dir.libs/$base.o.d + # and in $dir.libs/$base.o.d and $dir$base.o.d. We process the + # latter, because the former will be cleaned when $dir.libs is + # erased. tmpdepfile1="$dir.libs/$base.lo.d" - tmpdepfile2="$dir.libs/$base.d" + tmpdepfile2="$dir$base.o.d" + tmpdepfile3="$dir.libs/$base.d" "$@" -Wc,-MD else tmpdepfile1="$dir$base.o.d" tmpdepfile2="$dir$base.d" + tmpdepfile3="$dir$base.d" "$@" -MD fi stat=$? if test $stat -eq 0; then : else - rm -f "$tmpdepfile1" "$tmpdepfile2" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi if test -f "$tmpdepfile1"; then tmpdepfile="$tmpdepfile1" - else + elif test -f "$tmpdepfile2"; then tmpdepfile="$tmpdepfile2" + else + tmpdepfile="$tmpdepfile3" fi if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" @@ -477,3 +511,12 @@ none) esac exit 0 + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/gfx/cairo/libpixman/install-sh b/gfx/cairo/libpixman/install-sh index 6ce63b9f76bc..dd97db7aa1ca 100755 --- a/gfx/cairo/libpixman/install-sh +++ b/gfx/cairo/libpixman/install-sh @@ -1,7 +1,8 @@ #!/bin/sh -# # install - install a program, script, or datafile -# + +scriptversion=2004-09-10.20 + # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the # following copyright and license. @@ -41,13 +42,11 @@ # from scratch. It can only install one file at a time, a restriction # shared with many OS's install programs. - # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. doit="${DOITPROG-}" - # put in absolute paths if you don't have them in your path; or use env. vars. mvprog="${MVPROG-mv}" @@ -59,236 +58,265 @@ stripprog="${STRIPPROG-strip}" rmprog="${RMPROG-rm}" mkdirprog="${MKDIRPROG-mkdir}" -transformbasename="" -transform_arg="" -instcmd="$mvprog" chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" +chowncmd= +chgrpcmd= +stripcmd= rmcmd="$rmprog -f" mvcmd="$mvprog" -src="" -dst="" -dir_arg="" +src= +dst= +dir_arg= +dstarg= +no_target_directory= -while [ x"$1" != x ]; do - case $1 in - -c) instcmd=$cpprog - shift - continue;; +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... - -d) dir_arg=true - shift - continue;; +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. - -o) chowncmd="$chownprog $2" - shift - shift - continue;; +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; +while test -n "$1"; do + case $1 in + -c) shift + continue;; - -s) stripcmd=$stripprog - shift - continue;; + -d) dir_arg=true + shift + continue;; - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; + --help) echo "$usage"; exit 0;; - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; -if [ x"$src" = x ] -then - echo "$0: no input file specified" >&2 - exit 1 -else - : -fi + -o) chowncmd="$chownprog $2" + shift + shift + continue;; -if [ x"$dir_arg" != x ]; then - dst=$src - src="" + -s) stripcmd=$stripprog + shift + continue;; - if [ -d "$dst" ]; then - instcmd=: - chmodcmd="" - else - instcmd=$mkdirprog - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f "$src" ] || [ -d "$src" ] - then - : - else - echo "$0: $src does not exist" >&2 - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "$0: no destination specified" >&2 - exit 1 - else - : - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d "$dst" ] - then - dst=$dst/`basename "$src"` - else - : - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' - ' -IFS="${IFS-$defaultIFS}" - -oIFS=$IFS -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS=$oIFS - -pathcomp='' - -while [ $# -ne 0 ] ; do - pathcomp=$pathcomp$1 + -t) dstarg=$2 shift + shift + continue;; - if [ ! -d "$pathcomp" ] ; - then - $mkdirprog "$pathcomp" - else - : - fi + -T) no_target_directory=true + shift + continue;; - pathcomp=$pathcomp/ + --version) echo "$0 $scriptversion"; exit 0;; + + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac done + +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 fi -if [ x"$dir_arg" != x ] -then - $doit $instcmd "$dst" && +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac - if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi -else + if test -n "$dir_arg"; then + dst=$src + src= -# If we're going to rename the final executable, determine the name now. + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi - if [ x"$transformarg" = x ] - then - dstfile=`basename "$dst"` - else - dstfile=`basename "$dst" $transformbasename | - sed $transformarg`$transformbasename - fi + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi -# don't allow the sed command to completely eliminate the filename + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac - if [ x"$dstfile" = x ] - then - dstfile=`basename "$dst"` - else - : - fi + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi -# Make a couple of temp file names in the proper directory. + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ + # Make sure that the destination directory exists. -# Trap to clean up temp files at exit. + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" - trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 - trap '(exit $?); exit' 1 2 13 15 + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + IFS=$oIFS -# Move or copy the file name to the temp name + pathcomp= - $doit $instcmd "$src" "$dsttmp" && + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi -# and set any options; do chmod last to preserve setuid bits + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. + else + dstfile=`basename "$dst"` - if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi && + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ -# Now remove or move aside any old file at destination location. We try this -# two ways since rm can't unlink itself on some systems and the destination -# file might be busy for other reasons. In this case, the final cleanup -# might fail but the new file should still install successfully. + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 -{ - if [ -f "$dstdir/$dstfile" ] - then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null || - $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null || - { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit - } - else - : - fi -} && + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && -# Now rename the file to the real destination. + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. -fi && + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit; } +done # The final little trick to "correctly" pass the exit status to the exit trap. - { - (exit 0); exit + (exit 0); exit } + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/gfx/cairo/libpixman/missing b/gfx/cairo/libpixman/missing index fc54c64ec969..64b5f901dd55 100755 --- a/gfx/cairo/libpixman/missing +++ b/gfx/cairo/libpixman/missing @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2004-09-07.08 + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 +# Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -38,18 +42,24 @@ else configure_ac=configure.in fi +msg="missing on your system" + case "$1" in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -74,11 +84,15 @@ Supported PROGRAM values: lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch]" + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Send bug reports to ." + exit 0 ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit 0 ;; -*) @@ -87,14 +101,44 @@ Supported PROGRAM values: exit 1 ;; - aclocal*) +esac + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). +case "$1" in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; + + tar) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case "$1" in + aclocal*) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -102,13 +146,8 @@ WARNING: \`$1' is missing on your system. You should only need it if ;; autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -116,13 +155,8 @@ WARNING: \`$1' is missing on your system. You should only need it if ;; autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -140,13 +174,8 @@ WARNING: \`$1' is missing on your system. You should only need it if ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -156,14 +185,9 @@ WARNING: \`$1' is missing on your system. You should only need it if ;; autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get \`$1' as part of \`Autoconf' from any GNU archive site." @@ -185,7 +209,7 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your bison|yacc) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." @@ -215,7 +239,7 @@ WARNING: \`$1' is missing on your system. You should only need it if lex|flex) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." @@ -237,13 +261,8 @@ WARNING: \`$1' is missing on your system. You should only need it if ;; help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." @@ -262,13 +281,8 @@ WARNING: \`$1' is missing on your system. You should only need it if ;; makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy \`make' (AIX, @@ -284,10 +298,6 @@ WARNING: \`$1' is missing on your system. You should only need it if tar) shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -323,8 +333,8 @@ WARNING: I can't seem to be able to run \`tar' with the given arguments. *) echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the \`README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +344,10 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/gfx/cairo/libpixman/mkinstalldirs b/gfx/cairo/libpixman/mkinstalldirs deleted file mode 100755 index d2d5f21b6112..000000000000 --- a/gfx/cairo/libpixman/mkinstalldirs +++ /dev/null @@ -1,111 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman -# Created: 1993-05-16 -# Public domain - -errstatus=0 -dirmode="" - -usage="\ -Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" 1>&2 - exit 0 - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -case $dirmode in - '') - if mkdir -p -- . 2>/dev/null; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - fi - ;; - *) - if mkdir -m "$dirmode" -p -- . 2>/dev/null; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - fi - ;; -esac - -for file -do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift - - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp="$pathcomp/" - done -done - -exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# End: -# mkinstalldirs ends here diff --git a/gfx/cairo/libpixman/src/Makefile.in b/gfx/cairo/libpixman/src/Makefile.in index 41ef4bc16468..cb0bea8e03e2 100644 --- a/gfx/cairo/libpixman/src/Makefile.in +++ b/gfx/cairo/libpixman/src/Makefile.in @@ -46,7 +46,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; diff --git a/gfx/cairo/libpixman/src/ic.c b/gfx/cairo/libpixman/src/ic.c index ea728a834d96..220b1ccd569b 100644 --- a/gfx/cairo/libpixman/src/ic.c +++ b/gfx/cairo/libpixman/src/ic.c @@ -1,5 +1,5 @@ /* - * 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 @@ -23,11 +23,6 @@ #include "icint.h" -#ifndef __GNUC__ -#define __inline -#endif - - #define cvt8888to0565(s) ((((s) >> 3) & 0x001f) | \ (((s) >> 5) & 0x07e0) | \ (((s) >> 8) & 0xf800)) diff --git a/gfx/cairo/libpixman/src/icblt.c b/gfx/cairo/libpixman/src/icblt.c index 413479ab6919..a48d1ef78336 100644 --- a/gfx/cairo/libpixman/src/icblt.c +++ b/gfx/cairo/libpixman/src/icblt.c @@ -1,7 +1,7 @@ /* * Id: $ * - * Copyright 1998 Keith Packard + * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/gfx/cairo/libpixman/src/icbltone.c b/gfx/cairo/libpixman/src/icbltone.c index ff5b511258c3..7d1fd5ff6eb3 100644 --- a/gfx/cairo/libpixman/src/icbltone.c +++ b/gfx/cairo/libpixman/src/icbltone.c @@ -1,7 +1,7 @@ /* * Id: $ * - * Copyright 1998 Keith Packard + * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/gfx/cairo/libpixman/src/iccolor.c b/gfx/cairo/libpixman/src/iccolor.c index 23288f1b7ca7..afa52f7e2c41 100644 --- a/gfx/cairo/libpixman/src/iccolor.c +++ b/gfx/cairo/libpixman/src/iccolor.c @@ -1,5 +1,5 @@ /* - * 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 diff --git a/gfx/cairo/libpixman/src/iccompose.c b/gfx/cairo/libpixman/src/iccompose.c index a8ae1e864f56..96d23b76be49 100644 --- a/gfx/cairo/libpixman/src/iccompose.c +++ b/gfx/cairo/libpixman/src/iccompose.c @@ -1,5 +1,5 @@ /* - * Copyright 2000 Keith Packard + * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/gfx/cairo/libpixman/src/icformat.c b/gfx/cairo/libpixman/src/icformat.c index c8a313e568a9..1aafaf20250d 100644 --- a/gfx/cairo/libpixman/src/icformat.c +++ b/gfx/cairo/libpixman/src/icformat.c @@ -1,5 +1,5 @@ /* - * 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 diff --git a/gfx/cairo/libpixman/src/icimage.c b/gfx/cairo/libpixman/src/icimage.c index 6f4958f4661d..516a0bc4e001 100644 --- a/gfx/cairo/libpixman/src/icimage.c +++ b/gfx/cairo/libpixman/src/icimage.c @@ -1,5 +1,5 @@ /* - * 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 @@ -639,3 +639,34 @@ IcComputeCompositeRegion (pixman_region16_t *region, return 1; } +int +miIsSolidAlpha (pixman_image_t *src) +{ + char line[1]; + + /* Alpha-only */ + if (PICT_FORMAT_TYPE (src->format_code) != PICT_TYPE_A) + return 0; + /* repeat */ + if (!src->repeat) + return 0; + /* 1x1 */ + if (src->pixels->width != 1 || src->pixels->height != 1) + return 0; + line[0] = 1; + /* XXX: For the next line, fb has: + (*pScreen->GetImage) (src->pixels, 0, 0, 1, 1, ZPixmap, ~0L, line); + Is the following simple assignment sufficient? + */ + line[0] = src->pixels->data[0]; + switch (src->pixels->bpp) { + case 1: + return (uint8_t) line[0] == 1 || (uint8_t) line[0] == 0x80; + case 4: + return (uint8_t) line[0] == 0xf || (uint8_t) line[0] == 0xf0; + case 8: + return (uint8_t) line[0] == 0xff; + default: + return 0; + } +} diff --git a/gfx/cairo/libpixman/src/icimage.h b/gfx/cairo/libpixman/src/icimage.h index 7325186b07b3..becc7b09a97c 100644 --- a/gfx/cairo/libpixman/src/icimage.h +++ b/gfx/cairo/libpixman/src/icimage.h @@ -1,5 +1,5 @@ /* - * Copyright 2000 Keith Packard + * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -194,6 +194,9 @@ IcComputeCompositeRegion (pixman_region16_t *region, uint16_t width, uint16_t height); +int +miIsSolidAlpha (pixman_image_t *src); + /* pixman_private int IcPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats); diff --git a/gfx/cairo/libpixman/src/icint.h b/gfx/cairo/libpixman/src/icint.h index bee151f1984d..a31ddf444012 100644 --- a/gfx/cairo/libpixman/src/icint.h +++ b/gfx/cairo/libpixman/src/icint.h @@ -1,5 +1,5 @@ /* - * Copyright 2003 Carl Worth + * Copyright © 2003 Carl Worth * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -33,10 +33,15 @@ #include #include - - #include "slim_internal.h" +#ifndef __GNUC__ +#define __inline +#endif + +#define MIN(a,b) ((a) < (b) ? (a) : (b)) +#define MAX(a,b) ((a) > (b) ? (a) : (b)) + /* C89 has implementation-defined behavior for % with negative operands. C99 has well-defined behavior which is that / with integers rounds toward zero and a%b is defined so that (a/b)*b + a%b == a. diff --git a/gfx/cairo/libpixman/src/icpixels.c b/gfx/cairo/libpixman/src/icpixels.c index 1adc66643dd9..c9b9afc7824f 100644 --- a/gfx/cairo/libpixman/src/icpixels.c +++ b/gfx/cairo/libpixman/src/icpixels.c @@ -1,7 +1,7 @@ /* - * $Id: icpixels.c,v 1.1 2005/02/24 20:08:55 tor%cs.brown.edu Exp $ + * $Id: icpixels.c,v 1.3 2005/06/04 07:03:28 vladimir%pobox.com Exp $ * - * Copyright 1998 Keith Packard + * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/gfx/cairo/libpixman/src/icrect.c b/gfx/cairo/libpixman/src/icrect.c index 7baa3588669c..5d202db0478b 100644 --- a/gfx/cairo/libpixman/src/icrect.c +++ b/gfx/cairo/libpixman/src/icrect.c @@ -1,5 +1,5 @@ /* - * Copyright 2000 Keith Packard + * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/gfx/cairo/libpixman/src/icrop.h b/gfx/cairo/libpixman/src/icrop.h index a3ac09e4c55a..7ea81f15890d 100644 --- a/gfx/cairo/libpixman/src/icrop.h +++ b/gfx/cairo/libpixman/src/icrop.h @@ -1,7 +1,7 @@ /* * Id: $ * - * Copyright 1998 Keith Packard + * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/gfx/cairo/libpixman/src/icstipple.c b/gfx/cairo/libpixman/src/icstipple.c index 300daf0a5871..121bbaa86811 100644 --- a/gfx/cairo/libpixman/src/icstipple.c +++ b/gfx/cairo/libpixman/src/icstipple.c @@ -1,7 +1,7 @@ /* * Id: $ * - * Copyright 1998 Keith Packard + * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/gfx/cairo/libpixman/src/ictransform.c b/gfx/cairo/libpixman/src/ictransform.c index dc80a29ecd91..982f9293a93a 100644 --- a/gfx/cairo/libpixman/src/ictransform.c +++ b/gfx/cairo/libpixman/src/ictransform.c @@ -1,5 +1,5 @@ /* - * 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 diff --git a/gfx/cairo/libpixman/src/ictrap.c b/gfx/cairo/libpixman/src/ictrap.c index 2021c33c5f2c..d1f4e0d1bb8a 100644 --- a/gfx/cairo/libpixman/src/ictrap.c +++ b/gfx/cairo/libpixman/src/ictrap.c @@ -1,34 +1,29 @@ /* - * Copyright 2002 University of Southern California + * $Id: ictrap.c,v 1.2 2005/03/23 19:53:40 tor%cs.brown.edu Exp $ * - * Permission to use, copy, modify, distribute, and sell this software - * and its documentation for any purpose is hereby granted without - * fee, provided that the above copyright notice appear in all copies - * and that both that copyright notice and this permission notice - * appear in supporting documentation, and that the name of University - * of Southern California not be used in advertising or publicity - * pertaining to distribution of the software without specific, - * written prior permission. University of Southern California makes - * no representations about the suitability of this software for any - * purpose. It is provided "as is" without express or implied - * warranty. + * Copyright © 2002 Keith Packard * - * UNIVERSITY OF SOUTHERN CALIFORNIA DISCLAIMS ALL WARRANTIES WITH - * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL UNIVERSITY OF - * SOUTHERN CALIFORNIA BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS - * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. * - * Author: Carl Worth, USC, Information Sciences Institute */ + * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ #include "icint.h" -#define MIN(a,b) ((a) < (b) ? (a) : (b)) -#define MAX(a,b) ((a) > (b) ? (a) : (b)) - pixman_image_t * IcCreateAlphaPicture (pixman_image_t *dst, pixman_format_t *format, @@ -109,78 +104,106 @@ pixman_trapezoid_bounds (int ntrap, const pixman_trapezoid_t *traps, pixman_box1 } } +/* XXX: There are failure cases in this function. Don't we need to + * propagate the errors out? + */ void -pixman_composite_trapezoids (pixman_operator_t op, - pixman_image_t *src, - pixman_image_t *dst, - int xSrc, - int ySrc, - const pixman_trapezoid_t *traps, - int ntraps) +pixman_composite_trapezoids (pixman_operator_t op, + pixman_image_t *src, + pixman_image_t *dst, + int xSrc, + int ySrc, + const pixman_trapezoid_t *traps, + int ntraps) { - pixman_image_t *image = NULL; - pixman_box16_t bounds; + pixman_image_t *image = NULL; + pixman_box16_t traps_bounds, dst_bounds, bounds; + pixman_region16_t *traps_region, *dst_region; int16_t xDst, yDst; int16_t xRel, yRel; - pixman_format_t *format; + pixman_format_t *format; if (ntraps == 0) return; - + + /* + * Check for solid alpha add + */ + if (op == PIXMAN_OPERATOR_ADD && miIsSolidAlpha (src)) + { + for (; ntraps; ntraps--, traps++) + fbRasterizeTrapezoid (dst, traps, 0, 0); + return; + } + xDst = traps[0].left.p1.x >> 16; yDst = traps[0].left.p1.y >> 16; format = pixman_format_create (PIXMAN_FORMAT_NAME_A8); + if (!format) + return; + + pixman_trapezoid_bounds (ntraps, traps, &traps_bounds); + + traps_region = pixman_region_create_simple (&traps_bounds); + + /* XXX: If the image has a clip region set, we should really be + * fetching it here instead, but it looks like we don't yet expose + * a pixman_image_get_clip_region function. */ + dst_bounds.x1 = 0; + dst_bounds.y1 = 0; + dst_bounds.x2 = pixman_image_get_width (dst); + dst_bounds.y2 = pixman_image_get_height (dst); + + dst_region = pixman_region_create_simple (&dst_bounds); + + pixman_region_intersect (traps_region, traps_region, dst_region); + + bounds = *(pixman_region_extents (traps_region)); + + pixman_region_destroy (traps_region); + pixman_region_destroy (dst_region); + + if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2) + return; + + image = IcCreateAlphaPicture (dst, format, + bounds.x2 - bounds.x1, + bounds.y2 - bounds.y1); + if (!image) + return; - if (format) - { - pixman_trapezoid_bounds (ntraps, traps, &bounds); - if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2) - return; - image = IcCreateAlphaPicture (dst, format, - bounds.x2 - bounds.x1, - bounds.y2 - bounds.y1); - if (!image) - return; - } for (; ntraps; ntraps--, traps++) { if (!xTrapezoidValid(traps)) continue; - if (!format) - { - pixman_trapezoid_bounds (1, traps, &bounds); - if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2) - continue; - image = IcCreateAlphaPicture (dst, format, - bounds.x2 - bounds.x1, - bounds.y2 - bounds.y1); - if (!image) - continue; - } fbRasterizeTrapezoid (image, traps, -bounds.x1, -bounds.y1); - if (!format) - { - xRel = bounds.x1 + xSrc - xDst; - yRel = bounds.y1 + ySrc - yDst; - pixman_composite (op, src, image, dst, - xRel, yRel, 0, 0, bounds.x1, bounds.y1, - bounds.x2 - bounds.x1, - bounds.y2 - bounds.y1); - pixman_image_destroy (image); - } - } - if (format) - { - xRel = bounds.x1 + xSrc - xDst; - yRel = bounds.y1 + ySrc - yDst; - pixman_composite (op, src, image, dst, - xRel, yRel, 0, 0, bounds.x1, bounds.y1, - bounds.x2 - bounds.x1, - bounds.y2 - bounds.y1); - pixman_image_destroy (image); } + xRel = bounds.x1 + xSrc - xDst; + yRel = bounds.y1 + ySrc - yDst; + pixman_composite (op, src, image, dst, + xRel, yRel, 0, 0, bounds.x1, bounds.y1, + bounds.x2 - bounds.x1, + bounds.y2 - bounds.y1); + pixman_image_destroy (image); + pixman_format_destroy (format); } + +void +pixman_add_trapezoids (pixman_image_t *dst, + int x_off, + int y_off, + const pixman_trapezoid_t *traps, + int ntraps) +{ + for (; ntraps; ntraps--, traps++) + { + if (!xTrapezoidValid (traps)) + continue; + + fbRasterizeTrapezoid (dst, traps, x_off, y_off); + } +} diff --git a/gfx/cairo/libpixman/src/ictri.c b/gfx/cairo/libpixman/src/ictri.c index 2a3ee7b2e771..97fbca54491e 100644 --- a/gfx/cairo/libpixman/src/ictri.c +++ b/gfx/cairo/libpixman/src/ictri.c @@ -1,5 +1,5 @@ /* - * Copyright 2002 Keith Packard + * Copyright © 2002 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/gfx/cairo/libpixman/src/icutil.c b/gfx/cairo/libpixman/src/icutil.c index 0cac19a2912d..549217000bae 100644 --- a/gfx/cairo/libpixman/src/icutil.c +++ b/gfx/cairo/libpixman/src/icutil.c @@ -1,7 +1,7 @@ /* * Id: $ * - * Copyright 1998 Keith Packard + * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/gfx/cairo/libpixman/src/pixman-xserver-compat.h b/gfx/cairo/libpixman/src/pixman-xserver-compat.h index 11bdea005029..6ee83737a074 100644 --- a/gfx/cairo/libpixman/src/pixman-xserver-compat.h +++ b/gfx/cairo/libpixman/src/pixman-xserver-compat.h @@ -23,18 +23,23 @@ * Author: Carl Worth, Red Hat, Inc. */ -#ifndef _PIXMAN_XORG_COMPAT_H_ -#define _PIXMAN_XORG_COMPAT_H_ +#ifndef _PIXMAN_XSERVER_COMPAT_H_ +#define _PIXMAN_XSERVER_COMPAT_H_ /* This is a compatibility header file, designed to make it easier to - * copy files directly from the xorg server into the implementation of - * libpixman. + * synchronize files between libpixman and the xserver repository. * - * The intended usage is that when copying files from the server, the - * only change necessary should be to replace the block of include - * directives with: + * Of course, long-term we would instead like to have the X server + * depend on libpixman to eliminate the code duplication. But for now, + * we at least make it easy to share files. * - * #include "pixman-xorg-compat.h" + * The libpixman code base regards the xserver repository as canonical + * for any shared files, so changes should be pushed up there. Then, + * to merge changes back down into libpixman, the process should be to + * simply copy the file and to replace the block of include directives + * with: + * + * #include "pixman-xserver-compat.h" */ /* First, include the primary internal header file for libpixman. */ @@ -44,14 +49,19 @@ /* Then, define any names that the server code will be expecting in * terms of libpixman names. */ -typedef pixman_bits_t FbBits; -typedef pixman_image_t* PicturePtr; - typedef uint8_t CARD8; typedef uint16_t CARD16; - typedef int16_t INT16; +typedef int Bool; +#define FALSE 0 +#define TRUE 1 + +typedef pixman_bits_t FbBits; +typedef pixman_image_t* PicturePtr; +typedef pixman_box16_t BoxRec; +typedef pixman_box16_t* BoxPtr; + typedef pixman_point_fixed_t xPointFixed; typedef pixman_line_fixed_t xLineFixed; typedef pixman_trapezoid_t xTrapezoid; diff --git a/gfx/cairo/libpixman/src/pixman.h b/gfx/cairo/libpixman/src/pixman.h index 446af22b9eb0..15068e2d971f 100644 --- a/gfx/cairo/libpixman/src/pixman.h +++ b/gfx/cairo/libpixman/src/pixman.h @@ -54,12 +54,12 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Id: pixman.h,v 1.2 2005/03/14 16:16:23 tor%cs.brown.edu Exp $ */ +/* $Id: pixman.h,v 1.3 2005/03/23 19:53:40 tor%cs.brown.edu Exp $ */ /* libic.h */ /* - * Copyright 1998 Keith Packard + * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -84,7 +84,7 @@ SOFTWARE. #if defined (__SVR4) && defined (__sun) # include #else -# if defined (__OpenBSD__) || defined (_AIX) +# if defined (__OpenBSD__) # include # else # include @@ -261,18 +261,18 @@ pixman_image_create (pixman_format_t *format, * by this software; it must be log2(sizeof (pixman_bits_t) * 8) */ +/* We use a 32-bit size on all platforms, (even those with native 64 + * bit types). This is consistent with the code currently in the X + * server, so it goes through much more well-tested code paths, (we + * saw rendering bugs when we tried IC_SHIFT==6 and uint64_t for + * pixman_bits_t on 64-bit platofrms). In addition, Keith says that + * his testing indicates that using 32-bits everywhere is a + * performance win in any case, (presumably due to 32-bit datapaths + * between the processor and the video card). +*/ #ifndef IC_SHIFT -# if defined(__alpha__) || defined(__alpha) || \ - defined(ia64) || defined(__ia64__) || \ - defined(__sparc64__) || \ - defined(__s390x__) || \ - defined(x86_64) || defined (__x86_64__) -#define IC_SHIFT 6 -typedef uint64_t pixman_bits_t; -# else #define IC_SHIFT 5 typedef uint32_t pixman_bits_t; -# endif #endif pixman_image_t * @@ -414,6 +414,13 @@ pixman_composite_trapezoids (pixman_operator_t op, const pixman_trapezoid_t *traps, int ntrap); +void +pixman_add_trapezoids (pixman_image_t *dst, + int x_off, + int y_off, + const pixman_trapezoid_t *traps, + int ntraps); + /* ictri.c */ void diff --git a/gfx/cairo/libpixman/src/renderedge.h b/gfx/cairo/libpixman/src/renderedge.h index 6b2edc2f976b..f6f73f34a296 100644 --- a/gfx/cairo/libpixman/src/renderedge.h +++ b/gfx/cairo/libpixman/src/renderedge.h @@ -1,5 +1,5 @@ /* - * $Id: renderedge.h,v 1.1 2005/02/24 20:08:55 tor%cs.brown.edu Exp $ + * $Id: renderedge.h,v 1.8 2006/02/03 04:49:30 vladimir%pobox.com Exp $ * * Copyright © 2004 Keith Packard * @@ -27,6 +27,45 @@ #include "pixman-xserver-compat.h" +/* Here is a drawing of the sample grid for the 4-bit alpha case, + along with indications of the various defined terms: + + STEP_Y_SMALL +┌─────┬─────┬─────┐ ↓ +│•••••│•••••│•••••│ ─── ⟵── Y_FRAC_FIRST +│•••••│•••••│•••••│ ─── +│•••••│•••••│•••••│ ↑ ⟵── Y_FRAC_LAST +├─────┼─────┼─────┤ +│•••••│•••••│•••••│ +│•••••│•••••│•••••│ ↓ +│•••••│•••••│•••••│ ─── +├─────┼─────┼─────┤ STEP_Y_BIG +│•••••│•••••│•••••│ ─── +│•••••│•••••│•••••│ ↑ +│•••••│•••••│•••••│ +└─────┴─────┴─────┘ + │ │ ││ ⟶│ │⟵STEP_X_BIG + │ │⟶││⟵STEP_X_SMALL + │ │ + │ └ X_FRAC_LAST + │ + └ X_FRAC_FIRST + +N = 4 (# of bits of alpha) +MAX_ALPHA = 15 (# of samples per pixel) +N_X_FRAC = 5 (# of sample columns per pixel) +N_Y_FRAC = 3 (# of sample rows per column) +STEP_X_SMALL (distance between sample columns within a pixel) +STEP_X_BIG (distance between sample columns across pixel boundaries) +STEP_Y_SMALL (distance between sample rows within a pixel) +STEP_Y_BIG (distance between sample rows across pixel boundaries) +X_FRAC_FIRST (sub-pixel position of first sample column in pixel) +X_FRAC_LAST (sub-pixel position of last sample column in pixel) +Y_FRAC_FIRST (sub-pixel position of first sample row in pixel) +Y_FRAC_LAST (sub-pixel position of last sample row pixel) + +*/ + #define MAX_ALPHA(n) ((1 << (n)) - 1) #define N_Y_FRAC(n) ((n) == 1 ? 1 : (1 << ((n)/2)) - 1) #define N_X_FRAC(n) ((1 << ((n)/2)) + 1) @@ -69,12 +108,12 @@ typedef struct { * Step across a small sample grid gap */ #define RenderEdgeStepSmall(edge) { \ - edge->x += edge->stepx_small; \ - edge->e += edge->dx_small; \ - if (edge->e > 0) \ + (edge)->x += (edge)->stepx_small; \ + (edge)->e += (edge)->dx_small; \ + if ((edge)->e > 0) \ { \ - edge->e -= edge->dy; \ - edge->x += edge->signdx; \ + (edge)->e -= (edge)->dy; \ + (edge)->x += (edge)->signdx; \ } \ } @@ -82,12 +121,12 @@ typedef struct { * Step across a large sample grid gap */ #define RenderEdgeStepBig(edge) { \ - edge->x += edge->stepx_big; \ - edge->e += edge->dx_big; \ - if (edge->e > 0) \ + (edge)->x += (edge)->stepx_big; \ + (edge)->e += (edge)->dx_big; \ + if ((edge)->e > 0) \ { \ - edge->e -= edge->dy; \ - edge->x += edge->signdx; \ + (edge)->e -= (edge)->dy; \ + (edge)->x += (edge)->signdx; \ } \ } diff --git a/gfx/cairo/libpixman/src/slim_internal.h b/gfx/cairo/libpixman/src/slim_internal.h index f0becf82aa18..5c1e5cf8a8b0 100644 --- a/gfx/cairo/libpixman/src/slim_internal.h +++ b/gfx/cairo/libpixman/src/slim_internal.h @@ -1,6 +1,6 @@ /* slim - Shared Library Interface Macros * - * Copyright 2003 Richard Henderson + * Copyright © 2003 Richard Henderson * * Permission to use, copy, modify, distribute, and sell this software * and its documentation for any purpose is hereby granted without diff --git a/gfx/cairo/quartz-surface.diff b/gfx/cairo/quartz-surface.diff deleted file mode 100644 index 071fdf0e15d0..000000000000 --- a/gfx/cairo/quartz-surface.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- /home/tor/src/cairo-0.3.0/src/cairo_quartz_surface.c 2005-01-21 06:17:22.000000000 -0600 -+++ cairo/src/cairo_quartz_surface.c 2005-02-24 11:05:49.655292536 -0600 -@@ -221,6 +221,7 @@ - - CGContextDrawImage(surface->context, rect, surface->cgImage); - -+ memset(surface->image->data, 0, surface->width * surface->height * 4); - - status = CAIRO_STATUS_SUCCESS; - } diff --git a/gfx/cairo/quartz.diff b/gfx/cairo/quartz.diff new file mode 100644 index 000000000000..e5975e0e3612 --- /dev/null +++ b/gfx/cairo/quartz.diff @@ -0,0 +1,1913 @@ +--- cairo-0.4.0/configure.in 2005-03-08 19:35:06.000000000 -0600 ++++ cairo/configure.in 2005-03-23 13:07:11.646608569 -0600 +@@ -79,7 +79,7 @@ + + AC_ARG_ENABLE(quartz, + [ --disable-quartz Disable cairo's quartz backend], +- [use_quartz=$enableval], [use_quartz="no (temporarily disabled while code is out of sync)"]) ++ [use_quartz=$enableval], [use_quartz=yes]) + + if test "x$use_quartz" = "xyes"; then + dnl There is no pkgconfig for quartz; lets do a header check +--- cairo-0.4.0/src/cairo_atsui_font.c 2005-02-22 13:28:48.000000000 -0600 ++++ cairo/src/cairo_atsui_font.c 2005-03-23 13:04:51.979974760 -0600 +@@ -30,778 +30,712 @@ + * The Initial Developer of the Original Code is Calum Robinson + * + * Contributor(s): +- * Calum Robinson ++ * Calum Robinson + */ + + #include + #include +- + #include "cairo-atsui.h" + #include "cairoint.h" ++#include "cairo-quartz-private.h" ++#include + ++typedef struct { ++ cairo_font_t base; + ++ cairo_font_scale_t scale; ++ ATSUStyle style; ++ ATSUStyle unscaled_style; ++ ATSUFontID fontID; ++} cairo_atsui_font_t; + ++typedef struct cairo_ATSUI_glyph_path_callback_info_t { ++ cairo_path_t *path; ++ cairo_matrix_t scale; ++} cairo_ATSUI_glyph_path_callback_info_t; + + +-#pragma mark Types + ++static CGAffineTransform ++CGAffineTransformMakeWithCairoFontScale(cairo_font_scale_t scale) ++{ ++ return CGAffineTransformMake(scale.matrix[0][0], scale.matrix[0][1], ++ scale.matrix[1][0], scale.matrix[1][1], ++ 0, 0); ++} + + ++static ATSUStyle ++CreateSizedCopyOfStyle(ATSUStyle inStyle, cairo_font_scale_t * scale) ++{ ++ ATSUStyle style; ++ OSStatus err; + + +-typedef struct { +- cairo_unscaled_font_t base; +- +- ATSUStyle style; +- ATSUFontID fontID; +-} cairo_atsui_font_t; ++ // Set the style's size ++ CGAffineTransform theTransform = ++ CGAffineTransformMakeWithCairoFontScale(*scale); ++ Fixed theSize = ++ FloatToFixed(CGSizeApplyAffineTransform ++ (CGSizeMake(1.0, 1.0), theTransform).height); ++ const ATSUAttributeTag theFontStyleTags[] = { kATSUSizeTag }; ++ const ByteCount theFontStyleSizes[] = { sizeof(Fixed) }; ++ ATSUAttributeValuePtr theFontStyleValues[] = { &theSize }; + ++ err = ATSUCreateAndCopyStyle(inStyle, &style); + +-typedef struct cairo_ATSUI_glyph_path_callback_info_t { +- cairo_path_t *path; +- cairo_matrix_t scale; +-} cairo_ATSUI_glyph_path_callback_info_t; ++ err = ATSUSetAttributes(style, ++ sizeof(theFontStyleTags) / ++ sizeof(ATSUAttributeTag), theFontStyleTags, ++ theFontStyleSizes, theFontStyleValues); ++ ++ ++ return style; ++} ++ ++ ++static cairo_status_t ++_cairo_atsui_font_create(const char *family, ++ cairo_font_slant_t slant, ++ cairo_font_weight_t weight, ++ cairo_font_scale_t *scale, ++ cairo_font_t **font_out) ++{ ++ cairo_atsui_font_t *font = NULL; ++ ATSUStyle style; ++ ATSUFontID fontID; ++ OSStatus err; ++ Boolean isItalic, isBold; ++ ++ ++ err = ATSUCreateStyle(&style); ++ ++ ++ switch (weight) { ++ case CAIRO_FONT_WEIGHT_BOLD: ++ isBold = true; ++ break; ++ case CAIRO_FONT_WEIGHT_NORMAL: ++ default: ++ isBold = false; ++ break; ++ } ++ ++ switch (slant) { ++ case CAIRO_FONT_SLANT_ITALIC: ++ isItalic = true; ++ break; ++ case CAIRO_FONT_SLANT_OBLIQUE: ++ isItalic = false; ++ break; ++ case CAIRO_FONT_SLANT_NORMAL: ++ default: ++ isItalic = false; ++ break; ++ } + ++ err = ATSUFindFontFromName(family, strlen(family), ++ kFontFamilyName, ++ kFontNoPlatformCode, ++ kFontRomanScript, ++ kFontNoLanguageCode, &fontID); + ++ if (err != noErr) { ++ // couldn't get the font - remap css names and try again + ++ if (!strcmp(family, "serif")) ++ family = "Times"; ++ else if (!strcmp(family, "sans-serif")) ++ family = "Helvetica"; ++ else if (!strcmp(family, "cursive")) ++ family = "Apple Chancery"; ++ else if (!strcmp(family, "fantasy")) ++ family = "Gadget"; ++ else if (!strcmp(family, "monospace")) ++ family = "Courier"; ++ else // anything else - return error instead? ++ family = "Courier"; + ++ err = ATSUFindFontFromName(family, strlen(family), ++ kFontFamilyName, ++ kFontNoPlatformCode, ++ kFontRomanScript, ++ kFontNoLanguageCode, &fontID); ++ } + +-#pragma mark Private Functions + ++ ATSUAttributeTag styleTags[] = ++ { kATSUQDItalicTag, kATSUQDBoldfaceTag, kATSUFontTag }; ++ ATSUAttributeValuePtr styleValues[] = { &isItalic, &isBold, &fontID }; ++ ByteCount styleSizes[] = ++ { sizeof(Boolean), sizeof(Boolean), sizeof(ATSUFontID) }; + + ++ err = ATSUSetAttributes(style, ++ sizeof(styleTags) / sizeof(styleTags[0]), ++ styleTags, styleSizes, styleValues); + ++ font = malloc(sizeof(cairo_atsui_font_t)); + +-static CGAffineTransform CGAffineTransformMakeWithCairoFontScale(cairo_font_scale_t scale) ++ _cairo_font_init(&font->base, scale, &cairo_atsui_font_backend); ++ ++ font->style = CreateSizedCopyOfStyle(style, scale); ++ ++ ++ Fixed theSize = FloatToFixed(1.0); ++ const ATSUAttributeTag theFontStyleTags[] = { kATSUSizeTag }; ++ const ByteCount theFontStyleSizes[] = { sizeof(Fixed) }; ++ ATSUAttributeValuePtr theFontStyleValues[] = { &theSize }; ++ err = ATSUSetAttributes(style, ++ sizeof(theFontStyleTags) / ++ sizeof(ATSUAttributeTag), theFontStyleTags, ++ theFontStyleSizes, theFontStyleValues); ++ ++ font->unscaled_style = style; ++ ++ font->fontID = fontID; ++ font->scale = *scale; ++ ++ *font_out = (cairo_font_t *)font; ++ ++ return CAIRO_STATUS_SUCCESS; ++} ++ ++ ++static void ++_cairo_atsui_font_destroy_font(void *abstract_font) ++{ ++ cairo_atsui_font_t *font = abstract_font; ++ ++ ++ if (font == NULL) ++ return; ++ ++ if (font->style) ++ ATSUDisposeStyle(font->style); ++ if (font->unscaled_style) ++ ATSUDisposeStyle(font->unscaled_style); ++ ++ free(font); ++} ++ ++ ++static void ++_cairo_atsui_font_destroy_unscaled_font(void *abstract_font) + { +- return CGAffineTransformMake( scale.matrix[0][0], scale.matrix[0][1], +- scale.matrix[1][0], scale.matrix[1][1], +- 0, 0); +-} +- +- +-static ATSUStyle CreateSizedCopyOfStyle(ATSUStyle inStyle, cairo_font_scale_t *scale) +-{ +- ATSUStyle style; +- OSStatus err; +- +- +- // Set the style's size +- CGAffineTransform theTransform = CGAffineTransformMakeWithCairoFontScale(*scale); +- Fixed theSize = FloatToFixed(CGSizeApplyAffineTransform(CGSizeMake(1.0, 1.0), theTransform).height); +- const ATSUAttributeTag theFontStyleTags[] = { kATSUSizeTag }; +- const ByteCount theFontStyleSizes[] = { sizeof(Fixed) }; +- ATSUAttributeValuePtr theFontStyleValues[] = { &theSize }; +- +- err = ATSUCreateAndCopyStyle(inStyle, &style); +- +- err = ATSUSetAttributes( style, +- sizeof(theFontStyleTags) / sizeof(ATSUAttributeTag), +- theFontStyleTags, theFontStyleSizes, theFontStyleValues); +- +- +- return style; + } + + ++static void ++_cairo_atsui_font_get_glyph_cache_key(void *abstract_font, ++ cairo_glyph_cache_key_t *key) ++{ ++} + + ++static cairo_status_t ++_cairo_atsui_font_text_to_glyphs(void *abstract_font, ++ const unsigned char *utf8, ++ cairo_glyph_t ** glyphs, int *nglyphs) ++{ ++ cairo_atsui_font_t *font = abstract_font; ++ size_t i; ++ OSStatus err; ++ ATSUTextLayout textLayout; ++ ATSLayoutRecord *layoutRecords; ++ ItemCount glyphCount, charCount; ++ UniChar *theText; ++ ATSUStyle style; + +-#pragma mark Public Functions ++ err = ATSUCreateTextLayout(&textLayout); + ++#if 1 ++ charCount = strlen(utf8); + ++ // Set the text in the text layout object, so we can measure it ++ theText = (UniChar *) malloc(charCount * sizeof(UniChar)); + ++ for (i = 0; i < charCount; i++) { ++ theText[i] = utf8[i]; ++ } ++#endif + ++#if 0 ++ // Set the text in the text layout object, so we can measure it ++ charCount = strlen(utf8); ++ theText = (UniChar *) malloc(charCount * sizeof(UniChar)); + +-static cairo_unscaled_font_t * +-_cairo_atsui_font_create( const char *family, +- cairo_font_slant_t slant, +- cairo_font_weight_t weight) +-{ +- cairo_atsui_font_t *font = NULL; +- ATSUStyle style; +- ATSUFontID fontID; +- OSStatus err; +- Boolean isItalic, isBold; +- +- +- err = ATSUCreateStyle(&style); +- +- +- switch (weight) +- { +- case CAIRO_FONT_WEIGHT_BOLD: +- isBold = true; +- break; +- case CAIRO_FONT_WEIGHT_NORMAL: +- default: +- isBold = false; +- break; +- } +- +- switch (slant) +- { +- case CAIRO_FONT_SLANT_ITALIC: +- isItalic = true; +- break; +- case CAIRO_FONT_SLANT_OBLIQUE: +- isItalic = false; +- break; +- case CAIRO_FONT_SLANT_NORMAL: +- default: +- isItalic = false; +- break; +- } +- +- err = ATSUFindFontFromName( family, strlen(family), +- kFontFamilyName, +- kFontNoPlatformCode, +- kFontRomanScript, +- kFontNoLanguageCode, +- &fontID); +- +- +- ATSUAttributeTag styleTags[] = {kATSUQDItalicTag, kATSUQDBoldfaceTag, kATSUFontTag}; +- ATSUAttributeValuePtr styleValues[] = {&isItalic, &isBold, &fontID}; +- ByteCount styleSizes[] = {sizeof(Boolean), sizeof(Boolean), sizeof(ATSUFontID)}; +- +- +- err = ATSUSetAttributes( style, +- sizeof(styleTags) / sizeof(styleTags[0]), +- styleTags, +- styleSizes, +- styleValues); +- +- +- +- font = malloc(sizeof(cairo_atsui_font_t)); +- +- if (_cairo_unscaled_font_init(&font->base, &cairo_atsui_font_backend) == CAIRO_STATUS_SUCCESS) +- { +- font->style = style; +- font->fontID = fontID; +- +- +- return &font->base; +- } +- +- +- free(font); +- +- return NULL; ++ size_t inBytes = charCount, outBytes = charCount; ++ iconv_t converter = iconv_open("UTF-8", "UTF-16"); ++ charCount = iconv(converter, utf8, &inBytes, theText, &outBytes); ++#endif ++ ++ err = ATSUSetTextPointerLocation(textLayout, ++ theText, 0, charCount, charCount); ++ ++ ++ // Set the style for all of the text ++ err = ATSUSetRunStyle(textLayout, ++ font->unscaled_style, kATSUFromTextBeginning, kATSUToTextEnd); ++ ++ // Get the glyphs from the text layout object ++ err = ATSUDirectGetLayoutDataArrayPtrFromTextLayout(textLayout, ++ 0, ++ kATSUDirectDataLayoutRecordATSLayoutRecordCurrent, ++ (void *) ++ &layoutRecords, ++ &glyphCount); ++ ++ *nglyphs = glyphCount - 1; ++ ++ ++ *glyphs = ++ (cairo_glyph_t *) malloc(*nglyphs * (sizeof(cairo_glyph_t))); ++ if (*glyphs == NULL) { ++ return CAIRO_STATUS_NO_MEMORY; ++ } ++ ++ for (i = 0; i < *nglyphs; i++) { ++ (*glyphs)[i].index = layoutRecords[i].glyphID; ++ (*glyphs)[i].x = FixedToFloat(layoutRecords[i].realPos); ++ (*glyphs)[i].y = 0; ++ } ++ ++ ++ free(theText); ++ ++ ATSUDirectReleaseLayoutDataArrayPtr(NULL, ++ kATSUDirectDataLayoutRecordATSLayoutRecordCurrent, ++ (void *) &layoutRecords); ++ ++ ATSUDisposeTextLayout(textLayout); ++ ++ ATSUDisposeStyle(style); ++ ++ ++ return CAIRO_STATUS_SUCCESS; + } + + +-static void +-_cairo_atsui_font_destroy(void *abstract_font) ++static cairo_status_t ++_cairo_atsui_font_font_extents(void *abstract_font, ++ cairo_font_extents_t * extents) ++{ ++ cairo_atsui_font_t *font = abstract_font; ++ ATSFontRef atsFont; ++ ATSFontMetrics metrics; ++ OSStatus err; ++ ++ // TODO - test this ++ ++ atsFont = FMGetATSFontRefFromFont(font->fontID); ++ ++ if (atsFont) { ++ err = ++ ATSFontGetHorizontalMetrics(atsFont, kATSOptionFlagsDefault, ++ &metrics); ++ ++ if (err == noErr) { ++ extents->ascent = metrics.ascent; ++ extents->descent = metrics.descent; ++ extents->height = metrics.capHeight; ++ extents->max_x_advance = metrics.maxAdvanceWidth; ++ ++ // The FT backend doesn't handle max_y_advance either, so we'll ignore it for now. ++ extents->max_y_advance = 0.0; ++ ++ return CAIRO_STATUS_SUCCESS; ++ } ++ } ++ ++ ++ return CAIRO_STATUS_NULL_POINTER; ++} ++ ++ ++static cairo_status_t ++_cairo_atsui_font_glyph_extents(void *abstract_font, ++ cairo_glyph_t * glyphs, ++ int num_glyphs, ++ cairo_text_extents_t * extents) + { +- cairo_atsui_font_t *font = abstract_font; +- +- +- if (font == NULL) +- return; +- +- if (font->style) +- ATSUDisposeStyle(font->style); +- +- free(font); +-} +- +- +-static cairo_status_t +-_cairo_atsui_font_text_to_glyphs( void *abstract_font, +- cairo_font_scale_t *sc, +- const unsigned char *utf8, +- cairo_glyph_t **glyphs, +- int *nglyphs) +-{ +- cairo_atsui_font_t *font = abstract_font; +- size_t i; +- OSStatus err; +- ATSUTextLayout textLayout; +- ATSLayoutRecord *layoutRecords; +- ItemCount glyphCount, charCount; +- UniChar *theText; +- ATSUStyle style; +- +- +- charCount = strlen(utf8); +- +- +- err = ATSUCreateTextLayout(&textLayout); +- +- +- // Set the text in the text layout object, so we can measure it +- theText = (UniChar *)malloc(charCount * sizeof(UniChar)); +- +- for (i = 0; i < charCount; i++) +- { +- theText[i] = utf8[i]; +- } +- +- err = ATSUSetTextPointerLocation( textLayout, +- theText, +- 0, +- charCount, +- charCount); +- +- +- style = CreateSizedCopyOfStyle(font->style, sc); +- +- +- // Set the style for all of the text +- err = ATSUSetRunStyle( textLayout, +- style, +- kATSUFromTextBeginning, +- kATSUToTextEnd); +- +- +- +- // Get the glyphs from the text layout object +- err = ATSUDirectGetLayoutDataArrayPtrFromTextLayout( textLayout, +- 0, +- kATSUDirectDataLayoutRecordATSLayoutRecordCurrent, +- (void *)&layoutRecords, +- &glyphCount); +- +- *nglyphs = glyphCount; +- +- +- *glyphs = (cairo_glyph_t *)malloc(glyphCount * (sizeof(cairo_glyph_t))); +- if (*glyphs == NULL) +- { +- return CAIRO_STATUS_NO_MEMORY; +- } +- +- for (i = 0; i < glyphCount; i++) +- { +- (*glyphs)[i].index = layoutRecords[i].glyphID; +- (*glyphs)[i].x = FixedToFloat(layoutRecords[i].realPos); +- (*glyphs)[i].y = 0; +- } +- +- +- free(theText); +- +- ATSUDirectReleaseLayoutDataArrayPtr( NULL, +- kATSUDirectDataLayoutRecordATSLayoutRecordCurrent, +- (void *)&layoutRecords); +- +- ATSUDisposeTextLayout(textLayout); +- +- ATSUDisposeStyle(style); +- +- +- return CAIRO_STATUS_SUCCESS; +-} +- +- +-static cairo_status_t +-_cairo_atsui_font_font_extents( void *abstract_font, +- cairo_font_scale_t *sc, +- cairo_font_extents_t *extents) +-{ +- cairo_atsui_font_t *font = abstract_font; +- ATSFontRef atsFont; +- ATSFontMetrics metrics; +- OSStatus err; +- +- +- // TODO - test this +- +- atsFont = FMGetATSFontRefFromFont(font->fontID); +- +- if (atsFont) +- { +- err = ATSFontGetHorizontalMetrics(atsFont, kATSOptionFlagsDefault, &metrics); +- +- if (err == noErr) +- { +- extents->ascent = metrics.ascent; +- extents->descent = metrics.descent; +- extents->height = metrics.capHeight; +- extents->max_x_advance = metrics.maxAdvanceWidth; +- +- // The FT backend doesn't handle max_y_advance either, so we'll ignore it for now. +- extents->max_y_advance = 0.0; +- +- +- return CAIRO_STATUS_SUCCESS; +- } +- } +- +- +- return CAIRO_STATUS_NULL_POINTER; +-} +- +- +-static cairo_status_t +-_cairo_atsui_font_glyph_extents( void *abstract_font, +- cairo_font_scale_t *sc, +- cairo_glyph_t *glyphs, +- int num_glyphs, +- cairo_text_extents_t *extents) +-{ +- cairo_atsui_font_t *font = abstract_font; +- cairo_point_double_t origin; +- cairo_point_double_t glyph_min, glyph_max; +- cairo_point_double_t total_min, total_max; +- OSStatus err; +- ATSUStyle style; +- int i; +- +- +- if (num_glyphs == 0) +- { +- extents->x_bearing = 0.0; +- extents->y_bearing = 0.0; +- extents->width = 0.0; +- extents->height = 0.0; +- extents->x_advance = 0.0; +- extents->y_advance = 0.0; +- +- return CAIRO_STATUS_SUCCESS; +- } +- +- origin.x = glyphs[0].x; +- origin.y = glyphs[0].y; +- +- +- style = CreateSizedCopyOfStyle(font->style, sc); +- +- +- for (i = 0; i < num_glyphs; i++) +- { +- GlyphID theGlyph = glyphs[i].index; +- double minX, maxX, ascent, descent; +- ATSGlyphIdealMetrics metricsH, metricsV; +- +- +- err = ATSUGlyphGetIdealMetrics( style, +- 1, +- &theGlyph, +- 0, +- &metricsH); +- +- +- ATSUVerticalCharacterType verticalType = kATSUStronglyVertical; +- ATSUAttributeTag theTag = kATSUVerticalCharacterTag; +- ByteCount theSize = sizeof(ATSUVerticalCharacterType); +- +- err = ATSUSetAttributes(style, 1, &theTag, &theSize, (ATSUAttributeValuePtr)&verticalType); +- +- err = ATSUGlyphGetIdealMetrics( style, +- 1, +- &theGlyph, +- 0, +- &metricsV); +- +- minX = metricsH.otherSideBearing.x; +- maxX = metricsH.advance.x; +- +- ascent = metricsV.advance.x; +- descent = metricsV.otherSideBearing.x; +- +- glyph_min.x = glyphs[i].x + minX; +- glyph_min.y = glyphs[i].y + descent; +- glyph_max.x = glyphs[i].x + maxX; +- glyph_max.y = glyphs[i].y + ascent; +- +- if (i==0) +- { +- total_min = glyph_min; +- total_max = glyph_max; +- } +- else +- { +- if (glyph_min.x < total_min.x) +- total_min.x = glyph_min.x; +- if (glyph_min.y < total_min.y) +- total_min.y = glyph_min.y; +- +- if (glyph_max.x > total_max.x) +- total_max.x = glyph_max.x; +- if (glyph_max.y > total_max.y) +- total_max.y = glyph_max.y; +- } +- } +- +- +- extents->x_bearing = total_min.x - origin.x; +- extents->y_bearing = total_min.y - origin.y; +- extents->width = total_max.x - total_min.x; +- extents->height = total_max.y - total_min.y; +- extents->x_advance = glyphs[i-1].x - origin.x; +- extents->y_advance = glyphs[i-1].y - origin.y; +- +- +- return CAIRO_STATUS_SUCCESS; +-} +- +- +-static cairo_status_t +-_cairo_atsui_font_glyph_bbox( void *abstract_font, +- cairo_font_scale_t *sc, +- const cairo_glyph_t *glyphs, +- int num_glyphs, +- cairo_box_t *bbox) +-{ +- cairo_atsui_font_t *font = abstract_font; +- cairo_fixed_t x1, y1, x2, y2; +- int i; +- OSStatus err; +- ATSUStyle style; +- +- +- bbox->p1.x = bbox->p1.y = CAIRO_MAXSHORT << 16; +- bbox->p2.x = bbox->p2.y = CAIRO_MINSHORT << 16; +- +- +- style = CreateSizedCopyOfStyle(font->style, sc); +- +- +- for (i = 0; i < num_glyphs; i++) +- { +- GlyphID theGlyph = glyphs[i].index; +- ATSGlyphIdealMetrics metrics; +- +- +- err = ATSUGlyphGetIdealMetrics( style, +- 1, +- &theGlyph, +- 0, +- &metrics); +- +- x1 = _cairo_fixed_from_double(glyphs[i].x); +- y1 = _cairo_fixed_from_double(glyphs[i].y); +- x2 = x1 + _cairo_fixed_from_double(metrics.advance.x); +- y2 = y1 + _cairo_fixed_from_double(metrics.advance.y); +- +- if (x1 < bbox->p1.x) +- bbox->p1.x = x1; +- +- if (y1 < bbox->p1.y) +- bbox->p1.y = y1; +- +- if (x2 > bbox->p2.x) +- bbox->p2.x = x2; +- +- if (y2 > bbox->p2.y) +- bbox->p2.y = y2; +- } +- +- +- ATSUDisposeStyle(style); +- +- +- return CAIRO_STATUS_SUCCESS; +-} +- +- +-static cairo_status_t +-_cairo_atsui_font_show_glyphs( void *abstract_font, +- cairo_font_scale_t *sc, +- cairo_operator_t operator, +- cairo_surface_t *source, +- cairo_surface_t *surface, +- int source_x, +- int source_y, +- const cairo_glyph_t *glyphs, +- int num_glyphs) +-{ +- cairo_atsui_font_t *font = abstract_font; +- CGContextRef myBitmapContext; +- CGColorSpaceRef colorSpace; +- cairo_image_surface_t *destImageSurface; +- int i; +- +- +- destImageSurface = _cairo_surface_get_image(surface); ++ cairo_atsui_font_t *font = abstract_font; ++ OSStatus err; ++ ++ assert(num_glyphs == 1); ++ ++ GlyphID theGlyph = glyphs[0].index; ++ ++ ATSGlyphIdealMetrics metricsH, metricsV; ++ ATSUStyle style; ++ ++ ATSUCreateAndCopyStyle(font->unscaled_style, &style); ++ ++ err = ATSUGlyphGetIdealMetrics(style, ++ 1, &theGlyph, 0, &metricsH); ++ ++ ATSUVerticalCharacterType verticalType = kATSUStronglyVertical; ++ const ATSUAttributeTag theTag[] = { kATSUVerticalCharacterTag }; ++ const ByteCount theSizes[] = { sizeof(verticalType) }; ++ ATSUAttributeValuePtr theValues[] = { &verticalType }; + +- +- // Create a CGBitmapContext for the dest surface for drawing into ++ err = ATSUSetAttributes(style, 1, theTag, theSizes, theValues); ++ ++ err = ATSUGlyphGetIdealMetrics(style, ++ 1, &theGlyph, 0, &metricsV); ++ ++ extents->x_bearing = metricsH.sideBearing.x; ++ extents->y_bearing = metricsV.advance.y; ++ extents->width = ++ metricsH.advance.x - metricsH.sideBearing.x - metricsH.otherSideBearing.x; ++ extents->height = ++ -metricsV.advance.y - metricsV.sideBearing.y - metricsV.otherSideBearing.y; ++ extents->x_advance = metricsH.advance.x; ++ extents->y_advance = 0; ++ ++ ATSUDisposeStyle(style); ++ ++ return CAIRO_STATUS_SUCCESS; ++} ++ ++ ++static cairo_status_t ++_cairo_atsui_font_glyph_bbox(void *abstract_font, ++ const cairo_glyph_t *glyphs, ++ int num_glyphs, cairo_box_t *bbox) ++{ ++ cairo_atsui_font_t *font = abstract_font; ++ cairo_fixed_t x1, y1, x2, y2; ++ int i; ++ OSStatus err; ++ ++ bbox->p1.x = bbox->p1.y = CAIRO_MAXSHORT << 16; ++ bbox->p2.x = bbox->p2.y = CAIRO_MINSHORT << 16; ++ ++ ++ for (i = 0; i < num_glyphs; i++) { ++ GlyphID theGlyph = glyphs[i].index; ++ ++ ATSGlyphScreenMetrics metrics; ++ ATSUGlyphGetScreenMetrics(font->style, ++ 1, &theGlyph, 0, true, true, &metrics); ++ ++ x1 = _cairo_fixed_from_double(glyphs[i].x + metrics.topLeft.x); ++ y1 = _cairo_fixed_from_double(glyphs[i].y - metrics.topLeft.y); ++ x2 = x1 + _cairo_fixed_from_double(metrics.height); ++ y2 = y1 + _cairo_fixed_from_double(metrics.width); ++ ++ if (x1 < bbox->p1.x) ++ bbox->p1.x = x1; ++ ++ if (y1 < bbox->p1.y) ++ bbox->p1.y = y1; ++ ++ if (x2 > bbox->p2.x) ++ bbox->p2.x = x2; ++ ++ if (y2 > bbox->p2.y) ++ bbox->p2.y = y2; ++ } ++ ++ return CAIRO_STATUS_SUCCESS; ++} ++ ++ ++static cairo_status_t ++_cairo_atsui_font_show_glyphs(void *abstract_font, ++ cairo_operator_t operator, ++ cairo_pattern_t *pattern, ++ cairo_surface_t *generic_surface, ++ int source_x, ++ int source_y, ++ int dest_x, ++ int dest_y, ++ unsigned int width, ++ unsigned int height, ++ const cairo_glyph_t *glyphs, ++ int num_glyphs) ++{ ++ cairo_atsui_font_t *font = abstract_font; ++ CGContextRef myBitmapContext; ++ CGColorSpaceRef colorSpace; ++ cairo_quartz_surface_t *surface = (cairo_quartz_surface_t *)generic_surface; ++ cairo_image_surface_t *destImageSurface; ++ int i; ++ ++ cairo_rectangle_t rect = {dest_x, dest_y, width, height}; ++ _cairo_surface_acquire_dest_image(generic_surface, ++ &rect, ++ &destImageSurface, ++ &rect, ++ NULL); ++ ++ // Create a CGBitmapContext for the dest surface for drawing into + colorSpace = CGColorSpaceCreateDeviceRGB(); +- +- myBitmapContext = CGBitmapContextCreate( destImageSurface->data, +- destImageSurface->width, +- destImageSurface->height, +- destImageSurface->depth / 4, +- destImageSurface->stride, +- colorSpace, +- kCGImageAlphaPremultipliedFirst); +- +- +- ATSFontRef atsFont = FMGetATSFontRefFromFont(font->fontID); +- CGFontRef cgFont = CGFontCreateWithPlatformFont(&atsFont); +- +- CGContextSetFont(myBitmapContext, cgFont); +- +- +- CGAffineTransform textTransform = CGAffineTransformMakeWithCairoFontScale(*sc); +- CGSize textSize = CGSizeMake(1.0, 1.0); +- +- textSize = CGSizeApplyAffineTransform(textSize, textTransform); +- +- CGContextSetFontSize(myBitmapContext, textSize.width); +- +- +- // TODO - bold and italic text +- // +- // We could draw the text using ATSUI and get bold, italics +- // etc. for free, but ATSUI does a lot of text layout work +- // that we don't really need... +- +- +- for (i = 0; i < num_glyphs; i++) +- { +- CGGlyph theGlyph = glyphs[i].index; +- +- CGContextShowGlyphsAtPoint(myBitmapContext, source_x + glyphs[i].x, destImageSurface->height - (source_y + glyphs[i].y), &theGlyph, 1); +- } +- +- +- CGColorSpaceRelease(colorSpace); +- CGContextRelease(myBitmapContext); +- +- +- return CAIRO_STATUS_SUCCESS; ++ ++ myBitmapContext = CGBitmapContextCreate(destImageSurface->data, ++ destImageSurface->width, ++ destImageSurface->height, ++ destImageSurface->depth / 4, ++ destImageSurface->stride, ++ colorSpace, ++ kCGImageAlphaPremultipliedFirst); ++ CGContextTranslateCTM(myBitmapContext, 0, destImageSurface->height); ++ CGContextScaleCTM(myBitmapContext, 1.0f, -1.0f); ++ ++ ATSFontRef atsFont = FMGetATSFontRefFromFont(font->fontID); ++ CGFontRef cgFont = CGFontCreateWithPlatformFont(&atsFont); ++ ++ CGContextSetFont(myBitmapContext, cgFont); ++ ++ CGAffineTransform textTransform = ++ CGAffineTransformMakeWithCairoFontScale(font->scale); ++ ++ textTransform = CGAffineTransformScale(textTransform, 1.0f, -1.0f); ++ ++ CGContextSetFontSize(myBitmapContext, 1.0); ++ CGContextSetTextMatrix(myBitmapContext, textTransform); ++ ++ if (pattern->type == CAIRO_PATTERN_SOLID && ++ _cairo_pattern_is_opaque(pattern)) { ++ cairo_solid_pattern_t *solid = (cairo_solid_pattern_t *)pattern; ++ CGContextSetRGBFillColor(myBitmapContext, ++ solid->red, solid->green, solid->blue, 1.0f); ++ } else ++ CGContextSetRGBFillColor(myBitmapContext, 0.0f, 0.0f, 0.0f, 0.0f); ++ ++ // TODO - bold and italic text ++ // ++ // We could draw the text using ATSUI and get bold, italics ++ // etc. for free, but ATSUI does a lot of text layout work ++ // that we don't really need... ++ ++ ++ for (i = 0; i < num_glyphs; i++) { ++ CGGlyph theGlyph = glyphs[i].index; ++ ++ CGContextShowGlyphsAtPoint(myBitmapContext, ++ glyphs[i].x, ++ glyphs[i].y, ++ &theGlyph, 1); ++ } ++ ++ ++ CGColorSpaceRelease(colorSpace); ++ CGContextRelease(myBitmapContext); ++ ++ _cairo_surface_release_dest_image(generic_surface, ++ &rect, ++ destImageSurface, ++ &rect, ++ NULL); ++ ++ return CAIRO_STATUS_SUCCESS; + } + + +-#pragma mark - +- +- +-static OSStatus MyATSCubicMoveToCallback(const Float32Point *pt, void *callBackDataPtr) +-{ +- cairo_ATSUI_glyph_path_callback_info_t *info = callBackDataPtr; +- double scaledPt[2]; +- cairo_point_t point; +- +- +- scaledPt[0] = pt->x; +- scaledPt[1] = pt->y; +- +- cairo_matrix_transform_point(&info->scale, &scaledPt[0], &scaledPt[1]); ++static OSStatus MyATSCubicMoveToCallback(const Float32Point * pt, ++ void *callBackDataPtr) ++{ ++ cairo_ATSUI_glyph_path_callback_info_t *info = callBackDataPtr; ++ double scaledPt[2]; ++ cairo_point_t point; ++ ++ ++ scaledPt[0] = pt->x; ++ scaledPt[1] = pt->y; ++ ++ cairo_matrix_transform_point(&info->scale, &scaledPt[0], &scaledPt[1]); + + point.x = _cairo_fixed_from_double(scaledPt[0]); + point.y = _cairo_fixed_from_double(scaledPt[1]); + + _cairo_path_move_to(info->path, &point); +- +- ++ ++ + return noErr; + } + + +-static OSStatus MyATSCubicLineToCallback(const Float32Point *pt, void *callBackDataPtr) ++static OSStatus MyATSCubicLineToCallback(const Float32Point * pt, ++ void *callBackDataPtr) + { +- cairo_ATSUI_glyph_path_callback_info_t *info = callBackDataPtr; +- cairo_point_t point; +- double scaledPt[2]; +- +- +- scaledPt[0] = pt->x; +- scaledPt[1] = pt->y; +- +- cairo_matrix_transform_point(&info->scale, &scaledPt[0], &scaledPt[1]); +- ++ cairo_ATSUI_glyph_path_callback_info_t *info = callBackDataPtr; ++ cairo_point_t point; ++ double scaledPt[2]; ++ ++ ++ scaledPt[0] = pt->x; ++ scaledPt[1] = pt->y; ++ ++ cairo_matrix_transform_point(&info->scale, &scaledPt[0], &scaledPt[1]); ++ + point.x = _cairo_fixed_from_double(scaledPt[0]); + point.y = _cairo_fixed_from_double(scaledPt[1]); + + _cairo_path_line_to(info->path, &point); +- +- +- return noErr; ++ ++ ++ return noErr; + } + + +-static OSStatus MyATSCubicCurveToCallback( const Float32Point *pt1, +- const Float32Point *pt2, +- const Float32Point *pt3, +- void *callBackDataPtr) ++static OSStatus MyATSCubicCurveToCallback(const Float32Point * pt1, ++ const Float32Point * pt2, ++ const Float32Point * pt3, ++ void *callBackDataPtr) + { +- cairo_ATSUI_glyph_path_callback_info_t *info = callBackDataPtr; ++ cairo_ATSUI_glyph_path_callback_info_t *info = callBackDataPtr; + cairo_point_t p0, p1, p2; +- double scaledPt[2]; +- +- +- scaledPt[0] = pt1->x; +- scaledPt[1] = pt1->y; +- +- cairo_matrix_transform_point(&info->scale, &scaledPt[0], &scaledPt[1]); ++ double scaledPt[2]; ++ ++ ++ scaledPt[0] = pt1->x; ++ scaledPt[1] = pt1->y; ++ ++ cairo_matrix_transform_point(&info->scale, &scaledPt[0], &scaledPt[1]); + + p0.x = _cairo_fixed_from_double(scaledPt[0]); + p0.y = _cairo_fixed_from_double(scaledPt[1]); +- ++ + + scaledPt[0] = pt2->x; +- scaledPt[1] = pt2->y; +- +- cairo_matrix_transform_point(&info->scale, &scaledPt[0], &scaledPt[1]); ++ scaledPt[1] = pt2->y; ++ ++ cairo_matrix_transform_point(&info->scale, &scaledPt[0], &scaledPt[1]); + + p1.x = _cairo_fixed_from_double(scaledPt[0]); + p1.y = _cairo_fixed_from_double(scaledPt[1]); +- ++ + + scaledPt[0] = pt3->x; +- scaledPt[1] = pt3->y; +- +- cairo_matrix_transform_point(&info->scale, &scaledPt[0], &scaledPt[1]); ++ scaledPt[1] = pt3->y; ++ ++ cairo_matrix_transform_point(&info->scale, &scaledPt[0], &scaledPt[1]); + + p2.x = _cairo_fixed_from_double(scaledPt[0]); + p2.y = _cairo_fixed_from_double(scaledPt[1]); +- ++ + + _cairo_path_curve_to(info->path, &p0, &p1, &p2); +- +- +- return noErr; ++ ++ ++ return noErr; + } + + +-static OSStatus MyCubicClosePathProc(void * callBackDataPtr) ++static OSStatus MyCubicClosePathProc(void *callBackDataPtr) + { +- cairo_ATSUI_glyph_path_callback_info_t *info = callBackDataPtr; +- +- ++ cairo_ATSUI_glyph_path_callback_info_t *info = callBackDataPtr; ++ ++ + _cairo_path_close_path(info->path); +- +- +- return noErr; +-} + + +-static cairo_status_t +-_cairo_atsui_font_glyph_path( void *abstract_font, +- cairo_font_scale_t *sc, +- cairo_glyph_t *glyphs, +- int num_glyphs, +- cairo_path_t *path) +-{ +- int i; +- cairo_atsui_font_t *font = abstract_font; +- OSStatus err; +- cairo_ATSUI_glyph_path_callback_info_t info; +- ATSUStyle style; +- +- +- static ATSCubicMoveToUPP moveProc = NULL; +- static ATSCubicLineToUPP lineProc = NULL; +- static ATSCubicCurveToUPP curveProc = NULL; +- static ATSCubicClosePathUPP closePathProc = NULL; +- +- +- if (moveProc == NULL) +- { +- moveProc = NewATSCubicMoveToUPP(MyATSCubicMoveToCallback); +- lineProc = NewATSCubicLineToUPP(MyATSCubicLineToCallback); +- curveProc = NewATSCubicCurveToUPP(MyATSCubicCurveToCallback); +- closePathProc = NewATSCubicClosePathUPP(MyCubicClosePathProc); +- } +- +- +- info.path = path; +- +- +- style = CreateSizedCopyOfStyle(font->style, sc); +- +- +- for (i = 0; i < num_glyphs; i++) +- { +- GlyphID theGlyph = glyphs[i].index; +- +- +- cairo_matrix_set_affine( &info.scale, +- 1.0, 0.0, +- 0.0, 1.0, +- glyphs[i].x, glyphs[i].y); +- +- +- err = ATSUGlyphGetCubicPaths( style, +- theGlyph, +- moveProc, +- lineProc, +- curveProc, +- closePathProc, +- (void *)&info, +- &err); +- } +- +- +- err = ATSUDisposeStyle(style); +- +- +- return CAIRO_STATUS_SUCCESS; +-} +- +- +-#pragma mark - +- +- +-static cairo_status_t +-_cairo_atsui_font_create_glyph(cairo_image_glyph_cache_entry_t *val) +-{ +- // TODO +- printf("_cairo_atsui_font_create_glyph is unimplemented\n"); +- +- // I'm not sure if we need this, given that the ATSUI backend does no caching(?) +- +- +- return CAIRO_STATUS_SUCCESS; +-} +- +- +-cairo_font_t * +-cairo_atsui_font_create(ATSUStyle style) +-{ +- cairo_font_scale_t scale; +- cairo_font_t *scaled; +- cairo_atsui_font_t *f = NULL; +- +- +- scaled = malloc(sizeof(cairo_font_t)); +- if (scaled == NULL) +- return NULL; +- +- +- f = malloc(sizeof(cairo_atsui_font_t)); +- if (f) +- { +- if (_cairo_unscaled_font_init(&f->base, &cairo_atsui_font_backend) == CAIRO_STATUS_SUCCESS) +- { +- f->style = style; +- +- _cairo_font_init(scaled, &scale, &f->base); +- +- return scaled; +- } +- } +- +- +- free(scaled); +- +- +- return NULL; ++ return noErr; + } + + ++static cairo_status_t ++_cairo_atsui_font_glyph_path(void *abstract_font, ++ cairo_glyph_t *glyphs, int num_glyphs, ++ cairo_path_t *path) ++{ ++ int i; ++ cairo_atsui_font_t *font = abstract_font; ++ OSStatus err; ++ cairo_ATSUI_glyph_path_callback_info_t info; ++ ++ ++ static ATSCubicMoveToUPP moveProc = NULL; ++ static ATSCubicLineToUPP lineProc = NULL; ++ static ATSCubicCurveToUPP curveProc = NULL; ++ static ATSCubicClosePathUPP closePathProc = NULL; ++ ++ ++ if (moveProc == NULL) { ++ moveProc = NewATSCubicMoveToUPP(MyATSCubicMoveToCallback); ++ lineProc = NewATSCubicLineToUPP(MyATSCubicLineToCallback); ++ curveProc = NewATSCubicCurveToUPP(MyATSCubicCurveToCallback); ++ closePathProc = NewATSCubicClosePathUPP(MyCubicClosePathProc); ++ } + + ++ info.path = path; + +-#pragma mark Backend + ++ for (i = 0; i < num_glyphs; i++) { ++ GlyphID theGlyph = glyphs[i].index; + + ++ cairo_matrix_set_affine(&info.scale, ++ 1.0, 0.0, ++ 0.0, 1.0, glyphs[i].x, glyphs[i].y); ++ ++ ++ err = ATSUGlyphGetCubicPaths(font->style, ++ theGlyph, ++ moveProc, ++ lineProc, ++ curveProc, ++ closePathProc, (void *) &info, &err); ++ } ++ ++ return CAIRO_STATUS_SUCCESS; ++} ++ ++ ++static cairo_status_t ++_cairo_atsui_font_create_glyph(cairo_image_glyph_cache_entry_t * val) ++{ ++ return CAIRO_STATUS_NO_MEMORY; ++} + + + const cairo_font_backend_t cairo_atsui_font_backend = { +- _cairo_atsui_font_create, +- _cairo_atsui_font_destroy, +- _cairo_atsui_font_font_extents, +- _cairo_atsui_font_text_to_glyphs, +- _cairo_atsui_font_glyph_extents, +- _cairo_atsui_font_glyph_bbox, +- _cairo_atsui_font_show_glyphs, +- _cairo_atsui_font_glyph_path, +- _cairo_atsui_font_create_glyph ++ _cairo_atsui_font_create, ++ _cairo_atsui_font_destroy_font, ++ _cairo_atsui_font_destroy_unscaled_font, ++ _cairo_atsui_font_font_extents, ++ _cairo_atsui_font_text_to_glyphs, ++ _cairo_atsui_font_glyph_extents, ++ _cairo_atsui_font_glyph_bbox, ++ _cairo_atsui_font_show_glyphs, ++ _cairo_atsui_font_glyph_path, ++ _cairo_atsui_font_get_glyph_cache_key, ++ _cairo_atsui_font_create_glyph + }; ++ ++ ++cairo_font_t *cairo_atsui_font_create(ATSUStyle style) ++{ ++#if 0 ++ cairo_font_scale_t scale; ++ cairo_font_t *scaled; ++ cairo_atsui_font_t *f = NULL; ++ ++ ++ scaled = malloc(sizeof(cairo_font_t)); ++ if (scaled == NULL) ++ return NULL; ++ ++ ++ f = malloc(sizeof(cairo_atsui_font_t)); ++ if (f) { ++ if (_cairo_unscaled_font_init(&f->base, &cairo_atsui_font_backend) ++ == CAIRO_STATUS_SUCCESS) { ++ f->style = style; ++ ++ _cairo_font_init(scaled, &scale, &f->base); ++ ++ return scaled; ++ } ++ } ++ ++ ++ free(scaled); ++ ++#endif ++ ++ return NULL; ++} +--- cairo-0.4.0/src/cairo_quartz_surface.c 2005-02-22 13:24:50.000000000 -0600 ++++ cairo/src/cairo_quartz_surface.c 2005-03-23 13:04:57.823662409 -0600 +@@ -35,67 +35,34 @@ + + #include "cairoint.h" + #include "cairo-quartz.h" ++#include "cairo-quartz-private.h" + +-#pragma mark Types +- +-typedef struct cairo_quartz_surface { +- cairo_surface_t base; +- +- CGContextRef context; +- +- int width; +- int height; +- +- cairo_image_surface_t *image; +- +- CGImageRef cgImage; +-} cairo_quartz_surface_t; +- +- +- +- +- +-#pragma mark Private functions +- +- +- +- +-void ImageDataReleaseFunc(void *info, const void *data, size_t size) ++static void ++ImageDataReleaseFunc(void *info, const void *data, size_t size) + { +- if (data != NULL) +- { +- free((void *)data); ++ if (data != NULL) { ++ free((void *) data); + } + } + + +- +- +-#pragma mark Public functions +- +- +- +- +- + void +-cairo_set_target_quartz_context( cairo_t *cr, +- CGContextRef context, +- int width, +- int height) ++cairo_set_target_quartz_context(cairo_t * cr, ++ CGContextRef context, ++ int width, int height) + { + cairo_surface_t *surface; +- +- ++ ++ + if (cr->status && cr->status != CAIRO_STATUS_NO_TARGET_SURFACE) + return; +- ++ + surface = cairo_quartz_surface_create(context, width, height); +- if (surface == NULL) +- { ++ if (surface == NULL) { + cr->status = CAIRO_STATUS_NO_MEMORY; + return; + } +- ++ + cairo_set_target_surface(cr, surface); + + /* cairo_set_target_surface takes a reference, so we must destroy ours */ +@@ -103,202 +70,201 @@ + } + + +-static cairo_surface_t * +-_cairo_quartz_surface_create_similar( void *abstract_src, +- cairo_format_t format, +- int drawable, +- int width, +- int height) ++static cairo_surface_t *_cairo_quartz_surface_create_similar(void ++ *abstract_src, ++ cairo_format_t ++ format, ++ int drawable, ++ int width, ++ int height) + { + return NULL; + } + + +-static void +-_cairo_quartz_surface_destroy(void *abstract_surface) ++static void _cairo_quartz_surface_destroy(void *abstract_surface) + { + cairo_quartz_surface_t *surface = abstract_surface; +- +- ++ ++ if (surface->image) ++ cairo_surface_destroy(surface->image); ++ + if (surface->cgImage) +- { +- CGImageRelease(surface->cgImage); +- } +- ++ CGImageRelease(surface->cgImage); + + free(surface); + } + + +-static double +-_cairo_quartz_surface_pixels_per_inch(void *abstract_surface) ++static double _cairo_quartz_surface_pixels_per_inch(void *abstract_surface) + { +- +- + // TODO - get this from CGDirectDisplay somehow? + return 96.0; + } + + +-static cairo_image_surface_t * +-_cairo_quartz_surface_get_image(void *abstract_surface) ++static cairo_status_t ++_cairo_quartz_surface_acquire_source_image(void *abstract_surface, ++ cairo_image_surface_t **image_out, ++ void **image_extra) + { +- cairo_quartz_surface_t *surface = abstract_surface; +- CGColorSpaceRef colorSpace; +- void *imageData; +- UInt32 imageDataSize, rowBytes; +- CGDataProviderRef dataProvider; +- +- ++ cairo_quartz_surface_t *surface = abstract_surface; ++ CGColorSpaceRef colorSpace; ++ void *imageData; ++ UInt32 imageDataSize, rowBytes; ++ CGDataProviderRef dataProvider; ++ + // We keep a cached (cairo_image_surface_t *) in the cairo_quartz_surface_t + // struct. If the window is ever drawn to without going through Cairo, then + // we would need to refetch the pixel data from the window into the cached + // image surface. +- if (surface->image) +- { ++ if (surface->image) { + cairo_surface_reference(&surface->image->base); + +- return surface->image; ++ *image_out = surface->image; ++ return CAIRO_STATUS_SUCCESS; + } +- ++ + colorSpace = CGColorSpaceCreateDeviceRGB(); +- +- ++ ++ + rowBytes = surface->width * 4; + imageDataSize = rowBytes * surface->height; + imageData = malloc(imageDataSize); +- +- dataProvider = CGDataProviderCreateWithData(NULL, imageData, imageDataSize, ImageDataReleaseFunc); +- +- surface->cgImage = CGImageCreate( surface->width, +- surface->height, +- 8, +- 32, +- rowBytes, +- colorSpace, +- kCGImageAlphaPremultipliedFirst, +- dataProvider, +- NULL, +- false, +- kCGRenderingIntentDefault); +- +- ++ ++ dataProvider = ++ CGDataProviderCreateWithData(NULL, imageData, imageDataSize, ++ ImageDataReleaseFunc); ++ ++ surface->cgImage = CGImageCreate(surface->width, ++ surface->height, ++ 8, ++ 32, ++ rowBytes, ++ colorSpace, ++ kCGImageAlphaPremultipliedFirst, ++ dataProvider, ++ NULL, ++ false, kCGRenderingIntentDefault); ++ + CGColorSpaceRelease(colorSpace); + CGDataProviderRelease(dataProvider); +- +- ++ + surface->image = (cairo_image_surface_t *) +- cairo_image_surface_create_for_data( imageData, +- CAIRO_FORMAT_ARGB32, +- surface->width, +- surface->height, +- rowBytes); +- +- ++ cairo_image_surface_create_for_data(imageData, ++ CAIRO_FORMAT_ARGB32, ++ surface->width, ++ surface->height, rowBytes); ++ ++ + // Set the image surface Cairo state to match our own. + _cairo_image_surface_set_repeat(surface->image, surface->base.repeat); +- _cairo_image_surface_set_matrix(surface->image, &(surface->base.matrix)); +- ++ _cairo_image_surface_set_matrix(surface->image, ++ &(surface->base.matrix)); ++ ++ *image_out = surface->image; ++ *image_extra = NULL; + +- return surface->image; ++ return CAIRO_STATUS_SUCCESS; + } + + +-static cairo_status_t +-_cairo_quartz_surface_set_image( void *abstract_surface, +- cairo_image_surface_t *image) ++static void ++_cairo_quartz_surface_release_source_image(void *abstract_surface, ++ cairo_image_surface_t * image, ++ void *image_extra) + { +- cairo_quartz_surface_t *surface = abstract_surface; +- cairo_status_t status; +- +- +- if (surface->image == image) +- { +- CGRect rect; +- +- +- rect = CGRectMake(0, 0, surface->width, surface->height); +- +- CGContextDrawImage(surface->context, rect, surface->cgImage); +- +- +- status = CAIRO_STATUS_SUCCESS; +- } +- else +- { +- // TODO - set_image from something other than what we returned from get_image +- status = CAIRO_STATUS_NO_TARGET_SURFACE; +- } +- +- +- return status; + } + + + static cairo_status_t +-_cairo_quartz_surface_set_matrix(void *abstract_surface, cairo_matrix_t *matrix) ++_cairo_quartz_surface_acquire_dest_image(void *abstract_surface, ++ cairo_rectangle_t * interest_rect, ++ cairo_image_surface_t ** ++ image_out, ++ cairo_rectangle_t * image_rect, ++ void **image_extra) + { + cairo_quartz_surface_t *surface = abstract_surface; + +- return _cairo_image_surface_set_matrix(surface->image, matrix); ++ image_rect->x = 0; ++ image_rect->y = 0; ++ image_rect->width = surface->image->width; ++ image_rect->height = surface->image->height; ++ ++ *image_out = surface->image; ++ ++ return CAIRO_STATUS_SUCCESS; + } + + +-static cairo_status_t +-_cairo_quartz_surface_set_filter(void *abstract_surface, cairo_filter_t filter) ++static void ++_cairo_quartz_surface_release_dest_image(void *abstract_surface, ++ cairo_rectangle_t * ++ intersect_rect, ++ cairo_image_surface_t * image, ++ cairo_rectangle_t * image_rect, ++ void *image_extra) + { + cairo_quartz_surface_t *surface = abstract_surface; + +- return _cairo_image_surface_set_filter(surface->image, filter); ++ if (surface->image == image) { ++ CGRect rect; ++ ++ rect = CGRectMake(0, 0, surface->width, surface->height); ++ ++ CGContextDrawImage(surface->context, rect, surface->cgImage); ++ ++ memset(surface->image->data, 0, surface->width * surface->height * 4); ++ } + } + + + static cairo_status_t +-_cairo_quartz_surface_set_repeat(void *abstract_surface, int repeat) ++_cairo_quartz_surface_clone_similar(void *surface, ++ cairo_surface_t * src, ++ cairo_surface_t ** clone_out) + { +- cairo_quartz_surface_t *surface = abstract_surface; +- +- return _cairo_image_surface_set_repeat(surface->image, repeat); ++ return CAIRO_INT_STATUS_UNSUPPORTED; + } + + + static cairo_int_status_t +-_cairo_quartz_surface_composite( cairo_operator_t operator, +- cairo_surface_t *generic_src, +- cairo_surface_t *generic_mask, +- void *abstract_dst, +- int src_x, +- int src_y, +- int mask_x, +- int mask_y, +- int dst_x, +- int dst_y, +- unsigned int width, +- unsigned int height) ++_cairo_quartz_surface_composite(cairo_operator_t operator, ++ cairo_surface_t * generic_src, ++ cairo_surface_t * generic_mask, ++ void *abstract_dst, ++ int src_x, ++ int src_y, ++ int mask_x, ++ int mask_y, ++ int dst_x, ++ int dst_y, ++ unsigned int width, unsigned int height) + { + return CAIRO_INT_STATUS_UNSUPPORTED; + } + + + static cairo_int_status_t +-_cairo_quartz_surface_fill_rectangles( void *abstract_surface, +- cairo_operator_t operator, +- const cairo_color_t *color, +- cairo_rectangle_t *rects, +- int num_rects) ++_cairo_quartz_surface_fill_rectangles(void *abstract_surface, ++ cairo_operator_t operator, ++ const cairo_color_t * color, ++ cairo_rectangle_t * rects, ++ int num_rects) + { + return CAIRO_INT_STATUS_UNSUPPORTED; + } + + + static cairo_int_status_t +-_cairo_quartz_surface_composite_trapezoids( cairo_operator_t operator, +- cairo_surface_t *generic_src, +- void *abstract_dst, +- int xSrc, +- int ySrc, +- cairo_trapezoid_t *traps, +- int num_traps) ++_cairo_quartz_surface_composite_trapezoids(cairo_operator_t operator, ++ cairo_surface_t * generic_src, ++ void *abstract_dst, ++ int xSrc, ++ int ySrc, ++ cairo_trapezoid_t * traps, ++ int num_traps) + { + return CAIRO_INT_STATUS_UNSUPPORTED; + } +@@ -319,8 +285,8 @@ + + + static cairo_int_status_t +-_cairo_quartz_surface_set_clip_region( void *abstract_surface, +- pixman_region16_t *region) ++_cairo_quartz_surface_set_clip_region(void *abstract_surface, ++ pixman_region16_t * region) + { + cairo_quartz_surface_t *surface = abstract_surface; + +@@ -328,10 +294,19 @@ + } + + +-static cairo_int_status_t +-_cairo_quartz_surface_create_pattern( void *abstract_surface, +- cairo_pattern_t *pattern, +- cairo_box_t *extents) ++static cairo_status_t ++_cairo_quartz_surface_show_glyphs(cairo_font_t * font, ++ cairo_operator_t operator, ++ cairo_pattern_t * pattern, ++ void *abstract_surface, ++ int source_x, ++ int source_y, ++ int dest_x, ++ int dest_y, ++ unsigned int width, ++ unsigned int height, ++ const cairo_glyph_t * glyphs, ++ int num_glyphs) + { + return CAIRO_INT_STATUS_UNSUPPORTED; + } +@@ -341,52 +316,41 @@ + _cairo_quartz_surface_create_similar, + _cairo_quartz_surface_destroy, + _cairo_quartz_surface_pixels_per_inch, +- _cairo_quartz_surface_get_image, +- _cairo_quartz_surface_set_image, +- _cairo_quartz_surface_set_matrix, +- _cairo_quartz_surface_set_filter, +- _cairo_quartz_surface_set_repeat, ++ _cairo_quartz_surface_acquire_source_image, ++ _cairo_quartz_surface_release_source_image, ++ _cairo_quartz_surface_acquire_dest_image, ++ _cairo_quartz_surface_release_dest_image, ++ _cairo_quartz_surface_clone_similar, + _cairo_quartz_surface_composite, + _cairo_quartz_surface_fill_rectangles, + _cairo_quartz_surface_composite_trapezoids, + _cairo_quartz_surface_copy_page, + _cairo_quartz_surface_show_page, + _cairo_quartz_surface_set_clip_region, +- _cairo_quartz_surface_create_pattern ++ _cairo_quartz_surface_show_glyphs + }; + + +-cairo_surface_t * +-cairo_quartz_surface_create( CGContextRef context, +- int width, +- int height) ++cairo_surface_t *cairo_quartz_surface_create(CGContextRef context, ++ int width, int height) + { + cairo_quartz_surface_t *surface; +- +- ++ + surface = malloc(sizeof(cairo_quartz_surface_t)); + if (surface == NULL) + return NULL; +- ++ + _cairo_surface_init(&surface->base, &cairo_quartz_surface_backend); +- +- +- surface->context = context; +- +- surface->width = width; +- surface->height = height; +- +- surface->image = NULL; +- +- surface->cgImage = NULL; +- +- +- // Set up the image surface which Cairo draws into and we blit to & from. +- surface->image = _cairo_quartz_surface_get_image(surface); +- +- +- return (cairo_surface_t *)surface; +-} + ++ surface->context = context; ++ surface->width = width; ++ surface->height = height; ++ surface->image = NULL; ++ surface->cgImage = NULL; ++ ++ // Set up the image surface which Cairo draws into and we blit to & from. ++ void *foo; ++ _cairo_quartz_surface_acquire_source_image(surface, &surface->image, &foo); + +-DEPRECATE (cairo_surface_create_for_drawable, cairo_quartz_surface_create); ++ return (cairo_surface_t *) surface; ++} diff --git a/gfx/cairo/stdint.diff b/gfx/cairo/stdint.diff index a93e9952963e..185b0a75e208 100644 --- a/gfx/cairo/stdint.diff +++ b/gfx/cairo/stdint.diff @@ -1,43 +1,6 @@ -? cairo/autom4te.cache -Index: libpixman/src/pixman.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/cairo/libpixman/src/pixman.h,v -retrieving revision 1.1 -diff -u -8 -p -r1.1 pixman.h ---- libpixman/src/pixman.h 24 Feb 2005 20:08:55 -0000 1.1 -+++ libpixman/src/pixman.h 11 Mar 2005 17:27:47 -0000 -@@ -79,17 +79,17 @@ SOFTWARE. - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - - - #if defined (__SVR4) && defined (__sun) - # include - #else --# if defined (__OpenBSD__) -+# if defined (__OpenBSD__) || defined (_AIX) - # include - # else - # include - # endif - #endif - - - #if defined(__cplusplus) || defined(c_plusplus) -Index: cairo/src/cairo-wideint.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/cairo/cairo/src/cairo-wideint.h,v -retrieving revision 1.1 -diff -u -8 -p -r1.1 cairo-wideint.h ---- cairo/src/cairo-wideint.h 24 Feb 2005 20:08:53 -0000 1.1 -+++ cairo/src/cairo-wideint.h 11 Mar 2005 17:27:47 -0000 -@@ -33,17 +33,25 @@ - * Contributor(s): - * Keith R. Packard - * - */ - +--- cairo-0.4.0/src/cairo-wideint.h 2005-02-22 13:24:50.000000000 -0600 ++++ cairo/src/cairo-wideint.h 2005-03-23 13:00:28.436158473 -0600 +@@ -38,7 +38,15 @@ #ifndef CAIRO_WIDEINT_H #define CAIRO_WIDEINT_H @@ -45,7 +8,7 @@ diff -u -8 -p -r1.1 cairo-wideint.h +#if defined (__SVR4) && defined (__sun) +# include +#else -+# if defined (__OpenBSD__) || defined (_AIX) ++# if defined (__OpenBSD__) +# include +# else +# include @@ -54,24 +17,9 @@ diff -u -8 -p -r1.1 cairo-wideint.h /* * 64-bit datatypes. Two separate implementations, one using - * built-in 64-bit signed/unsigned types another implemented - * as a pair of 32-bit ints - */ - - #define I cairo_private -Index: cairo/src/cairoint.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/cairo/cairo/src/cairoint.h,v -retrieving revision 1.1 -diff -u -8 -p -r1.1 cairoint.h ---- cairo/src/cairoint.h 24 Feb 2005 20:08:53 -0000 1.1 -+++ cairo/src/cairoint.h 11 Mar 2005 17:27:47 -0000 -@@ -49,17 +49,26 @@ - #include "config.h" - #endif - - #include - #include +--- cairo-0.4.0/src/cairoint.h 2005-03-04 11:57:54.000000000 -0600 ++++ cairo/src/cairoint.h 2005-03-23 13:00:45.667289010 -0600 +@@ -54,7 +54,16 @@ #include #include #include @@ -80,7 +28,7 @@ diff -u -8 -p -r1.1 cairoint.h +#if defined (__SVR4) && defined (__sun) +# include +#else -+# if defined (__OpenBSD__) || defined (_AIX) ++# if defined (__OpenBSD__) +# include +# else +# include @@ -89,8 +37,3 @@ diff -u -8 -p -r1.1 cairoint.h #include "cairo.h" - #if __GNUC__ >= 3 && defined(__ELF__) - # define slim_hidden_proto(name) slim_hidden_proto1(name, INT_##name) - # define slim_hidden_def(name) slim_hidden_def1(name, INT_##name) - # define slim_hidden_proto1(name, internal) \ - extern __typeof (name) name \ diff --git a/gfx/cairo/subdirs.diff b/gfx/cairo/subdirs.diff new file mode 100644 index 000000000000..12f0d6604c38 --- /dev/null +++ b/gfx/cairo/subdirs.diff @@ -0,0 +1,19 @@ +--- cairo-0.4.0/Makefile.am 2005-01-27 13:42:51.000000000 -0600 ++++ cairo/Makefile.am 2005-03-23 11:13:34.000000000 -0600 +@@ -1,4 +1,4 @@ +-SUBDIRS = src test doc ++SUBDIRS = src + + EXTRA_DIST = \ + COPYING \ +--- cairo-0.4.0/Makefile.in 2005-03-08 19:43:54.000000000 -0600 ++++ cairo/Makefile.in 2005-03-23 11:13:22.000000000 -0600 +@@ -250,7 +250,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-SUBDIRS = src test doc ++SUBDIRS = src + EXTRA_DIST = \ + COPYING \ + COPYING-LGPL-2.1 \