From 0b07ad98c5b93cc57cc7a9349eee7a6dbae4e869 Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Mon, 23 Jun 2008 12:41:50 +0000 Subject: [PATCH] * 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. --- src/ChangeLog | 7 +++++++ src/w32term.c | 7 +------ src/w32term.h | 9 --------- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index a61e3e4b44a..2a496a41a45 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2008-06-23 Jason Rumney + + * 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. + 2008-06-22 Kenichi Handa * font.c (font_find_for_lface): Try the adstyle specified in diff --git a/src/w32term.c b/src/w32term.c index a5f3ebaae21..770369454ed 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -54,7 +54,6 @@ along with GNU Emacs. If not, see . */ #include "keymap.h" #include "w32heap.h" -#include "w32bdf.h" #include #include "font.h" @@ -102,8 +101,6 @@ extern void free_frame_menubar (); 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 @@ x_draw_glyph_string_background (s, force_p) 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 @@ x_draw_glyph_string (s) /* 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; diff --git a/src/w32term.h b/src/w32term.h index 6c10b3be6d2..defb3231d5f 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -729,15 +729,6 @@ struct frame * check_x_frame (Lisp_Object); EXFUN (Fx_display_color_p, 1); EXFUN (Fx_display_grayscale_p, 1); -#define FONT_TYPE_FOR_UNIBYTE(font, ch) \ - ((font)->bdf ? BDF_1D_FONT : ANSI_FONT) - -#define FONT_TYPE_FOR_MULTIBYTE(font, ch) \ - (!(font)->bdf \ - ? UNICODE_FONT \ - : ((CHARSET_DIMENSION (CHAR_CHARSET ((ch))) == 1) \ - ? BDF_1D_FONT : BDF_2D_FONT)) - typedef DWORD (WINAPI * ClipboardSequence_Proc) (); typedef BOOL (WINAPI * AppendMenuW_Proc) ( IN HMENU, -- 2.39.2