X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=test%2Ftest.priv.h;h=a577da12ecac9f216f948aaa2255a5a771f35f38;hb=205ea499dbbceba5201d997fbd8b6b1f7f29bd50;hp=50ec1996411333446071686fe6562c69ea1776ef;hpb=e656c0ca01fc196f0eb66972af7fc51cb83d9651;p=ncurses.git diff --git a/test/test.priv.h b/test/test.priv.h index 50ec1996..a577da12 100644 --- a/test/test.priv.h +++ b/test/test.priv.h @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc. * + * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 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 +30,7 @@ /**************************************************************************** * Author: Thomas E. Dickey 1996-on * ****************************************************************************/ -/* $Id: test.priv.h,v 1.180 2019/03/30 20:19:38 tom Exp $ */ +/* $Id: test.priv.h,v 1.204 2022/08/20 16:34:24 tom Exp $ */ #ifndef __TEST_PRIV_H #define __TEST_PRIV_H 1 @@ -66,16 +67,8 @@ #define HAVE_ASSUME_DEFAULT_COLORS 0 #endif -#ifndef HAVE_BSD_STRING_H -#define HAVE_BSD_STRING_H 0 -#endif - -#ifndef HAVE_CURSES_VERSION -#define HAVE_CURSES_VERSION 0 -#endif - -#ifndef HAVE_CURSCR -#define HAVE_CURSCR 0 +#ifndef HAVE_CFMAKERAW +#define HAVE_CFMAKERAW 0 #endif #ifndef HAVE_CHGAT @@ -94,6 +87,18 @@ #define HAVE_COLOR_SET 0 #endif +#ifndef HAVE_BSD_STRING_H +#define HAVE_BSD_STRING_H 0 +#endif + +#ifndef HAVE_CURSES_VERSION +#define HAVE_CURSES_VERSION 0 +#endif + +#ifndef HAVE_CURSCR +#define HAVE_CURSCR 0 +#endif + #ifndef HAVE_DELSCREEN #define HAVE_DELSCREEN 0 #endif @@ -122,6 +127,10 @@ #define HAVE_GETMAXX 0 #endif +#ifndef HAVE_GETTIMEOFDAY +#define HAVE_GETTIMEOFDAY 0 +#endif + #ifndef HAVE_GETOPT_H #define HAVE_GETOPT_H 0 #endif @@ -162,6 +171,10 @@ #define HAVE_LOCALE_H 0 #endif +#ifndef HAVE_MATH_FUNCS +#define HAVE_MATH_FUNCS 0 +#endif + #ifndef HAVE_MATH_H #define HAVE_MATH_H 0 #endif @@ -242,6 +255,10 @@ #define HAVE_STDINT_H 0 #endif +#ifndef HAVE_STDNORETURN_H +#define HAVE_STDNORETURN_H 0 +#endif + #ifndef HAVE_STRSTR #define HAVE_STRSTR 0 #endif @@ -298,6 +315,10 @@ #define HAVE_WINSSTR 0 #endif +#ifndef HAVE_UNGET_WCH +#define HAVE_UNGET_WCH 0 +#endif + #ifndef HAVE_USE_DEFAULT_COLORS #define HAVE_USE_DEFAULT_COLORS 0 #endif @@ -390,6 +411,16 @@ #include #endif +#if HAVE_STDNORETURN_H && !defined(NCURSES_VERSION) +#include +#undef GCC_NORETURN +#define GCC_NORETURN _Noreturn +#endif + +#if !(defined(NCURSES_WGETCH_EVENTS) && defined(NEED_KEY_EVENT)) +#undef KEY_EVENT /* reduce compiler-warnings with Visual C++ */ +#endif + #if defined(HAVE_XCURSES) || defined(PDCURSES) /* no other headers */ #undef HAVE_SETUPTERM /* nonfunctional */ @@ -436,6 +467,13 @@ extern int optind; #include #include +#if defined(_MSC_VER) +#undef popen +#define popen(s,n) _popen(s,n) +#undef pclose +#define pclose(s) _pclose(s) +#endif + #ifndef GCC_NORETURN #define GCC_NORETURN /* nothing */ #endif @@ -473,8 +511,16 @@ extern int optind; #define slk_clear() /* nothing */ #endif +#ifndef HAVE_CURSES_DATA_TABSIZE +#define HAVE_CURSES_DATA_TABSIZE 0 +#endif + #if !NCURSES_EXT_FUNCS +#if HAVE_CURSES_DATA_TABSIZE #define set_tabsize(n) TABSIZE = (n) +#else +#define set_tabsize(n) /* nothing */ +#endif #endif #if HAVE_TPUTS_SP @@ -519,8 +565,12 @@ extern int optind; /* workaround, to build against NetBSD's variant of the form library */ #ifdef HAVE_NETBSD_FORM_H #define form_getyx(form, y, x) y = (int)current_field(form)->cursor_ypos, x = (int)current_field(form)->cursor_xpos -#else +#define form_field_row(field) (field)->form_row +#define form_field_col(field) (field)->form_col +#else /* e.g., SVr4, ncurses */ #define form_getyx(form, y, x) y = (int)(form)->currow, x = (int)(form)->curcol +#define form_field_row(field) (field)->frow +#define form_field_col(field) (field)->fcol #endif /* workaround, to build against NetBSD's variant of the form library */ @@ -688,10 +738,18 @@ extern int optind; #define HAVE_SNPRINTF 0 #endif +#ifndef HAVE_STRDUP +#define HAVE_STRDUP 0 +#endif + #ifndef USE_STRING_HACKS #define USE_STRING_HACKS 0 #endif +#ifndef HAVE_STRSTR +#define HAVE_STRSTR 0 +#endif + #ifndef NCURSES_CAST #ifdef __cplusplus extern "C" { @@ -718,19 +776,44 @@ extern "C" { #endif #if USE_STRING_HACKS && HAVE_SNPRINTF -#define _nc_SPRINTF NCURSES_VOID snprintf +#define _nc_SPRINTF NCURSES_VOID (snprintf) #define _nc_SLIMIT(n) NCURSES_CAST(size_t,n), #else -#define _nc_SPRINTF NCURSES_VOID sprintf +#define _nc_SPRINTF NCURSES_VOID (sprintf) #define _nc_SLIMIT(n) /* nothing */ #endif +/* + * X/Open Curses does not define the arrays of terminfo/termcap names as SVr4 + * curses did, and some implementations provide them anyway, but undeclared. + */ #ifdef DECL_CURSES_DATA_BOOLNAMES extern char *boolnames[], *boolcodes[], *boolfnames[]; extern char *numnames[], *numcodes[], *numfnames[]; extern char *strnames[], *strcodes[], *strfnames[]; #endif +/* + * Again, an SVr4 curses feature latent in the libraries but not in headers. + */ +#ifndef DECL_CURSES_DATA_TABSIZE +#define DECL_CURSES_DATA_TABSIZE 0 +#endif + +#if DECL_CURSES_DATA_TABSIZE +extern int TABSIZE; +#undef HAVE_CURSES_DATA_TABSIZE +#define HAVE_CURSES_DATA_TABSIZE 1 +#endif + +#ifndef HAVE_CURSES_DATA_TABSIZE +#define HAVE_CURSES_DATA_TABSIZE 0 +#endif + +/* + * X/Open Curses provides termname(), whose return value is analogous to the + * SVr4 curses variable ttytype[]. + */ #ifndef HAVE_CURSES_DATA_TTYTYPE #define HAVE_CURSES_DATA_TTYTYPE 0 #endif @@ -852,9 +935,9 @@ extern char *strnames[], *strcodes[], *strfnames[]; * ncurses restores the cursor in endwin(). Other libraries may not. */ #ifdef NCURSES_VERSION -#define exit_curses() endwin() +#define stop_curses() endwin() #else -#define exit_curses() do { endwin(); curs_set(1); } while (0) +#define stop_curses() do { endwin(); curs_set(1); } while (0) #endif /* ncurses implements tparm() with varargs, X/Open with a fixed-parameter list @@ -869,11 +952,14 @@ extern char *strnames[], *strcodes[], *strfnames[]; #if defined(NCURSES_VERSION) && HAVE_NC_ALLOC_H #include -#if HAVE_NC_FREEALL && defined(USE_TINFO) +#if HAVE_EXIT_TERMINFO && !defined(USE_CURSES) && (defined(USE_TERMINFO) || defined(USE_TINFO)) #undef ExitProgram -#define ExitProgram(code) _nc_free_tinfo(code) +#define ExitProgram(code) exit_terminfo(code) +#elif HAVE_EXIT_CURSES +#undef ExitProgram +#define ExitProgram(code) exit_curses(code) #endif -#else +#else /* not ncurses-tree */ #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)) @@ -890,7 +976,12 @@ extern char *strnames[], *strcodes[], *strfnames[]; #define EXIT_FAILURE 1 #endif -#if defined(_WIN32) || defined(USE_WIN32CON_DRIVER) +#undef _NC_WINDOWS +#if (defined(_WIN32) || defined(_WIN64)) +#define _NC_WINDOWS 1 +#endif + +#if defined(_NC_WINDOWS) || defined(USE_WIN32CON_DRIVER) #if defined(PDCURSES) #ifdef WINVER @@ -908,7 +999,19 @@ extern char *strnames[], *strcodes[], *strfnames[]; #define SIGKILL 9 #define getlogin() "username" -#elif defined(HAVE_NCURSESW_NCURSES_H) +#elif defined(EXP_WIN32_DRIVER) + +#if defined(HAVE_NCURSESW_NCURSES_H) +#include +#elif defined(HAVE_NCURSES_NCURSES_H) +#include +#else +#include +#endif + +#else + +#if defined(HAVE_NCURSESW_NCURSES_H) #include #elif defined(HAVE_NCURSES_NCURSES_H) #include @@ -916,6 +1019,8 @@ extern char *strnames[], *strcodes[], *strfnames[]; #include #endif +#endif + /* conflicts in test/firstlast.c */ #undef large #undef small @@ -943,9 +1048,9 @@ extern char *strnames[], *strcodes[], *strfnames[]; #endif #if !HAVE_STRSTR -extern char * _nc_strstr (const char *, const char *); +extern char *_nc_strstr(const char *, const char *); #define strstr(a,b) _nc_strstr((a),(b)) -#endif /* !HAVE_STRSTR */ +#endif /* !HAVE_STRSTR */ /* 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 @@ -988,6 +1093,12 @@ extern char * _nc_strstr (const char *, const char *); #define InitAndCatch(init,handler) do { init; CATCHALL(handler); } while (0) #endif +#if defined(_NC_WINDOWS) || defined(USE_WIN32CON_DRIVER) +#define SetupAlarm(opt) (void)opt +#else +#define SetupAlarm(opt) if (opt) alarm((unsigned)opt) +#endif + /* * Workaround for clean(er) compile with Solaris's legacy curses. * The same would be needed for HPUX 10.20 @@ -1065,6 +1176,14 @@ extern char *tgoto(char *, int, int); /* available, but not prototyped */ #define CONST_MENUS /* nothing */ #endif +#if defined(NCURSES_CONST) +#define CONST_FMT NCURSES_CONST +#elif defined(PDCURSES) +#define CONST_FMT const +#else +#define CONST_FMT /* nothing */ +#endif + /* * Simplify setting up demo of threading with these macros. */ @@ -1089,14 +1208,14 @@ extern char *tgoto(char *, int, int); /* available, but not prototyped */ #define WANT_USE_SCREEN() extern void _nc_want_use_screen(void) #endif -#if defined(TRACE) && HAVE__TRACEF +#if defined(TRACE) && HAVE__TRACEF && HAVE_CURSES_TRACE #define Trace(p) _tracef p #define USE_TRACE 1 #define START_TRACE() \ if ((_nc_tracing & TRACE_MAXIMUM) == 0) { \ int t = _nc_getenv_num("NCURSES_TRACE"); \ if (t >= 0) \ - trace((unsigned) t); \ + curses_trace((unsigned) t); \ } extern unsigned _nc_tracing; extern int _nc_getenv_num(const char *);