1 files changed, 106 insertions, 0 deletions
diff --git a/gdk/gdkfont.c b/gdk/gdkfont.c
index cc1274a0d6..0308fa8e0d 100644
--- a/gdk/gdkfont.c
+++ b/gdk/gdkfont.c
@@ -271,6 +271,62 @@ gdk_text_width (GdkFont      *font,
   return width;
 }
 
+gint
+gdk_text_width_wc (GdkFont	  *font,
+		   const GdkWChar *text,
+		   gint		   text_length)
+{
+  GdkFontPrivate *private;
+  gint width;
+  XFontStruct *xfont;
+  XFontSet fontset;
+
+  g_return_val_if_fail (font != NULL, -1);
+  g_return_val_if_fail (text != NULL, -1);
+
+  private = (GdkFontPrivate*) font;
+
+  switch (font->type)
+    {
+    case GDK_FONT_FONT:
+      xfont = (XFontStruct *) private->xfont;
+      if ((xfont->min_byte1 == 0) && (xfont->max_byte1 == 0))
+        {
+          gchar *text_8bit;
+          gint i;
+          text_8bit = g_new (gchar, text_length);
+          for (i=0; i<text_length; i++) text_8bit[i] = text[i];
+          width = XTextWidth (xfont, text_8bit, text_length);
+          g_free (text_8bit);
+        }
+      else
+        {
+          width = 0;
+        }
+      break;
+    case GDK_FONT_FONTSET:
+      if (sizeof(GdkWChar) == sizeof(wchar_t))
+	{
+	  fontset = (XFontSet) private->xfont;
+	  width = XwcTextEscapement (fontset, (wchar_t *)text, text_length);
+	}
+      else
+	{
+	  wchar_t *text_wchar;
+	  gint i;
+	  fontset = (XFontSet) private->xfont;
+	  text_wchar = g_new(wchar_t, text_length);
+	  for (i=0; i<text_length; i++) text_wchar[i] = text[i];
+	  width = XwcTextEscapement (fontset, text_wchar, text_length);
+	  g_free (text_wchar);
+	}
+      break;
+    default:
+      width = 0;
+    }
+  return width;
+}
+
 /* Problem: What if a character is a 16 bits character ?? */
 gint
 gdk_char_width (GdkFont *font,
@@ -319,6 +375,56 @@ gdk_char_width (GdkFont *font,
 }
 
 gint
+gdk_char_width_wc (GdkFont *font,
+		   GdkWChar character)
+{
+  GdkFontPrivate *private;
+  XCharStruct *chars;
+  gint width;
+  guint ch = character & 0xff;  /* get rid of sign-extension */
+  XFontStruct *xfont;
+  XFontSet fontset;
+
+  g_return_val_if_fail (font != NULL, -1);
+
+  private = (GdkFontPrivate*) font;
+
+  switch (font->type)
+    {
+    case GDK_FONT_FONT:
+      /* only 8 bits characters are considered here */
+      xfont = (XFontStruct *) private->xfont;
+      if ((xfont->min_byte1 == 0) &&
+          (xfont->max_byte1 == 0) &&
+          (ch >= xfont->min_char_or_byte2) &&
+          (ch <= xfont->max_char_or_byte2))
+        {
+          chars = xfont->per_char;
+          if (chars)
+            width = chars[ch - xfont->min_char_or_byte2].width;
+          else
+            width = xfont->min_bounds.width;
+        }
+      else
+        {
+          char ch2 = character;
+          width = XTextWidth (xfont, &ch2, 1);
+        }
+      break;
+    case GDK_FONT_FONTSET:
+      fontset = (XFontSet) private->xfont;
+      {
+	wchar_t char_wc = character;
+        width = XwcTextEscapement (fontset, &char_wc, 1) ;
+      }
+      break;
+    default:
+      width = 0;
+    }
+  return width;
+}
+
+gint
 gdk_string_measure (GdkFont     *font,
                     const gchar *string)
 {