ncurses 5.9 - patch 20150307

[ncurses.git] / test / test.priv.h

diff --git a/test/test.priv.h b/test/test.priv.h
index fb5f203fc0b18bdcd564c1243f133fadef4fdf5f..eedf201b6a6f694475d30d2ae7be59f77624baad 100644 (file)
--- a/test/test.priv.h
+++ b/test/test.priv.h
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2013,2014 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -29,7 +29,7 @@
 /****************************************************************************
  *  Author: Thomas E. Dickey                    1996-on                     *
  ****************************************************************************/
 /****************************************************************************
  *  Author: Thomas E. Dickey                    1996-on                     *
  ****************************************************************************/

-/* $Id: test.priv.h,v 1.73 2008/02/10 00:12:55 tom Exp $ */
+/* $Id: test.priv.h,v 1.131 2014/10/25 01:20:34 tom Exp $ */

 
 #ifndef __TEST_PRIV_H
 #define __TEST_PRIV_H 1
 
 #ifndef __TEST_PRIV_H
 #define __TEST_PRIV_H 1


@@ -42,19 +42,26 @@
  */
 #ifdef  HAVE_LIBFORMW
 #define HAVE_LIBFORMW 1
  */
 #ifdef  HAVE_LIBFORMW
 #define HAVE_LIBFORMW 1

+#define HAVE_LIBFORM 1

 #endif
 
 #ifdef  HAVE_LIBMENUW
 #define HAVE_LIBMENUW 1
 #endif
 
 #ifdef  HAVE_LIBMENUW
 #define HAVE_LIBMENUW 1

+#define HAVE_LIBMENU 1

 #endif
 
 #ifdef  HAVE_LIBPANELW
 #define HAVE_LIBPANELW 1
 #endif
 
 #ifdef  HAVE_LIBPANELW
 #define HAVE_LIBPANELW 1

+#define HAVE_LIBPANEL 1

 #endif
 
 /*
  * Fallback definitions to accommodate broken compilers.
  */
 #endif
 
 /*
  * Fallback definitions to accommodate broken compilers.
  */

+#ifndef HAVE_ASSUME_DEFAULT_COLORS
+#define HAVE_ASSUME_DEFAULT_COLORS 0
+#endif
+

 #ifndef HAVE_CURSES_VERSION
 #define HAVE_CURSES_VERSION 0
 #endif
 #ifndef HAVE_CURSES_VERSION
 #define HAVE_CURSES_VERSION 0
 #endif


@@ -115,6 +122,10 @@
 #define HAVE_LOCALE_H 0
 #endif
 
 #define HAVE_LOCALE_H 0
 #endif
 

+#ifndef HAVE_MATH_H
+#define HAVE_MATH_H 0
+#endif
+

 #ifndef HAVE_MENU_H
 #define HAVE_MENU_H 0
 #endif
 #ifndef HAVE_MENU_H
 #define HAVE_MENU_H 0
 #endif


@@ -151,6 +162,10 @@
 #define HAVE_RIPOFFLINE 0
 #endif
 
 #define HAVE_RIPOFFLINE 0
 #endif
 

+#ifndef HAVE_SCR_DUMP
+#define HAVE_SCR_DUMP 0
+#endif
+

 #ifndef HAVE_SETUPTERM
 #define HAVE_SETUPTERM 0
 #endif
 #ifndef HAVE_SETUPTERM
 #define HAVE_SETUPTERM 0
 #endif


@@ -163,14 +178,30 @@
 #define HAVE_SLK_INIT 0
 #endif
 
 #define HAVE_SLK_INIT 0
 #endif
 

+#ifndef HAVE_SYS_IOCTL_H
+#define HAVE_SYS_IOCTL_H 0
+#endif
+
+#ifndef HAVE_SYS_SELECT_H
+#define HAVE_SYS_SELECT_H 0
+#endif
+

 #ifndef HAVE_TERMATTRS
 #define HAVE_TERMATTRS 0
 #endif
 
 #ifndef HAVE_TERMATTRS
 #define HAVE_TERMATTRS 0
 #endif
 

