Split off PangoFontsetSimple

Put PangoFontsetSimple into its own files.

1 files changed, 36 insertions, 246 deletions

diff --git a/pango/pango-fontset.c b/pango/pango-fontset.c
index b8c15152..43dccd3a 100644
--- a/pango/pango-fontset.c
+++ b/pango/pango-fontset.c
@@ -10,7 +10,7 @@
  *
  * 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
+ * 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
@@ -30,7 +30,7 @@
 #include "pango-fontset-private.h"
 #include "pango-impl-utils.h"
 
-static PangoFontMetrics *pango_fontset_real_get_metrics (PangoFontset      *fontset);
+static PangoFontMetrics *pango_fontset_real_get_metrics (PangoFontset *fontset);
 
 
 G_DEFINE_ABSTRACT_TYPE (PangoFontset, pango_fontset, G_TYPE_OBJECT);
@@ -52,14 +52,14 @@ pango_fontset_class_init (PangoFontsetClass *class)
  * @fontset: a `PangoFontset`
  * @wc: a Unicode character
  *
- * Returns the font in the fontset that contains the best glyph for a
- * Unicode character.
+ * Returns the font in the fontset that contains the best
+ * glyph for a Unicode character.
  *
  * Return value: (transfer full): a `PangoFont`
  */
 PangoFont *
 pango_fontset_get_font (PangoFontset  *fontset,
-			guint          wc)
+                        guint          wc)
 {
 
   g_return_val_if_fail (PANGO_IS_FONTSET (fontset), NULL);
@@ -98,8 +98,8 @@ pango_fontset_get_metrics (PangoFontset  *fontset)
  */
 void
 pango_fontset_foreach (PangoFontset           *fontset,
-		       PangoFontsetForeachFunc func,
-		       gpointer                data)
+                       PangoFontsetForeachFunc func,
+                       gpointer                data)
 {
   g_return_if_fail (PANGO_IS_FONTSET (fontset));
   g_return_if_fail (func != NULL);
@@ -109,8 +109,8 @@ pango_fontset_foreach (PangoFontset           *fontset,
 
 static gboolean
 get_first_metrics_foreach (PangoFontset  *fontset,
-			   PangoFont     *font,
-			   gpointer       data)
+                           PangoFont     *font,
+                           gpointer       data)
 {
   PangoFontMetrics *fontset_metrics = data;
   PangoLanguage *language = PANGO_FONTSET_GET_CLASS (fontset)->get_language (fontset);
@@ -127,7 +127,7 @@ get_first_metrics_foreach (PangoFontset  *fontset,
 
   pango_font_metrics_unref (font_metrics);
 
-  return TRUE;			/* Stops iteration */
+  return TRUE;                  /* Stops iteration */
 }
 
 static PangoFontMetrics *
@@ -157,32 +157,32 @@ pango_fontset_real_get_metrics (PangoFontset  *fontset)
       gunichar wc = g_utf8_get_char (p);
       font = pango_fontset_get_font (fontset, wc);
       if (font)
-	{
-	  if (g_hash_table_lookup (fonts_seen, font) == NULL)
-	    {
-	      raw_metrics = pango_font_get_metrics (font, language);
-	      g_hash_table_insert (fonts_seen, font, font);
-
-	      if (count == 0)
-		{
-		  metrics->ascent = raw_metrics->ascent;
-		  metrics->descent = raw_metrics->descent;
-		  metrics->approximate_char_width = raw_metrics->approximate_char_width;
-		  metrics->approximate_digit_width = raw_metrics->approximate_digit_width;
-		}
-	      else
-		{
-		  metrics->ascent = MAX (metrics->ascent, raw_metrics->ascent);
-		  metrics->descent = MAX (metrics->descent, raw_metrics->descent);
-		  metrics->approximate_char_width += raw_metrics->approximate_char_width;
-		  metrics->approximate_digit_width += raw_metrics->approximate_digit_width;
-		}
-	      count++;
-	      pango_font_metrics_unref (raw_metrics);
-	    }
-	  else
-	    g_object_unref (font);
-	}
+        {
+          if (g_hash_table_lookup (fonts_seen, font) == NULL)
+            {
+              raw_metrics = pango_font_get_metrics (font, language);
+              g_hash_table_insert (fonts_seen, font, font);
+
+              if (count == 0)
+                {
+                  metrics->ascent = raw_metrics->ascent;
+                  metrics->descent = raw_metrics->descent;
+                  metrics->approximate_char_width = raw_metrics->approximate_char_width;
+                  metrics->approximate_digit_width = raw_metrics->approximate_digit_width;
+                }
+              else
+                {
+                  metrics->ascent = MAX (metrics->ascent, raw_metrics->ascent);
+                  metrics->descent = MAX (metrics->descent, raw_metrics->descent);
+                  metrics->approximate_char_width += raw_metrics->approximate_char_width;
+                  metrics->approximate_digit_width += raw_metrics->approximate_digit_width;
+                }
+              count++;
+              pango_font_metrics_unref (raw_metrics);
+            }
+          else
+            g_object_unref (font);
+        }
 
       p = g_utf8_next_char (p);
     }
@@ -197,213 +197,3 @@ pango_fontset_real_get_metrics (PangoFontset  *fontset)
 
   return metrics;
 }
