(X_WINDOWS_SUPPORT): Don't include term/x-win.

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

diff --git a/src/window.h b/src/window.h
index 6458fd3..9ad66e1 100644 (file)
--- a/src/window.h
+++ b/src/window.h
@@ -1,5 +1,5 @@
 /* Window definitions for GNU Emacs.
-   Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1993 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -123,6 +123,13 @@ struct window
     Lisp_Object last_modified;
     /* Value of point at that time */
     Lisp_Object last_point;
+    /* This window's vertical scroll bar.  This field is only for use
+       by the window-system-dependent code which implements the
+       scroll bars; it can store anything it likes here.  If this
+       window is newly created and we haven't displayed a scroll bar in
+       it yet, or if the frame doesn't have any scroll bars, this is nil.  */
+    Lisp_Object vertical_scroll_bar;
+
 /* The rest are currently not used or only half used */
     /* Frame coords of point at that time */
     Lisp_Object last_point_x;
@@ -152,6 +159,17 @@ struct window
     Lisp_Object display_table;
     /* Non-nil means window is marked as dedicated.  */
     Lisp_Object dedicated;
+    /* Line number and position of a line somewhere above the
+       top of the screen.  */
+    /* If this field is nil, it means we don't have a base line.  */
+    Lisp_Object base_line_number;
+    /* If this field is nil, it means we don't have a base line.
+       If it is a buffer, it means don't display the line number
+       as long as the window shows that buffer.  */
+    Lisp_Object base_line_pos;
+    /* If we have highlighted the region (or any part of it),
+       this is the mark position that we used, as an integer.  */
+    Lisp_Object region_showing;
   };
 
 /* 1 if W is a minibuffer window.  */
@@ -202,6 +220,9 @@ extern Lisp_Object Fnext_window ();
 extern Lisp_Object Fselect_window ();
 extern Lisp_Object Fdisplay_buffer ();
 extern Lisp_Object Fset_window_buffer ();
+extern Lisp_Object make_window ();
+extern Lisp_Object window_from_coordinates ();
+extern Lisp_Object Fwindow_dedicated_p ();
 
 /* Prompt to display in front of the minibuffer contents.  */
 extern char *minibuf_prompt;
@@ -215,6 +236,15 @@ extern int minibuf_prompt_width;
    minibuf_prompt as well as the buffer.  */
 extern char *echo_area_glyphs;
 
+/* This is the length of the message in echo_area_glyphs.  */
+extern int echo_area_glyphs_length;
+
+/* Value of echo_area_glyphs when it was last acted on.
+  If this is nonzero, there is a message on the frame
+  in the minibuffer and it should be erased as soon
+  as it is no longer requested to appear. */
+extern char *previous_echo_glyphs;
+
 /* Depth in recursive edits.  */
 extern int command_loop_level;