+#ifndef HAVE_TERMIOS_H
+#define HAVE_TERMIOS_H 0
+#endif
+

 #ifndef HAVE_TERMNAME
 #define HAVE_TERMNAME 0
 #endif
 
 #ifndef HAVE_TERMNAME
 #define HAVE_TERMNAME 0
 #endif
 

+#ifndef HAVE_TERM_ENTRY_H
+#define HAVE_TERM_ENTRY_H 0
+#endif
+

 #ifndef HAVE_TGETENT
 #define HAVE_TGETENT 0
 #endif
 #ifndef HAVE_TGETENT
 #define HAVE_TGETENT 0
 #endif


@@ -179,14 +210,14 @@
 #define HAVE_TIGETNUM 0
 #endif
 
 #define HAVE_TIGETNUM 0
 #endif
 

-#ifndef HAVE_TYPEAHEAD
-#define HAVE_TYPEAHEAD 0
-#endif
-

 #ifndef HAVE_TIGETSTR
 #define HAVE_TIGETSTR 0
 #endif
 
 #ifndef HAVE_TIGETSTR
 #define HAVE_TIGETSTR 0
 #endif
 

+#ifndef HAVE_TYPEAHEAD
+#define HAVE_TYPEAHEAD 0
+#endif
+

 #ifndef HAVE_WINSSTR
 #define HAVE_WINSSTR 0
 #endif
 #ifndef HAVE_WINSSTR
 #define HAVE_WINSSTR 0
 #endif


@@ -195,6 +226,30 @@
 #define HAVE_USE_DEFAULT_COLORS 0
 #endif
 
 #define HAVE_USE_DEFAULT_COLORS 0
 #endif
 

+#ifndef HAVE_USE_ENV
+#define HAVE_USE_ENV 0
+#endif
+
+#ifndef HAVE_USE_EXTENDED_NAMES
+#define HAVE_USE_EXTENDED_NAMES 0
+#endif
+
+#ifndef HAVE_USE_SCREEN
+#define HAVE_USE_SCREEN 0
+#endif
+
+#ifndef HAVE_USE_WINDOW
+#define HAVE_USE_WINDOW 0
+#endif
+
+#ifndef HAVE_VIDPUTS
+#define HAVE_VIDPUTS 0
+#endif
+
+#ifndef HAVE_VID_PUTS
+#define HAVE_VID_PUTS 0
+#endif
+

 #ifndef HAVE_WRESIZE
 #define HAVE_WRESIZE 0
 #endif
 #ifndef HAVE_WRESIZE
 #define HAVE_WRESIZE 0
 #endif


@@ -207,19 +262,39 @@
 #define NEED_PTEM_H 0
 #endif
 
 #define NEED_PTEM_H 0
 #endif
 

+#ifndef NEED_WCHAR_H
+#define NEED_WCHAR_H 0
+#endif
+

 #ifndef NO_LEAKS
 #define NO_LEAKS 0
 #endif
 
 #ifndef NO_LEAKS
 #define NO_LEAKS 0
 #endif
 

+/*
+ * Workaround for HPUX
+ */
+#if defined(__hpux) && !defined(NCURSES_VERSION)
+#define _ACS_COMPAT_CODE       /* needed for acs_map vs __acs_map */
+#endif
+

 #include <stdlib.h>
 #include <stdlib.h>

+#include <stdarg.h>

 #include <string.h>
 #include <sys/types.h>
 #include <string.h>
 #include <sys/types.h>

+#include <errno.h>

 
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
 
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 

-#include <signal.h>    /* include before curses.h to work around glibc bug */
+#include <signal.h>            /* include before curses.h to work around glibc bug */
+
+#if NEED_WCHAR_H
+#include <wchar.h>
+#ifdef HAVE_LIBUTF8_H
+#include <libutf8.h>
+#endif
+#endif

 
 #if defined(HAVE_XCURSES)
 #include <xcurses.h>
 
 #if defined(HAVE_XCURSES)
 #include <xcurses.h>


