ncurses 6.0 - patch 20171014

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

diff --git a/test/test.priv.h b/test/test.priv.h
index dcfa8e753e0259841cb38952267a39bb50dc086f..c2b4bd4695cbee29d83bdc5706bea3210b47e809 100644 (file)
--- a/test/test.priv.h
+++ b/test/test.priv.h
@@ -29,7 +29,7 @@
 /****************************************************************************
  *  Author: Thomas E. Dickey                    1996-on                     *
  ****************************************************************************/
-/* $Id: test.priv.h,v 1.154 2017/09/06 20:07:40 tom Exp $ */
+/* $Id: test.priv.h,v 1.160 2017/10/12 01:00:59 tom Exp $ */
 
 #ifndef __TEST_PRIV_H
 #define __TEST_PRIV_H 1
@@ -571,38 +571,46 @@ extern int optind;
 #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['}'])
+#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
+
+#ifndef WA_NORMAL
+#define WA_NORMAL       A_NORMAL
+#define WA_BOLD         A_BOLD
+#define WA_REVERSE      A_REVERSE
+#define WA_UNDERLINE    A_UNDERLINE
+#define WA_BLINK        A_BLINK
 #endif
 
 #ifndef OK
@@ -683,7 +691,15 @@ extern char *numnames[], *numcodes[], *numfnames[];
 extern char *strnames[], *strcodes[], *strfnames[];
 #endif
 
-#ifdef DECL_CURSES_DATA_TTYTYPE
+#ifndef HAVE_CURSES_DATA_TTYTYPE
+#define HAVE_CURSES_DATA_TTYTYPE 0
+#endif
+
+#ifndef DECL_CURSES_DATA_TTYTYPE
+#define DECL_CURSES_DATA_TTYTYPE 0
+#endif
+
+#if !defined(ttytype) && (!HAVE_CURSES_DATA_TTYTYPE || DECL_CURSES_DATA_TTYTYPE)
 #define ttytype termname()
 #endif
 
@@ -890,12 +906,18 @@ extern char *strnames[], *strcodes[], *strfnames[];
 
 #define VT_ACSC "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~"
 
-#define CATCHALL(handler) { \
+#define CATCHALL(handler) do { \
                int nsig; \
                for (nsig = SIGHUP; nsig < SIGTERM; ++nsig) \
                    if (nsig != SIGKILL) \
                        signal(nsig, handler); \
-           }
+           } while(0)
+
+#ifdef NCURSES_VERSION
+#define InitAndCatch(init,handler) do { CATCHALL(handler); init; } while (0)
+#else
+#define InitAndCatch(init,handler) do { init; CATCHALL(handler); } while (0)
+#endif
 
 /*
  * Workaround for clean(er) compile with Solaris's legacy curses.
@@ -1018,9 +1040,9 @@ extern int _nc_getenv_num(const char *);
  * 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))
+#define AttrArg(p,a)    (chtype) ((chtype)(p) | (chtype)(a))
 #else
-#define AttrArg(p,a)    (int) ((attr_t)(p) | (attr_t)(a))
+#define AttrArg(p,a)    (int) ((chtype)(p) | (chtype)(a))
 #endif
 
 /*