aboutsummaryrefslogtreecommitdiffstats
path: root/src/font.h
diff options
context:
space:
mode:
authorAlexander Gramiak2019-05-10 09:45:57 -0600
committerAlexander Gramiak2019-05-19 19:50:32 -0600
commita4fe9c70af7a60117480d3361541550341da801a (patch)
treef9c082b94c2af6df79f7aa66dbcce4a97eabbbbd /src/font.h
parentb3d3c0daa49f5cbed7c58c7508d4d36dba3757e5 (diff)
downloademacs-a4fe9c70af7a60117480d3361541550341da801a.tar.gz
emacs-a4fe9c70af7a60117480d3361541550341da801a.zip
Replace XChar2b with unsigned in all font backends
The xfont backend using XChar2b in its API doesn't mean that we should use it everywhere else. * src/dispextern.h (glyph_string): * src/ftcrfont.c (ftcrfont_draw): * src/ftxfont.c (ftxfont_draw): * src/w32term.c (w32_draw_glyphless_glyph_string_foreground): * src/xdisp.c (init_glyph_string, get_char_face_and_encoding) (get_glyph_face_and_encoding, get_char_glyph_code) (fill_gstring_glyph_string, fill_stretch_glyph_string) (normal_char_ascent_descent, gui_get_glyph_overhangs) (compute_overhangs_and_x, gui_produce_glyphs): * src/xfont.c (xfont_get_pcm, xfont_chars_supported, xfont_open) (xfont_encode_char, xfont_text_extents, xfont_draw) * src/xftfont.c (xftfont_draw): * src/xterm.c (x_compute_glyph_string_overhangs) (x_draw_glyphless_glyph_string_foreground): Use unsigned over XChar2b. * src/nsgui.h: * src/w32gui.h: * src/xterm.h: Remove XChar2b, STORE_XCHAR2B, XCHAR2B_BYTE1, and XCHAR2B_BYTE2 typedefs and macros. * src/font.h (font_driver): (ftfont_text_extents) * src/ftcrfont.c (ftcrfont_text_extents): * src/ftfont.c (ftfont_text_extents): * src/macfont.m (macfont_text_extents): * src/nsfont.m (nsfont_text_extents): * src/w32font.h (w32_font_text_extents): * src/font.c (xfont_text_extents): * src/xftfont.c (xftfont_text_extents): Make code parameter const.
Diffstat (limited to 'src/font.h')
-rw-r--r--src/font.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/font.h b/src/font.h
index 3720650a2e1..9ca0c97dc52 100644
--- a/src/font.h
+++ b/src/font.h
@@ -647,7 +647,7 @@ struct font_driver
647 the font FONT and the sequence of glyph codes CODE, and store the 647 the font FONT and the sequence of glyph codes CODE, and store the
648 result in METRICS. */ 648 result in METRICS. */
649 void (*text_extents) (struct font *font, 649 void (*text_extents) (struct font *font,
650 unsigned *code, int nglyphs, 650 const unsigned *code, int nglyphs,
651 struct font_metrics *metrics); 651 struct font_metrics *metrics);
652 652
653#ifdef HAVE_WINDOW_SYSTEM 653#ifdef HAVE_WINDOW_SYSTEM
@@ -894,7 +894,7 @@ extern Lisp_Object ftfont_shape (Lisp_Object);
894extern unsigned ftfont_encode_char (struct font *, int); 894extern unsigned ftfont_encode_char (struct font *, int);
895extern void ftfont_close (struct font *); 895extern void ftfont_close (struct font *);
896extern void ftfont_filter_properties (Lisp_Object, Lisp_Object); 896extern void ftfont_filter_properties (Lisp_Object, Lisp_Object);
897extern void ftfont_text_extents (struct font *, unsigned *, int, 897extern void ftfont_text_extents (struct font *, const unsigned *, int,
898 struct font_metrics *); 898 struct font_metrics *);
899extern void syms_of_ftfont (void); 899extern void syms_of_ftfont (void);
900#endif /* HAVE_FREETYPE */ 900#endif /* HAVE_FREETYPE */