@@ -231,7 +306,7 @@
 #include <curses.h>
 #endif
 
 #include <curses.h>
 #endif
 

-#if defined(HAVE_XCURSES)
+#if defined(HAVE_XCURSES) || defined(PDCURSES)

 /* no other headers */
 #undef  HAVE_SETUPTERM         /* nonfunctional */
 #define HAVE_SETUPTERM 0
 /* no other headers */
 #undef  HAVE_SETUPTERM         /* nonfunctional */
 #define HAVE_SETUPTERM 0


@@ -249,21 +324,18 @@
 
 /*
  * Not all curses.h implementations include unctrl.h,
 
 /*
  * Not all curses.h implementations include unctrl.h,

- * Solaris 10 xpg4 for example.

  */
  */

-#if defined(NCURSES_VERSION) || defined(_XOPEN_CURSES)
-#if defined(HAVE_NCURSESW_NCURSES_H)
+#if defined(HAVE_NCURSESW_UNCTRL_H)

 #include <ncursesw/unctrl.h>
 #include <ncursesw/unctrl.h>

-#elif defined(HAVE_NCURSES_NCURSES_H)
+#elif defined(HAVE_NCURSES_UNCTRL_H)

 #include <ncurses/unctrl.h>
 #include <ncurses/unctrl.h>

-#else
+#elif defined(HAVE_UNCTRL_H)

 #include <unctrl.h>
 #endif
 #include <unctrl.h>
 #endif

-#endif

 
 #if HAVE_GETOPT_H
 #include <getopt.h>
 
 #if HAVE_GETOPT_H
 #include <getopt.h>

-#else
+#elif !defined(HAVE_GETOPT_HEADER)

 /* 'getopt()' may be prototyped in <stdlib.h>, but declaring its variables
  * doesn't hurt.
  */
 /* 'getopt()' may be prototyped in <stdlib.h>, but declaring its variables
  * doesn't hurt.
  */


@@ -274,20 +346,20 @@ extern int optind;
 #if HAVE_LOCALE_H
 #include <locale.h>
 #else
 #if HAVE_LOCALE_H
 #include <locale.h>
 #else

-#define setlocale(name,string) /* nothing */
+#define setlocale(name,string) /* nothing */

 #endif
 
 #include <assert.h>
 #include <ctype.h>
 
 #ifndef GCC_NORETURN
 #endif
 
 #include <assert.h>
 #include <ctype.h>
 
 #ifndef GCC_NORETURN

-#define GCC_NORETURN /* nothing */
+#define GCC_NORETURN           /* nothing */

 #endif
 #ifndef GCC_PRINTFLIKE
 #endif
 #ifndef GCC_PRINTFLIKE

-#define GCC_PRINTFLIKE(a,b) /* nothing */
+#define GCC_PRINTFLIKE(a,b)    /* nothing */

 #endif
 #ifndef GCC_UNUSED
 #endif
 #ifndef GCC_UNUSED

-#define GCC_UNUSED /* nothing */
+#define GCC_UNUSED             /* nothing */

 #endif
 
 #ifndef HAVE_GETNSTR
 #endif
 
 #ifndef HAVE_GETNSTR


@@ -302,8 +374,21 @@ extern int optind;
 #endif
 #endif
 
 #endif
 #endif
 

+#if !USE_SOFTKEYS
+#define slk_init()             /* nothing */
+#define slk_restore()          /* nothing */
+#define slk_clear()            /* nothing */
+#endif
+
+#ifndef HAVE_WSYNCDOWN
+#define wsyncdown(win)         /* nothing */
+#endif
+

 #ifndef USE_WIDEC_SUPPORT
 #ifndef USE_WIDEC_SUPPORT

