Mercurial > emacs
comparison src/fontset.c @ 82992:5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
src/dispextern.h (PRODUCE_GLYPHS): Use the rif in IT->f, not the global rif.
(rif): Removed.
src/dispnew.c (rif): Removed.
(direct_output_for_insert, direct_output_forward_char, update_frame)
(redraw_overlapped_rows, redraw_overlapping_rows, update_window)
(update_marginal_area, update_text_area, update_window_line)
(set_window_cursor_after_update, scrolling_window): Use the rif of the
current frame, not the global rif.
src/fontset.c: #include termhooks.h, for FRAME_RIF.
(Finternal_char_font): Use the rif of the current frame.
src/frame.c (x_set_frame_parameters): Use the rif of the current frame.
src/keyboard.c (detect_input_pending_run_timers): Use the rif of the
current frame.
src/minibuf.c: #include termhooks.h, for FRAME_RIF.
(read_minibuf): Use the rif of the current frame.
src/term.c (update_begin): Removed rif update hack.
src/termhooks.h (FRAME_RIF): New macro.
src/xdisp.c (init_iterator, expose_frame): Removed rif update hack.
(echo_area_display, x_cursor_to, draw_fringe_bitmap)
(try_window_reusing_current_matrix, try_window_id)
(get_glyph_face_and_encoding, x_get_glyph_overhangs)
(get_char_face_and_encoding, compute_overhangs_and_x, draw_glyphs)
(x_produce_glyphs, x_insert_glyphs, x_clear_end_of_line)
(erase_phys_cursor, display_and_set_cursor, show_mouse_face)
(define_frame_cursor1, x_draw_vertical_border): Use the rif of the
current frame.
src/xfns.c (Fx_create_frame): Removed rif update hack.
src/xterm.c (frame_highlight, frame_unhighlight): Ditto.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-32
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Fri, 02 Jan 2004 04:22:23 +0000 |
parents | b085f18ebcf0 |
children | 82554ed1aed8 |
comparison
equal
deleted
inserted
replaced
82991:2b26656ff804 | 82992:5de4189e659d |
---|---|
43 #include "w32term.h" | 43 #include "w32term.h" |
44 #endif | 44 #endif |
45 #ifdef MAC_OS | 45 #ifdef MAC_OS |
46 #include "macterm.h" | 46 #include "macterm.h" |
47 #endif | 47 #endif |
48 #include "termhooks.h" | |
48 | 49 |
49 #ifdef FONTSET_DEBUG | 50 #ifdef FONTSET_DEBUG |
50 #undef xassert | 51 #undef xassert |
51 #define xassert(X) do {if (!(X)) abort ();} while (0) | 52 #define xassert(X) do {if (!(X)) abort ();} while (0) |
52 #undef INLINE | 53 #undef INLINE |
1277 SPLIT_CHAR (c, charset, c1, c2); | 1278 SPLIT_CHAR (c, charset, c1, c2); |
1278 if (c2 > 0) | 1279 if (c2 > 0) |
1279 STORE_XCHAR2B (&char2b, c1, c2); | 1280 STORE_XCHAR2B (&char2b, c1, c2); |
1280 else | 1281 else |
1281 STORE_XCHAR2B (&char2b, 0, c1); | 1282 STORE_XCHAR2B (&char2b, 0, c1); |
1282 rif->encode_char (c, &char2b, fontp, NULL); | 1283 FRAME_RIF (f)->encode_char (c, &char2b, fontp, NULL); |
1283 code = (XCHAR2B_BYTE1 (&char2b) << 8) | XCHAR2B_BYTE2 (&char2b); | 1284 code = (XCHAR2B_BYTE1 (&char2b) << 8) | XCHAR2B_BYTE2 (&char2b); |
1284 } | 1285 } |
1285 return Fcons (build_string (face->font_name), make_number (code)); | 1286 return Fcons (build_string (face->font_name), make_number (code)); |
1286 } | 1287 } |
1287 | 1288 |