X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ftest.priv.h;h=51d52a83ceb2d4ff165ae0913cb469ba60ce05ca;hp=1f6305d9041b026e3fa34991dc88f9201940b17b;hb=2b635f090ec43c82958cef9369464aee4dd8975f;hpb=cf94c7485f7b40ff7870b5bf9a65e7ab87481a76 diff --git a/test/test.priv.h b/test/test.priv.h index 1f6305d9..51d52a83 100644 --- a/test/test.priv.h +++ b/test/test.priv.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * + * Copyright (c) 1998-2010,2011 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.94 2010/03/28 19:51:16 tom Exp $ */ +/* $Id: test.priv.h,v 1.103 2011/03/22 09:15:45 tom Exp $ */ #ifndef __TEST_PRIV_H #define __TEST_PRIV_H 1 @@ -118,6 +118,10 @@ #define HAVE_LOCALE_H 0 #endif +#ifndef HAVE_MATH_H +#define HAVE_MATH_H 0 +#endif + #ifndef HAVE_MENU_H #define HAVE_MENU_H 0 #endif @@ -182,14 +186,14 @@ #define HAVE_TIGETNUM 0 #endif -#ifndef HAVE_TYPEAHEAD -#define HAVE_TYPEAHEAD 0 -#endif - #ifndef HAVE_TIGETSTR #define HAVE_TIGETSTR 0 #endif +#ifndef HAVE_TYPEAHEAD +#define HAVE_TYPEAHEAD 0 +#endif + #ifndef HAVE_WINSSTR #define HAVE_WINSSTR 0 #endif @@ -228,7 +232,7 @@ #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 @@ -247,7 +251,7 @@ #include #endif -#if defined(HAVE_XCURSES) +#if defined(HAVE_XCURSES) || defined(PDCURSES) /* no other headers */ #undef HAVE_SETUPTERM /* nonfunctional */ #define HAVE_SETUPTERM 0 @@ -290,20 +294,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 @@ -318,6 +322,16 @@ extern int optind; #endif #endif +#if !USE_SOFTKEYS +#define slk_init() /* nothing */ +#define slk_restore() /* nothing */ +#define slk_clear() /* nothing */ +#endif + +#ifndef HAVE_WSYNCDOWN +#define wsyncdown(win) /* nothing */ +#endif + #ifndef USE_WIDEC_SUPPORT #if (defined(_XOPEN_SOURCE_EXTENDED) || defined(_XPG5)) && defined(WACS_ULCORNER) #define USE_WIDEC_SUPPORT 1 @@ -344,6 +358,20 @@ extern int optind; #define USE_LIBFORM 0 #endif +/* 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 +#else +#define form_getyx(form, y, x) y = (form)->currow, x = (form)->curcol +#endif + +/* workaround, to build against NetBSD's variant of the form library */ +#ifdef HAVE_NETBSD_MENU_H +#define menu_itemwidth(menu) (menu)->max_item_width +#else +#define menu_itemwidth(menu) (menu)->itemlen +#endif + #ifndef HAVE_TYPE_ATTR_T #if !USE_WIDEC_SUPPORT && !defined(attr_t) #define attr_t chtype @@ -365,6 +393,79 @@ extern int optind; #define CCHARW_MAX 5 #endif +#if defined(NCURSES_VERSION) && defined(CURSES_WACS_ARRAY) && !defined(CURSES_WACS_SYMBOLS) +#define CURSES_WACS_SYMBOLS +#endif + +#if defined(CURSES_WACS_ARRAY) && !defined(CURSES_WACS_SYMBOLS) +/* NetBSD 5.1 defines these incorrectly */ +#undef WACS_RARROW +#undef WACS_LARROW +#undef WACS_UARROW +#undef WACS_DARROW +#undef WACS_BLOCK +#undef WACS_DIAMOND +#undef WACS_CKBOARD +#undef WACS_DEGREE +#undef WACS_PLMINUS +#undef WACS_BOARD +#undef WACS_LANTERN +#undef WACS_LRCORNER +#undef WACS_URCORNER +#undef WACS_ULCORNER +#undef WACS_LLCORNER +#undef WACS_PLUS +#undef WACS_HLINE +#undef WACS_S1 +#undef WACS_S9 +#undef WACS_LTEE +#undef WACS_RTEE +#undef WACS_BTEE +#undef WACS_TTEE +#undef WACS_VLINE +#undef WACS_BULLET +#undef WACS_S3 +#undef WACS_S7 +#undef WACS_LEQUAL +#undef WACS_GEQUAL +#undef WACS_PI +#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['}']) +#endif + #undef CTRL #define CTRL(x) ((x) & 0x1f) @@ -372,17 +473,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[], - *numnames[], *numcodes[], *numfnames[], - *strnames[], *strcodes[], *strfnames[]; +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 @@ -521,7 +622,7 @@ extern char *boolnames[], *boolcodes[], *boolfnames[], * that XSI shows. */ #ifndef NCURSES_CONST -#define NCURSES_CONST /* nothing */ +#define NCURSES_CONST /* nothing */ #endif /* out-of-band values for representing absent capabilities */ @@ -534,7 +635,7 @@ extern char *boolnames[], *boolcodes[], *boolfnames[], #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) @@ -598,7 +699,7 @@ extern char *tgoto(char *, int, int); /* available, but not prototyped */ #ifdef NCURSES_VERSION #define CONST_MENUS const #else -#define CONST_MENUS /* nothing */ +#define CONST_MENUS /* nothing */ #endif #ifndef HAVE_USE_WINDOW @@ -614,8 +715,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 @@ -644,6 +745,18 @@ 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 */