$TERM is now set to dumb.

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

diff --git a/src/xterm.h b/src/xterm.h
index 1f2e7a0..c8b768f 100644 (file)
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)

 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,


@@ -149,6 +149,9 @@ struct x_display_info
   /* Chain of all x_display_info structures.  */
   struct x_display_info *next;
 
   /* Chain of all x_display_info structures.  */
   struct x_display_info *next;
 

+  /* The generic display parameters corresponding to this X display. */
+  struct terminal *terminal;
+

   /* Connection number (normally a file descriptor number).  */
   int connection;
 
   /* Connection number (normally a file descriptor number).  */
   int connection;
 


@@ -253,7 +256,7 @@ struct x_display_info
   char *x_id_name;
 
   /* The number of fonts actually stored in x_font_table.
   char *x_id_name;
 
   /* The number of fonts actually stored in x_font_table.

-     font_table[n] is used and valid iff 0 <= n < n_fonts.  0 <=
+     font_table[n] is used and valid if 0 <= n < n_fonts.  0 <=

      n_fonts <= font_table_size and font_table[i].name != 0.  */
   int n_fonts;
 
      n_fonts <= font_table_size and font_table[i].name != 0.  */
   int n_fonts;
 


@@ -327,9 +330,6 @@ struct x_display_info
   /* Atom used in toolkit scroll bar client messages.  */
   Atom Xatom_Scrollbar;
 
   /* Atom used in toolkit scroll bar client messages.  */
   Atom Xatom_Scrollbar;
 

-#ifdef MULTI_KBOARD
-  struct kboard *kboard;
-#endif

   int cut_buffers_initialized; /* Whether we're sure they all exist */
 
   /* The frame (if any) which has the X window that has keyboard focus.
   int cut_buffers_initialized; /* Whether we're sure they all exist */
 
   /* The frame (if any) which has the X window that has keyboard focus.


@@ -532,8 +532,10 @@ struct x_output
 
   /* Pixel values used for various purposes.
      border_pixel may be -1 meaning use a gray tile.  */
 
   /* Pixel values used for various purposes.
      border_pixel may be -1 meaning use a gray tile.  */

+#if 0 /* These are also defined in struct frame.  Use that instead.  */

   unsigned long background_pixel;
   unsigned long foreground_pixel;
   unsigned long background_pixel;
   unsigned long foreground_pixel;

+#endif

   unsigned long cursor_pixel;
   unsigned long border_pixel;
   unsigned long mouse_pixel;
   unsigned long cursor_pixel;
   unsigned long border_pixel;
   unsigned long mouse_pixel;


@@ -807,6 +809,12 @@ struct scroll_bar
      place where the user grabbed it.  If the handle isn't currently
      being dragged, this is Qnil.  */
   Lisp_Object dragging;
      place where the user grabbed it.  If the handle isn't currently
      being dragged, this is Qnil.  */
   Lisp_Object dragging;

+
+#ifdef USE_TOOLKIT_SCROLL_BARS
+  /* t if the background of the fringe that is adjacent to a scroll
+     bar is extended to the gap between the fringe and the bar.  */
+  Lisp_Object fringe_extended_p;
+#endif

 };
 
 /* The number of elements a vector holding a struct scroll_bar needs.  */
 };
 
 /* The number of elements a vector holding a struct scroll_bar needs.  */


@@ -984,7 +992,6 @@ extern int x_had_errors_p P_ ((Display *));
 extern int x_catching_errors P_ ((void));
 extern void x_uncatch_errors P_ ((void));
 extern void x_clear_errors P_ ((Display *));
 extern int x_catching_errors P_ ((void));
 extern void x_uncatch_errors P_ ((void));
 extern void x_clear_errors P_ ((Display *));

-extern void x_fully_uncatch_errors P_ ((void));

 extern void x_set_window_size P_ ((struct frame *, int, int, int));
 extern void x_set_mouse_position P_ ((struct frame *, int, int));
 extern void x_set_mouse_pixel_position P_ ((struct frame *, int, int));
 extern void x_set_window_size P_ ((struct frame *, int, int, int));
 extern void x_set_mouse_position P_ ((struct frame *, int, int));
 extern void x_set_mouse_pixel_position P_ ((struct frame *, int, int));


@@ -1000,6 +1007,7 @@ extern void x_wm_set_size_hint P_ ((struct frame *, long, int));
 extern void x_wm_set_window_state P_ ((struct frame *, int));
 extern void x_wm_set_icon_pixmap P_ ((struct frame *, int));
 extern void x_delete_display P_ ((struct x_display_info *));
 extern void x_wm_set_window_state P_ ((struct frame *, int));
 extern void x_wm_set_icon_pixmap P_ ((struct frame *, int));
 extern void x_delete_display P_ ((struct x_display_info *));

+extern void x_delete_terminal P_ ((struct terminal *terminal));

 extern void x_initialize P_ ((void));
 extern unsigned long x_copy_color P_ ((struct frame *, unsigned long));
 #ifdef USE_X_TOOLKIT
 extern void x_initialize P_ ((void));
 extern unsigned long x_copy_color P_ ((struct frame *, unsigned long));
 #ifdef USE_X_TOOLKIT


@@ -1100,6 +1108,7 @@ extern void widget_store_internal_border P_ ((Widget));
 extern void x_session_initialize P_ ((struct x_display_info *dpyinfo));
 extern int x_session_check_input P_ ((struct input_event *bufp));
 extern int x_session_have_connection P_ ((void));
 extern void x_session_initialize P_ ((struct x_display_info *dpyinfo));
 extern int x_session_check_input P_ ((struct input_event *bufp));
 extern int x_session_have_connection P_ ((void));

+extern void x_session_close P_ ((void));

 #endif
 
 #define FONT_TYPE_FOR_UNIBYTE(font, ch) 0
 #endif
 
 #define FONT_TYPE_FOR_UNIBYTE(font, ch) 0