Rename `struct device' to `struct terminal'. Rename some terminal-related functions...

[bpt/emacs.git] / src / termchar.h

diff --git a/src/termchar.h b/src/termchar.h
index 5502ca2..f4b58f1 100644 (file)
--- a/src/termchar.h
+++ b/src/termchar.h
@@ -1,5 +1,6 @@
 /* Flags and parameters describing terminal's characteristics.
-   Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Each termcap frame points to its own struct tty_output object in
    the output_data.tty field.  The tty_output structure contains the
@@ -57,9 +58,9 @@ struct tty_display_info
 
   int reference_count;          /* Number of frames that are on this display. */
 
-  struct display *display;      /* Points back to the generic display
+  struct terminal *terminal;    /* Points back to the generic terminal
                                    structure.  This is sometimes handy. */
-  
+
   /* Info on cursor positioning.  */
   struct cm *Wcm;
 
@@ -70,11 +71,6 @@ struct tty_display_info
   /* The previous terminal frame we displayed on this tty.  */
   struct frame *previous_terminal_frame;
 
-#ifdef MULTI_KBOARD
-  /* The terminal's keyboard object. */
-  struct kboard *kboard;
-#endif  
-
   /* Strings, numbers and flags taken from the termcap entry.  */
 
   char *TS_ins_line;           /* "al" */
@@ -198,7 +194,7 @@ extern struct tty_display_info *tty_list;
 
 #define FRAME_TTY(f)                            \
   ((f)->output_method == output_termcap         \
-   ? (f)->display->display_info.tty             \
+   ? (f)->terminal->display_info.tty            \
    : (abort(), (struct tty_display_info *) 0))
 
 #define CURTTY() FRAME_TTY (SELECTED_FRAME())