# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1244683460 0
# Node ID 62899a250517faa24bb5d85f09ff8ba708de016b
# Parent  e8426f67383f2d05cef5ac0bcf2bfa37f1c0063a
(x_compute_glyph_string_overhangs): Handle the automatic
composition case.

diff -r e8426f67383f -r 62899a250517 src/xterm.c
--- a/src/xterm.c	Wed Jun 10 15:16:55 2009 +0000
+++ b/src/xterm.c	Thu Jun 11 01:24:20 2009 +0000
@@ -1194,16 +1194,27 @@
      struct glyph_string *s;
 {
   if (s->cmp == NULL
-      && s->first_glyph->type == CHAR_GLYPH)
-    {
-      unsigned *code = alloca (sizeof (unsigned) * s->nchars);
-      struct font *font = s->font;
+      && (s->first_glyph->type == CHAR_GLYPH
+	  || s->first_glyph->type == COMPOSITE_GLYPH))
+    {
       struct font_metrics metrics;
-      int i;
-
-      for (i = 0; i < s->nchars; i++)
-	code[i] = (s->char2b[i].byte1 << 8) | s->char2b[i].byte2;
-      font->driver->text_extents (font, code, s->nchars, &metrics);
+
+      if (s->first_glyph->type == CHAR_GLYPH)
+	{
+	  unsigned *code = alloca (sizeof (unsigned) * s->nchars);
+	  struct font *font = s->font;
+	  int i;
+
+	  for (i = 0; i < s->nchars; i++)
+	    code[i] = (s->char2b[i].byte1 << 8) | s->char2b[i].byte2;
+	  font->driver->text_extents (font, code, s->nchars, &metrics);
+	}
+      else
+	{
+	  Lisp_Object gstring = composition_gstring_from_id (s->cmp_id);
+
+	  composition_gstring_width (gstring, s->cmp_from, s->cmp_to, &metrics);
+	}
       s->right_overhang = (metrics.rbearing > metrics.width
 			   ? metrics.rbearing - metrics.width : 0);
       s->left_overhang = metrics.lbearing < 0 ? - metrics.lbearing : 0;