Condense Tramp entries.

[gnu-emacs] / src / window.h

diff --git a/src/window.h b/src/window.h
index aa4b18335ceebdd1bfc6dd194448028c3bb30e83..5f76163231a4ed33431590d543ef8466b3d9bb4d 100644 (file)
--- a/src/window.h
+++ b/src/window.h
@@ -1,5 +1,6 @@
 /* Window definitions for GNU Emacs.
-   Copyright (C) 1985, 1986, 1993, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1993, 1995, 1997, 1998, 1999, 2000, 2001
+   Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -128,10 +129,13 @@ struct window
     /* Non-nil means we have explicitly changed the value of start,
        but that the next redisplay is not obliged to use the new value.
        This is used in Fdelete_other_windows to force a call to
-       Vwindow_scroll_functions.  */
+       Vwindow_scroll_functions; also by Frecenter with argument.  */
     Lisp_Object optional_new_start;
     /* Number of columns display within the window is scrolled to the left.  */
     Lisp_Object hscroll;
+    /* Minimum hscroll for automatic hscrolling.  This is the value
+       the user has set, by set-window-hscroll for example.  */
+    Lisp_Object min_hscroll;
     /* Number saying how recently window was selected */
     Lisp_Object use_time;
     /* Unique number of window assigned when it was created */
@@ -208,7 +212,7 @@ struct window
     /* Original window height and top before mini-window was
        enlarged. */
     Lisp_Object orig_height, orig_top;
-    
+
     /* No Lisp data may follow below this point without changing
        mark_object in alloc.c.  The member current_matrix must be the
        first non-Lisp member.  */
@@ -224,17 +228,17 @@ struct window
     /* Intended cursor position.   This is a position within the
        glyph matrix.  */
     struct cursor_pos cursor;
-    
+
     /* Where the cursor actually is.  */
     struct cursor_pos phys_cursor;
-    
-    /* Cursor type last drawn on the window.  Used for X frames; -1
-       initially.  */
-    int phys_cursor_type;
+
+    /* Cursor type and width of last cursor drawn on the window.
+       Used for X and w32 frames; -1 initially.  */
+    int phys_cursor_type, phys_cursor_width;
 
     /* This is handy for undrawing the cursor.  */
     int phys_cursor_ascent, phys_cursor_height;
-    
+
     /* Non-zero means the cursor is currently displayed.  This can be
        set to zero by functions overpainting the cursor image.  */
     unsigned phys_cursor_on_p : 1;
@@ -257,7 +261,7 @@ struct window
     /* Amount by which lines of this window are scrolled in
        y-direction (smooth scrolling).  */
     int vscroll;
-    
+
     /* Z_BYTE - the buffer position of the last glyph in the current matrix
        of W.  Only valid if WINDOW_END_VALID is not nil.  */
     int window_end_bytepos;
@@ -275,12 +279,12 @@ struct window
 
 /* 1 if W is a minibuffer window.  */
 
-#define MINI_WINDOW_P(W)       (!EQ ((W)->mini_p, Qnil))
+#define MINI_WINDOW_P(W)       (!NILP ((W)->mini_p))
 
 /* Return the window column at which the text in window W starts.
    This is different from the `left' field because it does not include
    a left-hand scroll bar if any.  */
-   
+
 #define WINDOW_LEFT_MARGIN(W) \
      (XFASTINT ((W)->left) \
       + FRAME_LEFT_SCROLL_BAR_WIDTH (XFRAME (WINDOW_FRAME (W))))
@@ -301,16 +305,16 @@ struct window
          ? FRAME_SCROLL_BAR_COLS (XFRAME (WINDOW_FRAME (W))) \
          : 0))
 
-/* 1 if window W takes up the full width of its frame.  */ 
+/* 1 if window W takes up the full width of its frame.  */
 
 #define WINDOW_FULL_WIDTH_P(W) \
      (XFASTINT ((W)->width) == FRAME_WINDOW_WIDTH (XFRAME (WINDOW_FRAME (W))))
 
-/* 1 if window W's has no other windows to its right in its frame.  */ 
+/* 1 if window W's has no other windows to its right in its frame.  */
 
 #define WINDOW_RIGHTMOST_P(W) \
      (WINDOW_RIGHT_EDGE (W) == FRAME_WINDOW_WIDTH (XFRAME (WINDOW_FRAME (W))))
-     
+
 
 /* This is the window in which the terminal's cursor should
    be left when nothing is being done with it.  This must
@@ -334,6 +338,11 @@ extern int window_select_count;
 
 extern Lisp_Object minibuf_window;
 
+/* Non-nil means it is the window whose mode line should be
+   shown as the selected window when the minibuffer is selected.  */
+
+extern Lisp_Object minibuf_selected_window;
+
 /* Non-nil => window to for C-M-v to scroll when the minibuffer is
    selected.  */
 
@@ -365,6 +374,8 @@ EXFUN (Fwindow_hscroll, 1);
 EXFUN (Fset_window_vscroll, 2);
 EXFUN (Fwindow_vscroll, 1);
 EXFUN (Fset_window_margins, 3);
+EXFUN (Fwindow_live_p, 1);
+EXFUN (Fset_window_point, 2);
 extern Lisp_Object make_window P_ ((void));
 extern void delete_window P_ ((Lisp_Object));
 extern Lisp_Object window_from_coordinates P_ ((struct frame *, int, int, int *, int));
@@ -425,6 +436,10 @@ extern int clip_changed;
 
 extern int windows_or_buffers_changed;
 
+/* Nonzero means a frame's cursor type has been changed.  */
+
+extern int cursor_type_changed;
+
 /* Number of windows displaying the selected buffer.  Normally this is
    1, but it can be more.  */
 
@@ -441,4 +456,9 @@ extern void check_frame_size P_ ((struct frame *frame, int *rows, int *cols));
 
 struct glyph *get_phys_cursor_glyph P_ ((struct window *w));
 
+/* Value is non-zero if WINDOW is a live window.  */
+
+#define WINDOW_LIVE_P(WINDOW) \
+     (WINDOWP ((WINDOW)) && !NILP (XWINDOW ((WINDOW))->buffer))
+
 #endif /* not WINDOW_H_INCLUDED */