Move some fontmap stuff to pangox-private.h to access fontmap->resolution

2001-04-27  Havoc Pennington  <hp@redhat.com>

	* pango/pangox-fontmap.c: Move some fontmap stuff to
	pangox-private.h to access fontmap->resolution in pangox.c

	* pango/pangox.c (get_font_metrics_from_subfonts): multiply
	avg. width by PANGO_SCALE, and consider that avg width from X is
	in decipoints

	* modules/basic/basic-x.c: mark some chars unknown when shaping,
	with a flag PANGO_X_UNKNOWN_FLAG

	* pango/pangox.c (pango_x_font_get_metrics): use lookup_lang not
	lang when calling get_font_metrics_from_string
	(pango_x_render): render unknown chars

	* pango/pango-layout.c:
	(pango_layout_set_single_paragraph_mode): add mode where we don't
	break on para separators, instead we shape them and display glyphs
	(pango_layout_get_single_paragraph_mode): getter for above
	(pango_layout_check_lines): handle single paragraph mode

1 files changed, 1 insertions, 33 deletions

diff --git a/pango/pangox-fontmap.c b/pango/pangox-fontmap.c
index 8cb86a2c..360e4e6b 100644
--- a/pango/pangox-fontmap.c
+++ b/pango/pangox-fontmap.c
@@ -32,16 +32,7 @@
 #include "pango-utils.h"
 #include "pangox-private.h"
 
-#define PANGO_TYPE_X_FONT_MAP              (pango_x_font_map_get_type ())
-#define PANGO_X_FONT_MAP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_X_FONT_MAP, PangoXFontMap))
-#define PANGO_X_FONT_MAP_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_X_FONT_MAP, PangoXFontMapClass))
-#define PANGO_X_IS_FONT_MAP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_X_FONT_MAP))
-#define PANGO_X_IS_FONT_MAP_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_X_FONT_MAP))
-#define PANGO_X_FONT_MAP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_X_FONT_MAP, PangoXFontMapClass))
-
 typedef struct _PangoXFamilyEntry  PangoXFamilyEntry;
-typedef struct _PangoXFontMap      PangoXFontMap;
-typedef struct _PangoXFontMapClass PangoXFontMapClass;
 typedef struct _PangoXSizeInfo     PangoXSizeInfo;
 
 /* Number of freed fonts */
@@ -72,28 +63,6 @@ typedef enum
   XLFD_NUM_FIELDS     
 } FontField;
 
-struct _PangoXFontMap
-{
-  PangoFontMap parent_instance;
-
-  Display *display;
-
-  PangoXFontCache *font_cache;
-  GQueue *freed_fonts;
-
-  GHashTable *families;
-  GHashTable *size_infos;
-
-  GHashTable *to_atom_cache;
-  GHashTable *from_atom_cache;
-
-  int n_fonts;
-
-  double resolution;		/* (points / pixel) * PANGO_SCALE */
-
-  Window coverage_win;
-};
-
 struct _PangoXFontMapClass
 {
   PangoFontMapClass parent_class;
@@ -155,7 +124,6 @@ const struct {
   { "condensed",     PANGO_STRETCH_CONDENSED },
 };
 
-static GType    pango_x_font_map_get_type   (void);
 static void     pango_x_font_map_init       (PangoXFontMap      *fontmap);
 static void     pango_x_font_map_class_init (PangoXFontMapClass *class);
 
@@ -186,7 +154,7 @@ static char *   pango_x_get_identifier      (const char         *fontname);
 
 static PangoFontClass *parent_class;	/* Parent class structure for PangoXFontMap */
 
-static GType
+GType
 pango_x_font_map_get_type (void)
 {
   static GType object_type = 0;