--- mozilla.back/gfx/src/gtk/nsFontMetricsPango.cpp.orig	2007-06-28 14:44:31.000000000 +0200

+++ mozilla.back/gfx/src/gtk/nsFontMetricsPango.cpp	2007-06-28 15:48:04.000000000 +0200

@@ -21,6 +21,8 @@

  * are Copyright (C) 2004 the Initial Developer. All Rights Reserved.

  *

  * Contributor(s):

+ *   Christopher Blizzard <blizzard@mozilla.org>

+ *   Behdad Esfahbod <behdad@behdad.org>

  *

  * Alternatively, the contents of this file may be used under the terms of

  * either the GNU General Public License Version 2 or later (the "GPL"), or

@@ -36,6 +38,10 @@

  *

  * ***** END LICENSE BLOCK ***** */

+#define PANGO_ENABLE_BACKEND

+

+#include "nsFontMetricsPango.h"

+

 #include <strings.h>

 #include "nsFont.h"

 #include "nsIDeviceContext.h"

@@ -43,27 +49,37 @@

 #include "nsIPref.h"

 #include "nsServiceManagerUtils.h"

-#define PANGO_ENABLE_BACKEND

-#define PANGO_ENABLE_ENGINE

-

-#include "nsFontMetricsPango.h"

-#include "nsRenderingContextGTK.h"

-#include "nsDeviceContextGTK.h"

 #include "nsFontConfigUtils.h"

 #include "nsUnicharUtils.h"

 #include "nsQuickSort.h"

 #include "nsFontConfigUtils.h"

+#include "mozilla-decoder.h"

+

+#define FORCE_PR_LOG

+#include "prlog.h"

+

 #include <fontconfig/fontconfig.h>

+#include <freetype/tttables.h>

+

+#include <pango/pango.h>

+#include <pango/pangofc-font.h>

+

+#ifdef PSPANGO

+#include <pango/pangoft2.h>

+#include "nsRenderingContextPS.h"

+#include "nsDeviceContextPS.h"

+#include "nsType1.h"

+#else

 #include <gdk/gdk.h>

 #include <gdk/gdkx.h>

-#include <freetype/tttables.h>

+#include "nsRenderingContextGTK.h"

+#include "nsDeviceContextGTK.h"

+#endif

+

-#include "mozilla-decoder.h"

-#define FORCE_PR_LOG

-#include "prlog.h"

 // Globals

@@ -108,6 +124,49 @@ static nsresult    EnumFontsPango   (nsI

                                      PRUint32* aCount, PRUnichar*** aResult);

 static int         CompareFontNames (const void* aArg1, const void* aArg2,

                                      void* aClosure);

+static void  utf16_to_utf8 (const PRUnichar* aString, PRUint32 aLength,

+                            char *&text, gint &text_len);

+

+#ifdef PSPANGO

+static void

+default_substitute (FcPattern *pattern,

+                    gpointer   data)

+{

+  FcPatternDel (pattern, FC_HINTING);

+  FcPatternAddBool (pattern, FC_HINTING, 0);

+}

+#endif

+

+static PangoFontMap *

+get_fontmap (void)

+{

+  static PangoFontMap               *fontmap = NULL;

+

+  if (!fontmap) {

+#ifdef PSPANGO

+    fontmap = pango_ft2_font_map_new ();

+    pango_ft2_font_map_set_resolution ((PangoFT2FontMap *)fontmap, 72., 72.);

+    pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, default_substitute, NULL, NULL);

+#else

+    PangoContext* context = gdk_pango_context_get ();

+    fontmap = pango_context_get_font_map (context);

+    g_object_unref (context);

+#endif

+  }

+

+  return fontmap;

+}

+

+static PangoContext *

+get_context (void)

+{

+#ifdef PSPANGO

+  return pango_ft2_font_map_create_context ((PangoFT2FontMap *) get_fontmap ());

+#else

+  return gdk_pango_context_get();

+#endif

+}

