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.24
retrieving revision 1.29
diff -u -p -r1.24 -r1.29
--- src/lib/libcurses/curses_private.h	2002/07/19 13:22:41	1.24
+++ src/lib/libcurses/curses_private.h	2003/02/17 11:07:19	1.29
@@ -1,4 +1,4 @@
-/*	$NetBSD: curses_private.h,v 1.24 2002/07/19 13:22:41 blymn Exp $	*/
+/*	$NetBSD: curses_private.h,v 1.29 2003/02/17 11:07:19 dsl Exp $	*/
 
 /*-
  * Copyright (c) 1998-2000 Brett Lymn
@@ -99,7 +99,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) */
@@ -114,7 +115,8 @@ struct __window {		/* Window structure. 
 #define	__LEAVEOK	0x00000100	/* If cursor left */
 #define	__KEYPAD	0x00010000	/* If interpreting keypad codes */
 #define	__NOTIMEOUT	0x00020000	/* Wait indefinitely for func keys */
-#define __IDCHAR        0x00040000      /* insert/delete char sequences */
+#define __IDCHAR	0x00040000	/* insert/delete char sequences */
+#define __ISPAD		0x00080000	/* "window" is a pad */
 	unsigned int flags;
 	int	delay;			/* delay for getch() */
 	attr_t	wattr;			/* Character attributes */
@@ -150,7 +152,7 @@ struct __pair {
 /* Maximum colours */
 #define	MAX_COLORS	64
 /* Maximum colour pairs - determined by number of colour bits in attr_t */
-#define	MAX_PAIRS	64	/* PAIR_NUMBER(__COLOR) + 1 */
+#define	MAX_PAIRS	PAIR_NUMBER(__COLOR)
 
 typedef struct keymap keymap_t;
 
@@ -163,7 +165,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 */
@@ -240,6 +242,7 @@ struct __screen {
 	char ttytype[128];
 	int endwin;
 	int notty;
+	int half_delay;
 };
 
 
@@ -252,7 +255,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 *);
@@ -260,7 +263,7 @@ int      _cursesi_gettmode(SCREEN *);
 void     _cursesi_reset_acs(SCREEN *);
 void     _cursesi_resetterm(SCREEN *);
 int      _cursesi_setterm(char *, SCREEN *);
-int      _cursesi_wnoutrefresh(SCREEN *, WINDOW *);
+int      _cursesi_wnoutrefresh(SCREEN *, WINDOW *, int, int, int, int, int, int);
 int	 __delay(void);
 u_int	 __hash_more(char *, size_t, u_int);
 #define	__hash(s, len)	__hash_more((s), (len), 0u)
@@ -269,7 +272,7 @@ void	 __init_getch(SCREEN *);
 void	 __init_acs(SCREEN *);
 char	*__longname(char *, char *);	/* Original BSD version */
 int	 __mvcur(int, int, int, int, int);
-WINDOW  *__newwin(SCREEN *, int, int, int, int);
+WINDOW  *__newwin(SCREEN *, int, int, int, int, int);
 int	 __nodelay(void);
 int	 __notimeout(void);
 char	*__parse_cap(const char *, ...);
@@ -280,7 +283,7 @@ void     __restore_meta_state(void);
 void	 __restore_termios(void);
 void	 __restore_stophandler(void);
 void	 __save_termios(void);
-void	 __set_color(attr_t attr);
+void	 __set_color(WINDOW *win, attr_t attr);
 void	 __set_stophandler(void);
 void	 __set_subwin(WINDOW *, WINDOW *);
 void	 __startwin(SCREEN *);
@@ -292,6 +295,7 @@ int	 __touchline(WINDOW *, int, int, int
 int	 __touchwin(WINDOW *);
 char	*__tscroll(const char *, int, int);
 void	 __unsetattr(int);
+void	 __unset_color(WINDOW *win);
 int	 __waddch(WINDOW *, __LDATA *);
 int	 __wgetnstr(WINDOW *, char *, int);
 
@@ -305,7 +309,8 @@ 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;