Mercurial > emacs
diff src/termhooks.h @ 83431:76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
* src/termhooks.h (struct device): Rename to `terminal'. Rename member
`next_device' to `next_terminal'.
(device_list): Rename to `terminal_list'.
(FRAME_DEVICE): Rename to `FRAME_TERMINAL'.
(DEVICE_TERMINAL_CODING): Rename to `TERMINAL_TERMINAL_CODING'.
(TERMINAL_KEYBOARD_CODING): Rename to `TERMINAL_KEYBOARD_CODING'.
(DEVICE_ACTIVE_P): Rename to `TERMINAL_ACTIVE_P'.
Update declarations and macro definitions.
* src/termchar.h (tty_display_info): Rename member `device' to `terminal'.
(FRAME_TTY): Update for renames.
* src/xterm.h (x_display_info): Rename member `device' to `terminal'.
* src/frame.h (frame): Rename `device' member to `terminal'.
(FRAME_KBOARD, FRAME_LIVE_P, Qdevice, Qdisplay_live_p):
Update for renames.
* src/lisp.h (set_process_environment): Rename to `set_global_environment'.
(device): Rename to `terminal'.
* src/dispextern.h: Update declarations and macro definitions.
* src/terminal.c (device_list): Rename to `terminal_list'.
(next_device_id): Rename to `next_terminal_id'.
(initial_device): Rename to `initial_terminal'.
(get_device): Rename to `get_terminal'.
(create_device): Rename to `create_terminal'.
(mark_devices): Rename to `mark_terminals'.
(delete_device): Rename to `delete_terminal'.
(Fdelete_display): Rename to `Fdelete_terminal'.
(Fframe_terminal): Move here from frame.c.
(Fdisplay_live_p): Rename to `Fterminal_live_p'.
(Fdisplay_list): Rename to `Fterminal_list'.
(Fdisplay_name): Rename to `Fterminal_name'.
(init_initial_device): Rename to `init_initial_terminal'.
(delete_initial_device): Rename to `delete_initial_terminal'.
(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_terminal_param, store_terminal_param)
(Fterminal_parameters, Fterminal_parameter)
(Fmodify_terminal_parameters, Fset_terminal_parameter)
(syms_of_terminal): Update for renames.
* src/term.c (get_tty_device): Rename to `get_tty_terminal'. Update.
(Fdisplay_tty_type): Rename to `Ftty_type'.
(Fdisplay_controlling_tty_p): Rename to `Fcontrolling_tty_p'.
(delete_tty, tty_set_terminal_modes, tty_reset_terminal_modes)
(Ftty_display_color_p, Ftty_display_color_cells, get_named_tty)
(Ftty_no_underline, Fsuspend_tty, Fresume_tty, create_tty_output)
(init_tty, maybe_fatal, delete_tty, syms_of_term): Update for rename.
* src/frame.c (Qdevice): Rename to `Qterminal'.
(Qdisplay_live_p): Rename to `Qterminal_live_p'.
(terminal_frame_count): Rename to `tty_frame_count'.
(Fframe_display): Move to terminal.c, rename to `Fframe_terminal'.
(make_frame_without_minibuffer, make_initial_frame)
(make_terminal_frame, Fmodify_frame_parameters)
(do_switch_frame, Fdelete_frame, Fmouse_position)
(Fmouse_pixel_position, Fraise_frame, Flower_frame)
(Fredirect_frame_focus, set_term_frame_name, syms_of_frame):
Update for renames.
* src/xdisp.c (message2_nolog, message3_nolog, redisplay_internal)
(set_vertical_scroll_bar, redisplay_window, check_x_display_info)
(x_set_scroll_bar_foreground, x_set_scroll_bar_background)
(Fx_create_frame, Fxw_display_color_p, Fx_display_grayscale_p)
(Fx_display_pixel_width, Fx_display_pixel_height)
(Fx_display_planes, Fx_display_color_cells)
(Fx_server_max_request_size, Fx_server_vendor, Fx_server_version)
(Fx_display_screens, Fx_display_mm_height, Fx_display_mm_width)
(Fx_display_backing_store, Fx_display_visual_class)
(Fx_display_save_under, Fx_close_connection, x_create_tip_frame):
Update for renames.
* xterm.c (handle_one_xevent): Initialize `f' to NULL.
(x_delete_device): Rename to `x_delete_terminal'.
(x_create_device): Rename to `x_create_terminal'.
(XTset_terminal_modes, XTreset_terminal_modes)
(XTread_socket, x_connection_closed, x_term_init)
(x_term_init, x_delete_display): Update for renames.
* src/dispnew.c (Fredraw_frame, Fsend_string_to_terminal)
(Fsend_string_to_terminal, init_display): Update for renames.
* src/keyboard.c (push_frame_kboard, pop_kboard, pop_kboard)
(kbd_buffer_get_event, read_avail_input, tty_read_avail_input)
(interrupt_signal, Fset_output_flow_control)
(Fset_input_meta_mode, Fset_quit_char, delete_kboard)
(syms_of_keyboard): Update for renames.
* src/alloc.c (mark_devices): Update declaration.
(Fgarbage_collect): Update for renames.
* src/coding.c (Fset_terminal_coding_system_internal)
(Fterminal_coding_system4)
(Fset_keyboard_coding_system_internal)
(Fkeyboard_coding_system): Update for renames.
* src/data.c (Fterminal_local_value, Fset_terminal_local_value):
Update for renames.
* src/minibuf.c (read_minibuf): Update for renames.
* src/sysdep.c (init_sys_modes, reset_sys_modes): Update for renames.
* xselect.c (x_handle_selection_clear): Update for renames.
* lisp/files.el (save-buffers-kill-display): Rename to `save-buffers-kill-terminal'.
(save-buffers-kill-terminal, ctl-x-map): Update for renames.
* frame.el (make-frame): Rename 'device frame parameter to 'terminal. Update.
(frames-on-display-list, framep-on-display, suspend-frame): Update for renames.
(selected-display): Rename to `selected-terminal'.
* server.el (server-save-buffers-kill-display): Rename to
`server-save-buffers-kill-terminal'.
(server-delete-client, server-handle-delete-frame)
(server-handle-suspend-tty, server-process-filter)
(server-switch-buffer): Update for renames.
* startup.el (normal-splash-screen, normal-splash-screen): Update for renames.
* talk.el (talk): Update for renames.
* termdev.el (terminal-id): Update for renames.
* xt-mouse.el (turn-on-xterm-mouse-tracking-on-terminal)
(turn-off-xterm-mouse-tracking-on-terminal)
(xterm-mouse-handle-delete-frame): Update for renames.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-471
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Thu, 29 Dec 2005 18:20:26 +0000 |
parents | b64b7e867d0a |
children | b98066f4aa10 |
line wrap: on
line diff
--- a/src/termhooks.h Thu Dec 29 04:57:14 2005 +0000 +++ b/src/termhooks.h Thu Dec 29 18:20:26 2005 +0000 @@ -1,4 +1,4 @@ -/* Parameters and display hooks for output devices. +/* Parameters and display hooks for terminal devices. Copyright (C) 1985, 1986, 1993, 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @@ -288,30 +288,30 @@ #endif /* CONSP */ -/* Device-local parameters. */ -struct device +/* Terminal-local parameters. */ +struct terminal { - /* Chain of all display devices. */ - struct device *next_device; + /* Chain of all terminal devices. */ + struct terminal *next_terminal; - /* Unique id for this display device. */ + /* Unique id for this terminal device. */ int id; - /* The number of frames that are on this device. */ + /* The number of frames that are on this terminal. */ int reference_count; - /* The type of the display device. */ + /* The type of the terminal device. */ enum output_method type; - /* The name of the display device. Do not use this to identify the device. */ + /* The name of the terminal device. Do not use this to identify the device. */ char *name; #ifdef MULTI_KBOARD - /* The device's keyboard object. */ + /* The terminal's keyboard object. */ struct kboard *kboard; #endif - /* Device-type dependent data shared amongst all frames on this display. */ + /* Device-type dependent data shared amongst all frames on this terminal. */ union display_info { struct tty_display_info *tty; /* termchar.h */ @@ -381,8 +381,8 @@ void (*ring_bell_hook) P_ ((struct frame *f)); - void (*reset_terminal_modes_hook) P_ ((struct device *)); - void (*set_terminal_modes_hook) P_ ((struct device *)); + void (*reset_terminal_modes_hook) P_ ((struct terminal *)); + void (*set_terminal_modes_hook) P_ ((struct terminal *)); void (*update_begin_hook) P_ ((struct frame *)); void (*update_end_hook) P_ ((struct frame *)); @@ -428,7 +428,7 @@ /* If we're displaying frames using a window system that can stack frames on top of each other, this hook allows you to bring a frame to the front, or bury it behind all the other windows. If this - hook is zero, that means the device we're displaying on doesn't + hook is zero, that means the terminal we're displaying on doesn't support overlapping frames, so there's no need to raise or lower anything. @@ -512,10 +512,10 @@ /* Called to read input events. - DEVICE indicates which display device to read from. Input events - should be read into BUF, the size of which is given in SIZE. - EXPECTED is non-zero if the caller suspects that new input is - available. + TERMINAL indicates which terminal device to read from. Input + events should be read into BUF, the size of which is given in + SIZE. EXPECTED is non-zero if the caller suspects that new input + is available. A positive return value indicates that that many input events where read into BUF. @@ -525,11 +525,11 @@ XXX Please note that a non-zero value of EXPECTED only means that there is available input on at least one of the currently opened - display devices -- but not necessarily on this device. + terminal devices -- but not necessarily on this device. Therefore, in most cases EXPECTED should be simply ignored. XXX This documentation needs to be updated. */ - int (*read_socket_hook) P_ ((struct device *device, + int (*read_socket_hook) P_ ((struct terminal *terminal, int expected, struct input_event *hold_quit)); @@ -538,43 +538,43 @@ /* Called to delete the device-specific portions of a frame that is - on this display device. */ + on this terminal device. */ void (*delete_frame_hook) P_ ((struct frame *)); - /* Called after the last frame on this device is deleted, or when + /* Called after the last frame on this terminal is deleted, or when the display device was closed (hangup). - If this is NULL, then the generic delete_device is called - instead. Otherwise the hook must call delete_device itself. + If this is NULL, then the generic delete_terminal is called + instead. Otherwise the hook must call delete_terminal itself. The hook must check for and close any live frames that are still - on the device. Fdelete_frame ensures that there are no live - frames on the device when it calls this hook, so infinite + on the terminal. Fdelete_frame ensures that there are no live + frames on the terminal when it calls this hook, so infinite recursion is prevented. */ - void (*delete_device_hook) P_ ((struct device *)); + void (*delete_terminal_hook) P_ ((struct terminal *)); }; -/* Chain of all display devices currently in use. */ -extern struct device *device_list; +/* Chain of all terminal devices currently in use. */ +extern struct terminal *terminal_list; -#define FRAME_MUST_WRITE_SPACES(f) ((f)->device->must_write_spaces) -#define FRAME_FAST_CLEAR_END_OF_LINE(f) ((f)->device->fast_clear_end_of_line) -#define FRAME_LINE_INS_DEL_OK(f) ((f)->device->line_ins_del_ok) -#define FRAME_CHAR_INS_DEL_OK(f) ((f)->device->char_ins_del_ok) -#define FRAME_SCROLL_REGION_OK(f) ((f)->device->scroll_region_ok) -#define FRAME_SCROLL_REGION_COST(f) ((f)->device->scroll_region_cost) -#define FRAME_MEMORY_BELOW_FRAME(f) ((f)->device->memory_below_frame) +#define FRAME_MUST_WRITE_SPACES(f) ((f)->terminal->must_write_spaces) +#define FRAME_FAST_CLEAR_END_OF_LINE(f) ((f)->terminal->fast_clear_end_of_line) +#define FRAME_LINE_INS_DEL_OK(f) ((f)->terminal->line_ins_del_ok) +#define FRAME_CHAR_INS_DEL_OK(f) ((f)->terminal->char_ins_del_ok) +#define FRAME_SCROLL_REGION_OK(f) ((f)->terminal->scroll_region_ok) +#define FRAME_SCROLL_REGION_COST(f) ((f)->terminal->scroll_region_cost) +#define FRAME_MEMORY_BELOW_FRAME(f) ((f)->terminal->memory_below_frame) -#define FRAME_TERMINAL_CODING(f) ((f)->device->terminal_coding) -#define FRAME_KEYBOARD_CODING(f) ((f)->device->keyboard_coding) +#define FRAME_TERMINAL_CODING(f) ((f)->terminal->terminal_coding) +#define FRAME_KEYBOARD_CODING(f) ((f)->terminal->keyboard_coding) -#define DEVICE_TERMINAL_CODING(d) ((d)->terminal_coding) -#define DEVICE_KEYBOARD_CODING(d) ((d)->keyboard_coding) +#define TERMINAL_TERMINAL_CODING(d) ((d)->terminal_coding) +#define TERMINAL_KEYBOARD_CODING(d) ((d)->keyboard_coding) -#define FRAME_RIF(f) ((f)->device->rif) +#define FRAME_RIF(f) ((f)->terminal->rif) -#define FRAME_DEVICE(f) ((f)->device) +#define FRAME_TERMINAL(f) ((f)->terminal) /* FRAME_WINDOW_P tests whether the frame is a window, and is defined to be the predicate for the window system being used. */ @@ -592,16 +592,16 @@ #define FRAME_WINDOW_P(f) (0) #endif -/* Return true if the display device is not suspended. */ -#define DEVICE_ACTIVE_P(d) ((d)->type != output_termcap || (d)->display_info.tty->input) +/* Return true if the terminal device is not suspended. */ +#define TERMINAL_ACTIVE_P(d) ((d)->type != output_termcap || (d)->display_info.tty->input) -extern Lisp_Object get_terminal_param P_ ((struct device *, Lisp_Object)); -extern struct device *get_device P_ ((Lisp_Object display, int)); -extern struct device *create_device P_ ((void)); -extern void delete_device P_ ((struct device *)); +extern Lisp_Object get_terminal_param P_ ((struct terminal *, Lisp_Object)); +extern struct terminal *get_terminal P_ ((Lisp_Object terminal, int)); +extern struct terminal *create_terminal P_ ((void)); +extern void delete_terminal P_ ((struct terminal *)); -/* The initial display device, created by initial_term_init. */ -extern struct device *initial_device; +/* The initial terminal device, created by initial_term_init. */ +extern struct terminal *initial_terminal; /* arch-tag: 33a00ecc-52b5-4186-a410-8801ac9f087d (do not change this comment) */