X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=include%2Fcurses.h.in;h=b33995e8b67a9050eee973152ec4a10698398382;hp=2562f728b3bae23c6f4bf81781a1e2e32576735a;hb=b1f61d9f3aa244512045a6b02e759825d7049d34;hpb=661078ddbde3ce0f3b06e95642fbb9b5fef7dca1

diff --git a/include/curses.h.in b/include/curses.h.in
index 2562f728..b33995e8 100644
--- a/include/curses.h.in
+++ b/include/curses.h.in
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -31,7 +31,7 @@
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
-/* $Id: curses.h.in,v 1.60 1998/02/11 12:13:46 tom Exp $ */
+/* $Id: curses.h.in,v 1.93 2000/07/08 11:07:26 tom Exp $ */
 
 #ifndef __NCURSES_H
 #define __NCURSES_H
@@ -62,9 +62,14 @@
 #define NCURSES_ATTR_T int
 #endif
 
-#ifndef NCURSES_CONST
-#define NCURSES_CONST /* nothing */
-#endif
+#undef  NCURSES_CONST
+#define NCURSES_CONST @NCURSES_CONST@
+
+#undef	NCURSES_COLOR_T
+#define	NCURSES_COLOR_T short
+
+#undef	NCURSES_SIZE_T
+#define	NCURSES_SIZE_T short
 
 typedef unsigned @cf_cv_typeof_chtype@ chtype;
 
@@ -78,24 +83,17 @@ typedef unsigned @cf_cv_typeof_chtype@ chtype;
 /* XSI and SVr4 specify that curses implements 'bool'.  However, C++ may also
  * implement it.  If so, we must use the C++ compiler's type to avoid conflict
  * with other interfaces.
- *
- * To simplify use with/without the configuration script, we define the symbols
- * CXX_BUILTIN_BOOL and CXX_TYPE_OF_BOOL; they're edited by the configure
- * script.
  */
 
 #undef TRUE
+#define TRUE    1
+
 #undef FALSE
-#define CXX_BUILTIN_BOOL @cf_cv_builtin_bool@
-#define CXX_TYPE_OF_BOOL @cf_cv_type_of_bool@
+#define FALSE   0
 
-#if defined(__cplusplus) && CXX_BUILTIN_BOOL
-#define TRUE    ((CXX_TYPE_OF_BOOL)true)
-#define FALSE   ((CXX_TYPE_OF_BOOL)false)
-#else
-typedef CXX_TYPE_OF_BOOL bool;
-#define TRUE    ((bool)1)
-#define FALSE   ((bool)0)
+#if (!defined(__cplusplus) || !@cf_cv_builtin_bool@) && (!@cf_cv_cc_bool_type@)
+#undef bool
+typedef @cf_cv_type_of_bool@ bool;
 #endif
 
 #ifdef __cplusplus
@@ -253,18 +251,18 @@ cchar_t;
 struct ldat
 {
 	chtype  *text;		/* text of the line */
-	short   firstchar;	/* first changed character in the line */
-	short   lastchar;	/* last changed character in the line */
-	short   oldindex;	/* index of the line at last update */
+	NCURSES_SIZE_T firstchar; /* first changed character in the line */
+	NCURSES_SIZE_T lastchar; /* last changed character in the line */
+	NCURSES_SIZE_T oldindex; /* index of the line at last update */
 };
 
 struct _win_st
 {
-	short   _cury, _curx;	/* current cursor position */
+	NCURSES_SIZE_T _cury, _curx; /* current cursor position */
 
 	/* window location and size */
-	short   _maxy, _maxx;	/* maximums of x and y, NOT window size */
-	short   _begy, _begx;	/* screen coords of upper-left-hand corner */
+	NCURSES_SIZE_T _maxy, _maxx; /* maximums of x and y, NOT window size */
+	NCURSES_SIZE_T _begy, _begx; /* screen coords of upper-left-hand corner */
 
 	short   _flags;		/* window state flags */
 
@@ -287,8 +285,8 @@ struct _win_st
 	struct ldat *_line;	/* the actual line data */
 
 	/* global screen state */
-	short	_regtop;	/* top line of scrolling region */
-	short	_regbottom;	/* bottom line of scrolling region */
+	NCURSES_SIZE_T _regtop;	/* top line of scrolling region */
+	NCURSES_SIZE_T _regbottom; /* bottom line of scrolling region */
 
 	/* these are used only if this is a sub-window */
 	int	_parx;		/* x coordinate of this window in parent */
@@ -298,12 +296,12 @@ struct _win_st
 	/* these are used only if this is a pad */
 	struct pdat
 	{
-	    short _pad_y,      _pad_x;
-	    short _pad_top,    _pad_left;
-	    short _pad_bottom, _pad_right;
+	    NCURSES_SIZE_T _pad_y,      _pad_x;
+	    NCURSES_SIZE_T _pad_top,    _pad_left;
+	    NCURSES_SIZE_T _pad_bottom, _pad_right;
 	} _pad;
 
-	short   _yoffset;	/* real begy is _begy + _yoffset */
+	NCURSES_SIZE_T _yoffset; /* real begy is _begy + _yoffset */
 };
 
 extern WINDOW   *stdscr;
@@ -319,25 +317,42 @@ extern int	TABSIZE;
  */
 extern int ESCDELAY;	/* ESC expire time in milliseconds */
 