-#if defined(_XOPEN_SOURCE_EXTENDED) && defined(WACS_ULCORNER)
+#if (defined(_XOPEN_SOURCE_EXTENDED) \
+  || (defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE - 0 >= 500)) \
+  || (defined(NCURSES_WIDECHAR) && (NCURSES_WIDECHAR - 0 < 1))) \
+  && defined(WACS_ULCORNER)

 #define USE_WIDEC_SUPPORT 1
 #else
 #define USE_WIDEC_SUPPORT 0
 #define USE_WIDEC_SUPPORT 1
 #else
 #define USE_WIDEC_SUPPORT 0


@@ -328,6 +413,20 @@ extern int optind;
 #define USE_LIBFORM 0
 #endif
 
 #define USE_LIBFORM 0
 #endif
 

+/* workaround, to build against NetBSD's variant of the form library */
+#ifdef HAVE_NETBSD_FORM_H
+#define form_getyx(form, y, x) y = current_field(form)->cursor_ypos, x = current_field(form)->cursor_xpos
+#else
+#define form_getyx(form, y, x) y = (form)->currow, x = (form)->curcol
+#endif
+
+/* workaround, to build against NetBSD's variant of the form library */
+#ifdef HAVE_NETBSD_MENU_H
+#define menu_itemwidth(menu) (menu)->max_item_width
+#else
+#define menu_itemwidth(menu) (menu)->itemlen
+#endif
+

 #ifndef HAVE_TYPE_ATTR_T
 #if !USE_WIDEC_SUPPORT && !defined(attr_t)
 #define attr_t chtype
 #ifndef HAVE_TYPE_ATTR_T
 #if !USE_WIDEC_SUPPORT && !defined(attr_t)
 #define attr_t chtype


@@ -341,6 +440,14 @@ extern int optind;
 #define NCURSES_CH_T cchar_t
 #endif
 
 #define NCURSES_CH_T cchar_t
 #endif
 

+#ifndef NCURSES_COLOR_T
+#define NCURSES_COLOR_T short
+#endif
+
+#ifndef NCURSES_PAIRS_T
+#define NCURSES_PAIRS_T short
+#endif
+

 #ifndef NCURSES_OPAQUE
 #define NCURSES_OPAQUE 0
 #endif
 #ifndef NCURSES_OPAQUE
 #define NCURSES_OPAQUE 0
 #endif


@@ -349,6 +456,79 @@ extern int optind;
 #define CCHARW_MAX 5
 #endif
 
 #define CCHARW_MAX 5
 #endif
 

