[Emacs-diffs] Changes to emacs/src/w32term.c,v

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   08/04/09 12:10:33

Index: w32term.c
===================================================================
RCS file: /sources/emacs/emacs/src/w32term.c,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -b -r1.284 -r1.285
--- w32term.c   3 Mar 2008 06:32:12 -0000       1.284
+++ w32term.c   9 Apr 2008 12:10:33 -0000       1.285
@@ -1763,9 +1763,35 @@
 w32_compute_glyph_string_overhangs (s)
      struct glyph_string *s;
 {
+  if (s->cmp == NULL
+      && s->first_glyph->type == CHAR_GLYPH)
+    {
+#ifdef USE_FONT_BACKEND
+      if (enable_font_backend)
+       {
+         unsigned *code = alloca (sizeof (unsigned) * s->nchars);
+         struct font *font = (struct font *) s->font_info;
+         struct font_metrics metrics;
+         int i;
+
+         for (i = 0; i < s->nchars; i++)
+           code[i] = s->char2b[i];
+         font->driver->text_extents (font, code, s->nchars, &metrics);
+         s->right_overhang = (metrics.rbearing > metrics.width
+                              ? metrics.rbearing - metrics.width : 0);
+         s->left_overhang = metrics.lbearing < 0 ? -metrics.lbearing : 0;
+       }
+#else
   /* TODO: Windows does not appear to have a method for
      getting this info without getting the ABC widths for each
      individual character and working it out manually. */
+#endif
+    }
+  else if (s->cmp)
+    {
+      s->right_overhang = s->cmp->rbearing - s->cmp->pixel_width;
+      s->left_overhang = -s->cmp->lbearing;
+    }
 }
 
 
@@ -6892,7 +6918,7 @@
   w32_destroy_fringe_bitmap,
   w32_per_char_metric,
   w32_encode_char,
-  NULL, /* w32_compute_glyph_string_overhangs */
+  w32_compute_glyph_string_overhangs,
   x_draw_glyph_string,
   w32_define_frame_cursor,
   w32_clear_frame_area,