X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ftest.priv.h;h=f820a33d255d458e4934bf02c0f6654bf4ff7a7c;hp=6c940efaa0e37975981fb4bfcda705e33c44b50a;hb=4677e861e7e0127b8622b3340ceb6f1278b91244;hpb=a20e6eb464be80b9cd8cae7ce925d27fe9c209ed diff --git a/test/test.priv.h b/test/test.priv.h index 6c940efa..f820a33d 100644 --- 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-2018,2019 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.146 2017/08/07 23:29:48 tom Exp $ */ +/* $Id: test.priv.h,v 1.177 2019/02/02 19:57:53 tom Exp $ */ #ifndef __TEST_PRIV_H #define __TEST_PRIV_H 1 @@ -69,18 +69,39 @@ #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_CHGAT #define HAVE_CHGAT 0 #endif +#ifndef HAVE_COLOR_CONTENT +#define HAVE_COLOR_CONTENT 0 +#endif + +#ifndef HAVE_COPYWIN +#define HAVE_COPYWIN 0 +#endif + #ifndef HAVE_COLOR_SET #define HAVE_COLOR_SET 0 #endif +#ifndef HAVE_DELSCREEN +#define HAVE_DELSCREEN 0 +#endif + +#ifndef HAVE_DUPWIN +#define HAVE_DUPWIN 0 +#endif + #ifndef HAVE_FILTER #define HAVE_FILTER 0 #endif @@ -113,6 +134,10 @@ #define HAVE_GETWIN 0 #endif +#ifndef HAVE_HALFDELAY +#define HAVE_HALFDELAY 0 +#endif + #ifndef HAVE_INIT_EXTENDED_COLOR #define HAVE_INIT_EXTENDED_COLOR 0 #endif @@ -145,10 +170,18 @@ #define HAVE_MENU_H 0 #endif +#ifndef HAVE_MVDERWIN +#define HAVE_MVDERWIN 0 +#endif + #ifndef HAVE_MVVLINE #define HAVE_MVVLINE 0 #endif +#ifndef HAVE_MVWIN +#define HAVE_MVWIN 0 +#endif + #ifndef HAVE_MVWVLINE #define HAVE_MVWVLINE 0 #endif @@ -161,6 +194,10 @@ #define HAVE_NC_ALLOC_H 0 #endif +#ifndef HAVE_NEWPAD +#define HAVE_NEWPAD 0 +#endif + #ifndef HAVE_PANEL_H #define HAVE_PANEL_H 0 #endif @@ -169,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 @@ -197,6 +238,10 @@ #define HAVE_SLK_INIT 0 #endif +#ifndef HAVE_STDINT_H +#define HAVE_STDINT_H 0 +#endif + #ifndef HAVE_SYS_IOCTL_H #define HAVE_SYS_IOCTL_H 0 #endif @@ -205,10 +250,6 @@ #define HAVE_SYS_SELECT_H 0 #endif -#ifndef HAVE_TDESTROY -#define HAVE_TDESTROY 0 -#endif - #ifndef HAVE_TERMATTRS #define HAVE_TERMATTRS 0 #endif @@ -281,6 +322,10 @@ #define HAVE_VID_PUTS 0 #endif +#ifndef HAVE_WINSDELLN +#define HAVE_WINSDELLN 0 +#endif + #ifndef HAVE_WRESIZE #define HAVE_WRESIZE 0 #endif @@ -393,6 +438,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 @@ -401,6 +449,12 @@ extern int optind; #define getnstr(s,n) getstr(s) #endif +#if HAVE_INIT_EXTENDED_COLOR +#define USE_EXTENDED_COLOR 1 +#else +#define USE_EXTENDED_COLOR 0 +#endif + #ifndef USE_SOFTKEYS #if HAVE_SLK_INIT #define USE_SOFTKEYS 1 @@ -415,6 +469,12 @@ extern int optind; #define slk_clear() /* nothing */ #endif +#if HAVE_TPUTS_SP +#define USE_SP_FUNCS 1 +#else +#define USE_SP_FUNCS 0 +#endif + #ifndef HAVE_WSYNCDOWN #define wsyncdown(win) /* nothing */ #endif @@ -450,9 +510,9 @@ 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 = current_field(form)->cursor_ypos, x = current_field(form)->cursor_xpos +#define form_getyx(form, y, x) y = (int)current_field(form)->cursor_ypos, x = (int)current_field(form)->cursor_xpos #else -#define form_getyx(form, y, x) y = (form)->currow, x = (form)->curcol +#define form_getyx(form, y, x) y = (int)(form)->currow, x = (int)(form)->curcol #endif /* workaround, to build against NetBSD's variant of the form library */ @@ -526,38 +586,62 @@ 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 +#define OK (0) +#endif + +#ifndef ERR +#define ERR (-1) #endif #undef CTRL @@ -600,6 +684,15 @@ extern int optind; #define USE_STRING_HACKS 0 #endif +#ifndef NCURSES_CAST +#ifdef __cplusplus +extern "C" { +#define NCURSES_CAST(type,value) static_cast(value) +#else +#define NCURSES_CAST(type,value) (type)(value) +#endif +#endif + #if USE_STRING_HACKS && HAVE_STRLCAT #define _nc_STRCAT(d,s,n) NCURSES_VOID strlcat((d),(s),NCURSES_CAST(size_t,n)) #define _nc_STRNCAT(d,s,m,n) NCURSES_VOID strlcat((d),(s),NCURSES_CAST(size_t,m)) @@ -630,7 +723,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 @@ -674,18 +775,18 @@ extern char *strnames[], *strcodes[], *strfnames[]; * These usually are implemented as macros, but may be functions. */ #if !defined(getcurx) && !HAVE_GETCURX -#define getcurx(win) ((win)?(win)->_curx:ERR) -#define getcury(win) ((win)?(win)->_cury:ERR) +#define getcurx(win) ((win) ? ((int)(win)->_curx) : ERR) +#define getcury(win) ((win) ? ((int)(win)->_cury) : ERR) #endif #if !defined(getbegx) && !HAVE_GETBEGX -#define getbegx(win) ((win)?(win)->_begx:ERR) -#define getbegy(win) ((win)?(win)->_begy:ERR) +#define getbegx(win) ((win) ? ((int)(win)->_begx) : ERR) +#define getbegy(win) ((win) ? ((int)(win)->_begy) : ERR) #endif #if !defined(getmaxx) && !HAVE_GETMAXX -#define getmaxx(win) ((win)?((win)->_maxx + 1):ERR) -#define getmaxy(win) ((win)?((win)->_maxy + 1):ERR) +#define getmaxx(win) ((win) ? ((int)(win)->_maxx + 1) : ERR) +#define getmaxy(win) ((win) ? ((int)(win)->_maxy + 1) : ERR) #endif /* @@ -739,6 +840,15 @@ extern char *strnames[], *strcodes[], *strfnames[]; #define NCURSES_XNAMES 0 #endif +/* + * ncurses restores the cursor in endwin(). Other libraries may not. + */ +#ifdef NCURSES_VERSION +#define exit_curses() endwin() +#else +#define exit_curses() do { endwin(); curs_set(1); } while (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). */ @@ -772,7 +882,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 @@ -804,13 +914,30 @@ extern char *strnames[], *strcodes[], *strfnames[]; #endif +#ifdef NEED_TIME_H +#if TIME_WITH_SYS_TIME +# include +# include +#else +# if HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif +#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 +#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 */ @@ -828,12 +955,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. @@ -888,9 +1021,25 @@ extern char *tgoto(char *, int, int); /* available, but not prototyped */ #endif /* - * ncurses uses const in some places where X/Open does (or did) not allow. + * ncurses provides a termcap interface; a few packagers replace or displace + * its header file with an incompatible one. The demo_termcap program uses + * the ncurses file, if available. */ #ifdef NCURSES_VERSION +#ifndef HAVE_NCURSES_TERMCAP_H +#define HAVE_NCURSES_TERMCAP_H 0 +#endif +#ifndef HAVE_TERMCAP_H +#define HAVE_TERMCAP_H 0 +#endif +#endif + +/* + * ncurses uses const in some places where X/Open does (or did) not allow. + */ +#if defined(NCURSES_CONST) +#define CONST_MENUS NCURSES_CONST +#elif defined(PDCURSES) #define CONST_MENUS const #else #define CONST_MENUS /* nothing */ @@ -902,10 +1051,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 @@ -956,9 +1107,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 /*