diff --git a/curses.h b/curses.h index cf1f9ea3..01389f34 100644 --- a/curses.h +++ b/curses.h @@ -15,7 +15,7 @@ * See the file maintain.er for details of the current maintainer. * ************************************************************************/ -/* $Id: curses.h,v 1.179 2006/06/19 02:43:35 wmcbrine Exp $ */ +/* $Id: curses.h,v 1.180 2006/06/19 03:21:46 wmcbrine Exp $ */ /*----------------------------------------------------------------------* * PDCurses * @@ -1419,6 +1419,7 @@ WINDOW *subpad(WINDOW *, int, int, int, int); WINDOW *subwin(WINDOW *, int, int, int, int); int syncok(WINDOW *, bool); chtype termattrs(void); +attr_t term_attrs(void); char *termname(void); void timeout(int); int touchline(WINDOW *, int, int); @@ -1427,7 +1428,9 @@ int typeahead(int); int untouchwin(WINDOW *); void use_env(bool); int vidattr(chtype); +int vid_attr(attr_t, short, void *); int vidputs(chtype, int (*)(int)); +int vid_puts(attr_t, short, void *, int (*)(int)); int vline(chtype, int); int vw_printw(WINDOW *, const char *, va_list); int vwprintw(WINDOW *, const char *, va_list); diff --git a/doc/intro.man b/doc/intro.man index 0e00e21d..7673978d 100644 --- a/doc/intro.man +++ b/doc/intro.man @@ -389,6 +389,7 @@ FUNCTIONS subwin window syncok window termattrs termattrs + term_attrs termattrs termname termattrs tgetent termcap tgetflag termcap @@ -410,7 +411,9 @@ FUNCTIONS untouchwin touch use_env util vidattr terminfo + vid_attr terminfo vidputs terminfo + vid_puts terminfo vline border vwprintw printw vwscanw scanw diff --git a/pdcurses/termattr.c b/pdcurses/termattr.c index 42658323..0cdce256 100644 --- a/pdcurses/termattr.c +++ b/pdcurses/termattr.c @@ -31,7 +31,7 @@ #undef termname #undef wordchar -RCSID("$Id: termattr.c,v 1.28 2006/06/18 21:13:38 wmcbrine Exp $"); +RCSID("$Id: termattr.c,v 1.29 2006/06/19 03:21:47 wmcbrine Exp $"); /*man-start************************************************************** @@ -45,6 +45,7 @@ RCSID("$Id: termattr.c,v 1.28 2006/06/18 21:13:38 wmcbrine Exp $"); char killchar(void); char *longname(void); chtype termattrs(void); + attr_t term_attrs(void); char *termname(void); char wordchar(void); @@ -246,8 +247,7 @@ char *longname(void) chtype termattrs(void) { - chtype temp = (A_NORMAL | A_BOLD | A_BLINK | A_REVERSE | - A_UNDERLINE | A_ITALIC); + chtype temp = A_BLINK | A_BOLD | A_INVIS | A_REVERSE | A_UNDERLINE; /* note: blink is bold background on some platforms */ @@ -259,6 +259,14 @@ chtype termattrs(void) return temp; } +attr_t term_attrs(void) +{ + PDC_LOG(("term_attrs() - called\n")); + + return WA_BLINK | WA_BOLD | WA_INVIS | WA_LEFT | + WA_REVERSE | WA_RIGHT | WA_UNDERLINE; +} + char *termname(void) { PDC_LOG(("termname() - called\n")); diff --git a/pdcurses/terminfo.c b/pdcurses/terminfo.c index aa16078d..0c4b1453 100644 --- a/pdcurses/terminfo.c +++ b/pdcurses/terminfo.c @@ -23,7 +23,7 @@ #undef vidattr #undef vidputs -RCSID("$Id: terminfo.c,v 1.21 2006/03/29 20:06:41 wmcbrine Exp $"); +RCSID("$Id: terminfo.c,v 1.22 2006/06/19 03:21:47 wmcbrine Exp $"); /*man-start************************************************************** @@ -48,7 +48,10 @@ RCSID("$Id: terminfo.c,v 1.21 2006/03/29 20:06:41 wmcbrine Exp $"); long, long); int tputs(const char *, int, int (*)(int)); int vidattr(chtype attr); + int vid_attr(attr_t attr, short color_pair, void *opt); int vidputs(chtype attr, int (*putfunc)(int)); + int vid_puts(attr_t attr, short color_pair, void *opt, + int (*putfunc)(int)); X/Open Description: The mvcur() function controls low-level cursor motion with @@ -215,9 +218,23 @@ int vidattr(chtype attr) return ERR; } +int vid_attr(attr_t attr, short color_pair, void *opt) +{ + PDC_LOG(("vid_attr() - called\n")); + + return ERR; +} + int vidputs(chtype attr, int (*putfunc)(int)) { PDC_LOG(("vidputs() - called: attr %d\n", attr)); return ERR; } + +int vid_puts(attr_t attr, short color_pair, void *opt, int (*putfunc)(int)) +{ + PDC_LOG(("vid_puts() - called\n")); + + return ERR; +}