-/* non-XSI extensions (dickey@clark.net) */
+extern char ttytype[];		/* needed for backward compatibility */
+
+/*
+ * These functions are extensions - not in XSI Curses.
+ */
+extern char *keybound (int, int);
+extern const char *curses_version (void);
+extern int assume_default_colors (int, int);
 extern int define_key (char *, int);
 extern int keyok (int, bool);
 extern int resizeterm (int, int);
 extern int use_default_colors (void);
+extern int use_extended_names (bool);
 extern int wresize (WINDOW *, int, int);
 
-extern char ttytype[];		/* needed for backward compatibility */
-
 /*
  * GCC (and some other compilers) define '__attribute__'; we're using this
  * macro to alert the compiler to flag inconsistencies in printf/scanf-like
  * function calls.  Just in case '__attribute__' isn't defined, make a dummy.
  * G++ doesn't accept it anyway.
  */
-#if defined(__cplusplus) || (!defined(__GNUC__) && !defined(__attribute__))
+#if !defined(__GNUC__) && !defined(__attribute__)
 #define __attribute__(p) /* nothing */
 #endif
 
+/*
+ * For g++, turn off our macros that use __attribute__ (g++ recognizes some
+ * of them, but not at the same version levels as gcc).
+ */
+#ifdef __cplusplus
+#undef GCC_NORETURN
+#undef GCC_PRINTF
+#undef GCC_SCANF
+#undef GCC_UNUSED
+#endif
+
 /*
  * We cannot define these in ncurses_cfg.h, since they require parameters to be
  * passed (that's non-portable).
@@ -384,25 +399,25 @@ extern int add_wchstr(const cchar_t *);			/* missing */
 extern int attroff(NCURSES_ATTR_T);			/* generated */
 extern int attron(NCURSES_ATTR_T);			/* generated */
 extern int attrset(NCURSES_ATTR_T);			/* generated */
-extern int attr_get(void);				/* generated */
-extern int attr_off(NCURSES_ATTR_T);			/* generated */
-extern int attr_on(NCURSES_ATTR_T);			/* generated */
-extern int attr_set(NCURSES_ATTR_T);			/* generated */
+extern int attr_get(attr_t *, short *, void *);		/* generated */
+extern int attr_off(attr_t, void *);			/* generated */
+extern int attr_on(attr_t, void *);			/* generated */
+extern int attr_set(attr_t, short, void *);		/* generated */
 extern int baudrate(void);				/* implemented */
 extern int beep(void);					/* implemented */
 extern int bkgd(chtype);				/* generated */
 extern void bkgdset(chtype);				/* generated */
 #ifdef _XOPEN_SOURCE_EXTENDED
-extern int bkgrndset(const cchar_t *);			/* missing */
+extern void bkgrndset(const cchar_t *);			/* missing */
 extern int bkgrnd(const cchar_t *);			/* missing */
 #endif /* _XOPEN_SOURCE_EXTENDED */
 extern int border(chtype,chtype,chtype,chtype,chtype,chtype,chtype,chtype);	/* generated */
 #ifdef _XOPEN_SOURCE_EXTENDED
-extern int border_set(cchar_t,cchar_t,cchar_t,cchar_t,cchar_t,cchar_t,cchar_t,cchar_t);	/* missing */
+extern int border_set(const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*);	/* missing */
 #endif /* _XOPEN_SOURCE_EXTENDED */
 extern int box(WINDOW *, chtype, chtype);		/* generated */
 #ifdef _XOPEN_SOURCE_EXTENDED
-extern int box_set(WINDOW *, cchar_t, cchar_t);		/* missing */
+extern int box_set(WINDOW *, const cchar_t *, const cchar_t *);	/* missing */
 #endif /* _XOPEN_SOURCE_EXTENDED */
 extern bool can_change_color(void);			/* implemented */
 extern int cbreak(void);				/* implemented */
@@ -412,7 +427,7 @@ extern int clearok(WINDOW *,bool);			/* implemented */
 extern int clrtobot(void);				/* generated */
 extern int clrtoeol(void);				/* generated */
 extern int color_content(short,short*,short*,short*);	/* implemented */
-extern int color_set(short,void*);			/* missing */
+extern int color_set(short,void*);			/* generated */
 extern int COLOR_PAIR(int);				/* generated */
 extern int copywin(const WINDOW*,WINDOW*,int,int,int,int,int,int,int);	/* implemented */
 extern int curs_set(int);				/* implemented */
@@ -428,15 +443,13 @@ extern int doupdate(void);				/* implemented */
 extern WINDOW *dupwin(WINDOW *);			/* implemented */
 extern int echo(void);					/* implemented */
 extern int echochar(const chtype);			/* generated */
+extern int erase(void);					/* generated */
 #ifdef _XOPEN_SOURCE_EXTENDED
 extern int echo_wchar(const cchar_t *);			/* missing */
 extern int erasewchar(wchar_t*);			/* missing */
 #endif /* _XOPEN_SOURCE_EXTENDED */
 extern int endwin(void);				/* implemented */
 extern char erasechar(void);				/* implemented */
-#ifdef _XOPEN_SOURCE_EXTENDED
-extern int erase_wchar(wchar_t *);			/* missing */
-#endif /* _XOPEN_SOURCE_EXTENDED */
 extern void filter(void);				/* implemented */
 extern int flash(void);					/* implemented */
 extern int flushinp(void);				/* implemented */
@@ -460,8 +473,8 @@ extern int get_wstr(wint_t *);				/* missing */
 #endif /* _XOPEN_SOURCE_EXTENDED */
 extern int halfdelay(int);				/* implemented */
 extern bool has_colors(void);				/* implemented */
