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.38.6.1
retrieving revision 1.40.4.1
diff -u -p -r1.38.6.1 -r1.40.4.1
--- src/lib/libcurses/curses_private.h	2007/01/21 11:38:59	1.38.6.1
+++ src/lib/libcurses/curses_private.h	2008/01/09 01:36:23	1.40.4.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: curses_private.h,v 1.38.6.1 2007/01/21 11:38:59 blymn Exp $	*/
+/*	$NetBSD: curses_private.h,v 1.40.4.1 2008/01/09 01:36:23 matt Exp $	*/
 
 /*-
  * Copyright (c) 1998-2000 Brett Lymn
@@ -304,6 +304,8 @@ struct __screen {
 	int notty;
 	int half_delay;
 	int resized;
+	wchar_t *unget_list;
+	int unget_len, unget_pos;
 #ifdef HAVE_WCHAR
 #define MB_LEN_MAX 8
 #define MAX_CBUF_SIZE MB_LEN_MAX
@@ -323,14 +325,32 @@ extern int	 My_term;		/* Use Def_term re
 extern const char	*Def_term;	/* Default terminal type. */
 extern SCREEN   *_cursesi_screen;       /* The current screen in use */
 
-/* Private functions. */
+/* Debugging options/functions. */
 #ifdef DEBUG
-void	 __CTRACE(const char *, ...) __attribute__((__format__(__printf__, 1, 0)));
+#define __CTRACE_TSTAMP		0x00000001
+#define __CTRACE_MISC		0x00000002
+#define __CTRACE_INIT		0x00000004
+#define __CTRACE_SCREEN		0x00000008
+#define __CTRACE_WINDOW		0x00000010
+#define __CTRACE_REFRESH	0x00000020
+#define __CTRACE_COLOR		0x00000040
+#define __CTRACE_INPUT		0x00000080
+#define __CTRACE_OUTPUT		0x00000100
+#define __CTRACE_LINE		0x00000200
+#define __CTRACE_ATTR		0x00000400
+#define __CTRACE_ERASE		0x00000800
+#define __CTRACE_ALL		0x7fffffff
+void	 __CTRACE_init(void);
+void	 __CTRACE(int, const char *, ...) __attribute__((__format__(__printf__, 2, 3)));
 #endif
+
+/* Private functions. */
 void     __cputchar_args(char, void *);
 void     _cursesi_free_keymap(keymap_t *);
 int      _cursesi_gettmode(SCREEN *);
 void     _cursesi_reset_acs(SCREEN *);
+int	_cursesi_addbyte(WINDOW *, __LINE **, int *, int *, int , attr_t);
+int	_cursesi_addwchar(WINDOW *, __LINE **, int *, int *, const cchar_t *);
 #ifdef HAVE_WCHAR
 void     _cursesi_reset_wacs(SCREEN *);
 #endif /* HAVE_WCHAR */
@@ -345,9 +365,13 @@ void	 __init_acs(SCREEN *);
 #ifdef HAVE_WCHAR
 void	 __init_get_wch(SCREEN *);
 void	 __init_wacs(SCREEN *);
-void __cputwchar_args( wchar_t, void * );
-int     _cursesi_copy_nsp(nschar_t *src_nsp, struct __ldata *ch);
+void	__cputwchar_args( wchar_t, void * );
+int     _cursesi_copy_nsp(nschar_t *, struct __ldata *);
+void	__cursesi_free_nsp(nschar_t *);
+void	__cursesi_win_free_nsp(WINDOW *);
+void	__cursesi_putnsp(nschar_t *, const int, const int);
 #endif /* HAVE_WCHAR */
+int	 __unget(wint_t);
 char	*__longname(char *, char *);	/* Original BSD version */
 int	 __mvcur(int, int, int, int, int);
 WINDOW  *__newwin(SCREEN *, int, int, int, int, int);