summaryrefslogtreecommitdiff
path: root/src/termchar.h
diff options
context:
space:
mode:
authorKaroly Lorentey <lorentey@elte.hu>2004-01-02 02:54:17 +0000
committerKaroly Lorentey <lorentey@elte.hu>2004-01-02 02:54:17 +0000
commit7b00d185eba8e01f191a69740e3270c88f88159c (patch)
tree1bddf818e98404035261883f3cbfc5e4c80f40bf /src/termchar.h
parentdaf0170133e658c41f3ae2fc8558c5ab74227c1d (diff)
downloademacs-7b00d185eba8e01f191a69740e3270c88f88159c.tar.gz
emacs-7b00d185eba8e01f191a69740e3270c88f88159c.tar.bz2
emacs-7b00d185eba8e01f191a69740e3270c88f88159c.zip
MULTI_KBOARD support for ttys. Input-related bugfixes for X+tty sessions.
lib-src/emacsclient.c (pty_conversation): Fix errno check for read from fileno(in). src/config.in: Unconditionally define MULTI_KBOARD. src/frame.c (make_terminal_frame): Initialize f->kboard. src/keyboard.c (cmd_error_internal): Don't kill Emacs if a Quit was pressed on the tty of a X+tty session. (read_avail_input): Initialize nread to zero. Abort if there is no tty after a termcap read. (interrupt_signal)[USG]: Always reset signal handler. (init_keyboard): Always set signal handler for SIGINT/SIGQUIT if noninteractive. src/term.c (term_dummy_init): Initialize kboard to the initial_kboard. (term_init): Free component structures of the initial tty. Clear xmalloced structures. Moved rif initialization to syms_of_term. (term_init)[MULTI_KBOARD]: Initialize tty->kboard. (delete_tty)[MULTI_KBOARD]: Delete the keyboard. (syms_of_term): Initialize tty_display_method_template. src/termchar.h (tty_output)[MULTI_KBOARD]: Added kboard member. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-31
Diffstat (limited to 'src/termchar.h')
-rw-r--r--src/termchar.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/termchar.h b/src/termchar.h
index c54c1dde061..5b9082917fb 100644
--- a/src/termchar.h
+++ b/src/termchar.h
@@ -182,6 +182,11 @@ struct tty_display_info
/* This is a copy of struct frame's display_method value; needed for
freeing up memory when deleting the tty. */
struct display_method *display_method;
+
+#ifdef MULTI_KBOARD
+ /* The terminal's keyboard object. */
+ struct kboard *kboard;
+#endif
};
/* A chain of structures for all tty devices currently in use. */