-extern int has_ic(void);				/* implemented */
-extern int has_il(void);				/* implemented */
+extern bool has_ic(void);				/* implemented */
+extern bool has_il(void);				/* implemented */
 extern int hline(chtype, int);				/* generated */
 #ifdef _XOPEN_SOURCE_EXTENDED
 extern int hline_set(const cchar_t *, int);		/* missing */
@@ -493,16 +506,16 @@ extern int ins_wstr(const wchar_t *);			/* missing */
 extern int intrflush(WINDOW *,bool);			/* implemented */
 #ifdef _XOPEN_SOURCE_EXTENDED
 extern int inwstr(wchar_t *);				/* missing */
-extern int in_wch(const cchar_t *);			/* missing */
-extern int in_wchstr(const cchar_t *);			/* missing */
-extern int in_wchntr(const cchar_t *, int);		/* missing */
+extern int in_wch(NCURSES_CONST cchar_t *);		/* missing */
+extern int in_wchstr(NCURSES_CONST cchar_t *);		/* missing */
+extern int in_wchnstr(NCURSES_CONST cchar_t *, int);	/* missing */
 #endif /* _XOPEN_SOURCE_EXTENDED */
-extern int isendwin(void);				/* implemented */
-extern int is_linetouched(WINDOW *,int);		/* implemented */
-extern int is_wintouched(WINDOW *);			/* implemented */
-extern const char *keyname(int);			/* implemented */
+extern bool isendwin(void);				/* implemented */
+extern bool is_linetouched(WINDOW *,int);		/* implemented */
+extern bool is_wintouched(WINDOW *);			/* implemented */
+extern NCURSES_CONST char *keyname(int);		/* implemented */
 #ifdef _XOPEN_SOURCE_EXTENDED
-extern int key_name(wchar_t *);				/* missing */
+extern char *key_name(wchar_t);				/* missing */
 #endif /* _XOPEN_SOURCE_EXTENDED */
 extern int keypad(WINDOW *,bool);			/* implemented */
 extern char killchar(void);				/* implemented */
@@ -561,13 +574,13 @@ extern int mvins_nwstr(int, int, const wchar_t *, int);	/* missing */
 extern int mvins_wch(int, int, const cchar_t *);	/* missing */
 extern int mvins_wstr(int, int, const wchar_t *);	/* missing */
 extern int mvinwstr(int, int, wchar_t *);		/* missing */
-extern int mvin_wch(int, int, const cchar_t *);		/* missing */
-extern int mvin_wchstr(int, int, const cchar_t *);	/* missing */
-extern int mvin_wchntr(int, int, const cchar_t *, int);	/* missing */
+extern int mvin_wch(int, int, NCURSES_CONST cchar_t *);	/* missing */
+extern int mvin_wchstr(int, int, NCURSES_CONST cchar_t *);	/* missing */
+extern int mvin_wchnstr(int, int, NCURSES_CONST cchar_t *, int);	/* missing */
 #endif /* _XOPEN_SOURCE_EXTENDED */
-extern int mvprintw(int,int,const char *,...)		/* implemented */
+extern int mvprintw(int,int, NCURSES_CONST char *,...)	/* implemented */
 		GCC_PRINTFLIKE(3,4);
-extern int mvscanw(int,int,const char *,...)		/* implemented */
+extern int mvscanw(int,int, NCURSES_CONST char *,...)	/* implemented */
 		GCC_SCANFLIKE(3,4);
 extern int mvvline(int, int, chtype, int);		/* generated */
 #ifdef _XOPEN_SOURCE_EXTENDED
@@ -620,13 +633,13 @@ extern int mvwins_nwstr(WINDOW *, int,int, const wchar_t *,int); /* missing */
 extern int mvwins_wch(WINDOW *, int, int, const cchar_t *);	/* missing */
 extern int mvwins_wstr(WINDOW *, int, int, const wchar_t *);	/* missing */
 extern int mvwinwstr(WINDOW *, int, int, wchar_t *);		/* missing */
-extern int mvwin_wch(WINDOW *, int, int, const cchar_t *);	/* missing */
-extern int mvwin_wchnstr(WINDOW *, int,int,const cchar_t *,int); /* missing */
-extern int mvwin_wchstr(WINDOW *, int, int, const cchar_t *);	/* missing */
+extern int mvwin_wch(WINDOW *, int, int, NCURSES_CONST cchar_t *);	/* missing */
+extern int mvwin_wchnstr(WINDOW *, int,int, NCURSES_CONST cchar_t *,int); /* missing */
+extern int mvwin_wchstr(WINDOW *, int, int, NCURSES_CONST cchar_t *);	/* missing */
 #endif /* _XOPEN_SOURCE_EXTENDED */
-extern int mvwprintw(WINDOW*,int,int,const char *,...)	/* implemented */
+extern int mvwprintw(WINDOW*,int,int, NCURSES_CONST char *,...)	/* implemented */
 		GCC_PRINTFLIKE(4,5);
-extern int mvwscanw(WINDOW *,int,int,const char *,...)	/* implemented */
+extern int mvwscanw(WINDOW *,int,int, NCURSES_CONST char *,...)	/* implemented */
 		GCC_SCANFLIKE(4,5);
 extern int mvwvline(WINDOW *,int, int, chtype, int);	/* generated */
 #ifdef _XOPEN_SOURCE_EXTENDED
