Add checks for Cairo

Sat Jan  8 16:46:37 2005  Owen Taylor  <otaylor@redhat.com>

        * configure.in: Add checks for Cairo

        * pango/Makefile.am: Add libpangocairo.

        * pango/pangocairo-font.c pango/pangocairo-fontmap.c
        pango/pangocairo.h pango/pangocairo-private.h
        pango/pangocairo-fcfont.c pango/pangocairo-fcfontmap.c
        pango/pangocairo-fc.h: Start of a Cairo/FreeType backend.

        * pango/pangofc-fontmap.[ch]: Add a "get_render_key"
        virtual function to allow subclasses to specialize the
        details of how caching works. Add a default implementation
        that's a little more sophisticated than what was there
        before.

        * pango/pangoft2-private.h pangofc-font.c pangoft2.c:
        Move default implementations of has_char(), get_glyph()
        to the base class.

        * pango/pangofc-private.h pango/pangoft2-private.h:
        Move PANGO_UNITS_26_6 and friends to pango/pangofc-private.h.

        * examples/renderdemo.[ch] examples/pangoft2topgm.c
        examples/xftview.c: Allow passing in a custom function
        to transform drawing.

        * examples/Makefile.am examples/cairoview.c: Add a
        Cairo/Xlib example program.

        * examples/cairosimple.c: Simple Cairo example with
        output to a PNG.

        * pango/pango-layout.c (pango_layout_line_get_extents): Fix
        bug where line ink rect was always including 0, 0.

1 files changed, 54 insertions, 0 deletions

diff --git a/pango/pangocairo-fc.h b/pango/pangocairo-fc.h
new file mode 100644
index 00000000..22fd1b60
--- /dev/null
+++ b/pango/pangocairo-fc.h
@@ -0,0 +1,54 @@
+/* Pango
+ * pangocairo-fc.h: Private header file for Cairo/fontconfig combination
+ *
+ * Copyright (C) 2005 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __PANGOCAIRO_FC_H__
+#define __PANGOCAIRO_FC_H__
+
+#include "pangofc-fontmap.h"
+#include "pangocairo.h"
+
+G_BEGIN_DECLS
+
+#define PANGO_TYPE_CAIRO_FC_FONT_MAP       (pango_cairo_fc_font_map_get_type ())
+#define PANGO_CAIRO_FC_FONT_MAP(object)    (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_CAIRO_FC_FONT_MAP, PangoCairoFcFontMap))
+#define PANGO_IS_CAIRO_FC_FONT_MAP(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_CAIRO_FC_FONT_MAP))
+
+typedef struct _PangoCairoFcFontMap PangoCairoFcFontMap;
+
+struct _PangoCairoFcFontMap
+{
+  PangoFcFontMap parent_instance;
+
+  double dpi;
+
+  FT_Library library;
+  PangoRenderer *renderer;
+};
+
+GType pango_cairo_fc_font_map_get_type (void);
+
+PangoFcFont *_pango_cairo_fc_font_new (PangoCairoFcFontMap *cffontmap,
+				       FcPattern	   *pattern);
+
+G_END_DECLS
+
+#endif /* __PANGOCAIRO_FC_H__ */
+