Mercurial > emacs
comparison src/termhooks.h @ 83298:ed09a89e2b25
Fix UTF-8 tty input when first frame is an X frame. Steps towards multiple tty locale support.
* lisp/international/mule-cmds.el (set-locale-environment): Ignore
window-system; always set the keyboard coding system.
* src/termhooks.h (DISPLAY_TERMINAL_CODING, DISPLAY_KEYBOARD_CODING): New macros.
* src/coding.c (Fset_terminal_coding_system_internal, Fterminal_coding_system)
(Fset_keyboard_coding_system_internal, Fkeyboard_coding_system): Add DISPLAY
parameter.
* src/term.c (get_display): Add THROW parameter.
(get_tty_display, Fdisplay_name, Fdisplay_tty_type, Fdisplay_controlling_tty_p)
(Fdelete_display, Fdisplay_live_p): Update callers.
* src/xfns.c (check_x_display_info): Ditto.
* src/frame.c (Fmake_terminal_frame, Fframe_display): Ditto.
* src/dispextern.h (get_display): Update prototype.
* lisp/international/mule.el (set-terminal-coding-system)
(set-keyboard-coding-system): Add DISPLAY parameter.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-338
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Tue, 03 May 2005 01:49:33 +0000 |
| parents | 2c2b97b30980 |
| children | 61487e73bbc2 |
comparison
equal
deleted
inserted
replaced
| 83297:8e357d90cc9f | 83298:ed09a89e2b25 |
|---|---|
| 548 #define FRAME_MEMORY_BELOW_FRAME(f) ((f)->display->memory_below_frame) | 548 #define FRAME_MEMORY_BELOW_FRAME(f) ((f)->display->memory_below_frame) |
| 549 | 549 |
| 550 #define FRAME_TERMINAL_CODING(f) ((f)->display->terminal_coding) | 550 #define FRAME_TERMINAL_CODING(f) ((f)->display->terminal_coding) |
| 551 #define FRAME_KEYBOARD_CODING(f) ((f)->display->keyboard_coding) | 551 #define FRAME_KEYBOARD_CODING(f) ((f)->display->keyboard_coding) |
| 552 | 552 |
| 553 #define DISPLAY_TERMINAL_CODING(d) ((d)->terminal_coding) | |
| 554 #define DISPLAY_KEYBOARD_CODING(d) ((d)->keyboard_coding) | |
| 555 | |
| 553 #define FRAME_RIF(f) ((f)->display->rif) | 556 #define FRAME_RIF(f) ((f)->display->rif) |
| 554 | 557 |
| 555 #define FRAME_DISPLAY(f) ((f)->display) | 558 #define FRAME_DISPLAY(f) ((f)->display) |
| 556 | 559 |
| 557 /* FRAME_WINDOW_P tests whether the frame is a window, and is | 560 /* FRAME_WINDOW_P tests whether the frame is a window, and is |