Mercurial > emacs
comparison src/coding.c @ 83342:9216636c02fc
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
* src/termhooks.h (struct device): Rename to `struct device'.
Rename member `next_display' to `next_device'.
Rename member `delete_display_hook' to `delete_device_hook'.
(FRAME_DISPLAY): Rename to FRAME_DEVICE.
(DISPLAY_ACTIVE_P): Rename to DEVICE_ACTIVE_P.
(DISPLAY_TERMINAL_CODING): Rename to DEVICE_TERMINAL_CODING.
(DISPLAY_KEYBOARD_CODING): Rename to DEVICE_KEYBOARD_CODING.
* src/frame.h (stuct frame): Rename `display' member to `device'.
* src/xterm.h (x_display_info): Rename member `frame_display' to `device'.
* src/termchar.h (struct tty_display_info): Rename `display' member to `device'.
* src/keyboard.c (push_display_kboard): Rename to push_device_kboard.
* lisp/frame.el (make-frame): Rename frame parameter `display-id' to `device'.
* src/frame.c (Fmake_terminal_frame): Ditto.
* src/xfns.c (Fx_create_frame): Ditto.
* src/term.c (display_list): Rename to device_list.
* src/term.c (initial_display): Rename to initial_device.
* src/term.c (next_display_id): Rename to next_device_id.
* src/term.c (get_display): Rename to get_device.
* src/term.c (get_tty_display): Rename to get_tty_device.
* src/term.c (get_named_tty_display): Rename to get_named_tty.
* src/term.c (init_initial_display): Rename to init_initial_device.
* src/term.c (delete_initial_display): Rename to delete_initial_device.
* src/term.c (create_display): Rename to create_device.
* src/term.c (delete_display): Rename to delete_device.
* src/xfns.c (check_x_display_info): Document that the function allows
display ids as well.
* src/xterm.c (x_delete_frame_display): Rename to x_delete_device.
* src/xterm.c (x_create_frame_display): Rename to x_create_device.
* src/coding.c: Update.
* src/dispextern.h: Update.
* src/data.c: Update.
* src/dispnew.c: Update.
* src/frame.c: Update.
* src/frame.h: Update.
* src/keyboard.c: Update.
* src/keyboard.h: Update.
* src/lisp.h: Update.
* src/sysdep.c: Update.
* src/term.c: Update.
* src/xdisp.c: Update.
* src/xselect.c: Update.
* src/xterm.c: Update.
* src/prefix-args.c: Include stdlib.h for exit.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-382
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Mon, 11 Jul 2005 00:05:55 +0000 |
parents | 6c13700d1c13 |
children | 532e0a9335a9 |
comparison
equal
deleted
inserted
replaced
83341:76e51706154e | 83342:9216636c02fc |
---|---|
7305 } | 7305 } |
7306 | 7306 |
7307 DEFUN ("set-terminal-coding-system-internal", Fset_terminal_coding_system_internal, | 7307 DEFUN ("set-terminal-coding-system-internal", Fset_terminal_coding_system_internal, |
7308 Sset_terminal_coding_system_internal, 1, 2, 0, | 7308 Sset_terminal_coding_system_internal, 1, 2, 0, |
7309 doc: /* Internal use only. */) | 7309 doc: /* Internal use only. */) |
7310 (coding_system, display) | 7310 (coding_system, device) |
7311 Lisp_Object coding_system; | 7311 Lisp_Object coding_system; |
7312 Lisp_Object display; | 7312 Lisp_Object device; |
7313 { | 7313 { |
7314 struct coding_system *terminal_coding = DISPLAY_TERMINAL_CODING (get_display (display, 1)); | 7314 struct coding_system *terminal_coding = DEVICE_TERMINAL_CODING (get_device (device, 1)); |
7315 CHECK_SYMBOL (coding_system); | 7315 CHECK_SYMBOL (coding_system); |
7316 setup_coding_system (Fcheck_coding_system (coding_system), terminal_coding); | 7316 setup_coding_system (Fcheck_coding_system (coding_system), terminal_coding); |
7317 /* We had better not send unsafe characters to terminal. */ | 7317 /* We had better not send unsafe characters to terminal. */ |
7318 terminal_coding->mode |= CODING_MODE_INHIBIT_UNENCODABLE_CHAR; | 7318 terminal_coding->mode |= CODING_MODE_INHIBIT_UNENCODABLE_CHAR; |
7319 /* Character composition should be disabled. */ | 7319 /* Character composition should be disabled. */ |
7343 return Qnil; | 7343 return Qnil; |
7344 } | 7344 } |
7345 | 7345 |
7346 DEFUN ("terminal-coding-system", Fterminal_coding_system, | 7346 DEFUN ("terminal-coding-system", Fterminal_coding_system, |
7347 Sterminal_coding_system, 0, 1, 0, | 7347 Sterminal_coding_system, 0, 1, 0, |
7348 doc: /* Return coding system specified for terminal output on the given display. | 7348 doc: /* Return coding system specified for terminal output on the given device. |
7349 DISPLAY may be a display id, a frame, or nil for the selected frame's display. */) | 7349 DEVICE may be a display device id, a frame, or nil for the selected |
7350 (display) | 7350 frame's display device. */) |
7351 Lisp_Object display; | 7351 (device) |
7352 { | 7352 Lisp_Object device; |
7353 return DISPLAY_TERMINAL_CODING (get_display (display, 1))->symbol; | 7353 { |
7354 return DEVICE_TERMINAL_CODING (get_device (device, 1))->symbol; | |
7354 } | 7355 } |
7355 | 7356 |
7356 DEFUN ("set-keyboard-coding-system-internal", Fset_keyboard_coding_system_internal, | 7357 DEFUN ("set-keyboard-coding-system-internal", Fset_keyboard_coding_system_internal, |
7357 Sset_keyboard_coding_system_internal, 1, 2, 0, | 7358 Sset_keyboard_coding_system_internal, 1, 2, 0, |
7358 doc: /* Internal use only. */) | 7359 doc: /* Internal use only. */) |
7359 (coding_system, display) | 7360 (coding_system, device) |
7360 Lisp_Object coding_system; | 7361 Lisp_Object coding_system; |
7361 Lisp_Object display; | 7362 Lisp_Object device; |
7362 { | 7363 { |
7363 struct display *d = get_display (display, 1); | 7364 struct device *d = get_device (device, 1); |
7364 CHECK_SYMBOL (coding_system); | 7365 CHECK_SYMBOL (coding_system); |
7365 | 7366 |
7366 setup_coding_system (Fcheck_coding_system (coding_system), | 7367 setup_coding_system (Fcheck_coding_system (coding_system), |
7367 DISPLAY_KEYBOARD_CODING (d)); | 7368 DEVICE_KEYBOARD_CODING (d)); |
7368 /* Character composition should be disabled. */ | 7369 /* Character composition should be disabled. */ |
7369 DISPLAY_KEYBOARD_CODING (d)->composing = COMPOSITION_DISABLED; | 7370 DEVICE_KEYBOARD_CODING (d)->composing = COMPOSITION_DISABLED; |
7370 return Qnil; | 7371 return Qnil; |
7371 } | 7372 } |
7372 | 7373 |
7373 DEFUN ("keyboard-coding-system", Fkeyboard_coding_system, | 7374 DEFUN ("keyboard-coding-system", Fkeyboard_coding_system, |
7374 Skeyboard_coding_system, 0, 1, 0, | 7375 Skeyboard_coding_system, 0, 1, 0, |
7375 doc: /* Return coding system specified for decoding keyboard input. */) | 7376 doc: /* Return coding system specified for decoding keyboard input. */) |
7376 (display) | 7377 (device) |
7377 Lisp_Object display; | 7378 Lisp_Object device; |
7378 { | 7379 { |
7379 return DISPLAY_KEYBOARD_CODING (get_display (display, 1))->symbol; | 7380 return DEVICE_KEYBOARD_CODING (get_device (device, 1))->symbol; |
7380 } | 7381 } |
7381 | 7382 |
7382 | 7383 |
7383 DEFUN ("find-operation-coding-system", Ffind_operation_coding_system, | 7384 DEFUN ("find-operation-coding-system", Ffind_operation_coding_system, |
7384 Sfind_operation_coding_system, 1, MANY, 0, | 7385 Sfind_operation_coding_system, 1, MANY, 0, |