Mercurial > emacs
comparison src/dispextern.h @ 83420:521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
* lisp/termdev.el (terminal-parameter-alist, terminal-parameters, terminal-parameter-p)
(terminal-parameter, set-terminal-parameter, terminal-handle-delete-frame): Remove.
* src/term.c (Vring_bell_function, device_list, initial_device)
(next_device_id, ring_bell, update_begin, update_end)
(set_terminal_window, cursor_to, raw_cursor_to)
(clear_to_end, clear_frame, clear_end_of_line)
(write_glyphs, insert_glyphs, delete_glyphs, ins_del_lines)
(get_device, Fdisplay_name, create_device, delete_device)
(Fdelete_display, Fdisplay_live_p, Fdisplay_list)
Move to terminal.c.
(syms_of_term): Move their initialization to terminal.c.
* src/terminal.c: New file.
(device_list, next_device_id, initial_device, Vring_bell_function)
(ring_bell, update_begin, update_end, set_terminal_window)
(cursor_to, raw_cursor_to, clear_to_end, clear_frame)
(clear_end_of_line, write_glyphs, insert_glyphs, delete_glyphs)
(ins_del_lines, get_device, create_device, delete_device)
(Fdelete_display, Fdisplay_live_p, Fdisplay_list, Fdisplay_name): Move here.
(mark_devices, get_terminal_param, store_terminal_param)
(Fterminal_parameters, Fterminal_parameter)
(Fmodify_terminal_parameters, Fset_terminal_parameter)
(init_initial_device, delete_initial_device)
(syms_of_terminal): New functions.
* lisp/simple.el (normal-erase-is-backspace-setup-frame)
(normal-erase-is-backspace-mode): Rephrase things
without terminal-parameter-p.
* lisp/termdev.el (terminal-getenv, terminal-setenv)
(with-terminal-environment): Ditto.
* mac/makefile.MPW (EmacsObjects): Add terminal.c.x.
({Src}terminal.c.x): Add dependencies.
* src/Makefile.in (obj): Add terminal.o.
(terminal.o): Add dependencies.
[HAVE_CARBON]: Make terminal.o depend on macgui.h.
* src/alloc.c (mark_devices): Declare.
(Fgarbage_collect): Call `mark_devices'.
* src/dispextern.h (set_scroll_region, turn_off_insert)
(turn_off_highlight, background_highlight, clear_end_of_line_raw)
(tty_clear_end_of_line, tty_setup_colors, delete_tty): Remove.
(raw_cursor_to, clear_to_end, tty_turn_off_insert)
(tty_turn_off_highlight): Add declaration.
* src/emacs.c (main): Call `syms_of_terminal'.
* src/frame.c (get_future_frame_param): New function.
(Fmake_terminal_frame): Use it.
* src/keyboard.c (pop_kboard): Remove unused variable.
(Fset_output_flow_control): Return nil.
* src/keymap.h (Fset_keymap_parent): Add EXFUN.
* src/lisp.h (syms_of_terminal): Declare it.
* src/sysdep.c (reset_sys_modes): Update for renames.
* src/term.c (set_scroll_region): Rename to `tty_set_scroll_region'.
(turn_on_insert): Rename to `tty_turn_on_insert'.
(turn_off_insert): Rename to `tty_turn_off_insert'.
(turn_off_highlight): Rename to `tty_turn_off_highlight'.
(turn_on_highlight): Rename to `tty_turn_on_highlight'.
(toggle_highligh): Rename to `tty_toggle_highlight'.
(background_highlight): Rename to `tty_background_highlight'.
(highlight_if_desired): Rename to `tty_highlight_if_desired'.
(tty_ring_bell, tty_update_end, tty_set_terminal_window)
(tty_set_scroll_region, tty_background_highlight)
(tty_cursor_to, tty_raw_cursor_to, tty_clear_to_end)
(tty_clear_frame, tty_clear_end_of_line, tty_write_glyphs)
(tty_insert_glyphs, tty_delete_glyphs, tty_ins_del_lines)
(term_get_fkeys, tty_setup_colors, dissociate_if_controlling_tty)
(delete_tty): Add static modifier.
(tty_reset_terminal_modes, tty_set_terminal_window)
(tty_set_scroll_region, tty_background_highlight)
(tty_highlight_if_desired, tty_cursor_to)
(tty_raw_cursor_to, tty_clear_to_end, tty_clear_frame)
(tty_clear_end_of_line, tty_write_glyphs, tty_insert_glyphs)
(tty_delete_glyphs, tty_ins_del_lines, turn_on_face):
Update for renames.
* src/termhooks.h (param_alist): New member to struct device.
* src/xterm.h (x_delete_device): Declare.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-460
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sun, 25 Dec 2005 20:06:58 +0000 |
parents | 03934708f1e9 |
children | 1f5d64c4df6f |
comparison
equal
deleted
inserted
replaced
83419:b658f9b67fc5 | 83420:521d3f18b3d1 |
---|---|
2620 int, struct glyph_row *, enum face_id)); | 2620 int, struct glyph_row *, enum face_id)); |
2621 void init_iterator_to_row_start P_ ((struct it *, struct window *, | 2621 void init_iterator_to_row_start P_ ((struct it *, struct window *, |
2622 struct glyph_row *)); | 2622 struct glyph_row *)); |
2623 int get_next_display_element P_ ((struct it *)); | 2623 int get_next_display_element P_ ((struct it *)); |
2624 void set_iterator_to_next P_ ((struct it *, int)); | 2624 void set_iterator_to_next P_ ((struct it *, int)); |
2625 void produce_glyphs P_ ((struct it *)); | |
2626 void produce_special_glyphs P_ ((struct it *, enum display_element_type)); | |
2627 void start_display P_ ((struct it *, struct window *, struct text_pos)); | 2625 void start_display P_ ((struct it *, struct window *, struct text_pos)); |
2628 void move_it_to P_ ((struct it *, int, int, int, int, int)); | 2626 void move_it_to P_ ((struct it *, int, int, int, int, int)); |
2629 void move_it_vertically P_ ((struct it *, int)); | 2627 void move_it_vertically P_ ((struct it *, int)); |
2630 void move_it_vertically_backward P_ ((struct it *, int)); | 2628 void move_it_vertically_backward P_ ((struct it *, int)); |
2631 void move_it_by_lines P_ ((struct it *, int, int)); | 2629 void move_it_by_lines P_ ((struct it *, int, int)); |
2903 void enable_glyph_matrix_rows P_ ((struct glyph_matrix *, int, int, int)); | 2901 void enable_glyph_matrix_rows P_ ((struct glyph_matrix *, int, int, int)); |
2904 void clear_glyph_row P_ ((struct glyph_row *)); | 2902 void clear_glyph_row P_ ((struct glyph_row *)); |
2905 void prepare_desired_row P_ ((struct glyph_row *)); | 2903 void prepare_desired_row P_ ((struct glyph_row *)); |
2906 int line_hash_code P_ ((struct glyph_row *)); | 2904 int line_hash_code P_ ((struct glyph_row *)); |
2907 void set_window_update_flags P_ ((struct window *, int)); | 2905 void set_window_update_flags P_ ((struct window *, int)); |
2908 void write_glyphs P_ ((struct frame *, struct glyph *, int)); | |
2909 void insert_glyphs P_ ((struct frame *, struct glyph *, int)); | |
2910 void redraw_frame P_ ((struct frame *)); | 2906 void redraw_frame P_ ((struct frame *)); |
2911 void redraw_garbaged_frames P_ ((void)); | 2907 void redraw_garbaged_frames P_ ((void)); |
2912 int scroll_cost P_ ((struct frame *, int, int, int)); | 2908 int scroll_cost P_ ((struct frame *, int, int, int)); |
2913 int direct_output_for_insert P_ ((int)); | 2909 int direct_output_for_insert P_ ((int)); |
2914 int direct_output_forward_char P_ ((int)); | 2910 int direct_output_forward_char P_ ((int)); |
2922 void init_display P_ ((void)); | 2918 void init_display P_ ((void)); |
2923 void syms_of_display P_ ((void)); | 2919 void syms_of_display P_ ((void)); |
2924 extern Lisp_Object Qredisplay_dont_pause; | 2920 extern Lisp_Object Qredisplay_dont_pause; |
2925 GLYPH spec_glyph_lookup_face P_ ((struct window *, GLYPH)); | 2921 GLYPH spec_glyph_lookup_face P_ ((struct window *, GLYPH)); |
2926 | 2922 |
2927 /* Defined in term.c */ | 2923 /* Defined in terminal.c */ |
2928 | 2924 |
2929 extern void ring_bell P_ ((struct frame *)); | 2925 extern void ring_bell P_ ((struct frame *)); |
2930 extern void update_begin P_ ((struct frame *)); | 2926 extern void update_begin P_ ((struct frame *)); |
2931 extern void update_end P_ ((struct frame *)); | 2927 extern void update_end P_ ((struct frame *)); |
2932 extern void set_terminal_window P_ ((struct frame *, int)); | 2928 extern void set_terminal_window P_ ((struct frame *, int)); |
2933 extern void set_scroll_region P_ ((struct frame *, int, int)); | 2929 extern void cursor_to P_ ((struct frame *, int, int)); |
2934 extern void turn_off_insert P_ ((struct tty_display_info *)); | 2930 |
2935 extern void turn_off_highlight P_ ((struct tty_display_info *)); | 2931 /* Was not declared before: */ |
2936 extern void background_highlight P_ ((struct tty_display_info *)); | 2932 extern void raw_cursor_to P_ ((struct frame *, int, int)); |
2933 extern void clear_to_end P_ ((struct frame *)); | |
2934 | |
2937 extern void clear_frame P_ ((struct frame *)); | 2935 extern void clear_frame P_ ((struct frame *)); |
2938 extern void clear_end_of_line P_ ((struct frame *, int)); | 2936 extern void clear_end_of_line P_ ((struct frame *, int)); |
2939 extern void clear_end_of_line_raw P_ ((struct frame *, int)); | 2937 extern void write_glyphs P_ ((struct frame *, struct glyph *, int)); |
2940 extern void tty_clear_end_of_line P_ ((struct frame *, int)); | 2938 extern void insert_glyphs P_ ((struct frame *, struct glyph *, int)); |
2941 extern void delete_glyphs P_ ((struct frame *, int)); | 2939 extern void delete_glyphs P_ ((struct frame *, int)); |
2942 extern void ins_del_lines P_ ((struct frame *, int, int)); | 2940 extern void ins_del_lines P_ ((struct frame *, int, int)); |
2941 | |
2942 extern struct device *get_device P_ ((Lisp_Object display, int)); | |
2943 | |
2944 extern struct device *init_initial_device P_ ((void)); | |
2945 | |
2946 | |
2947 /* Defined in term.c */ | |
2948 | |
2949 extern void tty_set_terminal_modes P_ ((struct device *)); | |
2950 extern void tty_reset_terminal_modes P_ ((struct device *)); | |
2951 extern void tty_turn_off_insert P_ ((struct tty_display_info *)); | |
2952 extern void tty_turn_off_highlight P_ ((struct tty_display_info *)); | |
2943 extern int string_cost P_ ((char *)); | 2953 extern int string_cost P_ ((char *)); |
2944 extern int per_line_cost P_ ((char *)); | 2954 extern int per_line_cost P_ ((char *)); |
2945 extern void calculate_costs P_ ((struct frame *)); | 2955 extern void calculate_costs P_ ((struct frame *)); |
2956 extern void produce_glyphs P_ ((struct it *)); | |
2957 extern void produce_special_glyphs P_ ((struct it *, enum display_element_type)); | |
2958 extern int tty_capable_p P_ ((struct tty_display_info *, unsigned, unsigned long, unsigned long)); | |
2946 extern void set_tty_color_mode P_ ((struct frame *, Lisp_Object)); | 2959 extern void set_tty_color_mode P_ ((struct frame *, Lisp_Object)); |
2947 extern void tty_setup_colors P_ ((struct tty_display_info *, int)); | |
2948 extern struct device *get_device P_ ((Lisp_Object display, int)); | |
2949 extern struct device *get_tty_device P_ ((Lisp_Object terminal)); | 2960 extern struct device *get_tty_device P_ ((Lisp_Object terminal)); |
2950 extern struct device *get_named_tty P_ ((char *)); | 2961 extern struct device *get_named_tty P_ ((char *)); |
2951 EXFUN (Fdisplay_tty_type, 1); | 2962 EXFUN (Fdisplay_tty_type, 1); |
2952 extern struct device *init_initial_device P_ ((void)); | 2963 extern void create_tty_output P_ ((struct frame *)); |
2953 extern struct device *init_tty P_ ((char *, char *, int)); | 2964 extern struct device *init_tty P_ ((char *, char *, int)); |
2954 extern void delete_tty P_ ((struct device *)); | |
2955 extern void cursor_to P_ ((struct frame *, int, int)); | |
2956 extern int tty_capable_p P_ ((struct tty_display_info *, unsigned, unsigned long, unsigned long)); | |
2957 extern void tty_set_terminal_modes P_ ((struct device *)); | |
2958 extern void tty_reset_terminal_modes P_ ((struct device *)); | |
2959 extern void create_tty_output P_ ((struct frame *)); | |
2960 | 2965 |
2961 | 2966 |
2962 /* Defined in scroll.c */ | 2967 /* Defined in scroll.c */ |
2963 | 2968 |
2964 extern int scrolling_max_lines_saved P_ ((int, int, int *, int *, int *)); | 2969 extern int scrolling_max_lines_saved P_ ((int, int, int *, int *, int *)); |