-
-
-/*
- * PangoFontsetSimple
- */
-
-#define PANGO_FONTSET_SIMPLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FONTSET_SIMPLE, PangoFontsetSimpleClass))
-#define PANGO_IS_FONTSET_SIMPLE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FONTSET_SIMPLE))
-#define PANGO_FONTSET_SIMPLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FONTSET_SIMPLE, PangoFontsetSimpleClass))
-
-static void              pango_fontset_simple_finalize     (GObject                 *object);
-static PangoFontMetrics *pango_fontset_simple_get_metrics  (PangoFontset            *fontset);
-static PangoLanguage *   pango_fontset_simple_get_language (PangoFontset            *fontset);
-static  PangoFont *      pango_fontset_simple_get_font     (PangoFontset            *fontset,
-							    guint                    wc);
-static void              pango_fontset_simple_foreach      (PangoFontset            *fontset,
-							    PangoFontsetForeachFunc  func,
-							    gpointer                 data);
-
-struct _PangoFontsetSimple
-{
-  PangoFontset parent_instance;
-
-  GPtrArray *fonts;
-  GPtrArray *coverages;
-  PangoLanguage *language;
-};
-
-struct _PangoFontsetSimpleClass
-{
-  PangoFontsetClass parent_class;
-};
-
-/**
- * pango_fontset_simple_new:
- * @language: a `PangoLanguage` tag
- *
- * Creates a new `PangoFontsetSimple` for the given language.
- *
- * Return value: the newly allocated `PangoFontsetSimple`
- */
-PangoFontsetSimple *
-pango_fontset_simple_new (PangoLanguage *language)
-{
-  PangoFontsetSimple *fontset;
-
-  fontset = g_object_new (PANGO_TYPE_FONTSET_SIMPLE, NULL);
-  fontset->language = language;
-
-  return fontset;
-}
-
-
-G_DEFINE_TYPE (PangoFontsetSimple, pango_fontset_simple, PANGO_TYPE_FONTSET);
-
-static void
-pango_fontset_simple_class_init (PangoFontsetSimpleClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  PangoFontsetClass *fontset_class = PANGO_FONTSET_CLASS (class);
-
-  object_class->finalize = pango_fontset_simple_finalize;
-
-  fontset_class->get_font = pango_fontset_simple_get_font;
-  fontset_class->get_metrics = pango_fontset_simple_get_metrics;
-  fontset_class->get_language = pango_fontset_simple_get_language;
-  fontset_class->foreach = pango_fontset_simple_foreach;
-}
-
-static void
-pango_fontset_simple_init (PangoFontsetSimple *fontset)
-{
-  fontset->fonts = g_ptr_array_new ();
-  fontset->coverages = g_ptr_array_new ();
-  fontset->language = NULL;
-}
-
-static void
-pango_fontset_simple_finalize (GObject *object)
-{
-  PangoFontsetSimple *fontset = PANGO_FONTSET_SIMPLE (object);
-  PangoCoverage *coverage;
-  unsigned int i;
-
-  for (i = 0; i < fontset->fonts->len; i++)
-    g_object_unref (g_ptr_array_index(fontset->fonts, i));
-
-  g_ptr_array_free (fontset->fonts, TRUE);
-
-  for (i = 0; i < fontset->coverages->len; i++)
-    {
-      coverage = g_ptr_array_index (fontset->coverages, i);
-      if (coverage)
-	pango_coverage_unref (coverage);
-    }
-
-  g_ptr_array_free (fontset->coverages, TRUE);
-
-  G_OBJECT_CLASS (pango_fontset_simple_parent_class)->finalize (object);
-}
-
-/**
- * pango_fontset_simple_append:
- * @fontset: a `PangoFontsetSimple`.
- * @font: (transfer full): a `PangoFont`.
- *
- * Adds a font to the fontset.
- *
- * The fontset takes ownership of @font.
- */
-void
-pango_fontset_simple_append (PangoFontsetSimple *fontset,
-			     PangoFont          *font)
-{
-  g_ptr_array_add (fontset->fonts, font);
-  g_ptr_array_add (fontset->coverages, NULL);
-}
-
-/**
- * pango_fontset_simple_size:
- * @fontset: a `PangoFontsetSimple`.
- *
- * Returns the number of fonts in the fontset.
- *
- * Return value: the size of @fontset
- */
-int
-pango_fontset_simple_size (PangoFontsetSimple *fontset)
-{
-  return fontset->fonts->len;
-}
-
-static PangoLanguage *
-pango_fontset_simple_get_language (PangoFontset  *fontset)
-{
-  PangoFontsetSimple *simple = PANGO_FONTSET_SIMPLE (fontset);
-
-  return simple->language;
-}
-
-static PangoFontMetrics *
-pango_fontset_simple_get_metrics (PangoFontset  *fontset)
-{
-  PangoFontsetSimple *simple = PANGO_FONTSET_SIMPLE (fontset);
-
-  if (simple->fonts->len == 1)
-    return pango_font_get_metrics (PANGO_FONT (g_ptr_array_index(simple->fonts, 0)),
-				   simple->language);
-
-  return PANGO_FONTSET_CLASS (pango_fontset_simple_parent_class)->get_metrics (fontset);
-}
-
-static PangoFont *
-pango_fontset_simple_get_font (PangoFontset  *fontset,
-			       guint          wc)
-{
-  PangoFontsetSimple *simple = PANGO_FONTSET_SIMPLE (fontset);
-  PangoCoverageLevel best_level = PANGO_COVERAGE_NONE;
-  PangoCoverageLevel level;
-  PangoFont *font;
-  PangoCoverage *coverage;
-  int result = -1;
-  unsigned int i;
-
-  for (i = 0; i < simple->fonts->len; i++)
-    {
-      coverage = g_ptr_array_index (simple->coverages, i);
-
-      if (coverage == NULL)
-	{
-	  font = g_ptr_array_index (simple->fonts, i);
-
-	  coverage = pango_font_get_coverage (font, simple->language);
-	  g_ptr_array_index (simple->coverages, i) = coverage;
-	}
-
-      level = pango_coverage_get (coverage, wc);
-
-      if (result == -1 || level > best_level)
-	{
-	  result = i;
-	  best_level = level;
-	  if (level == PANGO_COVERAGE_EXACT)
-	    break;
-	}
-    }
-
-  if (G_UNLIKELY (result == -1))
-    return NULL;
-
-  font = g_ptr_array_index(simple->fonts, result);
-  return g_object_ref (font);
-}
-
-static void
-pango_fontset_simple_foreach (PangoFontset           *fontset,
-			      PangoFontsetForeachFunc func,
-			      gpointer                data)
-{
-  PangoFontsetSimple *simple = PANGO_FONTSET_SIMPLE (fontset);
-  unsigned int i;
-
-  for (i = 0; i < simple->fonts->len; i++)
-    {
-      if ((*func) (fontset,
-		   g_ptr_array_index (simple->fonts, i),
-		   data))
-	return;
-    }
-}