@@ -634,14 +647,14 @@ extern int mvwvline_set(WINDOW *, int,int, const cchar_t *,int); /* missing */
 #endif /* _XOPEN_SOURCE_EXTENDED */
 extern int napms(int);					/* implemented */
 extern WINDOW *newpad(int,int);				/* implemented */
-extern SCREEN *newterm(const char *,FILE *,FILE *);	/* implemented */
+extern SCREEN *newterm(NCURSES_CONST char *,FILE *,FILE *);	/* implemented */
 extern WINDOW *newwin(int,int,int,int);			/* implemented */
 extern int nl(void);					/* implemented */
 extern int nocbreak(void);				/* implemented */
 extern int nodelay(WINDOW *,bool);			/* implemented */
 extern int noecho(void);				/* implemented */
 extern int nonl(void);					/* implemented */
-extern int noqiflush(void);				/* implemented */
+extern void noqiflush(void);				/* implemented */
 extern int noraw(void);					/* implemented */
 extern int notimeout(WINDOW *,bool);			/* implemented */
 extern int overlay(const WINDOW*,WINDOW *);		/* implemented */
@@ -654,11 +667,11 @@ extern int pecho_wchar(WINDOW *, const cchar_t *);	/* missing */
 #endif /* _XOPEN_SOURCE_EXTENDED */
 extern int pnoutrefresh(WINDOW*,int,int,int,int,int,int);/* implemented */
 extern int prefresh(WINDOW *,int,int,int,int,int,int);	/* implemented */
-extern int printw(const char *,...)			/* implemented */
+extern int printw(NCURSES_CONST char *,...)		/* implemented */
 		GCC_PRINTFLIKE(1,2);
 extern int putp(const char *);				/* implemented */
 extern int putwin(WINDOW *, FILE *);			/* implemented */
-extern int qiflush(void);				/* implemented */
+extern void qiflush(void);				/* implemented */
 extern int raw(void);					/* implemented */
 extern int redrawwin(WINDOW *);				/* generated */
 extern int refresh(void);				/* generated */
@@ -667,7 +680,7 @@ extern int reset_prog_mode(void);			/* implemented */
 extern int reset_shell_mode(void);			/* implemented */
 extern int ripoffline(int, int (*init)(WINDOW *, int));	/* implemented */
 extern int savetty(void);				/* implemented */
-extern int scanw(const char *,...)			/* implemented */
+extern int scanw(NCURSES_CONST char *,...)		/* implemented */
 		GCC_SCANFLIKE(1,2);
 extern int scr_dump(const char *);			/* implemented */
 extern int scr_init(const char *);			/* implemented */
@@ -677,18 +690,19 @@ extern int scrollok(WINDOW *,bool);			/* implemented */
 extern int scr_restore(const char *);			/* implemented */
 extern int scr_set(const char *);			/* implemented */
 #ifdef _XOPEN_SOURCE_EXTENDED
-extern int setcchar(cchar_t *, wchar_t *, attr_t, short, const void *);	/* missing */
+extern int setcchar(cchar_t *, const wchar_t *, const attr_t, short, const void *);	/* missing */
 #endif /* _XOPEN_SOURCE_EXTENDED */
 extern int setscrreg(int,int);				/* generated */
 extern SCREEN *set_term(SCREEN *);			/* implemented */
-extern int slk_attroff(const attr_t);			/* implemented */
-extern int slk_attr_off(attr_t);			/* generated:WIDEC */
-extern int slk_attron(const attr_t);			/* implemented */
-extern int slk_attr_on(attr_t);				/* generated:WIDEC */
-extern int slk_attrset(const attr_t);			/* implemented */
-extern attr_t slk_attr(void);                           /* implemented */
-extern int slk_attr_set(attr_t);			/* generated:WIDEC */
+extern int slk_attroff(const chtype);			/* implemented */
+extern int slk_attr_off(const attr_t, void *);		/* generated:WIDEC */
+extern int slk_attron(const chtype);			/* implemented */
+extern int slk_attr_on(attr_t,void*);			/* generated:WIDEC */
+extern int slk_attrset(const chtype);			/* implemented */
+extern attr_t slk_attr(void);				/* implemented */
+extern int slk_attr_set(const attr_t,short,void*);	/* implemented */
 extern int slk_clear(void);				/* implemented */
+extern int slk_color(short);				/* implemented */
 extern int slk_init(int);				/* implemented */
 extern char *slk_label(int);				/* implemented */
 extern int slk_noutrefresh(void);			/* implemented */
@@ -697,7 +711,7 @@ extern int slk_restore(void);				/* implemented */
 extern int slk_set(int,const char *,int);		/* implemented */
 extern int slk_touch(void);				/* implemented */
 #ifdef _XOPEN_SOURCE_EXTENDED
-extern int slk_wset(int, wchar_t *, int);		/* missing */
+extern int slk_wset(int, const wchar_t *, int);		/* missing */
 #endif /* _XOPEN_SOURCE_EXTENDED */
 extern int standout(void);				/* generated */
 extern int standend(void);				/* generated */
@@ -708,31 +722,34 @@ extern int syncok(WINDOW *, bool);			/* implemented */
 extern chtype termattrs(void);				/* implemented */
 extern attr_t term_attrs(void);				/* missing */
 extern char *termname(void);				/* implemented */
