PangoCairoFontMap for win32 fonts.

2005-02-24  Owen Taylor  <otaylor@redhat.com>

	* pango/pangocairo-win32.h pango/pangocairo-win32font.c
	pango/pangocairo-win32fontmap.c	pango/Makefile.am:
	PangoCairoFontMap for win32 fonts.

	* pango/pangocairo-fontmap.c: Use PangoCairoWin32FontMap
	when available.

	* pango/pangowin32.h pango/pangowin32-fontmap.h pango/pangowin32.c:
	Add virtual pango_win32_font_select_font()
	to prepare a DC for use with a PangoWin32Font, and to release,
	pango_win32_font_scale_font() to get logical unit => Pango units scale,
	pango_win32_font_done_font() to release resources.

	* pango/pangowin32-fontmap.[ch]: Add a find_font() virtual method
	to allow subclasses that change how PangoFont lookup and
	creation happens.

	* pango/pangowin32-fontmap.c: Move initialization into
	pango_win32_font_map_init() to facilitate derivation.

	* pango/pangowin2.c pango/pangowin32-fontmap.c
	pango/pangowin32-private.h: Move PangoWin32Font/PangoWin32FontMap
	definitions into pangowin32-private.h to allow derivation for
	PangoCairoWin32Font.

	* modules/basic/basic-win32.c: Use pango_win32_font_select_font()
	and friends.

	* modules/basic/basic-win32.c: Use g_utf8_to_utf16 instead
	of g_convert for simplicity and speed.

	* pango/fonts.c (pango_font_get_font_map) pango/pango-font.h
	pango/pangofc-font.c pango/pangowin32.c pango/pango.c pango/pango.def
	docs/pango-sections.txt: Add a virtual function to get the fontmap
	for a font.

	* pango/pangocairo-render.c: Use pango_font_get_font_map()
	rather than PangoFcFontMap hack.

	* pango/pango-types.h: Move the declaration of PangoFontMap here
	to avoid interactions between pango-font.h and pango-fontmap.h.

	* pango/pangocairo.h: Remove accidental include
	of pangofc-fontmap.h.

1 files changed, 55 insertions, 0 deletions

diff --git a/pango/pangocairo-win32.h b/pango/pangocairo-win32.h
new file mode 100644
index 00000000..cc458314
--- /dev/null
+++ b/pango/pangocairo-win32.h
@@ -0,0 +1,55 @@
+/* Pango
+ * pangocairo-win32.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_WIN32_H__
+#define __PANGOCAIRO_WIN32_H__
+
+#include "pangowin32.h"
+#include "pangowin32-private.h"
+#include "pangocairo.h"
+
+G_BEGIN_DECLS
+
+#define PANGO_TYPE_CAIRO_WIN32_FONT_MAP       (pango_cairo_win32_font_map_get_type ())
+#define PANGO_CAIRO_WIN32_FONT_MAP(object)    (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_CAIRO_WIN32_FONT_MAP, PangoCairoWin32FontMap))
+#define PANGO_IS_CAIRO_WIN32_FONT_MAP(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_CAIRO_WIN32_FONT_MAP))
+
+typedef struct _PangoCairoWin32FontMap PangoCairoWin32FontMap;
+
+struct _PangoCairoWin32FontMap
+{
+  PangoWin32FontMap parent_instance;
+
+  double dpi;
+
+  PangoRenderer *renderer;
+};
+
+GType pango_cairo_win32_font_map_get_type (void);
+
+PangoFont *_pango_cairo_win32_font_new (PangoCairoWin32FontMap       *cwfontmap,
+					PangoContext                 *context,
+					PangoWin32Face               *face,
+					const PangoFontDescription   *desc);
+G_END_DECLS
+
+#endif /* __PANGOCAIRO_WIN32_H__ */
+