Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/lib/libcurses/curses_private.h,v
rcsdiff: /ftp/cvs/cvsroot/src/lib/libcurses/curses_private.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.27
retrieving revision 1.38
diff -u -p -r1.27 -r1.38
--- src/lib/libcurses/curses_private.h	2003/01/09 12:48:05	1.27
+++ src/lib/libcurses/curses_private.h	2006/01/15 11:43:54	1.38
@@ -1,4 +1,4 @@
-/*	$NetBSD: curses_private.h,v 1.27 2003/01/09 12:48:05 blymn Exp $	*/
+/*	$NetBSD: curses_private.h,v 1.38 2006/01/15 11:43:54 jdc Exp $	*/
 
 /*-
  * Copyright (c) 1998-2000 Brett Lymn
@@ -73,8 +73,6 @@ extern char	*__tc_ac, *__tc_AB, *__tc_ae
 struct __ldata {
 	wchar_t	ch;			/* Character */
 	attr_t	attr;			/* Attributes */
-	wchar_t	bch;			/* Background character */
-	attr_t	battr;			/* Background attributes */
 };
 
 #define __LDATASIZE	(sizeof(__LDATA))
@@ -99,7 +97,8 @@ struct __window {		/* Window structure. 
 	int begy, begx;			/* Window home. */
 	int cury, curx;			/* Current x, y coordinates. */
 	int maxy, maxx;			/* Maximum values for curx, cury. */
-	short ch_off;			/* x offset for firstch/lastch. */
+	int reqy, reqx;			/* Size requested when created */
+	int ch_off;			/* x offset for firstch/lastch. */
 	__LINE **lines;			/* Array of pointers to the lines */
 	__LINE  *lspace;		/* line space (for cleanup) */
 	__LDATA *wspace;		/* window space (for cleanup) */
@@ -122,6 +121,10 @@ struct __window {		/* Window structure. 
 	wchar_t	bch;			/* Background character */
 	attr_t	battr;			/* Background attributes */
 	int	scr_t, scr_b;		/* Scrolling region top, bottom */
+	SCREEN	*screen;		/* Screen for this window */
+	int	pbegy, pbegx,
+		sbegy, sbegx,
+		smaxy, smaxx;		/* Saved prefresh() values */
 };
 
 /* Set of attributes unset by 'me' - 'mb', 'md', 'mh', 'mk', 'mp' and 'mr'. */
@@ -164,7 +167,7 @@ struct __screen {
 	WINDOW	*stdscr;	/* Standard screen. */
 	WINDOW	*__virtscr;	/* Virtual screen (for doupdate()). */
 	int      curwin;        /* current window for refresh */
-	short    lx, ly;        /* loop parameters for refresh */
+	int      lx, ly;        /* loop parameters for refresh */
 	int	 COLS;		/* Columns on the screen. */
 	int	 LINES;		/* Lines on the screen. */
 	int	 COLORS;	/* Maximum colors on the screen */
@@ -226,6 +229,7 @@ struct __screen {
 	int echoit;
 	int pfast;
 	int rawmode;
+	int nl;
 	int noqch;
 	int clearok;
 	int useraw;
@@ -242,6 +246,7 @@ struct __screen {
 	int endwin;
 	int notty;
 	int half_delay;
+	int resized;
 };
 
 
@@ -254,7 +259,7 @@ extern SCREEN   *_cursesi_screen;       
 
 /* Private functions. */
 #ifdef DEBUG
-void	 __CTRACE(const char *, ...);
+void	 __CTRACE(const char *, ...) __attribute__((__format__(__printf__, 1, 0)));
 #endif
 void     __cputchar_args(char, void *);
 void     _cursesi_free_keymap(keymap_t *);
@@ -262,9 +267,8 @@ int      _cursesi_gettmode(SCREEN *);
 void     _cursesi_reset_acs(SCREEN *);
 void     _cursesi_resetterm(SCREEN *);
 int      _cursesi_setterm(char *, SCREEN *);
-int      _cursesi_wnoutrefresh(SCREEN *, WINDOW *, int, int, int, int, int, int);
 int	 __delay(void);
-u_int	 __hash_more(char *, size_t, u_int);
+u_int	 __hash_more(const void *, size_t, u_int);
 #define	__hash(s, len)	__hash_more((s), (len), 0u)
 void	 __id_subwins(WINDOW *);
 void	 __init_getch(SCREEN *);
@@ -281,9 +285,11 @@ void     __restore_cursor_vis(void);
 void     __restore_meta_state(void);
 void	 __restore_termios(void);
 void	 __restore_stophandler(void);
+void	 __restore_winchhandler(void);
 void	 __save_termios(void);
 void	 __set_color(WINDOW *win, attr_t attr);
 void	 __set_stophandler(void);
+void	 __set_winchhandler(void);
 void	 __set_subwin(WINDOW *, WINDOW *);
 void	 __startwin(SCREEN *);
 void	 __stop_signal_handler(int);
@@ -297,6 +303,7 @@ void	 __unsetattr(int);
 void	 __unset_color(WINDOW *win);
 int	 __waddch(WINDOW *, __LDATA *);
 int	 __wgetnstr(WINDOW *, char *, int);
+void	 __winch_signal_handler(int);
 
 /* Private #defines. */
 #define	min(a,b)	((a) < (b) ? (a) : (b))
@@ -308,9 +315,7 @@ extern int		 __endwin;
 extern int		 __pfast;
 extern int		 __rawmode;
 extern int		 __noqch;
-extern attr_t		 __nca;
 extern attr_t		 __mask_op, __mask_me, __mask_ue, __mask_se;
-extern struct __winlist	*__winlistp;
 extern WINDOW		*__virtscr;
 extern int		 __using_color;
 extern attr_t		 __default_color;