Mercurial > emacs
comparison src/minibuf.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 | d4539e5181a1 |
children | 03a73693678e |
comparison
equal
deleted
inserted
replaced
82991:2b26656ff804 | 82992:5de4189e659d |
---|---|
32 #include "frame.h" | 32 #include "frame.h" |
33 #include "window.h" | 33 #include "window.h" |
34 #include "syntax.h" | 34 #include "syntax.h" |
35 #include "intervals.h" | 35 #include "intervals.h" |
36 #include "keymap.h" | 36 #include "keymap.h" |
37 #include "termhooks.h" | |
37 | 38 |
38 extern int quit_char; | 39 extern int quit_char; |
39 | 40 |
40 /* List of buffers for use as minibuffers. | 41 /* List of buffers for use as minibuffers. |
41 The first element of the list is used for the outermost minibuffer | 42 The first element of the list is used for the outermost minibuffer |
690 { | 691 { |
691 XWINDOW (minibuf_window)->cursor.hpos = 0; | 692 XWINDOW (minibuf_window)->cursor.hpos = 0; |
692 XWINDOW (minibuf_window)->cursor.x = 0; | 693 XWINDOW (minibuf_window)->cursor.x = 0; |
693 XWINDOW (minibuf_window)->must_be_updated_p = 1; | 694 XWINDOW (minibuf_window)->must_be_updated_p = 1; |
694 update_frame (XFRAME (selected_frame), 1, 1); | 695 update_frame (XFRAME (selected_frame), 1, 1); |
695 if (rif && rif->flush_display) | 696 { |
696 rif->flush_display (XFRAME (XWINDOW (minibuf_window)->frame)); | 697 struct frame *f = XFRAME (XWINDOW (minibuf_window)->frame); |
698 struct redisplay_interface *rif = FRAME_RIF (f); | |
699 if (rif && rif->flush_display) | |
700 rif->flush_display (f); | |
701 } | |
697 } | 702 } |
698 | 703 |
699 /* Make minibuffer contents into a string. */ | 704 /* Make minibuffer contents into a string. */ |
700 Fset_buffer (minibuffer); | 705 Fset_buffer (minibuffer); |
701 if (allow_props) | 706 if (allow_props) |