/****************************************************************************
* Author: Thomas E. Dickey 1996-on *
****************************************************************************/
-/* $Id: test.priv.h,v 1.78 2008/09/06 22:01:24 tom Exp $ */
+/* $Id: test.priv.h,v 1.80 2008/12/20 16:37:20 tom Exp $ */
#ifndef __TEST_PRIV_H
#define __TEST_PRIV_H 1
#define KEY_MIN 256 /* not defined in Solaris 8 */
#endif
+#define colored_chtype(ch, attr, pair) \
+ ((ch) | (attr) | COLOR_PAIR(pair))
+
/*
* Workaround for HPUX
*/
#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
#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 USING_SCREEN(s,func,data) func(s,data)
#define WANT_USE_SCREEN() extern void _nc_want_use_screen(void)
#endif