]> ncurses.scripts.mit.edu Git - ncurses.git/blobdiff - test/test.priv.h
projects / ncurses.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ncurses 6.1 - patch 20181027
[ncurses.git] / test / test.priv.h
diff --git a/test/test.priv.h b/test/test.priv.h
index a7cc109cf9f8b2561f8d35ed1ca5d0136bd8458c..f4c11aa5506791777c71c8c1fdc84c5f29a030db 100644 (file)
--- a/test/test.priv.h
+++ b/test/test.priv.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2017,2018 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            *
@@ -29,7 +29,7 @@
 /****************************************************************************
  *  Author: Thomas E. Dickey                    1996-on                     *
  ****************************************************************************/
-/* $Id: test.priv.h,v 1.158 2017/09/30 17:58:37 tom Exp $ */
+/* $Id: test.priv.h,v 1.169 2018/08/19 00:28:27 tom Exp $ */
 
 #ifndef __TEST_PRIV_H
 #define __TEST_PRIV_H 1
@@ -206,6 +206,10 @@
 #define HAVE_PUTWIN 0
 #endif
 
+#ifndef HAVE_RESET_COLOR_PAIRS
+#define HAVE_RESET_COLOR_PAIRS 0
+#endif
+
 #ifndef HAVE_RESIZE_TERM
 #define HAVE_RESIZE_TERM 0
 #endif
@@ -438,6 +442,9 @@ extern int optind;
 #ifndef GCC_PRINTFLIKE
 #define GCC_PRINTFLIKE(a,b)    /* nothing */
 #endif
+#ifndef GCC_SCANFLIKE
+#define GCC_SCANFLIKE(a,b)     /* nothing */
+#endif
 #ifndef GCC_UNUSED
 #define GCC_UNUSED             /* nothing */
 #endif
@@ -571,38 +578,54 @@ 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
+#endif
+#ifndef WA_BOLD
+#define WA_BOLD         A_BOLD
+#endif
+#ifndef WA_REVERSE
+#define WA_REVERSE      A_REVERSE
+#endif
+#ifndef WA_UNDERLINE
+#define WA_UNDERLINE    A_UNDERLINE
+#endif
+#ifndef WA_BLINK
+#define WA_BLINK        A_BLINK
 #endif
 
 #ifndef OK
@@ -691,7 +714,7 @@ extern char *strnames[], *strcodes[], *strfnames[];
 #define DECL_CURSES_DATA_TTYTYPE 0
 #endif
 
-#if !HAVE_CURSES_DATA_TTYTYPE || DECL_CURSES_DATA_TTYTYPE
+#if !defined(ttytype) && (!HAVE_CURSES_DATA_TTYTYPE || DECL_CURSES_DATA_TTYTYPE)
 #define ttytype termname()
 #endif
 
@@ -842,7 +865,7 @@ extern char *strnames[], *strcodes[], *strfnames[];
 #define EXIT_FAILURE 1
 #endif
 
-#if defined(__MINGW32__) || defined(USE_WIN32CON_DRIVER)
+#if defined(_WIN32) || defined(USE_WIN32CON_DRIVER)
 
 #if defined(PDCURSES)
 #ifdef WINVER
@@ -879,8 +902,12 @@ extern char *strnames[], *strcodes[], *strfnames[];
  * that XSI shows.
  */
 #ifndef NCURSES_CONST
+#ifdef PDCURSES
+#define NCURSES_CONST          const   /* close enough */
+#else
 #define NCURSES_CONST          /* nothing */
 #endif
+#endif
 
 /* out-of-band values for representing absent capabilities */
 #define ABSENT_BOOLEAN         ((signed char)-1)       /* 255 */
@@ -966,7 +993,7 @@ extern char *tgoto(char *, int, int);       /* available, but not prototyped */
 /*
  * ncurses uses const in some places where X/Open does (or did) not allow.
  */
-#ifdef NCURSES_VERSION
+#if defined(NCURSES_VERSION) || defined(PDCURSES)
 #define CONST_MENUS const
 #else
 #define CONST_MENUS            /* nothing */
@@ -978,10 +1005,12 @@ extern char *tgoto(char *, int, int);    /* available, but not prototyped */
 
 #if HAVE_USE_WINDOW
 #define USING_WINDOW(w,func) use_window(w, (NCURSES_WINDOW_CB) func, w)
+#define USING_WINDOW1(w,func,safe) use_window(w, (NCURSES_WINDOW_CB) safe, NULL)
 #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
-#define USING_WINDOW(w,func) func(w)
+#define USING_WINDOW(w,func) func(w, NULL)
+#define USING_WINDOW1(w,func,safe) func(w)
 #define USING_WINDOW2(w,func,data) func(w,data)
 #define WANT_USE_WINDOW() extern void _nc_want_use_window(void)
 #endif
ncurses, with patches starting at ncurses-5.6; new users should use https://github.com/ThomasDickey/ncurses-snapshots/