X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ftest.priv.h;h=56d1da06cba0af44a1e5cf1d4a9f69077158224e;hp=0ab41507989b8c5ca2a0119bdc71d1800f2861ef;hb=52aa842907b31bb56fb5133da3f023b45bd4355f;hpb=574a94bc3d70682bde48f7f10d3c12a58e581e27 diff --git a/test/test.priv.h b/test/test.priv.h index 0ab41507..56d1da06 100644 --- a/test/test.priv.h +++ b/test/test.priv.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. * + * Copyright (c) 1998-2009,2010 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.67 2007/06/23 15:46:17 tom Exp $ */ +/* $Id: test.priv.h,v 1.97 2010/11/13 20:33:36 tom Exp $ */ #ifndef __TEST_PRIV_H #define __TEST_PRIV_H 1 @@ -42,14 +42,17 @@ */ #ifdef HAVE_LIBFORMW #define HAVE_LIBFORMW 1 +#define HAVE_LIBFORM 1 #endif #ifdef HAVE_LIBMENUW #define HAVE_LIBMENUW 1 +#define HAVE_LIBMENU 1 #endif #ifdef HAVE_LIBPANELW #define HAVE_LIBPANELW 1 +#define HAVE_LIBPANEL 1 #endif /* @@ -59,6 +62,14 @@ #define HAVE_CURSES_VERSION 0 #endif +#ifndef HAVE_CHGAT +#define HAVE_CHGAT 0 +#endif + +#ifndef HAVE_COLOR_SET +#define HAVE_COLOR_SET 0 +#endif + #ifndef HAVE_FILTER #define HAVE_FILTER 0 #endif @@ -83,6 +94,10 @@ #define HAVE_GETOPT_H 0 #endif +#ifndef HAVE_GETPARX +#define HAVE_GETPARX 0 +#endif + #ifndef HAVE_GETWIN #define HAVE_GETWIN 0 #endif @@ -171,10 +186,6 @@ #define HAVE_TYPEAHEAD 0 #endif -#ifndef HAVE_TIGETSTR -#define HAVE_TIGETSTR 0 -#endif - #ifndef HAVE_WINSSTR #define HAVE_WINSSTR 0 #endif @@ -195,19 +206,32 @@ #define NEED_PTEM_H 0 #endif +#ifndef NEED_WCHAR_H +#define NEED_WCHAR_H 0 +#endif + #ifndef NO_LEAKS #define NO_LEAKS 0 #endif #include +#include #include #include +#include #if HAVE_UNISTD_H #include #endif -#include /* include before curses.h to work around glibc bug */ +#include /* include before curses.h to work around glibc bug */ + +#if NEED_WCHAR_H +#include +#ifdef HAVE_LIBUTF8_H +#include +#endif +#endif #if defined(HAVE_XCURSES) #include @@ -235,9 +259,18 @@ #include #endif -#ifdef NCURSES_VERSION -#define HAVE_COLOR_SET 1 -#define HAVE_CHGAT 1 +/* + * 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) +#include +#elif defined(HAVE_NCURSES_NCURSES_H) +#include +#else +#include +#endif #endif #if HAVE_GETOPT_H @@ -253,20 +286,20 @@ extern int optind; #if HAVE_LOCALE_H #include #else -#define setlocale(name,string) /* nothing */ +#define setlocale(name,string) /* nothing */ #endif #include #include #ifndef GCC_NORETURN -#define GCC_NORETURN /* nothing */ +#define GCC_NORETURN /* nothing */ #endif #ifndef GCC_PRINTFLIKE -#define GCC_PRINTFLIKE(a,b) /* nothing */ +#define GCC_PRINTFLIKE(a,b) /* nothing */ #endif #ifndef GCC_UNUSED -#define GCC_UNUSED /* nothing */ +#define GCC_UNUSED /* nothing */ #endif #ifndef HAVE_GETNSTR @@ -282,7 +315,7 @@ extern int optind; #endif #ifndef USE_WIDEC_SUPPORT -#if defined(_XOPEN_SOURCE_EXTENDED) && defined(WACS_ULCORNER) +#if (defined(_XOPEN_SOURCE_EXTENDED) || defined(_XPG5)) && defined(WACS_ULCORNER) #define USE_WIDEC_SUPPORT 1 #else #define USE_WIDEC_SUPPORT 0 @@ -308,8 +341,8 @@ extern int optind; #endif #ifndef HAVE_TYPE_ATTR_T -#if !USE_WIDEC_SUPPORT -#define attr_t long +#if !USE_WIDEC_SUPPORT && !defined(attr_t) +#define attr_t chtype #endif #endif @@ -328,17 +361,25 @@ extern int optind; #define CCHARW_MAX 5 #endif -#ifndef CTRL -#define CTRL(x) ((x) & 0x1f) -#endif +#undef CTRL +#define CTRL(x) ((x) & 0x1f) #define QUIT CTRL('Q') #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 + +#define colored_chtype(ch, attr, pair) \ + ((chtype) (ch) | (chtype) (attr) | (chtype) COLOR_PAIR(pair)) + /* * Workaround for HPUX */ @@ -353,6 +394,25 @@ extern int optind; #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; \ + short 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. */ @@ -371,6 +431,21 @@ extern int optind; #define getmaxy(win) ((win)?((win)->_maxy + 1):ERR) #endif +/* + * Solaris 10 xpg4: +#define __m_getparx(w) ((w)->_parent == (WINDOW *) 0 ? -1 \ + : (w)->_begx - (w)->_parent->_begx) + */ +#if !defined(getparx) && !HAVE_GETPARX +#ifdef __m_getparx +#define getparx(win) __m_getparx(win) +#define getpary(win) __m_getpary(win) +#else +#define getparx(win) ((win)?((win)->_parx + 1):ERR) +#define getpary(win) ((win)?((win)->_pary + 1):ERR) +#endif +#endif + #if !defined(mvwvline) && !HAVE_MVWVLINE #define mvwvline(w,y,x,ch,n) (move(y,x) == ERR ? ERR : wvline(w,ch,n)) #define mvwhline(w,y,x,ch,n) (move(y,x) == ERR ? ERR : whline(w,ch,n)) @@ -414,6 +489,7 @@ extern int optind; #endif #else #define typeMalloc(type,n) (type *) malloc((n) * sizeof(type)) +#define typeCalloc(type,elts) (type *) calloc((elts), sizeof(type)) #define typeRealloc(type,n,p) (type *) realloc(p, (n) * sizeof(type)) #endif @@ -428,12 +504,20 @@ extern int optind; #define EXIT_FAILURE 1 #endif +#ifdef __MINGW32__ +#include +/* 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 -#define NCURSES_CONST /* nothing */ +#define NCURSES_CONST /* nothing */ #endif /* out-of-band values for representing absent capabilities */ @@ -446,7 +530,7 @@ extern int optind; #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) @@ -459,4 +543,124 @@ extern int optind; signal(nsig, handler); \ } +/* + * Workaround for clean(er) compile with Solaris's legacy curses. + * The same would be needed for HPUX 10.20 + */ +#ifndef TPUTS_ARG +#if defined(sun) && !defined(_XOPEN_CURSES) && !defined(NCURSES_VERSION_PATCH) +#define TPUTS_ARG char +extern char *tgoto(char *, int, int); /* available, but not prototyped */ +#else +#define TPUTS_ARG int +#endif +#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 +#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 + +/* + * ncurses uses const in some places where X/Open does (or did) not allow. + */ +#ifdef NCURSES_VERSION +#define CONST_MENUS const +#else +#define CONST_MENUS /* nothing */ +#endif + +#ifndef HAVE_USE_WINDOW +#if !defined(NCURSES_VERSION_PATCH) || (NCURSES_VERSION_PATCH < 20070915) || !NCURSES_EXT_FUNCS +#define HAVE_USE_WINDOW 0 +#else +#define HAVE_USE_WINDOW 1 +#endif +#endif + +/* + * Simplify setting up demo of threading with these macros. + */ + +#if !HAVE_USE_WINDOW +typedef int (*NCURSES_WINDOW_CB) (WINDOW *, void *); +typedef int (*NCURSES_SCREEN_CB) (SCREEN *, void *); +#endif + +#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 +#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 + +#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 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 + +/* + * 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 */