* w32bdf.c, w32bdf.h: Remove obsolete files.

* makefile.w32-in: Remove refs to w32bdf.h and w32bdf.c.

* w32gui.h: Don't include w32bdf.h.
(XCharStruct, enum w32_char_font_type, W32FontStruct):
Remove obsolete font support.

* w32font.h (struct w32font_info): Remove compat_w32_font.
Add hfont member.
(FONT_COMPAT): Remove obsolete macro.

* w32font.c (w32font_close): Remove compat code. Delete hfont member.
(w32font_encode_char, w32font_text_extents): Use new hfont member.
(w32font_open_internal): Remove compat code. Set new hfont member.
(Fx_select_font): Use new hfont member.

* w32uniscribe.c (uniscribe_otf_capability, uniscribe_shape):
(uniscribe_encode_char): Use new hfont member.

* w32term.c (x_draw_glyph_string_foreground):
(x_draw_composite_glyph_string_foreground): Use new hfont member.
(x_draw_glyph_string): Use metrics in w32font_info.

1 files changed, 16 insertions, 13 deletions

diff --git a/src/w32term.c b/src/w32term.c
index 770369454ed..57662051302 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -251,8 +251,6 @@ void x_set_window_size P_ ((struct frame *, int, int, int));
 void x_wm_set_window_state P_ ((struct frame *, int));
 void x_wm_set_icon_pixmap P_ ((struct frame *, int));
 static void w32_initialize P_ ((void));
-static void x_font_min_bounds P_ ((XFontStruct *, int *, int *));
-int x_compute_min_glyph_bounds P_ ((struct frame *));
 static void x_update_end P_ ((struct frame *));
 static void w32_frame_up_to_date P_ ((struct frame *));
 static void w32_set_terminal_modes P_ ((struct terminal *));
@@ -1239,6 +1237,7 @@ x_draw_glyph_string_foreground (s)
      struct glyph_string *s;
 {
   int i, x;
+  struct w32font_info * w32_font;
   HFONT old_font;
 
   /* If first glyph of S has a left box line, start drawing the text
@@ -1259,8 +1258,10 @@ x_draw_glyph_string_foreground (s)
   SetBkColor (s->hdc, s->gc->background);
   SetTextAlign (s->hdc, TA_BASELINE | TA_LEFT);
 
-  if (s->font && FONT_COMPAT (s->font)->hfont)
-    old_font = SelectObject (s->hdc, FONT_COMPAT (s->font)->hfont);
+  w32_font = (struct w32font_info *) s->font;
+
+  if (w32_font && w32_font->hfont)
+    old_font = SelectObject (s->hdc, w32_font->hfont);
 
   /* Draw characters of S as rectangles if S's font could not be
      loaded. */
@@ -1278,7 +1279,6 @@ x_draw_glyph_string_foreground (s)
   else
     {
       int boff = s->font->baseline_offset;
-      struct font *font = s->font;
       int y;
 
       if (s->font->vertical_centering)
@@ -1287,14 +1287,14 @@ x_draw_glyph_string_foreground (s)
       y = s->ybase - boff;
       if (s->for_overlaps
           || (s->background_filled_p && s->hl != DRAW_CURSOR))
-        font->driver->draw (s, 0, s->nchars, x, y, 0);
+        s->font->driver->draw (s, 0, s->nchars, x, y, 0);
       else
-        font->driver->draw (s, 0, s->nchars, x, y, 1);
+        s->font->driver->draw (s, 0, s->nchars, x, y, 1);
       if (s->face->overstrike)
-        font->driver->draw (s, 0, s->nchars, x + 1, y, 0);
+        s->font->driver->draw (s, 0, s->nchars, x + 1, y, 0);
     }
 
-  if (s->font && FONT_COMPAT (s->font)->hfont)
+  if (w32_font && w32_font->hfont)
     SelectObject (s->hdc, old_font);
 }
 
@@ -1306,6 +1306,7 @@ x_draw_composite_glyph_string_foreground (s)
 {
   int i, j, x;
   HFONT old_font;
+  struct w32font_info * w32_font;
 
   /* If first glyph of S has a left box line, start drawing the text
      of S to the right of that box line.  */
@@ -1325,8 +1326,10 @@ x_draw_composite_glyph_string_foreground (s)
   SetBkMode (s->hdc, TRANSPARENT);
   SetTextAlign (s->hdc, TA_BASELINE | TA_LEFT);
 
-  if (s->font && FONT_COMPAT (s->font)->hfont)
-    old_font = SelectObject (s->hdc, FONT_COMPAT (s->font)->hfont);
+  w32_font = (struct w32font_info *) s->font;
+
+  if (w32_font && w32_font->hfont)
+    old_font = SelectObject (s->hdc, w32_font->hfont);
 
   /* Draw a rectangle for the composition if the font for the very
      first character of the composition could not be loaded.  */
@@ -1392,7 +1395,7 @@ x_draw_composite_glyph_string_foreground (s)
         }
     }
 
-  if (s->font && FONT_COMPAT (s->font)->hfont)
+  if (w32_font && w32_font->hfont)
     SelectObject (s->hdc, old_font);
 }
 
@@ -2342,7 +2345,7 @@ x_draw_glyph_string (s)
 
       /* Draw strike-through.  */
       if (s->face->strike_through_p
-          && !FONT_COMPAT (s->font)->tm.tmStruckOut)
+          && !((struct w32font_info *) s->font)->metrics.tmStruckOut)
         {
           unsigned long h = 1;
           unsigned long dy = (s->height - h) / 2;