+#if defined(NCURSES_VERSION) && defined(CURSES_WACS_ARRAY) && !defined(CURSES_WACS_SYMBOLS)
+#define CURSES_WACS_SYMBOLS
+#endif
+
+#if defined(CURSES_WACS_ARRAY) && !defined(CURSES_WACS_SYMBOLS)
+/* NetBSD 5.1 defines these incorrectly */
+#undef WACS_RARROW
+#undef WACS_LARROW
+#undef WACS_UARROW
+#undef WACS_DARROW
+#undef WACS_BLOCK
+#undef WACS_DIAMOND
+#undef WACS_CKBOARD
+#undef WACS_DEGREE
+#undef WACS_PLMINUS
+#undef WACS_BOARD
+#undef WACS_LANTERN
+#undef WACS_LRCORNER
+#undef WACS_URCORNER
+#undef WACS_ULCORNER
+#undef WACS_LLCORNER
+#undef WACS_PLUS
+#undef WACS_HLINE
+#undef WACS_S1
+#undef WACS_S9
+#undef WACS_LTEE
+#undef WACS_RTEE
+#undef WACS_BTEE
+#undef WACS_TTEE
+#undef WACS_VLINE
+#undef WACS_BULLET
+#undef WACS_S3
+#undef WACS_S7
+#undef WACS_LEQUAL
+#undef WACS_GEQUAL
+#undef WACS_PI
+#undef WACS_NEQUAL
+#undef WACS_STERLING
+
+#define        WACS_RARROW     &(CURSES_WACS_ARRAY['+'])
+#define        WACS_LARROW     &(CURSES_WACS_ARRAY[','])
+#define        WACS_UARROW     &(CURSES_WACS_ARRAY['-'])
+#define        WACS_DARROW     &(CURSES_WACS_ARRAY['.'])
+#define        WACS_BLOCK      &(CURSES_WACS_ARRAY['0'])
+#define        WACS_DIAMOND    &(CURSES_WACS_ARRAY['`'])
+#define        WACS_CKBOARD    &(CURSES_WACS_ARRAY['a'])
+#define        WACS_DEGREE     &(CURSES_WACS_ARRAY['f'])
+#define        WACS_PLMINUS    &(CURSES_WACS_ARRAY['g'])
+#define        WACS_BOARD      &(CURSES_WACS_ARRAY['h'])
+#define        WACS_LANTERN    &(CURSES_WACS_ARRAY['i'])
+#define        WACS_LRCORNER   &(CURSES_WACS_ARRAY['j'])
+#define        WACS_URCORNER   &(CURSES_WACS_ARRAY['k'])
+#define        WACS_ULCORNER   &(CURSES_WACS_ARRAY['l'])
+#define        WACS_LLCORNER   &(CURSES_WACS_ARRAY['m'])
+#define        WACS_PLUS       &(CURSES_WACS_ARRAY['n'])
+#define        WACS_HLINE      &(CURSES_WACS_ARRAY['q'])
+#define        WACS_S1         &(CURSES_WACS_ARRAY['o'])
+#define        WACS_S9         &(CURSES_WACS_ARRAY['s'])
+#define        WACS_LTEE       &(CURSES_WACS_ARRAY['t'])
+#define        WACS_RTEE       &(CURSES_WACS_ARRAY['u'])
+#define        WACS_BTEE       &(CURSES_WACS_ARRAY['v'])
+#define        WACS_TTEE       &(CURSES_WACS_ARRAY['w'])
+#define        WACS_VLINE      &(CURSES_WACS_ARRAY['x'])
+#define        WACS_BULLET     &(CURSES_WACS_ARRAY['~'])
+#define        WACS_S3         &(CURSES_WACS_ARRAY['p'])
+#define        WACS_S7         &(CURSES_WACS_ARRAY['r'])
+#define        WACS_LEQUAL     &(CURSES_WACS_ARRAY['y'])
+#define        WACS_GEQUAL     &(CURSES_WACS_ARRAY['z'])
+#define        WACS_PI         &(CURSES_WACS_ARRAY['{'])
+#define        WACS_NEQUAL     &(CURSES_WACS_ARRAY['|'])
+#define        WACS_STERLING   &(CURSES_WACS_ARRAY['}'])
+#endif
+

 #undef CTRL
 #define CTRL(x)        ((x) & 0x1f)
 
 #undef CTRL
 #define CTRL(x)        ((x) & 0x1f)
 


@@ -356,9 +536,18 @@ extern int optind;
 #define ESCAPE         CTRL('[')
 
 #ifndef KEY_MIN
 #define ESCAPE         CTRL('[')
 
 #ifndef KEY_MIN

-#define KEY_MIN 256    /* not defined in Solaris 8 */
+#define KEY_MIN 256            /* not defined in Solaris 8 */
+#endif
+
+#ifdef DECL_CURSES_DATA_BOOLNAMES
+extern char *boolnames[], *boolcodes[], *boolfnames[];
+extern char *numnames[], *numcodes[], *numfnames[];
+extern char *strnames[], *strcodes[], *strfnames[];

 #endif
 
 #endif
 

+#define colored_chtype(ch, attr, pair) \
+       ((chtype) (ch) | (chtype) (attr) | (chtype) COLOR_PAIR(pair))
+

 /*
  * Workaround for HPUX
  */
 /*
  * Workaround for HPUX
  */


@@ -373,6 +562,25 @@ extern int optind;
 #define getpary(w) __getpary(w)
 #endif
 
 #define getpary(w) __getpary(w)
 #endif
 

