X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/36a305a723c63fd345be65c536c52fe9765c14be..5dda54d600664bdff6b9e76773c4f29fd7e39915:/src/terminal.c
diff --git a/src/terminal.c b/src/terminal.c
index 2c0c60e734..23455262cb 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -1,5 +1,5 @@
/* Functions related to terminal devices.
- Copyright (C) 2005-2012 Free Software Foundation, Inc.
+ Copyright (C) 2005-2014 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -18,8 +18,6 @@ along with GNU Emacs. If not, see . */
#include
-#define TERMHOOKS_INLINE EXTERN_INLINE
-
#include
#include "lisp.h"
@@ -39,6 +37,8 @@ static int next_terminal_id;
/* The initial terminal device, created by initial_term_init. */
struct terminal *initial_terminal;
+static Lisp_Object Qterminal_live_p;
+
static void delete_initial_terminal (struct terminal *);
/* This setter is used only in this file, so it can be private. */
@@ -199,11 +199,11 @@ ins_del_lines (struct frame *f, int vpos, int n)
/* 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,
+ current frame. If THROW is false, return NULL for failure,
otherwise throw an error. */
struct terminal *
-get_terminal (Lisp_Object terminal, int throw)
+get_terminal (Lisp_Object terminal, bool throw)
{
struct terminal *result = NULL;
@@ -224,19 +224,19 @@ get_terminal (Lisp_Object terminal, int throw)
return result;
}
-
-
-/* Create a new terminal object and add it to the terminal list. */
+/* Create a new terminal object of TYPE and add it to the terminal list. RIF
+ may be NULL if this terminal type doesn't support window-based redisplay. */
struct terminal *
-create_terminal (void)
+create_terminal (enum output_method type, struct redisplay_interface *rif)
{
struct terminal *terminal = allocate_terminal ();
Lisp_Object terminal_coding, keyboard_coding;
terminal->next_terminal = terminal_list;
terminal_list = terminal;
-
+ terminal->type = type;
+ terminal->rif = rif;
terminal->id = next_terminal_id++;
terminal->keyboard_coding = xmalloc (sizeof (struct coding_system));
@@ -280,7 +280,7 @@ delete_terminal (struct terminal *terminal)
xfree (terminal->name);
terminal->name = NULL;
- /* Check for live frames that are still on this terminal. */
+ /* Check for live frames that are still on this terminal. */
FOR_EACH_FRAME (tail, frame)
{
struct frame *f = XFRAME (frame);
@@ -360,14 +360,7 @@ If FRAME is nil, the selected frame is used.
The terminal device is represented by its integer identifier. */)
(Lisp_Object frame)
{
- struct terminal *t;
-
- if (NILP (frame))
- frame = selected_frame;
-
- CHECK_LIVE_FRAME (frame);
-
- t = FRAME_TERMINAL (XFRAME (frame));
+ struct terminal *t = FRAME_TERMINAL (decode_live_frame (frame));
if (!t)
return Qnil;
@@ -405,8 +398,6 @@ possible return values. */)
return Qw32;
case output_msdos_raw:
return Qpc;
- case output_mac:
- return Qmac;
case output_ns:
return Qns;
default:
@@ -509,7 +500,15 @@ selected frame's terminal). */)
return store_terminal_param (t, parameter, value);
}
-
+/* Initial frame has no device-dependent output data, but has
+ face cache which should be freed when the frame is deleted. */
+
+static void
+initial_free_frame_resources (struct frame *f)
+{
+ eassert (FRAME_INITIAL_P (f));
+ free_frame_faces (f);
+}
/* Create the bootstrap display terminal for the initial frame.
Returns a terminal of type output_initial. */
@@ -520,12 +519,12 @@ init_initial_terminal (void)
if (initialized || terminal_list || tty_list)
emacs_abort ();
- initial_terminal = create_terminal ();
- initial_terminal->type = output_initial;
+ initial_terminal = create_terminal (output_initial, NULL);
initial_terminal->name = xstrdup ("initial_terminal");
initial_terminal->kboard = initial_kboard;
initial_terminal->delete_terminal_hook = &delete_initial_terminal;
- /* All other hooks are NULL. */
+ initial_terminal->delete_frame_hook = &initial_free_frame_resources;
+ /* Other hooks are NULL by default. */
return initial_terminal;
}
@@ -558,6 +557,8 @@ Each function is called with argument, the terminal.
This may be called just before actually deleting the terminal,
or some time later. */);
Vdelete_terminal_functions = Qnil;
+
+ DEFSYM (Qterminal_live_p, "terminal-live-p");
DEFSYM (Qdelete_terminal_functions, "delete-terminal-functions");
DEFSYM (Qrun_hook_with_args, "run-hook-with-args");