Mercurial > emacs
diff src/xfns.c @ 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 | ec395f552d45 |
children | db27bb9f0d2f |
line wrap: on
line diff
--- a/src/xfns.c Thu Dec 29 04:57:14 2005 +0000 +++ b/src/xfns.c Thu Dec 29 18:20:26 2005 +0000 @@ -244,7 +244,7 @@ } /* Let the user specify an X display with a Lisp object. - OBJECT may be nil, a frame or a device id. + OBJECT may be nil, a frame or a terminal id. nil stands for the selected frame--or, if that is not an X frame, the first X display on the list. */ @@ -267,12 +267,12 @@ } else if (INTEGERP (object)) { - struct device *d = get_device (XINT (object), 1); - - if (d->type != output_x_window) - error ("Display %d is not an X display", XINT (object)); - - dpyinfo = d->display_info.x; + struct terminal *t = get_terminal (XINT (object), 1); + + if (t->type != output_x_window) + error ("Terminal %d is not an X display", XINT (object)); + + dpyinfo = t->display_info.x; } else if (STRINGP (object)) dpyinfo = x_display_info_for_name (object); @@ -1463,10 +1463,10 @@ if (FRAME_X_WINDOW (f) && FRAME_VISIBLE_P (f)) { /* Remove all scroll bars because they have wrong colors. */ - if (FRAME_DEVICE (f)->condemn_scroll_bars_hook) - (*FRAME_DEVICE (f)->condemn_scroll_bars_hook) (f); - if (FRAME_DEVICE (f)->judge_scroll_bars_hook) - (*FRAME_DEVICE (f)->judge_scroll_bars_hook) (f); + if (FRAME_TERMINAL (f)->condemn_scroll_bars_hook) + (*FRAME_TERMINAL (f)->condemn_scroll_bars_hook) (f); + if (FRAME_TERMINAL (f)->judge_scroll_bars_hook) + (*FRAME_TERMINAL (f)->judge_scroll_bars_hook) (f); update_face_from_frame_parameter (f, Qscroll_bar_foreground, value); redraw_frame (f); @@ -1512,10 +1512,10 @@ if (FRAME_X_WINDOW (f) && FRAME_VISIBLE_P (f)) { /* Remove all scroll bars because they have wrong colors. */ - if (FRAME_DEVICE (f)->condemn_scroll_bars_hook) - (*FRAME_DEVICE (f)->condemn_scroll_bars_hook) (f); - if (FRAME_DEVICE (f)->judge_scroll_bars_hook) - (*FRAME_DEVICE (f)->judge_scroll_bars_hook) (f); + if (FRAME_TERMINAL (f)->condemn_scroll_bars_hook) + (*FRAME_TERMINAL (f)->condemn_scroll_bars_hook) (f); + if (FRAME_TERMINAL (f)->judge_scroll_bars_hook) + (*FRAME_TERMINAL (f)->judge_scroll_bars_hook) (f); update_face_from_frame_parameter (f, Qscroll_bar_background, value); redraw_frame (f); @@ -3025,14 +3025,14 @@ until we know if this frame has a specified name. */ Vx_resource_name = Vinvocation_name; - display = x_get_arg (dpyinfo, parms, Qdevice, 0, 0, RES_TYPE_NUMBER); + display = x_get_arg (dpyinfo, parms, Qterminal, 0, 0, RES_TYPE_NUMBER); if (EQ (display, Qunbound)) display = x_get_arg (dpyinfo, parms, Qdisplay, 0, 0, RES_TYPE_STRING); if (EQ (display, Qunbound)) display = Qnil; dpyinfo = check_x_display_info (display); #ifdef MULTI_KBOARD - kb = dpyinfo->device->kboard; + kb = dpyinfo->terminal->kboard; #else kb = &the_only_kboard; #endif @@ -3077,8 +3077,8 @@ /* Note that X Windows does support scroll bars. */ FRAME_CAN_HAVE_SCROLL_BARS (f) = 1; - f->device = dpyinfo->device; - f->device->reference_count++; + f->terminal = dpyinfo->terminal; + f->terminal->reference_count++; f->output_method = output_x_window; f->output_data.x = (struct x_output *) xmalloc (sizeof (struct x_output)); @@ -3395,7 +3395,7 @@ } /* Initialize `default-minibuffer-frame' in case this is the first - frame on this display device. */ + frame on this terminal. */ if (FRAME_HAS_MINIBUF_P (f) && (!FRAMEP (kb->Vdefault_minibuffer_frame) || !FRAME_LIVE_P (XFRAME (kb->Vdefault_minibuffer_frame)))) @@ -3500,10 +3500,10 @@ DEFUN ("xw-display-color-p", Fxw_display_color_p, Sxw_display_color_p, 0, 1, 0, doc: /* Internal function called by `display-color-p', which see. */) - (device) - Lisp_Object device; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (device); + struct x_display_info *dpyinfo = check_x_display_info (terminal); if (dpyinfo->n_planes <= 2) return Qnil; @@ -3525,13 +3525,13 @@ 0, 1, 0, doc: /* Return t if the X display supports shades of gray. Note that color displays do support shades of gray. -The optional argument DEVICE specifies which display to ask about. -DEVICE should be a device id, a frame or a display name (a string). -If omitted or nil, that stands for the selected frame's display device. */) - (device) - Lisp_Object device; +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). +If omitted or nil, that stands for the selected frame's display. */) + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (device); + struct x_display_info *dpyinfo = check_x_display_info (terminal); if (dpyinfo->n_planes <= 1) return Qnil; @@ -3553,56 +3553,56 @@ DEFUN ("x-display-pixel-width", Fx_display_pixel_width, Sx_display_pixel_width, 0, 1, 0, - doc: /* Returns the width in pixels of the X display DEVICE. -The optional argument DEVICE specifies which display to ask about. -DEVICE should be a device id, a frame or a display name (a string). + doc: /* Returns the width in pixels of the X display TERMINAL. +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (device) - Lisp_Object device; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (device); + struct x_display_info *dpyinfo = check_x_display_info (terminal); return make_number (dpyinfo->width); } DEFUN ("x-display-pixel-height", Fx_display_pixel_height, Sx_display_pixel_height, 0, 1, 0, - doc: /* Returns the height in pixels of the X display DEVICE. -The optional argument DEVICE specifies which display to ask about. -DEVICE should be a device id, a frame or a display name (a string). + doc: /* Returns the height in pixels of the X display TERMINAL. +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (device) - Lisp_Object device; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (device); + struct x_display_info *dpyinfo = check_x_display_info (terminal); return make_number (dpyinfo->height); } DEFUN ("x-display-planes", Fx_display_planes, Sx_display_planes, 0, 1, 0, - doc: /* Returns the number of bitplanes of the X display DEVICE. -The optional argument DEVICE specifies which display to ask about. -DEVICE should be a device id, a frame or a display name (a string). + doc: /* Returns the number of bitplanes of the X display TERMINAL. +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (device) - Lisp_Object device; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (device); + struct x_display_info *dpyinfo = check_x_display_info (terminal); return make_number (dpyinfo->n_planes); } DEFUN ("x-display-color-cells", Fx_display_color_cells, Sx_display_color_cells, 0, 1, 0, - doc: /* Returns the number of color cells of the X display DEVICE. -The optional argument DEVICE specifies which display to ask about. -DEVICE should be a device id, a frame or a display name (a string). + doc: /* Returns the number of color cells of the X display TERMINAL. +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (device) - Lisp_Object device; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (device); + struct x_display_info *dpyinfo = check_x_display_info (terminal); int nr_planes = DisplayPlanes (dpyinfo->display, XScreenNumberOfScreen (dpyinfo->screen)); @@ -3620,29 +3620,29 @@ DEFUN ("x-server-max-request-size", Fx_server_max_request_size, Sx_server_max_request_size, 0, 1, 0, - doc: /* Returns the maximum request size of the X server of display DEVICE. -The optional argument DEVICE specifies which display to ask about. -DEVICE should be a device id, a frame or a display name (a string). + doc: /* Returns the maximum request size of the X server of display TERMINAL. +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (device) - Lisp_Object device; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (device); + struct x_display_info *dpyinfo = check_x_display_info (terminal); return make_number (MAXREQUEST (dpyinfo->display)); } DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, - doc: /* Returns the "vendor ID" string of the X server of display DEVICE. + doc: /* Returns the "vendor ID" string of the X server of display TERMINAL. \(Labelling every distributor as a "vendor" embodies the false assumption that operating systems cannot be developed and distributed noncommercially.) -The optional argument DEVICE specifies which display to ask about. -DEVICE should be a device id, a frame or a display name (a string). +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (device) - Lisp_Object device; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (device); + struct x_display_info *dpyinfo = check_x_display_info (terminal); char *vendor = ServerVendor (dpyinfo->display); if (! vendor) vendor = ""; @@ -3650,18 +3650,18 @@ } DEFUN ("x-server-version", Fx_server_version, Sx_server_version, 0, 1, 0, - doc: /* Returns the version numbers of the X server of display DEVICE. + doc: /* Returns the version numbers of the X server of display TERMINAL. The value is a list of three integers: the major and minor version numbers of the X Protocol in use, and the distributor-specific release number. See also the function `x-server-vendor'. -The optional argument DEVICE specifies which display to ask about. -DEVICE should be a device id, a frame or a display name (a string). +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (device) - Lisp_Object device; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (device); + struct x_display_info *dpyinfo = check_x_display_info (terminal); Display *dpy = dpyinfo->display; return Fcons (make_number (ProtocolVersion (dpy)), @@ -3670,55 +3670,55 @@ } DEFUN ("x-display-screens", Fx_display_screens, Sx_display_screens, 0, 1, 0, - doc: /* Return the number of screens on the X server of display DEVICE. -The optional argument DEVICE specifies which display to ask about. -DEVICE should be a device id, a frame or a display name (a string). + doc: /* Return the number of screens on the X server of display TERMINAL. +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (device) - Lisp_Object device; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (device); + struct x_display_info *dpyinfo = check_x_display_info (terminal); return make_number (ScreenCount (dpyinfo->display)); } DEFUN ("x-display-mm-height", Fx_display_mm_height, Sx_display_mm_height, 0, 1, 0, - doc: /* Return the height in millimeters of the X display DEVICE. -The optional argument DEVICE specifies which display to ask about. -DEVICE should be a device id, a frame or a display name (a string). + doc: /* Return the height in millimeters of the X display TERMINAL. +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (device) - Lisp_Object device; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (device); + struct x_display_info *dpyinfo = check_x_display_info (terminal); return make_number (HeightMMOfScreen (dpyinfo->screen)); } DEFUN ("x-display-mm-width", Fx_display_mm_width, Sx_display_mm_width, 0, 1, 0, - doc: /* Return the width in millimeters of the X display DEVICE. -The optional argument DEVICE specifies which display to ask about. -DEVICE should be a device id, a frame or a display name (a string). + doc: /* Return the width in millimeters of the X display TERMINAL. +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (device) - Lisp_Object device; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (device); + struct x_display_info *dpyinfo = check_x_display_info (terminal); return make_number (WidthMMOfScreen (dpyinfo->screen)); } DEFUN ("x-display-backing-store", Fx_display_backing_store, Sx_display_backing_store, 0, 1, 0, - doc: /* Returns an indication of whether X display DEVICE does backing store. + doc: /* Returns an indication of whether X display TERMINAL does backing store. The value may be `always', `when-mapped', or `not-useful'. -The optional argument DEVICE specifies which display to ask about. -DEVICE should be a device id, a frame or a display name (a string). +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (device) - Lisp_Object device; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (device); + struct x_display_info *dpyinfo = check_x_display_info (terminal); Lisp_Object result; switch (DoesBackingStore (dpyinfo->screen)) @@ -3745,17 +3745,17 @@ DEFUN ("x-display-visual-class", Fx_display_visual_class, Sx_display_visual_class, 0, 1, 0, - doc: /* Return the visual class of the X display DEVICE. + doc: /* Return the visual class of the X display TERMINAL. The value is one of the symbols `static-gray', `gray-scale', `static-color', `pseudo-color', `true-color', or `direct-color'. -The optional argument DEVICE specifies which display to ask about. -DEVICE should a device id, a frame or a display name (a string). +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (device) - Lisp_Object device; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (device); + struct x_display_info *dpyinfo = check_x_display_info (terminal); Lisp_Object result; switch (dpyinfo->visual->class) @@ -3788,14 +3788,14 @@ DEFUN ("x-display-save-under", Fx_display_save_under, Sx_display_save_under, 0, 1, 0, - doc: /* Returns t if the X display DEVICE supports the save-under feature. -The optional argument DEVICE specifies which display to ask about. -DEVICE should be a device id, a frame or a display name (a string). + doc: /* Returns t if the X display TERMINAL supports the save-under feature. +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (device) - Lisp_Object device; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (device); + struct x_display_info *dpyinfo = check_x_display_info (terminal); if (DoesSaveUnders (dpyinfo->screen) == True) return Qt; @@ -4075,7 +4075,7 @@ if (dpyinfo->reference_count > 0) error ("Display still has frames on it"); - x_delete_device (dpyinfo->device); + x_delete_terminal (dpyinfo->terminal); return Qnil; } @@ -4652,8 +4652,8 @@ FRAME_CAN_HAVE_SCROLL_BARS (f) = 0; record_unwind_protect (unwind_create_tip_frame, frame); - f->device = dpyinfo->device; - f->device->reference_count++; + f->terminal = dpyinfo->terminal; + f->terminal->reference_count++; /* By setting the output method, we're essentially saying that the frame is live, as per FRAME_LIVE_P. If we get a signal