+/*
+ * Workaround in case getcchar() returns a positive value when the source
+ * string produces only a L'\0'.
+ */
+#define TEST_CCHAR(s, count, then_stmt, else_stmt) \
+       if ((count = getcchar(s, NULL, NULL, NULL, NULL)) > 0) { \
+           wchar_t test_wch[CCHARW_MAX + 2]; \
+           attr_t test_attrs; \
+           NCURSES_PAIRS_T test_pair; \
+           \
+           if (getcchar( s, test_wch, &test_attrs, &test_pair, NULL) == OK \
+               && test_wch[0] != L'\0') { \
+               then_stmt \
+           } else { \
+               else_stmt \
+           } \
+       } else { \
+           else_stmt \
+       }

 /*
  * These usually are implemented as macros, but may be functions.
  */
 /*
  * These usually are implemented as macros, but may be functions.
  */


@@ -431,6 +639,17 @@ extern int optind;
 #define TIGETSTR(ti,tc) tgetstr(tc,&area_pointer)
 #endif
 
 #define TIGETSTR(ti,tc) tgetstr(tc,&area_pointer)
 #endif
 

+/*
+ * So far (2013 - more than ten years), only ncurses implements
+ * use_extended_names().
+ */
+#if defined(NCURSES_XNAMES)
+#elif defined(NCURSES_VERSION) && defined(HAVE_TERM_ENTRY_H) && HAVE_TERM_ENTRY_H
+#define NCURSES_XNAMES 1
+#else
+#define NCURSES_XNAMES 0
+#endif
+

 /* ncurses implements tparm() with varargs, X/Open with a fixed-parameter list
  * (which is incompatible with legacy usage, doesn't solve any problems).
  */
 /* ncurses implements tparm() with varargs, X/Open with a fixed-parameter list
  * (which is incompatible with legacy usage, doesn't solve any problems).
  */


@@ -448,8 +667,9 @@ extern int optind;
 #define ExitProgram(code) _nc_free_tinfo(code)
 #endif
 #else
 #define ExitProgram(code) _nc_free_tinfo(code)
 #endif
 #else

-#define typeMalloc(type,n) (type *) malloc((n) * sizeof(type))
-#define typeRealloc(type,n,p) (type *) realloc(p, (n) * sizeof(type))
+#define typeMalloc(type,n) (type *) malloc((size_t)(n) * sizeof(type))
+#define typeCalloc(type,elts) (type *) calloc((size_t)(elts), sizeof(type))
+#define typeRealloc(type,n,p) (type *) realloc(p, (size_t)(n) * sizeof(type))

 #endif
 
 #ifndef ExitProgram
 #endif
 
 #ifndef ExitProgram


@@ -463,12 +683,44 @@ extern int optind;
 #define EXIT_FAILURE 1
 #endif
 
 #define EXIT_FAILURE 1
 #endif
 

+#if defined(__MINGW32__) || defined(USE_WIN32CON_DRIVER)
+
+#if defined(PDCURSES)
+#ifdef WINVER
+#  if WINVER < 0x0501
+#    error WINVER must at least be 0x0501
+#  endif
+#else
+#  define WINVER 0x0501
+#endif
+#include <windows.h>
+#include <sys/time.h>          /* for struct timeval */
+#undef sleep
+#define sleep(n) Sleep((n) * 1000)
+#define SIGHUP  1
+#define SIGKILL 9
+#define getlogin() "username"
+
+#elif defined(HAVE_NCURSESW_NCURSES_H)
+#include <ncursesw/nc_mingw.h>
+#elif defined(HAVE_NCURSES_NCURSES_H)
+#include <ncurses/nc_mingw.h>
+#else
+#include <nc_mingw.h>
+#endif
+
+/* conflicts in test/firstlast.c */
+#undef large
+#undef small
+
+#endif
+

 /* Use this to quiet gcc's -Wwrite-strings warnings, but accommodate SVr4
  * curses which doesn't have const parameters declared (so far) in the places
  * that XSI shows.
  */
 #ifndef NCURSES_CONST
 /* Use this to quiet gcc's -Wwrite-strings warnings, but accommodate SVr4
  * curses which doesn't have const parameters declared (so far) in the places
  * that XSI shows.
  */
 #ifndef NCURSES_CONST

