From 769daee934b17bd1e720ee84ee0ded93d8d3a37d Mon Sep 17 00:00:00 2001 From: William McBrine Date: Fri, 16 Dec 2005 23:27:47 +0000 Subject: [PATCH] Empty implementations of filter(), noqiflush(), qiflush() and use_env() for compatibility. To Do: Is a meaningful implementation of some of these possible? --- curses.h | 6 +++++- doc/intro.man | 10 +++++----- os2/pdcurses.def | 4 ++++ pdcurses/color.c | 6 +++--- pdcurses/inopts.c | 32 ++++++++++++++++++++++++++++---- pdcurses/util.c | 33 ++++++++++++++++++++++++++++++--- win32/curses.def | 4 ++++ win32/curses_lcc.def | 4 ++++ 8 files changed, 83 insertions(+), 16 deletions(-) diff --git a/curses.h b/curses.h index 272e227f..fa24a5d1 100644 --- a/curses.h +++ b/curses.h @@ -18,7 +18,7 @@ *************************************************************************** */ /* -$Id: curses.h,v 1.51 2005/12/15 17:32:00 wmcbrine Exp $ +$Id: curses.h,v 1.52 2005/12/16 23:27:47 wmcbrine Exp $ */ /* *---------------------------------------------------------------------- @@ -1675,6 +1675,7 @@ WINDOW* PDC_CDECL dupwin Args(( WINDOW* )); int PDC_CDECL endwin Args(( void )); int PDC_CDECL erase Args(( void )); char PDC_CDECL erasechar Args(( void )); +void PDC_CDECL filter Args(( void )); int PDC_CDECL flash Args(( void )); int PDC_CDECL flushinp Args(( void )); attr_t PDC_CDECL getattrs Args(( WINDOW* )); @@ -1721,6 +1722,7 @@ WINDOW* PDC_CDECL newpad Args(( int, int )); SCREEN* PDC_CDECL newterm Args(( char*, FILE*, FILE* )); WINDOW* PDC_CDECL newwin Args(( int, int, int, int )); int PDC_CDECL noraw Args(( void )); +void PDC_CDECL noqiflush Args(( void )); int PDC_CDECL notimeout Args(( WINDOW *, bool )); int PDC_CDECL overlay Args(( const WINDOW*, WINDOW* )); int PDC_CDECL overwrite Args(( const WINDOW*, WINDOW* )); @@ -1732,6 +1734,7 @@ int PDC_CDECL prefresh Args(( WINDOW*, int, int, int, int, int, int )); int PDC_CDECL printw Args(( char*,... )); int PDC_CDECL scanw Args(( char*,... )); #endif +void PDC_CDECL qiflush Args(( void )); int PDC_CDECL raw Args(( void )); int PDC_CDECL refresh Args(( void )); int PDC_CDECL reset_prog_mode Args(( void )); @@ -1774,6 +1777,7 @@ void PDC_CDECL traceon Args(( void )); #endif int PDC_CDECL typeahead Args(( int )); char* PDC_CDECL unctrl Args(( chtype )); +void PDC_CDECL use_env Args(( bool )); int PDC_CDECL vline Args(( chtype, int )); int PDC_CDECL waddch Args(( WINDOW*, const chtype )); int PDC_CDECL waddchnstr Args(( WINDOW*, const chtype*, int )); diff --git a/doc/intro.man b/doc/intro.man index aacb6a7d..15d8aa24 100644 --- a/doc/intro.man +++ b/doc/intro.man @@ -216,7 +216,7 @@ FUNCTIONS clearok outopts clrtobot clear clrtoeol clear - *** color_content color + color_content color color_set attr copywin overlay curs_set kernel @@ -237,7 +237,7 @@ FUNCTIONS endwin initscr erase clear erasechar termattr - *** filter util + filter util flash beep flushinp util getbegyx getyx @@ -331,7 +331,7 @@ FUNCTIONS nodelay inopts noecho inopts nonl outopts - *** noqiflush inopts + noqiflush inopts noraw inopts notimeout inopts overlay overlay @@ -343,7 +343,7 @@ FUNCTIONS printw printw *** putp terminfo *** putwin util - *** qiflush inopts + qiflush inopts raw inopts raw_output outopts redrawwin refresh @@ -406,7 +406,7 @@ FUNCTIONS unctrl util ungetch getch untouchwin touch - *** use_env util + use_env util *** vidattr terminfo *** vidputs terminfo vline border diff --git a/os2/pdcurses.def b/os2/pdcurses.def index b97f1940..9671861a 100644 --- a/os2/pdcurses.def +++ b/os2/pdcurses.def @@ -43,6 +43,7 @@ EXPORTS echo endwin erasechar + filter flash flushinp has_colors @@ -74,6 +75,7 @@ EXPORTS nodelay noecho nonl + noqiflush noraw notimeout overlay @@ -82,6 +84,7 @@ EXPORTS pnoutrefresh prefresh printw + qiflush raw raw_output refresh @@ -119,6 +122,7 @@ EXPORTS traceon typeahead unctrl + use_env waddch waddchnstr waddstr diff --git a/pdcurses/color.c b/pdcurses/color.c index 5216040d..994beb0b 100644 --- a/pdcurses/color.c +++ b/pdcurses/color.c @@ -53,7 +53,7 @@ static int PDC_init_pair(); #endif #ifdef PDCDEBUG -char *rcsid_color = "$Id: color.c,v 1.11 2005/12/15 17:32:00 wmcbrine Exp $"; +char *rcsid_color = "$Id: color.c,v 1.12 2005/12/16 23:27:47 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -63,10 +63,10 @@ char *rcsid_color = "$Id: color.c,v 1.11 2005/12/15 17:32:00 wmcbrine Exp $"; Synopsis: int start_color(void); int init_pair(short pair, short fg, short bg); - *** int init_color(short color, short red, short green, short blue); + int init_color(short color, short red, short green, short blue); bool has_colors(void); bool can_change_color(void); - *** int color_content(short color, short *redp, short *greenp, short *bluep); + int color_content(short color, short *redp, short *greenp, short *bluep); int pair_content(short pair, short *fgp, short *bgp); int PDC_set_line_color(short color); diff --git a/pdcurses/inopts.c b/pdcurses/inopts.c index 2dcbf056..2a164293 100644 --- a/pdcurses/inopts.c +++ b/pdcurses/inopts.c @@ -55,7 +55,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_inopts = "$Id: inopts.c,v 1.2 2003/12/28 08:38:59 mark Exp $"; +char *rcsid_inopts = "$Id: inopts.c,v 1.3 2005/12/16 23:27:47 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -75,8 +75,8 @@ char *rcsid_inopts = "$Id: inopts.c,v 1.2 2003/12/28 08:38:59 mark Exp $"; int notimeout(WINDOW *win, bool bf); int raw(void); int noraw(void); - *** void noqiflush(void); - *** void qiflush(void); + void noqiflush(void); + void qiflush(void); int timeout(int delay); int wtimeout(WINDOW *win, int delay); int typeahead(int fildes); @@ -167,7 +167,7 @@ char *rcsid_inopts = "$Id: inopts.c,v 1.2 2003/12/28 08:38:59 mark Exp $"; The meta() function is provided for portability. By default, 8 bits are returned. - notimeout() is a no-op in PDCurses. + notimeout(), noqiflush() and qiflush() are no-ops in PDCurses. X/Open Return Value: All functions return OK on success and ERR on error. @@ -533,6 +533,30 @@ int PDC_CDECL noraw() } /***********************************************************************/ #ifdef HAVE_PROTO +void PDC_CDECL noqiflush(void) +#else +void PDC_CDECL noqiflush() +#endif +/***********************************************************************/ +{ +#ifdef PDCDEBUG + if (trace_on) PDC_debug("noqiflush() - called\n"); +#endif +} +/***********************************************************************/ +#ifdef HAVE_PROTO +void PDC_CDECL qiflush(void) +#else +void PDC_CDECL qiflush() +#endif +/***********************************************************************/ +{ +#ifdef PDCDEBUG + if (trace_on) PDC_debug("qiflush() - called\n"); +#endif +} +/***********************************************************************/ +#ifdef HAVE_PROTO int PDC_CDECL typeahead( int fildes ) #else int PDC_CDECL typeahead(fildes) diff --git a/pdcurses/util.c b/pdcurses/util.c index e9afc38f..9d20897a 100644 --- a/pdcurses/util.c +++ b/pdcurses/util.c @@ -65,7 +65,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_util = "$Id: util.c,v 1.7 2005/12/06 01:56:18 wmcbrine Exp $"; +char *rcsid_util = "$Id: util.c,v 1.8 2005/12/16 23:27:47 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -75,8 +75,8 @@ char *rcsid_util = "$Id: util.c,v 1.7 2005/12/06 01:56:18 wmcbrine Exp $"; Synopsis: char *unctrl(chtype c); char *keyname(int key); - *** int filter(void); - *** void use_env(void); + void filter(void); + void use_env(bool x); *** int putwin(WINDOW *win, FILE *filep); *** WINDOW *getwin(FILE *filep); int delay_output( int ms ); @@ -113,6 +113,8 @@ char *rcsid_util = "$Id: util.c,v 1.7 2005/12/06 01:56:18 wmcbrine Exp $"; If this is not true, then we will be unable to reliably flush the typeahead. + filter() and use_env() are no-ops on PDCurses. + X/Open Return Value: All functions return OK on success and ERR on error. @@ -265,6 +267,31 @@ int key; } /***********************************************************************/ #ifdef HAVE_PROTO +void PDC_CDECL filter(void) +#else +void PDC_CDECL filter() +#endif +/***********************************************************************/ +{ +#ifdef PDCDEBUG + if (trace_on) PDC_debug("filter() - called\n"); +#endif +} +/***********************************************************************/ +#ifdef HAVE_PROTO +void PDC_CDECL use_env( bool x ) +#else +void PDC_CDECL use_env(x) +bool x; +#endif +/***********************************************************************/ +{ +#ifdef PDCDEBUG + if (trace_on) PDC_debug("use_env() - called: x %d\n",x); +#endif +} +/***********************************************************************/ +#ifdef HAVE_PROTO int PDC_CDECL delay_output( int ms ) #else int PDC_CDECL delay_output(ms) diff --git a/win32/curses.def b/win32/curses.def index f56d8ca4..beecabf1 100644 --- a/win32/curses.def +++ b/win32/curses.def @@ -44,6 +44,7 @@ EXPORTS echochar EXPORTS endwin EXPORTS erase EXPORTS erasechar +EXPORTS filter EXPORTS flash EXPORTS flushinp EXPORTS getstr @@ -126,6 +127,7 @@ EXPORTS nocbreak EXPORTS nodelay EXPORTS noecho EXPORTS nonl +EXPORTS noqiflush EXPORTS noraw EXPORTS notimeout EXPORTS overlay @@ -135,6 +137,7 @@ EXPORTS pechochar EXPORTS pnoutrefresh EXPORTS prefresh EXPORTS printw +EXPORTS qiflush EXPORTS raw EXPORTS raw_output EXPORTS redrawwin @@ -178,6 +181,7 @@ EXPORTS traceoff EXPORTS typeahead EXPORTS unctrl EXPORTS untouchwin +EXPORTS use_env EXPORTS vline EXPORTS waddch EXPORTS waddchnstr diff --git a/win32/curses_lcc.def b/win32/curses_lcc.def index 0afe5064..84a70f55 100644 --- a/win32/curses_lcc.def +++ b/win32/curses_lcc.def @@ -37,6 +37,7 @@ echochar endwin erase erasechar +filter flash flushinp getstr @@ -119,6 +120,7 @@ nocbreak nodelay noecho nonl +noqiflush noraw notimeout overlay @@ -128,6 +130,7 @@ pechochar pnoutrefresh prefresh printw +qiflush raw raw_output redrawwin @@ -171,6 +174,7 @@ traceoff typeahead unctrl untouchwin +use_env vline waddch waddchnstr