-extern int tigetflag(const char *);			/* implemented */
-extern int tigetnum(const char *);			/* implemented */
-extern char *tigetstr(const char *);			/* implemented */
-extern int timeout(int);				/* generated */
+extern int tigetflag(NCURSES_CONST char *);		/* implemented */
+extern int tigetnum(NCURSES_CONST char *);		/* implemented */
+extern char *tigetstr(NCURSES_CONST char *);		/* implemented */
+extern void timeout(int);				/* generated */
+extern int touchline(WINDOW *, int, int);		/* generated */
+extern int touchwin(WINDOW *);				/* generated */
+extern char *tparm(NCURSES_CONST char *, ...);		/* implemented */
 extern int typeahead(int);				/* implemented */
 extern int ungetch(int);				/* implemented */
 #ifdef _XOPEN_SOURCE_EXTENDED
-extern int unget_wch(const wchar_t *);			/* missing */
+extern int unget_wch(const wchar_t);			/* missing */
 #endif /* _XOPEN_SOURCE_EXTENDED */
 extern int untouchwin(WINDOW *);			/* generated */
 extern void use_env(bool);				/* implemented */
 extern int vidattr(chtype);				/* implemented */
-extern int vid_attr(attr_t);				/* generated:WIDEC */
+extern int vid_attr(attr_t, short, void *);		/* generated:WIDEC */
 extern int vidputs(chtype, int (*)(int));		/* implemented */
 #ifdef _XOPEN_SOURCE_EXTENDED
-extern int vid_puts(attr_t, int (*)(int));		/* missing */
+extern int vid_puts(attr_t, short, void *, int (*)(int)); /* missing */
 #endif /* _XOPEN_SOURCE_EXTENDED */
 extern int vline(chtype, int);				/* generated */
 #ifdef _XOPEN_SOURCE_EXTENDED
 extern int vline_set(const cchar_t *, int);		/* missing */
 #endif /* _XOPEN_SOURCE_EXTENDED */
-extern int vwprintw(WINDOW *,const char *,va_list);	/* implemented */
-extern int vw_printw(WINDOW *,const char *,va_list);	/* generated */
-extern int vwscanw(WINDOW *,const char *,va_list);	/* implemented */
-extern int vw_scanw(WINDOW *,const char *,va_list);	/* generated */
+extern int vwprintw(WINDOW *, NCURSES_CONST char *,va_list);	/* implemented */
+extern int vw_printw(WINDOW *, NCURSES_CONST char *,va_list);	/* generated */
+extern int vwscanw(WINDOW *, NCURSES_CONST char *,va_list);	/* implemented */
+extern int vw_scanw(WINDOW *, NCURSES_CONST char *,va_list);	/* generated */
 extern int waddch(WINDOW *, const chtype);		/* implemented */
 extern int waddchnstr(WINDOW *,const chtype *const,int); /* implemented */
 extern int waddchstr(WINDOW *,const chtype *);		/* generated */
@@ -740,6 +757,7 @@ extern int waddnstr(WINDOW *,const char *const,int);	/* implemented */
 extern int waddstr(WINDOW *,const char *);		/* generated */
 #ifdef _XOPEN_SOURCE_EXTENDED
 extern int waddwstr(WINDOW *,const wchar_t *);		/* missing */
+extern int waddnwstr(WINDOW *,const wchar_t *,int);	/* missing */
 extern int wadd_wch(WINDOW *,const cchar_t *);		/* missing */
 extern int wadd_wchnstr(WINDOW *,const cchar_t *,int);	/* missing */
 extern int wadd_wchstr(WINDOW *,const cchar_t *);	/* missing */
@@ -747,25 +765,25 @@ extern int wadd_wchstr(WINDOW *,const cchar_t *);	/* missing */
 extern int wattron(WINDOW *, int);			/* generated */
 extern int wattroff(WINDOW *, int);			/* generated */
 extern int wattrset(WINDOW *, int);			/* generated */
-extern attr_t wattr_get(WINDOW *);			/* generated */
-extern int wattr_on(WINDOW *, const attr_t);		/* implemented */
-extern int wattr_off(WINDOW *, const attr_t);		/* implemented */
-extern int wattr_set(WINDOW *, attr_t);			/* generated */
+extern int wattr_get(WINDOW *, attr_t *, short *, void *);	/* generated */
+extern int wattr_on(WINDOW *, NCURSES_CONST attr_t, void *);	/* implemented */
+extern int wattr_off(WINDOW *, NCURSES_CONST attr_t, void *);	/* implemented */
+extern int wattr_set(WINDOW *, attr_t, short, void *);		/* generated */
 extern int wbkgd(WINDOW *,const chtype);		/* implemented */
 extern void wbkgdset(WINDOW *,chtype);			/* implemented */
 #ifdef _XOPEN_SOURCE_EXTENDED
-extern int wbkgrndset(WINDOW *,const cchar_t *);	/* missing */
+extern void wbkgrndset(WINDOW *,const cchar_t *);	/* missing */
 extern int wbkgrnd(WINDOW *,const cchar_t *);		/* missing */
 #endif /* _XOPEN_SOURCE_EXTENDED */
 extern int wborder(WINDOW *,chtype,chtype,chtype,chtype,chtype,chtype,chtype,chtype);	/* implemented */
 #ifdef _XOPEN_SOURCE_EXTENDED
