1 files changed, 50 insertions, 50 deletions

diff --git a/src/termhooks.h b/src/termhooks.h
index c925a85b484..7045d6ee1e3 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -1,4 +1,4 @@
-/* Parameters and display hooks for output devices.
+/* Parameters and display hooks for terminal devices.
    Copyright (C) 1985, 1986, 1993, 1994, 2002, 2003, 2004,
                  2005 Free Software Foundation, Inc.
 
@@ -288,30 +288,30 @@ enum {
 #endif /* CONSP */
 
 
-/* Device-local parameters. */
-struct device
+/* Terminal-local parameters. */
+struct terminal
 {
-  /* Chain of all display devices. */
-  struct device *next_device;
+  /* Chain of all terminal devices. */
+  struct terminal *next_terminal;
 
-  /* Unique id for this display device. */
+  /* Unique id for this terminal device. */
   int id;
 
-  /* The number of frames that are on this device. */
+  /* The number of frames that are on this terminal. */
   int reference_count;
   
-  /* The type of the display device. */
+  /* The type of the terminal device. */
   enum output_method type;
 
-  /* The name of the display device.  Do not use this to identify the device. */
+  /* The name of the terminal device.  Do not use this to identify the device. */
   char *name;
 
 #ifdef MULTI_KBOARD
-  /* The device's keyboard object. */
+  /* The terminal's keyboard object. */
   struct kboard *kboard;
 #endif
 
-  /* Device-type dependent data shared amongst all frames on this display. */
+  /* Device-type dependent data shared amongst all frames on this terminal. */
   union display_info
   {
     struct tty_display_info *tty;     /* termchar.h */
@@ -381,8 +381,8 @@ struct device
   
   void (*ring_bell_hook) P_ ((struct frame *f));
   
-  void (*reset_terminal_modes_hook) P_ ((struct device *));
-  void (*set_terminal_modes_hook) P_ ((struct device *));
+  void (*reset_terminal_modes_hook) P_ ((struct terminal *));
+  void (*set_terminal_modes_hook) P_ ((struct terminal *));
 
   void (*update_begin_hook) P_ ((struct frame *));
   void (*update_end_hook) P_ ((struct frame *));
@@ -428,7 +428,7 @@ struct device
   /* If we're displaying frames using a window system that can stack
      frames on top of each other, this hook allows you to bring a frame
      to the front, or bury it behind all the other windows.  If this
-     hook is zero, that means the device we're displaying on doesn't
+     hook is zero, that means the terminal we're displaying on doesn't
      support overlapping frames, so there's no need to raise or lower
      anything.
      
@@ -512,10 +512,10 @@ struct device
 
   /* Called to read input events.
 
-     DEVICE indicates which display device to read from.  Input events
-     should be read into BUF, the size of which is given in SIZE.
-     EXPECTED is non-zero if the caller suspects that new input is
-     available.
+     TERMINAL indicates which terminal device to read from.  Input
+     events should be read into BUF, the size of which is given in
+     SIZE.  EXPECTED is non-zero if the caller suspects that new input
+     is available.
 
      A positive return value indicates that that many input events
      where read into BUF.
@@ -525,11 +525,11 @@ struct device
 
      XXX Please note that a non-zero value of EXPECTED only means that
      there is available input on at least one of the currently opened
-     display devices -- but not necessarily on this device.
+     terminal devices -- but not necessarily on this device.
      Therefore, in most cases EXPECTED should be simply ignored.
 
      XXX This documentation needs to be updated.  */
-  int (*read_socket_hook) P_ ((struct device *device,
+  int (*read_socket_hook) P_ ((struct terminal *terminal,
                                int expected,
                                struct input_event *hold_quit));
 
@@ -538,43 +538,43 @@ struct device
 
 
   /* Called to delete the device-specific portions of a frame that is
-     on this display device. */
+     on this terminal device. */
   void (*delete_frame_hook) P_ ((struct frame *));
 
-  /* Called after the last frame on this device is deleted, or when
+  /* Called after the last frame on this terminal is deleted, or when
      the display device was closed (hangup).
      
-     If this is NULL, then the generic delete_device is called
-     instead.  Otherwise the hook must call delete_device itself.
+     If this is NULL, then the generic delete_terminal is called
+     instead.  Otherwise the hook must call delete_terminal itself.
 
      The hook must check for and close any live frames that are still
-     on the device.  Fdelete_frame ensures that there are no live
-     frames on the device when it calls this hook, so infinite
+     on the terminal.  Fdelete_frame ensures that there are no live
+     frames on the terminal when it calls this hook, so infinite
      recursion is prevented.  */
-  void (*delete_device_hook) P_ ((struct device *));
+  void (*delete_terminal_hook) P_ ((struct terminal *));
 };
 
 
-/* Chain of all display devices currently in use. */
-extern struct device *device_list;
+/* Chain of all terminal devices currently in use. */
+extern struct terminal *terminal_list;
 
-#define FRAME_MUST_WRITE_SPACES(f) ((f)->device->must_write_spaces)
-#define FRAME_FAST_CLEAR_END_OF_LINE(f) ((f)->device->fast_clear_end_of_line)
-#define FRAME_LINE_INS_DEL_OK(f) ((f)->device->line_ins_del_ok)
-#define FRAME_CHAR_INS_DEL_OK(f) ((f)->device->char_ins_del_ok)
-#define FRAME_SCROLL_REGION_OK(f) ((f)->device->scroll_region_ok)
-#define FRAME_SCROLL_REGION_COST(f) ((f)->device->scroll_region_cost)
-#define FRAME_MEMORY_BELOW_FRAME(f) ((f)->device->memory_below_frame)
+#define FRAME_MUST_WRITE_SPACES(f) ((f)->terminal->must_write_spaces)
+#define FRAME_FAST_CLEAR_END_OF_LINE(f) ((f)->terminal->fast_clear_end_of_line)
+#define FRAME_LINE_INS_DEL_OK(f) ((f)->terminal->line_ins_del_ok)
+#define FRAME_CHAR_INS_DEL_OK(f) ((f)->terminal->char_ins_del_ok)
+#define FRAME_SCROLL_REGION_OK(f) ((f)->terminal->scroll_region_ok)
+#define FRAME_SCROLL_REGION_COST(f) ((f)->terminal->scroll_region_cost)
+#define FRAME_MEMORY_BELOW_FRAME(f) ((f)->terminal->memory_below_frame)
 
-#define FRAME_TERMINAL_CODING(f) ((f)->device->terminal_coding)
-#define FRAME_KEYBOARD_CODING(f) ((f)->device->keyboard_coding)
+#define FRAME_TERMINAL_CODING(f) ((f)->terminal->terminal_coding)
+#define FRAME_KEYBOARD_CODING(f) ((f)->terminal->keyboard_coding)
 
-#define DEVICE_TERMINAL_CODING(d) ((d)->terminal_coding)
-#define DEVICE_KEYBOARD_CODING(d) ((d)->keyboard_coding)
+#define TERMINAL_TERMINAL_CODING(d) ((d)->terminal_coding)
+#define TERMINAL_KEYBOARD_CODING(d) ((d)->keyboard_coding)
 
-#define FRAME_RIF(f) ((f)->device->rif)
+#define FRAME_RIF(f) ((f)->terminal->rif)
 
-#define FRAME_DEVICE(f) ((f)->device)
+#define FRAME_TERMINAL(f) ((f)->terminal)
 
 /* FRAME_WINDOW_P tests whether the frame is a window, and is
    defined to be the predicate for the window system being used.  */
@@ -592,16 +592,16 @@ extern struct device *device_list;
 #define FRAME_WINDOW_P(f) (0)
 #endif
 
-/* Return true if the display device is not suspended. */
-#define DEVICE_ACTIVE_P(d) ((d)->type != output_termcap || (d)->display_info.tty->input)
+/* Return true if the terminal device is not suspended. */
+#define TERMINAL_ACTIVE_P(d) ((d)->type != output_termcap || (d)->display_info.tty->input)
 
-extern Lisp_Object get_terminal_param P_ ((struct device *, Lisp_Object));
-extern struct device *get_device P_ ((Lisp_Object display, int));
-extern struct device *create_device P_ ((void));
-extern void delete_device P_ ((struct device *));
+extern Lisp_Object get_terminal_param P_ ((struct terminal *, Lisp_Object));
+extern struct terminal *get_terminal P_ ((Lisp_Object terminal, int));
+extern struct terminal *create_terminal P_ ((void));
+extern void delete_terminal P_ ((struct terminal *));
 
-/* The initial display device, created by initial_term_init. */
-extern struct device *initial_device;
+/* The initial terminal device, created by initial_term_init. */
+extern struct terminal *initial_terminal;
 
 /* arch-tag: 33a00ecc-52b5-4186-a410-8801ac9f087d
    (do not change this comment) */