Imported from /home/lorry/working-area/delta_texinfo-tarball/texinfo-5.2.tar.xz.HEADtexinfo-5.2master

1 files changed, 50 insertions, 28 deletions

diff --git a/info/window.h b/info/window.h
index 648120d..8cb755f 100644
--- a/info/window.h
+++ b/info/window.h
@@ -1,10 +1,8 @@
 /* window.h -- Structure and flags used in manipulating Info windows.
-   $Id: window.h,v 1.12 2008/09/13 10:02:01 gray Exp $
+   $Id: window.h 5337 2013-08-22 17:54:06Z karl $
 
-   This file is part of GNU Info, a program for reading online documentation
-   stored in Info format.
-
-   Copyright (C) 1993, 1997, 2004, 2007 Free Software Foundation, Inc.
+   Copyright 1993, 1997, 2004, 2007, 2011 2013
+   Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,7 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-   Written by Brian Fox (bfox@ai.mit.edu). */
+   Originally written by Brian Fox. */
 
 #ifndef INFO_WINDOW_H
 #define INFO_WINDOW_H
@@ -70,16 +68,18 @@ typedef struct window_struct
 {
   struct window_struct *next;      /* Next window in this chain. */
   struct window_struct *prev;      /* Previous window in this chain. */
-  int width;            /* Width of this window. */
-  int height;           /* Height of this window. */
-  int first_row;        /* Offset of the first line in the_screen. */
-  int goal_column;      /* The column we would like the cursor to appear in. */
+  size_t width;         /* Width of this window. */
+  size_t height;        /* Height of this window. */
+  size_t first_row;     /* Offset of the first line in the_screen. */
+  size_t goal_column;   /* The column we would like the cursor to appear in. */
   Keymap keymap;        /* Keymap used to read commands in this window. */
   WINDOW_STATE_DECL;    /* Node, pagetop and point. */
   LINE_MAP line_map;    /* Current line map */
   char *modeline;       /* Calculated text of the modeline for this window. */
   char **line_starts;   /* Array of printed line starts for this node. */
-  int line_count;       /* Number of lines appearing in LINE_STARTS. */
+  size_t line_count;    /* Number of lines appearing in LINE_STARTS. */
+  size_t *log_line_no;  /* Number of logical line corresponding to each
+			   physical one. */
   int flags;            /* See below for details. */
 } WINDOW;
 
@@ -179,16 +179,25 @@ extern void window_unmark_chain (WINDOW *chain, int flag);
 /* Make WINDOW start displaying at PERCENT percentage of its node. */
 extern void window_goto_percentage (WINDOW *window, int percent);
 
-/* Build a new node which has FORMAT printed with ARG1 and ARG2 as the
+/* Build a new node which has AP printed according to FORMAT as the
    contents. */
-extern NODE *build_message_node (const char *format, void *arg1, void *arg2);
+extern NODE *build_message_node (const char *format, va_list ap);
+
+extern NODE *format_message_node (const char *format, ...)
+  TEXINFO_PRINTFLIKE(1,2);
+
+/* Build a new node with the given CONTENTS.
+   Note: CONTENTS is "stolen", i.e. the pointer to it is saved in the
+   new node. */
+extern NODE *string_to_node (char *contents);
 
 /* Useful functions can be called from outside of window.c. */
 extern void initialize_message_buffer (void);
 
-/* Print FORMAT with ARG1,2 to the end of the current message buffer. */
-extern void printf_to_message_buffer (const char *format, void *arg1, void *arg2,
-    void *arg3);
+/* Print arguments according to FORMAT to the end of the current message
+   buffer. */
+extern void printf_to_message_buffer (const char *format, ...)
+  TEXINFO_PRINTFLIKE(1,2);
 
 /* Convert the contents of the message buffer to a node. */
 extern NODE *message_buffer_to_node (void);
@@ -199,17 +208,27 @@ extern int message_buffer_length_this_line (void);
 /* Pad STRING to COUNT characters by inserting blanks. */
 extern int pad_to (int count, char *string);
 
-/* Make a message appear in the echo area, built from FORMAT, ARG1 and ARG2.
-   The arguments are treated similar to printf () arguments, but not all of
-   printf () hair is present.  The message appears immediately.  If there was
+/* Make a message appear in the echo area, built from arguments formatted
+   according to FORMAT.
+
+   The message appears immediately.  If there was
    already a message appearing in the echo area, it is removed. */
-extern void window_message_in_echo_area (const char *format, void *arg1, void *arg2);
+extern void window_message_in_echo_area (const char *format, ...)
+  TEXINFO_PRINTFLIKE(1,2);
+
+extern void vwindow_message_in_echo_area (const char *format, va_list ap);
 
-/* Place a temporary message in the echo area built from FORMAT, ARG1
-   and ARG2.  The message appears immediately, but does not destroy
+extern void free_echo_area (void);
+
+/* Place a temporary message in the echo area built from arguments
+   formatted as per FORMAT.
+
+   The message appears immediately, but does not destroy
    any existing message.  A future call to unmessage_in_echo_area ()
    restores the old contents. */
-extern void message_in_echo_area (const char *format, void *arg1, void *arg2);
+extern void message_in_echo_area (const char *format, ...)
+  TEXINFO_PRINTFLIKE(1,2);
+
 extern void unmessage_in_echo_area (void);
 
 /* Clear the echo area, removing any message that is already present.
@@ -254,17 +273,20 @@ extern int window_chars_to_goal (WINDOW *win, int goal);
 
 extern size_t process_node_text
         (WINDOW *win, char *start, int do_tags,
-         int (*fun) (void *, size_t, const char *, char *, size_t, size_t),
+         int (*fun) (void *, size_t, size_t, const char *, char *,
+		     size_t, size_t),
 	 void *closure);
 
-void clean_manpage (char *manpage);
+extern void clean_manpage (char *manpage);
 
 extern void window_compute_line_map (WINDOW *win);
 
-int window_point_to_column (WINDOW *win, long point, long *np);
+extern int window_point_to_column (WINDOW *win, long point, long *np);
+
+extern void window_line_map_init (WINDOW *win);
 
-void window_line_map_init (WINDOW *win);
+extern long window_end_of_line (WINDOW *win);
 
-long window_end_of_line (WINDOW *win);
+extern size_t window_log_to_phys_line (WINDOW *window, size_t ln);
 
 #endif /* not INFO_WINDOW_H */