-#define NCURSES_CONST /* nothing */
+#define NCURSES_CONST          /* nothing */

 #endif
 
 /* out-of-band values for representing absent capabilities */
 #endif
 
 /* out-of-band values for representing absent capabilities */


@@ -481,7 +733,7 @@ extern int optind;
 #define CANCELLED_NUMERIC      (-2)
 #define CANCELLED_STRING       (char *)(-1)
 
 #define CANCELLED_NUMERIC      (-2)
 #define CANCELLED_STRING       (char *)(-1)
 

-#define VALID_BOOLEAN(s) ((unsigned char)(s) <= 1) /* reject "-1" */
+#define VALID_BOOLEAN(s) ((unsigned char)(s) <= 1)     /* reject "-1" */

 #define VALID_NUMERIC(s) ((s) >= 0)
 #define VALID_STRING(s)  ((s) != CANCELLED_STRING && (s) != ABSENT_STRING)
 
 #define VALID_NUMERIC(s) ((s) >= 0)
 #define VALID_STRING(s)  ((s) != CANCELLED_STRING && (s) != ABSENT_STRING)
 


@@ -499,24 +751,51 @@ extern int optind;
  * The same would be needed for HPUX 10.20
  */
 #ifndef TPUTS_ARG
  * The same would be needed for HPUX 10.20
  */
 #ifndef TPUTS_ARG

+#define TPUTS_ARG int
+#endif
+

 #if defined(sun) && !defined(_XOPEN_CURSES) && !defined(NCURSES_VERSION_PATCH)
 #if defined(sun) && !defined(_XOPEN_CURSES) && !defined(NCURSES_VERSION_PATCH)

+#undef TPUTS_ARG

 #define TPUTS_ARG char
 extern char *tgoto(char *, int, int);  /* available, but not prototyped */
 #define TPUTS_ARG char
 extern char *tgoto(char *, int, int);  /* available, but not prototyped */

-#else
-#define TPUTS_ARG int

 #endif
 #endif

+
+#ifndef TPUTS_PROTO
+#define TPUTS_PROTO(func,value) int func(TPUTS_ARG value)
+#endif
+
+#ifndef TPUTS_RETURN
+#define TPUTS_RETURN(value) return value

 #endif
 
 /*
  * Workarounds for Solaris's X/Open curses
  */
 #endif
 
 /*
  * Workarounds for Solaris's X/Open curses
  */

-#if defined(sun) && defined(_XOPEN_CURSES) && !defined(NCURSES_VERSION_PATCH)

 #if !defined(KEY_MIN) && defined(__KEY_MIN)
 #define KEY_MIN __KEY_MIN
 #endif
 #if !defined(KEY_MAX) && defined(__KEY_MIN)
 #define KEY_MAX __KEY_MAX
 #endif
 #if !defined(KEY_MIN) && defined(__KEY_MIN)
 #define KEY_MIN __KEY_MIN
 #endif
 #if !defined(KEY_MAX) && defined(__KEY_MIN)
 #define KEY_MAX __KEY_MAX
 #endif

+
+/*
+ * Workaround to build with Sun's default SVr4 curses.
+ */
+#ifdef NCURSES_VERSION
+#ifndef HAVE_VW_PRINTW
+#define HAVE_VW_PRINTW 1
+#endif
+#endif
+
+/*
+ * ncurses provides arrays of capability names; X/Open discarded these SVr4
+ * features.  Some implementations continue to provide them (see the test
+ * configure script).
+ */
+#ifdef NCURSES_VERSION
+#ifndef HAVE_CURSES_DATA_BOOLNAMES
+#define HAVE_CURSES_DATA_BOOLNAMES 1
+#endif

 #endif
 
 /*
 #endif
 
 /*


@@ -525,27 +804,71 @@ extern char *tgoto(char *, int, int);     /* available, but not prototyped */
 #ifdef NCURSES_VERSION
 #define CONST_MENUS const
 #else
 #ifdef NCURSES_VERSION
 #define CONST_MENUS const
 #else