+

 nsFontMetricsPango::nsFontMetricsPango()

 {

@@ -169,14 +228,20 @@ nsFontMetricsPango::Init(const nsFont& a

     mLangGroup = aLangGroup;

     // Hang on to the device context

+#ifdef PSPANGO

+    mDeviceContext = (nsDeviceContextPS *)aContext;

+#else

     mDeviceContext = aContext;

+#endif

     mPointSize = NSTwipsToFloatPoints(mFont.size);

+#ifndef PSPANGO

     // Make sure to clamp the pixel size to something reasonable so we

     // don't make the X server blow up.

     nscoord screenPixels = gdk_screen_height();

     mPointSize = PR_MIN(screenPixels * FONT_MAX_FONT_SCALE, mPointSize);

+#endif

     // enumerate over the font names passed in

     mFont.EnumerateFamilies(nsFontMetricsPango::EnumFontCallback, this);

@@ -329,7 +394,7 @@ nsFontMetricsPango::CacheFontMetrics(voi

     // mPangoSpaceWidth

     PangoLayout *layout = pango_layout_new(mPangoContext);

-    pango_layout_set_text(layout, " ", 1);

+    pango_layout_set_text(layout, " ", -1);

     int pswidth, psheight;

     pango_layout_get_size(layout, &pswidth, &psheight);

     mPangoSpaceWidth = pswidth;

@@ -337,14 +402,14 @@ nsFontMetricsPango::CacheFontMetrics(voi

     // mSpaceWidth (width of a space)

     nscoord tmpWidth;

-    GetWidth(" ", 1, tmpWidth, NULL);

+    GetWidth(" ", 1, tmpWidth CONTEXT_ARG_NULL);

     mSpaceWidth = tmpWidth;

     // mAveCharWidth (width of an 'average' char)

     //    XftTextExtents16(GDK_DISPLAY(), xftFont, &xUnichar, 1, &extents);

     //rawWidth = extents.width;

     //mAveCharWidth = NSToCoordRound(rawWidth * f);

-    GetWidth("x", 1, tmpWidth, NULL);

+    GetWidth("x", 1, tmpWidth CONTEXT_ARG_NULL);

     mAveCharWidth = tmpWidth;

     // mXHeight (height of an 'x' character)

@@ -460,130 +525,96 @@ nsFontMetricsPango::GetFontHandle(nsFont

 // nsIFontMetricsPango impl

-nsresult

-nsFontMetricsPango::GetWidth(const char* aString, PRUint32 aLength,

-                             nscoord& aWidth,

-                             nsRenderingContextGTK *aContext)

+#ifdef PSPANGO

+NS_IMETHODIMP

+nsFontMetricsPSPango::GetStringWidth(const char *String,nscoord &aWidth,nscoord aLength)

 {

-    PangoLayout *layout = pango_layout_new(mPangoContext);

-

-    pango_layout_set_text(layout, aString, aLength);

+    return GetWidth (String, (PRUint32) aLength, aWidth CONTEXT_ARG_NULL);

+}

-    if (mPangoSpaceWidth)

-        FixupSpaceWidths(layout, aString);

+NS_IMETHODIMP

+nsFontMetricsPSPango::GetStringWidth(const PRUnichar *aString,nscoord &aWidth,nscoord aLength)

+{

+    return GetWidth (aString, (PRUint32)aLength, aWidth, NULL CONTEXT_ARG_NULL);

+}

+#endif

+nsresult

+nsFontMetricsPango::GetWidth(const char* aString, PRUint32 aLength,

+                             nscoord& aWidth

+                             CONTEXT_ARG_DEF)

+{

     int width, height;

-

+    PangoLayout *layout = GetLayout(aString, aLength);

     pango_layout_get_size(layout, &width, &height);

-

     g_object_unref(layout);

-    float f;

-    f = mDeviceContext->DevUnitsToAppUnits();

+    float f = mDeviceContext->DevUnitsToAppUnits();

     aWidth = NSToCoordRound(width * f / PANGO_SCALE);

-    //    printf("GetWidth (char *) %d\n", aWidth);

-

     return NS_OK;

 }

 nsresult

 nsFontMetricsPango::GetWidth(const PRUnichar* aString, PRUint32 aLength,

-                             nscoord& aWidth, PRInt32 *aFontID,

-                             nsRenderingContextGTK *aContext)

+                             nscoord& aWidth, PRInt32 *aFontID

+                             CONTEXT_ARG_DEF)

 {

-    nsresult rv = NS_OK;

-    PangoLayout *layout = pango_layout_new(mPangoContext);

-

-    gchar *text = g_utf16_to_utf8(aString, aLength,

-                                  NULL, NULL, NULL);

-

-    if (!text) {

-        aWidth = 0;

-#ifdef DEBUG

-        NS_WARNING("nsFontMetricsPango::GetWidth invalid unicode to follow");

-        DUMP_PRUNICHAR(aString, aLength)

-#endif

-        rv = NS_ERROR_FAILURE;

-        goto loser;

-    }

-

     gint width, height;

-

-    pango_layout_set_text(layout, text, strlen(text));

-    FixupSpaceWidths(layout, text);

+    PangoLayout *layout = GetLayout(aString, aLength);

     pango_layout_get_size(layout, &width, &height);

+    g_object_unref(layout);

-    float f;

-    f = mDeviceContext->DevUnitsToAppUnits();

+    float f = mDeviceContext->DevUnitsToAppUnits();

     aWidth = NSToCoordRound(width * f / PANGO_SCALE);

-    //    printf("GetWidth %d\n", aWidth);

-

- loser:

-    g_free(text);

-    g_object_unref(layout);

-

-    return rv;

+    return NS_OK;

 }

 nsresult

-nsFontMetricsPango::GetTextDimensions(const PRUnichar* aString,

+nsFontMetricsPango::GetTextDimensions(const char* aString,

                                       PRUint32 aLength,

-                                      nsTextDimensions& aDimensions, 

-                                      PRInt32* aFontID,

-                                      nsRenderingContextGTK *aContext)

+                                      nsTextDimensions& aDimensions

+                                      CONTEXT_ARG_DEF)

 {

-    nsresult rv = NS_OK;

-

-    PangoLayout *layout = pango_layout_new(mPangoContext);

+    PangoLayout *layout = GetLayout(aString, aLength);

+    PangoLayoutLine *line = pango_layout_get_line(layout, 0);

-    gchar *text = g_utf16_to_utf8(aString, aLength,

-                                  NULL, NULL, NULL);

-

-    if (!text) {

-#ifdef DEBUG

-        NS_WARNING("nsFontMetricsPango::GetTextDimensions invalid unicode to follow");

-        DUMP_PRUNICHAR(aString, aLength)

-#endif

-        aDimensions.width = 0;

-        aDimensions.ascent = 0;

-        aDimensions.descent = 0;

-

-        rv = NS_ERROR_FAILURE;

-        goto loser;

-    }

-        

+    PangoRectangle logical;

+    pango_layout_line_get_extents(line, NULL, &logical);

+    g_object_unref(layout);

-    pango_layout_set_text(layout, text, strlen(text));

-    FixupSpaceWidths(layout, text);

+    float P2T = mDeviceContext->DevUnitsToAppUnits();

-    // Get the logical extents

-    PangoLayoutLine *line;

-    if (pango_layout_get_line_count(layout) != 1) {

-        printf("Warning: more than one line!\n");

-    }

-    line = pango_layout_get_line(layout, 0);

+    aDimensions.ascent  = NSToCoordRound(PANGO_ASCENT(logical)  * P2T / PANGO_SCALE);

+    aDimensions.descent = NSToCoordRound(PANGO_DESCENT(logical) * P2T / PANGO_SCALE);

+    aDimensions.width   = NSToCoordRound(logical.width          * P2T / PANGO_SCALE);

-    PangoRectangle rect;

-    pango_layout_line_get_extents(line, NULL, &rect);

+    return NS_OK;

+}

-    float P2T;

-    P2T = mDeviceContext->DevUnitsToAppUnits();

+nsresult

+nsFontMetricsPango::GetTextDimensions(const PRUnichar* aString,

+                                      PRUint32 aLength,

+                                      nsTextDimensions& aDimensions, 

+                                      PRInt32* aFontID

+                                      CONTEXT_ARG_DEF)

+{

+    PangoLayout *layout = GetLayout(aString, aLength);

+    PangoLayoutLine *line = pango_layout_get_line(layout, 0);

-    aDimensions.width = NSToCoordRound(rect.width * P2T / PANGO_SCALE);

-    aDimensions.ascent = NSToCoordRound(PANGO_ASCENT(rect) * P2T / PANGO_SCALE);

-    aDimensions.descent = NSToCoordRound(PANGO_DESCENT(rect) * P2T / PANGO_SCALE);

+    PangoRectangle logical;

+    pango_layout_line_get_extents(line, NULL, &logical);

+    g_object_unref(layout);

-    //    printf("GetTextDimensions %d %d %d\n", aDimensions.width,

-    //aDimensions.ascent, aDimensions.descent);

+    float P2T = mDeviceContext->DevUnitsToAppUnits();

- loser:

-    g_free(text);

-    g_object_unref(layout);

+    aDimensions.ascent  = NSToCoordRound(PANGO_ASCENT(logical)  * P2T / PANGO_SCALE);

+    aDimensions.descent = NSToCoordRound(PANGO_DESCENT(logical) * P2T / PANGO_SCALE);

+    aDimensions.width   = NSToCoordRound(logical.width          * P2T / PANGO_SCALE);

-    return rv;

+    return NS_OK;

 }

 nsresult

@@ -595,13 +626,13 @@ nsFontMetricsPango::GetTextDimensions(co

                                       nsTextDimensions&   aDimensions,

                                       PRInt32&            aNumCharsFit,

                                       nsTextDimensions&   aLastWordDimensions,

-                                      PRInt32*            aFontID,

-                                      nsRenderingContextGTK *aContext)

+                                      PRInt32*            aFontID

+                                      CONTEXT_ARG_DEF)

 {

     return GetTextDimensionsInternal(aString, aLength, aAvailWidth, aBreaks,

                                      aNumBreaks, aDimensions, aNumCharsFit,

-                                     aLastWordDimensions, aContext);

+                                     aLastWordDimensions CONTEXT_ARG_PASS);

 }

@@ -614,8 +645,8 @@ nsFontMetricsPango::GetTextDimensions(co

                                       nsTextDimensions&   aDimensions,

                                       PRInt32&            aNumCharsFit,

                                       nsTextDimensions&   aLastWordDimensions,

-                                      PRInt32*            aFontID,

-                                      nsRenderingContextGTK *aContext)

+                                      PRInt32*            aFontID

+                                      CONTEXT_ARG_DEF)

 {

     nsresult rv = NS_OK;

     PRInt32 curBreak = 0;

@@ -623,23 +654,15 @@ nsFontMetricsPango::GetTextDimensions(co

     PRInt32 *utf8Breaks = new PRInt32[aNumBreaks];

-    gchar *text = g_utf16_to_utf8(aString, (PRInt32)aLength,

-                                  NULL, NULL, NULL);

+    gchar* text;

+    gint text_len;

+    utf16_to_utf8 (aString, aLength, text, text_len);

     curChar = text;

-    if (!text) {

-#ifdef DEBUG

-        NS_WARNING("nsFontMetricsPango::GetWidth invalid unicode to follow");

-        DUMP_PRUNICHAR(aString, (PRUint32)aLength)

-#endif

-        rv = NS_ERROR_FAILURE;

-        goto loser;

-    }

-

     // Covert the utf16 break offsets to utf8 break offsets

     for (PRInt32 curOffset=0; curOffset < aLength;

-         curOffset++, curChar = g_utf8_find_next_char(curChar, NULL)) {

+         curOffset++, curChar = g_utf8_next_char(curChar)) {

         if (aBreaks[curBreak] == curOffset) {

             utf8Breaks[curBreak] = curChar - text;

             curBreak++;

@@ -653,10 +676,10 @@ nsFontMetricsPango::GetTextDimensions(co

     utf8Breaks[curBreak] = curChar - text;

 #if 0

-    if (strlen(text) != aLength) {

-        printf("Different lengths for utf16 %d and utf8 %d\n", aLength, strlen(text));

+    if (text_len != aLength) {

+        printf("Different lengths for utf16 %d and utf8 %d\n", aLength, text_len);

         DUMP_PRUNICHAR(aString, aLength)

-        DUMP_PRUNICHAR(text, strlen(text))

+        DUMP_PRUNICHAR(text, text_len)

         for (PRInt32 i = 0; i < aNumBreaks; ++i) {

             printf("  break %d utf16 %d utf8 %d\n", i, aBreaks[i], utf8Breaks[i]);

         }

@@ -666,9 +689,9 @@ nsFontMetricsPango::GetTextDimensions(co

     // We'll use curBreak to indicate which of the breaks end up being

     // used for the break point for this line.

     curBreak = 0;

-    rv = GetTextDimensionsInternal(text, strlen(text), aAvailWidth, utf8Breaks,

+    rv = GetTextDimensionsInternal(text, text_len, aAvailWidth, utf8Breaks,

                                    aNumBreaks, aDimensions, aNumCharsFit,

-                                   aLastWordDimensions, aContext);

+                                   aLastWordDimensions CONTEXT_ARG_PASS);

     // Figure out which of the breaks we ended up using to convert

     // back to utf16 - start from the end.

@@ -681,200 +704,365 @@ nsFontMetricsPango::GetTextDimensions(co

         }

     }

- loser:

-    if (text)

-        g_free(text);

+    g_free(text);

     delete[] utf8Breaks;

     return rv;

 }

-nsresult

-nsFontMetricsPango::DrawString(const char *aString, PRUint32 aLength,

-                               nscoord aX, nscoord aY,

-                               const nscoord* aSpacing,

-                               nsRenderingContextGTK *aContext,

-                               nsDrawingSurfaceGTK *aSurface)

+#ifdef PSPANGO

+

+typedef struct _nsPSPangoRenderer        nsPSPangoRenderer;

+typedef struct _nsPSPangoRendererClass   nsPSPangoRendererClass;

+

+struct _nsPSPangoRenderer

 {

-    PangoLayout *layout = pango_layout_new(mPangoContext);

+  PangoRenderer parent_instance;

+  nsRenderingContextPS *psContext;

+  nsFontMetricsPSPango *psPangoFontMetrics;

+  float zoom;

+};

-    pango_layout_set_text(layout, aString, aLength);

-    FixupSpaceWidths(layout, aString);

+struct _nsPSPangoRendererClass

+{

+  PangoRendererClass parent_class;

+};

-    int x = aX;

-    int y = aY;

+#define _PS_TYPE_PANGO_RENDERER            (_ps_pango_renderer_get_type())

+#define _PS_PANGO_RENDERER(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), _PS_TYPE_PANGO_RENDERER, _nsPSPangoRenderer))

+#define _PS_IS_PANGO_RENDERER(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), _PS_TYPE_PANGO_RENDERER))

+#define _PS_PANGO_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), _PS_TYPE_PANGO_RENDERER, _nsPSPangoRendererClass))

+#define _PS_IS_PANGO_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), _PS_TYPE_PANGO_RENDERER))

+#define _PS_PANGO_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), _PS_TYPE_PANGO_RENDERER, _nsPSPangoRendererClass))

-    aContext->GetTranMatrix()->TransformCoord(&x, &y);

+G_DEFINE_TYPE (_nsPSPangoRenderer, _ps_pango_renderer, PANGO_TYPE_RENDERER)

-    PangoLayoutLine *line;

-    if (pango_layout_get_line_count(layout) != 1) {

-        printf("Warning: more than one line!\n");

-    }

-    line = pango_layout_get_line(layout, 0);

+static PangoRenderer *

+get_renderer (void)

+{

+  static PangoRenderer               *renderer = NULL;

-    aContext->UpdateGC();

-    GdkGC *gc = aContext->GetGC();

+  if (!renderer)

+    renderer = (PangoRenderer *) g_object_new (_PS_TYPE_PANGO_RENDERER, NULL);

-    if (aSpacing && *aSpacing) {

-        DrawStringSlowly(aString, NULL, aLength, aSurface->GetDrawable(),

-                         gc, x, y, line, aSpacing);

-    }

-    else {

-        gdk_draw_layout_line(aSurface->GetDrawable(), gc,

-                             x, y,

-                             line);

-    }

+  return renderer;

+}

-    g_object_unref(gc);

-    g_object_unref(layout);

+static void

+_ps_pango_renderer_draw_glyphs (PangoRenderer    *renderer,

+                              PangoFont        *font,

+                              PangoGlyphString *glyphs,

+                              int               x,

+                              int               y);

-    //    printf("DrawString (char *)\n");

+static void

+_ps_pango_renderer_class_init (nsPSPangoRendererClass *klass)

+{

+  PangoRendererClass *renderer_class = PANGO_RENDERER_CLASS (klass);

+  

+  renderer_class->draw_glyphs = _ps_pango_renderer_draw_glyphs;

+}

-    return NS_OK;

+static void

+_ps_pango_renderer_init (nsPSPangoRenderer *renderer)

+{

+}

+

+class nsPangoType1Generator : public nsPSFontGenerator {

+public:

+  nsPangoType1Generator();

+  ~nsPangoType1Generator();

+  nsresult Init(PangoFont *aFont);

+  void  GeneratePSFont(FILE* aFile);

+

+protected:

+  PangoFont *mFont;

+};

+

+nsPangoType1Generator::nsPangoType1Generator()

+{

 }

 nsresult

-nsFontMetricsPango::DrawString(const PRUnichar* aString, PRUint32 aLength,

-                               nscoord aX, nscoord aY,

-                               PRInt32 aFontID,

-                               const nscoord* aSpacing,

-                               nsRenderingContextGTK *aContext,

-                               nsDrawingSurfaceGTK *aSurface)

+nsPangoType1Generator::Init(PangoFont *aFont)

+  {

+  NS_ENSURE_TRUE(aFont, NS_ERROR_FAILURE);

+  mFont = aFont;

+  g_object_ref (mFont);

+  return NS_OK;

+}

+

+nsPangoType1Generator::~nsPangoType1Generator()

 {

-    nsresult rv = NS_OK;

-    int x = aX;

-    int y = aY;

+  g_object_unref (mFont);

+  mFont = nsnull;

+}

-    aContext->UpdateGC();

-    GdkGC *gc = aContext->GetGC();

+void nsPangoType1Generator::GeneratePSFont(FILE* aFile)

+{

+  FT_Face face = pango_fc_font_lock_face ((PangoFcFont *) mFont);

-    PangoLayout *layout = pango_layout_new(mPangoContext);

+  if (face == nsnull)

+    return;

-    gchar *text = g_utf16_to_utf8(aString, aLength,

-                                  NULL, NULL, NULL);

+  int wmode = 0;

+  if (mGlyphSubset->Count())

+    FT2SubsetToType1FontSet(face, mGlyphSubset, wmode, aFile);

-    if (!text) {

-#ifdef DEBUG

-        NS_WARNING("nsFontMetricsPango::DrawString invalid unicode to follow");

-        DUMP_PRUNICHAR(aString, aLength)

-#endif

-        rv = NS_ERROR_FAILURE;

-        goto loser;

-    }

+ pango_fc_font_unlock_face ((PangoFcFont *) mFont);

+}

-    pango_layout_set_text(layout, text, strlen(text));

-    FixupSpaceWidths(layout, text);

+typedef struct

+{

+  nsCString    *FontNameBase;

+  nsCStringKey *key;

+  int           font_size;

+} PSPangoFontData;

-    aContext->GetTranMatrix()->TransformCoord(&x, &y);

+static void

+ps_pango_font_data_destroy (PSPangoFontData *data)

+{

+  delete data->key;

+  delete data->FontNameBase;

+  g_free (data);

+}

-    PangoLayoutLine *line;

-    if (pango_layout_get_line_count(layout) != 1) {

-        printf("Warning: more than one line!\n");

-    }

-    line = pango_layout_get_line(layout, 0);

+static void

+_ps_pango_renderer_draw_glyphs (PangoRenderer    *renderer,

+                              PangoFont        *font,

+                              PangoGlyphString *glyphs,

+                              int               x,

+                              int               y)

+{

+  if (!glyphs->num_glyphs)

+    return;

-    if (aSpacing && *aSpacing) {

-        DrawStringSlowly(text, aString, aLength, aSurface->GetDrawable(),

-                         gc, x, y, line, aSpacing);

-    }

-    else {

-        gdk_draw_layout_line(aSurface->GetDrawable(), gc,

-                             x, y,

-                             line);

-    }

+  static GQuark data_quark = 0;

+  if (!data_quark)

+    data_quark = g_quark_from_static_string ("ps-pango-font-data");

- loser:

+  PSPangoFontData *data;

+  if (!(data = (PSPangoFontData *) g_object_get_qdata (G_OBJECT (font), data_quark)))

+    {

+      data = g_new (PSPangoFontData, 1);

-    g_free(text);

-    g_object_unref(gc);

-    g_object_unref(layout);

+      FT_Face face = pango_fc_font_lock_face ((PangoFcFont *) font);

+      if (face == nsnull)

+        return;

+      int wmode = 0;

+      data->FontNameBase = new nsCString ();

+      if (NS_FAILED(FT2ToType1FontName(face, wmode, *data->FontNameBase))) {

+        g_free (data);

+        pango_fc_font_unlock_face ((PangoFcFont *) font);

+        return;

+      }

+      pango_fc_font_unlock_face ((PangoFcFont *) font);

-    //    printf("DrawString\n");

+      PangoFontDescription *desc = pango_font_describe (font);

+      data->font_size = pango_font_description_get_size (desc);

+      pango_font_description_free (desc);

+

+      data->key = new nsCStringKey (*data->FontNameBase);

+

+      g_object_set_qdata_full (G_OBJECT (font), data_quark, data, (GDestroyNotify) ps_pango_font_data_destroy);

+    }

+

+  nsPSPangoRenderer *ps_renderer = (nsPSPangoRenderer *)renderer;

+  nsRenderingContextPS *aContext = ps_renderer->psContext;

+  nsFontMetricsPSPango *metrics = ps_renderer->psPangoFontMetrics;

+  nsDeviceContextPS* dc = NS_REINTERPRET_CAST (nsDeviceContextPS*, metrics->GetDeviceContext());

+  nsPostScriptObj* psObj = aContext->GetPostScriptObj();

+  nsHashtable *psFGList = dc->GetPSFontGeneratorList();

+  g_return_if_fail (psFGList);

+  nsPSFontGenerator* psFontGen = (nsPSFontGenerator*) psFGList->Get(data->key);

+  if (!psFontGen) {

+    nsresult rv;

+    psFontGen = new nsPangoType1Generator;

+    g_return_if_fail (psFontGen);

+    rv = ((nsPangoType1Generator*)psFontGen)->Init(font);

+    if (NS_FAILED(rv)) {

+      delete psFontGen;

+      return;

+    }

+    psFGList->Put(data->key, (void *) psFontGen);

+  }

+  nscoord font_size = NSToCoordRound (ps_renderer->zoom * data->font_size / PANGO_SCALE);

+

+  g_return_if_fail (aContext);

+  g_return_if_fail (psObj);

+

+  nscoord aX = NSToCoordRound(ps_renderer->zoom * x / PANGO_SCALE);

+  nscoord aY = NSToCoordRound(ps_renderer->zoom * y / PANGO_SCALE);

+  psObj->moveto(aX, aY);

+

+  PRInt32 currSubFont, prevSubFont = -1;

+  PRUint32 i;

+  PangoGlyphString gl;

+

+  gl.glyphs = glyphs->glyphs;

+  gl.num_glyphs = 0;