Mercurial > emacs
comparison src/termhooks.h @ 82990:2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
lib-src/emacsclient.c (copy_from_to, pty_conversation): Re-added SIGIO
hack. (Sigh.)
lisp/frame.el (make-frame-on-tty): Use make-terminal-frame, not
make-frame.
src/dispnew.c (line_hash_code, line_draw_cost): Updated to use
the new display_method parameters.
(Fredraw_frame): fflush the tty only if f is a termcap frame.
(direct_output_for_insert): Updated to use the new display_method
parameters. fflush the tty only if f is a termcap frame.
(direct_output_forward_char, update_frame_1, scrolling): Ditto.
(update_frame_line, Fding, bitch_at_user): Ditto.
(Fsend_string_to_terminal): Fail if current frame is not on a tty.
(init_display): Frame size change is safe here.
src/frame.c (Vterminal_frame): Restored previously deleted variable.
(syms_of_frame): Initialize it.
(make_terminal_frame): Copy the frame's display_method from tty_display_info.
(Fmake_terminal_frame): Enable simultaneous X and tty frames (buggy).
(Fredirect_frame_focus): Don't call frame_rehighlight_hook if frame
is on a termcap device.
src/frame.h (struct frame): Renamed display to display_method.
(Vterminal_frame): Re-added declaration.
src/keyboard.c (flow_control): Moved to struct tty_display_info.
(read_avail_input): Check ttys even if there is a read_socket_hook.
(Fset_input_mode): Call reset_sys_modes/init_sys_modes and set
flow_control or meta_key only when the frame is a termcap frame.
(Fcurrent_input_mode): Handle flow_control and meta_key right on
non-termcap frames.
src/scroll.c (calculate_scrolling, calculate_direct_scrolling): Update
to use the new display_method parameters.
(scrolling_1, scroll_cost): Ditto.
src/sysdep.c (init_sys_modes, reset_sys_modes): Always set the
terminal parameters if tty_out->input is not stdin. Updated to the
new location of flow_control.
(hft_init): Moved HFT init code to term_init, as it needs the frame.
src/term.c (tty_display_method_template): New variable.
(update_begin): Added rif hack.
(set_terminal_window, ins_del_lines, term_init): Updated to use the
new display_method parameters.
(insert_glyphs, ins_del_lines): Only call insert_glyphs_hook if the
current frame is not on a tty.
(calculate_costs): Don't calculate costs if not on a tty.
(term_dummy_init): Fixed tty->output initialization. Preallocate Wcm
and display_method.
(term_init): Allocate & initialize display_method. Blindly fixed
WINDOWSNT-specific parts. Added HFT-specific initialization
exception from hft_init.
(delete_tty): Only delete termcap frames. Free() the display_method.
src/termchar.h (struct tty_display_info): Moved high-level terminal
characteristics to struct display_method. Added flow_control and
display_method members.
src/termhooks.h (struct display_method): New struct (renamed from
struct device). Added accessor macros.
src/window.c (init_window_once): Initialize Vterminal_frame.
src/xdisp.c (init_iterator, expose_frame): Added rif hack.
(try_window_id): Updated to use the new display_method parameters.
src/xfaces.c (realize_basic_faces): Don't call
x_update_menu_appearance if the frame is a tty frame.
src/xfns.c (Fx_create_frame): Added rif hack. Initialize
display_method.
(x_create_tip_frame): Initialize display_method.
src/xterm.c (x_display_method): New variable.
(x_flush, x_frame_of_widget, XTmouse_position): Ignore non-X frames.
(x_window_to_scroll_bar, x_window_to_menu_bar): Ditto.
(xim_destroy_callback, xim_instantiate_callback): Ditto.
(frame_highlight, frame_unhighlight): Added rif hack.
(x_initialize): Don't initialize rif. Do initialize x_display_method.
src/xterm.h (x_display_method): New declaration.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-30
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Fri, 02 Jan 2004 01:15:26 +0000 |
parents | f3845715a5f6 |
children | 5de4189e659d |
comparison
equal
deleted
inserted
replaced
82989:f3845715a5f6 | 82990:2ecd1f669db9 |
---|---|
29 #ifndef P_ | 29 #ifndef P_ |
30 #define P_(X) () | 30 #define P_(X) () |
31 #endif | 31 #endif |
32 | 32 |
33 /* Device-local parameters. */ | 33 /* Device-local parameters. */ |
34 struct device | 34 struct display_method |
35 { | 35 { |
36 /* Terminal characteristics. */ | |
37 | |
38 int must_write_spaces; /* Nonzero means spaces in the text must | |
39 actually be output; can't just skip over | |
40 some columns to leave them blank. */ | |
41 int fast_clear_end_of_line; /* Nonzero means terminal has a `ce' string */ | |
42 | |
43 int line_ins_del_ok; /* Terminal can insert and delete lines */ | |
44 int char_ins_del_ok; /* Terminal can insert and delete chars */ | |
45 int scroll_region_ok; /* Terminal supports setting the scroll | |
46 window */ | |
47 int scroll_region_cost; /* Cost of setting the scroll window, | |
48 measured in characters. */ | |
49 int memory_below_frame; /* Terminal remembers lines scrolled | |
50 off bottom */ | |
51 | |
52 #if 0 /* These are not used anywhere. */ | |
53 /* EMACS_INT baud_rate; */ /* Output speed in baud */ | |
54 int min_padding_speed; /* Speed below which no padding necessary. */ | |
55 int dont_calculate_costs; /* Nonzero means don't bother computing | |
56 various cost tables; we won't use them. */ | |
57 #endif | |
58 | |
59 /* Window-based redisplay interface for this frame (0 for termcap | |
60 frames). */ | |
61 struct redisplay_interface *rif; | |
62 | |
36 /* XXX Display hooks will go here. */ | 63 /* XXX Display hooks will go here. */ |
37 }; | 64 }; |
65 | |
66 #define FRAME_MUST_WRITE_SPACES(f) ((f)->display_method->must_write_spaces) | |
67 #define FRAME_FAST_CLEAR_END_OF_LINE(f) ((f)->display_method->fast_clear_end_of_line) | |
68 #define FRAME_LINE_INS_DEL_OK(f) ((f)->display_method->line_ins_del_ok) | |
69 #define FRAME_CHAR_INS_DEL_OK(f) ((f)->display_method->char_ins_del_ok) | |
70 #define FRAME_SCROLL_REGION_OK(f) ((f)->display_method->scroll_region_ok) | |
71 #define FRAME_SCROLL_REGION_COST(f) ((f)->display_method->scroll_region_cost) | |
72 #define FRAME_MEMORY_BELOW_FRAME(f) ((f)->display_method->memory_below_frame) | |
38 | 73 |
39 /* Text display hooks. */ | 74 /* Text display hooks. */ |
40 | 75 |
41 extern void (*cursor_to_hook) P_ ((int vpos, int hpos)); | 76 extern void (*cursor_to_hook) P_ ((int vpos, int hpos)); |
42 extern void (*raw_cursor_to_hook) P_ ((int, int)); | 77 extern void (*raw_cursor_to_hook) P_ ((int, int)); |
430 shift_modifier= CHAR_SHIFT, | 465 shift_modifier= CHAR_SHIFT, |
431 ctrl_modifier = CHAR_CTL, | 466 ctrl_modifier = CHAR_CTL, |
432 meta_modifier = CHAR_META /* Under X, the XK_Meta_[LR] keysyms. */ | 467 meta_modifier = CHAR_META /* Under X, the XK_Meta_[LR] keysyms. */ |
433 }; | 468 }; |
434 | 469 |
435 #endif | 470 #endif /* CONSP */ |
436 | 471 |
437 /* arch-tag: 33a00ecc-52b5-4186-a410-8801ac9f087d | 472 /* arch-tag: 33a00ecc-52b5-4186-a410-8801ac9f087d |
438 (do not change this comment) */ | 473 (do not change this comment) */ |