aboutsummaryrefslogtreecommitdiffstats
path: root/src/dispextern.h
diff options
context:
space:
mode:
authorKaroly Lorentey2003-12-27 10:00:19 +0000
committerKaroly Lorentey2003-12-27 10:00:19 +0000
commitfca177d467f0264cab4256a67175fc52fba42f2e (patch)
treeaac26ce7368d3cffc254b50f4474b03430f025ee /src/dispextern.h
parent6548cf002c635f6799e2e127393128842be35632 (diff)
downloademacs-fca177d467f0264cab4256a67175fc52fba42f2e.tar.gz
emacs-fca177d467f0264cab4256a67175fc52fba42f2e.zip
Fully eliminated global tty state variables.
lib-src/emacsclient.c (main.c): Fix error message. lisp/frame.el (make-frame-on-tty): New function. lisp/server.el (server-process-filter): Notify emacsclient if there was on error during evaluation. src/cm.c: Fix remaining cases of direct Wcm references. src/dispextern.h: Updated prototypes. src/dispnew.c (Fredraw_frame): Fix set_terminal_modes call. (init_display): Remove reference to meta_key. src/frame.c (make_terminal_frame): Renamed first parameter to tty_name. Call term_init before creating the frame. (Fmake_terminal_frame): Look up the `tty' and `tty-type' frame parameters from the currently selected terminal before the global default. (Fdelete_frame): Make sure that the new selected frame is live. src/keyboard.c (meta_key): Moved to struct tty_output. (read_avail_input): Fix C syntax. Update references to meta_key. (Fsuspend_emacs): pass current tty to init_sys_modes via record_unwind_protect. (Fset_input_mode): Update references to meta_key. (Fcurrent_input_mode): Ditto. src/sysdep.c (init_sys_modes): Updated old_tty and meta_key references. Don't call set_terminal_modes, it needs termcap strings. (reset_sys_modes): Call tty_reset_terminal_modes instead of reset_terminal_modes. Updated old_tty references. src/term.c: Massive updates throuout the file. (TS_*, TN_*): Moved to struct tty_output. (RPov, delete_in_insert_mode se_is_so, costs_set, insert_mode): Ditto. (standout_mode, specified_window, tty_cursor_hidden): Ditto. (tty_set_terminal_modes, tty_reset_terminal_modes): New functions. (turn_on_insert, turn_off_insert): Added tty parameter. (turn_on_highlight, turn_off_highlight, toggle_highlight): Added tty parameter. (tty_hide_cursor, tty_show_cursor): Ditto. (background_highlight, highlight_if_desired): Ditto. (tty_capable_p): Changed first parameter to tty_output. (term_init): Make sure top_frame is initialized. Don't exit on errors if this would have been a secondary terminal. Call set_terminal_modes on the end. (delete_tty): New function. (delete_tty_1): New function. (print_all_frames): New function, marginally useful for debugging. src/termchar.h (struct tty_output): Changed old_tty to be a pointer. Removed old_tty_valid member. Added tty-specific variables from term.c. src/xfaces.c (Ftty_supports_face_attributes_p): Update for new tty_capable_p. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-9
Diffstat (limited to 'src/dispextern.h')
-rw-r--r--src/dispextern.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/dispextern.h b/src/dispextern.h
index 195d080ca92..7148c68859c 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2724,15 +2724,15 @@ extern Lisp_Object Qredisplay_dont_pause;
2724/* Defined in term.c */ 2724/* Defined in term.c */
2725 2725
2726extern void ring_bell P_ ((void)); 2726extern void ring_bell P_ ((void));
2727extern void set_terminal_modes P_ (()); 2727extern void set_terminal_modes P_ ((void));
2728extern void reset_terminal_modes P_ (()); 2728extern void reset_terminal_modes P_ ((void));
2729extern void update_begin P_ ((struct frame *)); 2729extern void update_begin P_ ((struct frame *));
2730extern void update_end P_ ((struct frame *)); 2730extern void update_end P_ ((struct frame *));
2731extern void set_terminal_window P_ ((int)); 2731extern void set_terminal_window P_ ((int));
2732extern void set_scroll_region P_ ((int, int)); 2732extern void set_scroll_region P_ ((int, int));
2733extern void turn_off_insert P_ ((void)); 2733extern void turn_off_insert P_ ((struct tty_output *));
2734extern void turn_off_highlight P_ ((void)); 2734extern void turn_off_highlight P_ ((struct tty_output *));
2735extern void background_highlight P_ ((void)); 2735extern void background_highlight P_ ((struct tty_output *));
2736extern void clear_frame P_ ((void)); 2736extern void clear_frame P_ ((void));
2737extern void clear_end_of_line P_ ((int)); 2737extern void clear_end_of_line P_ ((int));
2738extern void clear_end_of_line_raw P_ ((int)); 2738extern void clear_end_of_line_raw P_ ((int));
@@ -2742,12 +2742,12 @@ extern int string_cost P_ ((char *));
2742extern int per_line_cost P_ ((char *)); 2742extern int per_line_cost P_ ((char *));
2743extern void calculate_costs P_ ((struct frame *)); 2743extern void calculate_costs P_ ((struct frame *));
2744extern void set_tty_color_mode P_ ((struct frame *, Lisp_Object)); 2744extern void set_tty_color_mode P_ ((struct frame *, Lisp_Object));
2745extern void tty_setup_colors P_ ((int)); 2745extern void tty_setup_colors P_ ((struct tty_output *, int));
2746extern struct tty_output *term_init P_ ((char *, char *)); 2746extern struct tty_output *term_init P_ ((char *, char *));
2747extern struct tty_output *term_dummy_init P_ ((void)); 2747extern struct tty_output *term_dummy_init P_ ((void));
2748extern void fatal P_ ((/* char *, ... */)); 2748extern void fatal P_ ((/* char *, ... */));
2749void cursor_to P_ ((int, int)); 2749void cursor_to P_ ((int, int));
2750extern int tty_capable_p P_ ((struct frame *, unsigned, unsigned long, unsigned long)); 2750extern int tty_capable_p P_ ((struct tty_output *, unsigned, unsigned long, unsigned long));
2751 2751
2752/* Defined in scroll.c */ 2752/* Defined in scroll.c */
2753 2753