changeset 96208:8c22d4c6cfb2

* w32term.c (x_draw_glyph_string_background) (x_draw_glyph_string): Remove old bdf font code. * w32term.h (FONT_TYPE_FOR_UNIBYTE, FONT_TYPE_FOR_MULTIBYTE): Remove.
author Jason Rumney <jasonr@gnu.org>
date Mon, 23 Jun 2008 12:41:46 +0000
parents 2e4b2055f713
children 43b1cc6ee9a1
files src/w32term.c
diffstat 1 files changed, 1 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/w32term.c	Mon Jun 23 12:41:36 2008 +0000
+++ b/src/w32term.c	Mon Jun 23 12:41:46 2008 +0000
@@ -54,7 +54,6 @@
 #include "keymap.h"
 
 #include "w32heap.h"
-#include "w32bdf.h"
 #include <shellapi.h>
 
 #include "font.h"
@@ -102,8 +101,6 @@
 extern int w32_codepage_for_font (char *fontname);
 extern Cursor w32_load_cursor (LPCTSTR name);
 
-extern glyph_metric *w32_BDF_TextMetric(bdffont *fontp,
-					unsigned char *text, int dim);
 extern Lisp_Object Vwindow_system;
 
 #define x_any_window_to_frame x_window_to_frame
@@ -1223,7 +1220,6 @@
         if (FONT_HEIGHT (s->font) < s->height - 2 * box_line_width
 	       || s->font_not_found_p
 	       || s->extends_to_end_of_line_p
-	       || FONT_COMPAT (s->font)->bdf
 	       || cleartype_active
 	       || force_p)
 	{
@@ -2346,8 +2342,7 @@
 
       /* Draw strike-through.  */
       if (s->face->strike_through_p
-          && (FONT_COMPAT (s->font)->bdf
-	      || !FONT_COMPAT (s->font)->tm.tmStruckOut))
+          && !FONT_COMPAT (s->font)->tm.tmStruckOut)
         {
           unsigned long h = 1;
           unsigned long dy = (s->height - h) / 2;