/* Functions related to terminal devices.
- Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
#include <config.h>
#include <stdio.h>
+#include <setjmp.h>
#include "lisp.h"
#include "frame.h"
\f
-/* Return the terminal object specified by TERMINAL. TERMINAL may be a
- terminal id, a frame, or nil for the terminal device of the current
- frame. If THROW is zero, return NULL for failure, otherwise throw
- an error. */
+/* Return the terminal object specified by TERMINAL. TERMINAL may be
+ a terminal object, a frame, or nil for the terminal device of the
+ current frame. If THROW is zero, return NULL for failure,
+ otherwise throw an error. */
struct terminal *
get_terminal (Lisp_Object terminal, int throw)
if (TERMINALP (terminal))
result = XTERMINAL (terminal);
-
else if (FRAMEP (terminal))
- {
- result = FRAME_TERMINAL (XFRAME (terminal));
- }
+ result = FRAME_TERMINAL (XFRAME (terminal));
if (result && !result->name)
result = NULL;
create_terminal (void)
{
struct terminal *terminal = allocate_terminal ();
+ Lisp_Object terminal_coding, keyboard_coding;
terminal->name = NULL;
terminal->next_terminal = terminal_list;
terminal->terminal_coding =
(struct coding_system *) xmalloc (sizeof (struct coding_system));
- setup_coding_system (Qno_conversion, terminal->keyboard_coding);
- setup_coding_system (Qundecided, terminal->terminal_coding);
+ /* If default coding systems for the terminal and the keyboard are
+ already defined, use them in preference to the defaults. This is
+ needed when Emacs runs in daemon mode. */
+ keyboard_coding = SYMBOL_VALUE (intern ("default-keyboard-coding-system"));
+ if (NILP (keyboard_coding)
+ || EQ (keyboard_coding, Qunbound)
+ || NILP (Fcoding_system_p (keyboard_coding)))
+ keyboard_coding = Qno_conversion;
+ terminal_coding = SYMBOL_VALUE (intern ("default-terminal-coding-system"));
+ if (NILP (terminal_coding)
+ || EQ (terminal_coding, Qunbound)
+ || NILP (Fcoding_system_p (terminal_coding)))
+ terminal_coding = Qundecided;
+
+ setup_coding_system (keyboard_coding, terminal->keyboard_coding);
+ setup_coding_system (terminal_coding, terminal->terminal_coding);
terminal->param_alist = Qnil;
return terminal;
struct terminal **tp;
Lisp_Object tail, frame;
- /* Protect against recursive calls. Fdelete_frame calls the
+ /* Protect against recursive calls. delete_frame calls the
delete_terminal_hook when we delete our last frame. */
if (!terminal->name)
return;
struct frame *f = XFRAME (frame);
if (FRAME_LIVE_P (f) && f->terminal == terminal)
{
- /* Maybe this should pass Qnoelisp rather than Qt? */
- Fdelete_frame (frame, Qt);
+ /* Pass Qnoelisp rather than Qt. */
+ delete_frame (frame, Qnoelisp);
}
}
terminal->keyboard_coding = NULL;
xfree (terminal->terminal_coding);
terminal->terminal_coding = NULL;
-
+
if (terminal->kboard && --terminal->kboard->reference_count == 0)
{
delete_kboard (terminal->kboard);
DEFUN ("delete-terminal", Fdelete_terminal, Sdelete_terminal, 0, 2, 0,
doc: /* Delete TERMINAL by deleting all frames on it and closing the terminal.
-TERMINAL may be a terminal id, a frame, or nil (meaning the selected
-frame's terminal).
+TERMINAL may be a terminal object, a frame, or nil (meaning the
+selected frame's terminal).
Normally, you may not delete a display if all other displays are suspended,
but if the second argument FORCE is non-nil, you may do so. */)
struct terminal *p = terminal_list;
while (p && (p == t || !TERMINAL_ACTIVE_P (p)))
p = p->next_terminal;
-
+
if (!p)
error ("Attempt to delete the sole active display terminal");
}
Lisp_Object object;
{
struct terminal *t;
-
+
t = get_terminal (object, 0);
if (!t)
doc: /* Return the name of the terminal device TERMINAL.
It is not guaranteed that the returned value is unique among opened devices.
-TERMINAL may be a terminal id, a frame, or nil (meaning the
+TERMINAL may be a terminal object, a frame, or nil (meaning the
selected frame's terminal). */)
(terminal)
Lisp_Object terminal;
The value is a list of elements of the form (PARM . VALUE), where PARM
is a symbol.
-TERMINAL can be a terminal id, a frame or nil (meaning the selected
-frame's terminal). */)
+TERMINAL can be a terminal object, a frame, or nil (meaning the
+selected frame's terminal). */)
(terminal)
Lisp_Object terminal;
{
DEFUN ("terminal-parameter", Fterminal_parameter, Sterminal_parameter, 2, 2, 0,
doc: /* Return TERMINAL's value for parameter PARAMETER.
-TERMINAL can be a terminal id, a frame or nil (meaning the selected
-frame's terminal). */)
+TERMINAL can be a terminal object, a frame, or nil (meaning the
+selected frame's terminal). */)
(terminal, parameter)
Lisp_Object terminal;
Lisp_Object parameter;
doc: /* Set TERMINAL's value for parameter PARAMETER to VALUE.
Return the previous value of PARAMETER.
-TERMINAL can be a terminal id, a frame or nil (meaning the selected
-frame's terminal). */)
+TERMINAL can be a terminal object, a frame or nil (meaning the
+selected frame's terminal). */)
(terminal, parameter, value)
Lisp_Object terminal;
Lisp_Object parameter;
This may be called just before actually deleting the terminal,
or some time later. */);
Vdelete_terminal_functions = Qnil;
- Qdelete_terminal_functions = intern ("delete-terminal-functions");
+ Qdelete_terminal_functions = intern_c_string ("delete-terminal-functions");
staticpro (&Qdelete_terminal_functions);
- Qrun_hook_with_args = intern ("run-hook-with-args");
+ Qrun_hook_with_args = intern_c_string ("run-hook-with-args");
staticpro (&Qrun_hook_with_args);
defsubr (&Sdelete_terminal);
defsubr (&Sterminal_parameter);
defsubr (&Sset_terminal_parameter);
- Fprovide (intern ("multi-tty"), Qnil);
+ Fprovide (intern_c_string ("multi-tty"), Qnil);
}
/* arch-tag: e9af6f27-b483-47dc-bb1a-730c1c5cab03
HCoop / bpt / emacs.git / blobdiff