-#define CONST_MENUS /* nothing */
+#define CONST_MENUS            /* nothing */

 #endif
 
 /*
  * Simplify setting up demo of threading with these macros.
  */
 #endif
 
 /*
  * Simplify setting up demo of threading with these macros.
  */

-#if !defined(NCURSES_VERSION_PATCH) || (NCURSES_VERSION_PATCH < 20070915) || !NCURSES_EXT_FUNCS
-typedef int (*NCURSES_CALLBACK)(WINDOW *, void *);
-#define WANT_USE_WINDOW() \
-static int \
-use_window(WINDOW *win, int (*func) (WINDOW *, void *), void *data) \
-{ \
-    return func(win, data); \
-} \
-       extern void _nc_want_use_window(void)
-#define USING_WINDOW(w,func) use_window(w, (NCURSES_CALLBACK) func, w)
+
+#if HAVE_USE_WINDOW
+#define USING_WINDOW(w,func) use_window(w, (NCURSES_WINDOW_CB) func, w)
+#define USING_WINDOW2(w,func,data) use_window(w, (NCURSES_WINDOW_CB) func, data)
+#define WANT_USE_WINDOW() extern void _nc_want_use_window(void)

 #else
 #else

-#define WANT_USE_WINDOW() /* nothing */ \
-       extern void _nc_want_use_window(void)

 #define USING_WINDOW(w,func) func(w)
 #define USING_WINDOW(w,func) func(w)

+#define USING_WINDOW2(w,func,data) func(w,data)
+#define WANT_USE_WINDOW() extern void _nc_want_use_window(void)

 #endif
 
 #endif
 

+#if HAVE_USE_WINDOW
+#define USING_SCREEN(s,func,data) use_screen(s, (NCURSES_SCREEN_CB) func, data)
+#define WANT_USE_SCREEN() extern void _nc_want_use_screen(void)
+#else
+#define USING_SCREEN(s,func,data) func(data)
+#define WANT_USE_SCREEN() extern void _nc_want_use_screen(void)
+#endif
+
+#ifdef TRACE
+#define Trace(p) _tracef p
+#define USE_TRACE 1
+#else
+#define Trace(p)               /* nothing */
+#define USE_TRACE 0
+#endif
+
+#define Trace2(p)              /* nothing */
+
+#define MvAddCh         (void) mvaddch
+#define MvWAddCh        (void) mvwaddch
+#define MvAddStr        (void) mvaddstr
+#define MvWAddStr       (void) mvwaddstr
+#define MvWAddChStr     (void) mvwaddchstr
+#define MvPrintw        (void) mvprintw
+#define MvWPrintw       (void) mvwprintw
+#define MvHLine         (void) mvhline
+#define MvWHLine        (void) mvwhline
+#define MvVLine         (void) mvvline
+#define MvWVLine        (void) mvwvline
+
+/*
+ * The macro likely uses unsigned values, while X/Open prototype uses int.
+ */
+#if defined(wattrset) || defined(PDCURSES)
+#define AttrArg(p,a)    (attr_t) ((attr_t)(p) | (attr_t)(a))
+#else
+#define AttrArg(p,a)    (int) ((attr_t)(p) | (attr_t)(a))
+#endif
+
+/*
+ * Workaround for defective implementation of gcc attribute warn_unused_result
+ */
+#if defined(__GNUC__) && defined(_FORTIFY_SOURCE)
+#define IGNORE_RC(func) errno = func
+#else
+#define IGNORE_RC(func) (void) func
+#endif /* gcc workarounds */
+
+#define init_mb(state) memset(&state, 0, sizeof(state))

 
 #endif /* __TEST_PRIV_H */
 
 #endif /* __TEST_PRIV_H */