-extern int wborder_set(WINDOW *,cchar_t,cchar_t,cchar_t,cchar_t,cchar_t,cchar_t,cchar_t,cchar_t);	/* missing */
+extern int wborder_set(WINDOW *,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*);	/* missing */
 #endif /* _XOPEN_SOURCE_EXTENDED */
 extern int wchgat(WINDOW *, int, attr_t, short, const void *);/* implemented */
 extern int wclear(WINDOW *);				/* implemented */
 extern int wclrtobot(WINDOW *);				/* implemented */
 extern int wclrtoeol(WINDOW *);				/* implemented */
-extern int wcolor_set(WINDOW*,short,void*);		/* missing */
+extern int wcolor_set(WINDOW*,short,void*);		/* implemented */
 extern void wcursyncup(WINDOW *);			/* implemented */
 extern int wdelch(WINDOW *);				/* implemented */
 extern int wdeleteln(WINDOW *);				/* generated */
@@ -791,7 +809,7 @@ extern int whline(WINDOW *, chtype, int);		/* implemented */
 #ifdef _XOPEN_SOURCE_EXTENDED
 extern int whline_set(WINDOW *, const cchar_t *, int);	/* missing */
 #endif /* _XOPEN_SOURCE_EXTENDED */
-extern chtype winch(WINDOW *);				/* generated */
+extern chtype winch(WINDOW *);				/* implemented */
 extern int winchnstr(WINDOW *, chtype *, int);		/* implemented */
 extern int winchstr(WINDOW *, chtype *);		/* generated */
 extern int winnstr(WINDOW *, char *, int);		/* implemented */
@@ -809,17 +827,17 @@ extern int wins_nwstr(WINDOW *, const wchar_t *, int);	/* missing */
 extern int wins_wch(WINDOW *, const cchar_t *);		/* missing */
 extern int wins_wstr(WINDOW *, const wchar_t *);	/* missing */
 extern int winwstr(WINDOW *, wchar_t *);		/* missing */
-extern int win_wch(WINDOW *, const cchar_t *);		/* missing */
-extern int win_wchnstr(WINDOW *, const cchar_t *, int);	/* missing */
-extern int win_wchstr(WINDOW *, const cchar_t *);	/* missing */
+extern int win_wch(WINDOW *, NCURSES_CONST cchar_t *);	/* missing */
+extern int win_wchnstr(WINDOW *, NCURSES_CONST cchar_t *, int);	/* missing */
+extern int win_wchstr(WINDOW *, NCURSES_CONST cchar_t *);	/* missing */
 #endif /* _XOPEN_SOURCE_EXTENDED */
 extern int wmove(WINDOW *,int,int);			/* implemented */
 extern int wnoutrefresh(WINDOW *);			/* implemented */
-extern int wprintw(WINDOW *,const char *,...)		/* implemented */
+extern int wprintw(WINDOW *, NCURSES_CONST char *,...)	/* implemented */
 		GCC_PRINTFLIKE(2,3);
 extern int wredrawln(WINDOW *,int,int);			/* implemented */
 extern int wrefresh(WINDOW *);				/* implemented */
-extern int wscanw(WINDOW *,const char *,...)		/* implemented */
+extern int wscanw(WINDOW *, NCURSES_CONST char *,...)	/* implemented */
 		GCC_SCANFLIKE(2,3);
 extern int wscrl(WINDOW *,int);				/* implemented */
 extern int wsetscrreg(WINDOW *,int,int);		/* implemented */
@@ -827,16 +845,18 @@ extern int wstandout(WINDOW *);				/* generated */
 extern int wstandend(WINDOW *);				/* generated */
 extern void wsyncdown(WINDOW *);			/* implemented */
 extern void wsyncup(WINDOW *);				/* implemented */
-extern int wtimeout(WINDOW *,int);			/* implemented */
+extern void wtimeout(WINDOW *,int);			/* implemented */
 extern int wtouchln(WINDOW *,int,int,int);		/* implemented */
 #ifdef _XOPEN_SOURCE_EXTENDED
-extern wchar_t wunctrl(cchar_t *);			/* missing */
+extern wchar_t *wunctrl(cchar_t *);			/* missing */
 #endif /* _XOPEN_SOURCE_EXTENDED */
 extern int wvline(WINDOW *,chtype,int);			/* implemented */
 #ifdef _XOPEN_SOURCE_EXTENDED
 extern int wvline_set(WINDOW *, const cchar_t *, int);	/* missing */
 #endif /* _XOPEN_SOURCE_EXTENDED */
 
+extern bool mouse_trafo(int*, int*, bool);              /* generated */
+
 /* attributes */
 
 #define NCURSES_BITS(mask,shift) ((mask) << ((shift) + @cf_cv_widec_shift@))
@@ -897,8 +917,12 @@ extern int wvline_set(WINDOW *, const cchar_t *, int);	/* missing */
 #define getbegyx(win,y,x)	(y = (win)?(win)->_begy:ERR, x = (win)?(win)->_begx:ERR)
 #define getmaxyx(win,y,x)	(y = (win)?((win)->_maxy + 1):ERR, x = (win)?((win)->_maxx + 1):ERR)
 #define getparyx(win,y,x)	(y = (win)?(win)->_pary:ERR, x = (win)?(win)->_parx:ERR)
-#define getsyx(y,x)		getyx(stdscr, y, x)
-#define setsyx(y,x)		(stdscr->_cury = y, stdscr->_curx = x)
+#define getsyx(y,x) do { if(newscr->_leaveok) (y)=(x)=-1; \
+			 else getyx(newscr,(y),(x)); \
+		    } while(0)
+#define setsyx(y,x) do { if((y)==-1 && (x)==-1) newscr->_leaveok=TRUE; \
+			 else {newscr->_leaveok=FALSE;wmove(newscr,(y),(x));} \
+		    } while(0)
 
 /* It seems older SYSV curses versions define these */
 #define getattrs(win)		((win)?(win)->_attrs:A_NORMAL)
