X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ftest.priv.h;h=56d1da06cba0af44a1e5cf1d4a9f69077158224e;hp=f62a930d2360981416b2444b68f7b67de8a30b88;hb=52aa842907b31bb56fb5133da3f023b45bd4355f;hpb=d998cb49bfb53bd99900fd4ed94519579bea99de diff --git a/test/test.priv.h b/test/test.priv.h index f62a930d..56d1da06 100644 --- a/test/test.priv.h +++ b/test/test.priv.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2007,2008 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.81 2008/12/28 20:20:39 juergen 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 /* @@ -183,10 +186,6 @@ #define HAVE_TYPEAHEAD 0 #endif -#ifndef HAVE_TIGETSTR -#define HAVE_TIGETSTR 0 -#endif - #ifndef HAVE_WINSSTR #define HAVE_WINSSTR 0 #endif @@ -207,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 @@ -274,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 @@ -303,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 @@ -356,11 +368,17 @@ extern int optind; #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) \ - ((ch) | (attr) | COLOR_PAIR(pair)) + ((chtype) (ch) | (chtype) (attr) | (chtype) COLOR_PAIR(pair)) /* * Workaround for HPUX @@ -376,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. */ @@ -480,7 +517,7 @@ extern int optind; * that XSI shows. */ #ifndef NCURSES_CONST -#define NCURSES_CONST /* nothing */ +#define NCURSES_CONST /* nothing */ #endif /* out-of-band values for representing absent capabilities */ @@ -493,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) @@ -531,13 +568,33 @@ extern char *tgoto(char *, int, int); /* available, but not prototyped */ #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 */ +#define CONST_MENUS /* nothing */ #endif #ifndef HAVE_USE_WINDOW @@ -553,8 +610,8 @@ extern char *tgoto(char *, int, int); /* available, but not prototyped */ */ #if !HAVE_USE_WINDOW -typedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *); -typedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *); +typedef int (*NCURSES_WINDOW_CB) (WINDOW *, void *); +typedef int (*NCURSES_SCREEN_CB) (SCREEN *, void *); #endif #if HAVE_USE_WINDOW @@ -583,6 +640,27 @@ typedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *); #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 */