@@ -911,14 +935,13 @@ extern int wvline_set(WINDOW *, const cchar_t *, int);	/* missing */
 #define getparx(win)		((win)?(win)->_parx:ERR)
 #define getpary(win)		((win)?(win)->_pary:ERR)
 
-#define winch(win)       	((win)?(win)->_line[(win)->_cury].text[(win)->_curx]:0)
-#define wstandout(win)      	(wattr_set(win,A_STANDOUT))
-#define wstandend(win)      	(wattr_set(win,A_NORMAL))
-#define wattr_set(win,at)    	((win)?((win)->_attrs = (at)):0)
+#define wstandout(win)      	(wattrset(win,A_STANDOUT))
+#define wstandend(win)      	(wattrset(win,A_NORMAL))
+#define wattr_set(win,a,p,opts) ((win)->_attrs = (((a) & ~A_COLOR) | COLOR_PAIR(p)), OK)
 
-#define wattron(win,at)		wattr_on(win, at)
-#define wattroff(win,at)	wattr_off(win, at)
-#define wattrset(win,at)    	wattr_set(win, at)
+#define wattron(win,at)		wattr_on(win, at, (void *)0)
+#define wattroff(win,at)	wattr_off(win, at, (void *)0)
+#define wattrset(win,at)    	((win)->_attrs = (at))
 
 #define scroll(win)		wscrl(win,1)
 
@@ -935,7 +958,7 @@ extern int wvline_set(WINDOW *, const cchar_t *, int);	/* missing */
 #define winchstr(w, s)		winchnstr(w, s, -1)
 #define winsstr(w, s)		winsnstr(w, s, -1)
 
-#define redrawwin(w)		wredrawln(w, 0, w->_maxy+1)
+#define redrawwin(win)		wredrawln(win, 0, (win)->_maxy+1)
 #define waddstr(win,str)	waddnstr(win,str,-1)
 #define waddchstr(win,str)	waddchnstr(win,str,-1)
 
@@ -956,6 +979,7 @@ extern int wvline_set(WINDOW *, const cchar_t *, int);	/* missing */
 #define clear()        		wclear(stdscr)
 #define clrtobot()     		wclrtobot(stdscr)
 #define clrtoeol()     		wclrtoeol(stdscr)
+#define color_set(c,o)		wcolor_set(stdscr,c,o)
 #define delch()        		wdelch(stdscr)
 #define deleteln()     		winsdelln(stdscr,-1)
 #define echochar(c)		wechochar(stdscr,c)
@@ -1034,14 +1058,14 @@ extern int wvline_set(WINDOW *, const cchar_t *, int);	/* missing */
  * winnwstr(), wins_nwstr(), wins_wch(), win_wch(), win_wchnstr().
  * Except for wchgat(), these are not yet implemented.  They will be someday.
  */
-#define add_wch(c)			wadd_wch(stsdscr,c)
+#define add_wch(c)			wadd_wch(stdscr,c)
 #define addnwstr(wstr,n)		waddnwstr(stdscr,wstr,n)
 #define addwstr(wstr,n)			waddnwstr(stdscr,wstr,-1)
-#define attr_get()			wattr_get(stdscr)
-#define attr_off(a)			wattr_off(stdscr,a)
-#define attr_on(a)			wattr_on(stdscr,a)
-#define attr_set(a)			wattr_set(stdscr,a)
-#define box_set(w,v,h)			wborder_set(w,v,v,h,h,0,0,0,9)
+#define attr_get(a,pair,opts)		wattr_get(stdscr,a,pair,opts)
+#define attr_off(a,opts)		wattr_off(stdscr,a,opts)
+#define attr_on(a,opts)			wattr_on(stdscr,a,opts)
+#define attr_set(a,pair,opts)		wattr_set(stdscr,a,pair,opts)
+#define box_set(w,v,h)			wborder_set(w,v,v,h,h,0,0,0,0)
 #define chgat(n,a,c,o)			wchgat(stdscr,n,a,c,o)
 #define echo_wchar(c)			wecho_wchar(stdscr,c)
 #define getbkgd(win)			((win)->_bkgd)
@@ -1076,11 +1100,11 @@ extern int wvline_set(WINDOW *, const cchar_t *, int);	/* missing */
 #define mvinwstr(y,x,c)			mvwinnwstr(stdscr,y,x,c,-1)
 #define mvvline_set(y,x,c,n)		mvwvline_set(stdscr,y,x,c,n)
 
-#define mvwadd_wch(y,x,win,c)		(wmove(win,y,x) == ERR ? ERR : wadd_wch(stsdscr,c))
-#define mvwaddnwstr(y,x,win,wstr,n)	(wmove(win,y,x) == ERR ? ERR : waddnwstr(stdscr,wstr,n))
-#define mvwaddwstr(y,x,win,wstr,n)	(wmove(win,y,x) == ERR ? ERR : waddnwstr(stdscr,wstr,-1))
+#define mvwadd_wch(win,y,x,c)		(wmove(win,y,x) == ERR ? ERR : wadd_wch(stdscr,c))
+#define mvwaddnwstr(win,y,x,wstr,n)	(wmove(win,y,x) == ERR ? ERR : waddnwstr(stdscr,wstr,n))
+#define mvwaddwstr(win,y,x,wstr,n)	(wmove(win,y,x) == ERR ? ERR : waddnwstr(stdscr,wstr,-1))
 #define mvwchgat(win,y,x,n,a,c,o)	(wmove(win,y,x) == ERR ? ERR : wchgat(win,n,a,c,o))
-#define mvwget_wch(win,y,x,c)		(wmove(win,y,x) == ERR ? ERR : wget_wch(win,n))
+#define mvwget_wch(win,y,x,c)		(wmove(win,y,x) == ERR ? ERR : wget_wch(win,c))
 #define mvwget_wstr(win,y,x,t)		(wmove(win,y,x) == ERR ? ERR : wgetn_wstr(win,t,-1))
 #define mvwgetn_wstr(win,y,x,t,n)	(wmove(win,y,x) == ERR ? ERR : wgetn_wstr(win,t,n))
 #define mvwhline_set(win,y,x,c,n)	(wmove(win,y,x) == ERR ? ERR : whline_set(win,c,n))
@@ -1089,18 +1113,20 @@ extern int wvline_set(WINDOW *, const cchar_t *, int);	/* missing */
 #define mvwin_wchstr(win,y,x,c)		(wmove(win,y,x) == ERR ? ERR : win_wchnstr(stdscr,c,-1))
 #define mvwinnwstr(win,y,x,c,n)		(wmove(win,y,x) == ERR ? ERR : winnwstr(stdscr,c,n))
 #define mvwins_nwstr(win,y,x,t,n)	(wmove(win,y,x) == ERR ? ERR : wins_nwstr(stdscr,t,n))
-#define mvwins_wch(win,y,x,c)		(wmove(win,y,x) == ERR ? ERR : wins_wch(c))
+#define mvwins_wch(win,y,x,c)		(wmove(win,y,x) == ERR ? ERR : wins_wch(stdscr,c))
 #define mvwins_wstr(win,y,x,t)		(wmove(win,y,x) == ERR ? ERR : wins_nwstr(stdscr,t,-1))
 #define mvwinwstr(win,y,x,c)		(wmove(win,y,x) == ERR ? ERR : winnwstr(stdscr,c,-1))
 #define mvwvline_set(win,y,x,c,n)	(wmove(win,y,x) == ERR ? ERR : wvline_set(win,c,n))
 
-#define slk_attr_off(a)			slk_attroff(a)
-#define slk_attr_on(a)			slk_attron(a)
-#define slk_attr_set(a)			slk_attrset(a)
-#define vid_attr(a)			vidattr(a)
-#define vline_set(c,n)			vhline_set(stdscr,c,n)
+#define slk_attr_off(a,v)		((v) ? ERR : slk_attroff(a))
+#define slk_attr_on(a,v)		((v) ? ERR : slk_attron(a))
+
+#define vid_attr(a,pair,opts)		vidattr(a)
+#define vline_set(c,n)			wvline_set(stdscr,c,n)
 #define waddwstr(win,wstr,n)		waddnwstr(win,wstr,-1)
-#define wattr_get(win)			((win)->_attrs)
+#define wattr_get(win,a,p,opts)		((void)((a) != 0 && (*(a) = (win)->_attrs)), \
+					 (void)((p) != 0 && (*(p) = PAIR_NUMBER((win)->_attrs))), \
+					 OK)
 #define wget_wstr(w,t)			wgetn_wstr(w,t,-1)
 #define win_wchstr(w,c)			win_wchnstr(w,c,-1)
 #define wins_wstr(w,t)			wins_nwstr(w,t,-1)
@@ -1280,6 +1306,9 @@ extern int ungetmouse(MEVENT *);
 extern mmask_t mousemask(mmask_t, mmask_t *);
 extern bool wenclose(const WINDOW *, int, int);
 extern int mouseinterval(int);
+extern bool wmouse_trafo(const WINDOW* win,int* y, int* x, bool to_screen);
+
+#define mouse_trafo(y,x,to_screen) wmouse_trafo(stdscr,y,x,to_screen)
 
 /* other non-XSI functions */
 
@@ -1292,7 +1321,7 @@ extern void _tracef(const char *, ...) GCC_PRINTFLIKE(1,2);
 extern void _tracedump(const char *, WINDOW *);
 extern char *_traceattr(attr_t);
 extern char *_traceattr2(int, chtype);
-extern char *_tracebits(void);
+extern char *_nc_tracebits(void);
 extern char *_tracechar(const unsigned char);
 extern char *_tracechtype(chtype);
 extern char *_tracechtype2(int, chtype);
@@ -1313,6 +1342,7 @@ extern void trace(const unsigned int);
 #define TRACE_BITS	0x0100	/* trace state of TTY control bits */
 #define TRACE_ICALLS	0x0200	/* trace internal/nested calls */
 #define TRACE_CCALLS	0x0400	/* trace per-character calls */
+#define TRACE_DATABASE	0x0800	/* trace read/write of terminfo/termcap data */
 #define TRACE_MAXIMUM	0xffff	/* maximum trace level */
 
 #if defined(TRACE) || defined(NCURSES_TEST)
@@ -1325,6 +1355,14 @@ extern const char *_nc_visbuf(const char *);
 #endif
 
 #ifdef __cplusplus
+
+/* these names conflict with STL */
+#undef box
+#undef clear
+#undef erase
+#undef move
+#undef refresh
+
 }
 #endif