diff --git a/pdcurses/addch.c b/pdcurses/addch.c index 4080fee6..87562294 100644 --- a/pdcurses/addch.c +++ b/pdcurses/addch.c @@ -13,7 +13,7 @@ #include -RCSID("$Id: addch.c,v 1.29 2006/10/23 05:03:30 wmcbrine Exp $"); +RCSID("$Id: addch.c,v 1.30 2006/10/23 05:46:32 wmcbrine Exp $"); /*man-start************************************************************** @@ -27,6 +27,13 @@ RCSID("$Id: addch.c,v 1.29 2006/10/23 05:03:30 wmcbrine Exp $"); int echochar(const chtype ch); int wechochar(WINDOW *win, const chtype ch); + int add_wch(const cchar_t *wch); + int wadd_wch(WINDOW *win, const cchar_t *wch); + int mvadd_wch(int y, int x, const cchar_t *wch); + int mvwadd_wch(WINDOW *win, int y, int x, const cchar_t *wch); + int echo_wchar(const cchar_t *wch); + int wecho_wchar(WINDOW *win, const cchar_t *wch); + int PDC_chadd(WINDOW *win, chtype ch, bool xlat, bool advance); X/Open Description: @@ -111,6 +118,12 @@ RCSID("$Id: addch.c,v 1.29 2006/10/23 05:03:30 wmcbrine Exp $"); mvwaddch Y Y Y echochar Y - 3.0 wechochar Y - 3.0 + add_wch Y + wadd_wch Y + mvadd_wch Y + mvwadd_wch Y + echo_wchar Y + wecho_wchar Y PDC_chadd - - - **man-end****************************************************************/ diff --git a/pdcurses/addchstr.c b/pdcurses/addchstr.c index f3962ad7..7b28aac0 100644 --- a/pdcurses/addchstr.c +++ b/pdcurses/addchstr.c @@ -14,7 +14,7 @@ #include #include -RCSID("$Id: addchstr.c,v 1.33 2006/10/23 05:03:30 wmcbrine Exp $"); +RCSID("$Id: addchstr.c,v 1.34 2006/10/23 05:46:32 wmcbrine Exp $"); /*man-start************************************************************** @@ -30,6 +30,16 @@ RCSID("$Id: addchstr.c,v 1.33 2006/10/23 05:03:30 wmcbrine Exp $"); int mvwaddchstr(WINDOW *, int y, int x, const chtype *ch); int mvwaddchnstr(WINDOW *, int y, int x, const chtype *ch, int n); + int add_wchstr(const cchar_t *wch); + int add_wchnstr(const cchar_t *wch, int n); + int wadd_wchstr(WINDOW *win, const cchar_t *wch); + int wadd_wchnstr(WINDOW *win, const cchar_t *wch, int n); + int mvadd_wchstr(int y, int x, const cchar_t *wch); + int mvadd_wchnstr(int y, int x, const cchar_t *wch, int n); + int mvwadd_wchstr(WINDOW *win, int y, int x, const cchar_t *wch); + int mvwadd_wchnstr(WINDOW *win, int y, int x, const cchar_t *wch, + int n); + X/Open Description: These routines write a chtype directly into the window structure starting at the current position. The four routines with n as @@ -53,6 +63,14 @@ RCSID("$Id: addchstr.c,v 1.33 2006/10/23 05:03:30 wmcbrine Exp $"); waddchnstr Y - 4.0 mvaddchnstr Y - 4.0 mvwaddchnstr Y - 4.0 + add_wchstr Y + wadd_wchstr Y + mvadd_wchstr Y + mvwadd_wchstr Y + add_wchnstr Y + wadd_wchnstr Y + mvadd_wchnstr Y + mvwadd_wchnstr Y **man-end****************************************************************/ diff --git a/pdcurses/addstr.c b/pdcurses/addstr.c index 8dc87ed9..3f98dd42 100644 --- a/pdcurses/addstr.c +++ b/pdcurses/addstr.c @@ -13,7 +13,7 @@ #include -RCSID("$Id: addstr.c,v 1.31 2006/10/23 05:03:30 wmcbrine Exp $"); +RCSID("$Id: addstr.c,v 1.32 2006/10/23 05:46:32 wmcbrine Exp $"); /*man-start************************************************************** @@ -58,6 +58,14 @@ RCSID("$Id: addstr.c,v 1.31 2006/10/23 05:03:30 wmcbrine Exp $"); waddnstr Y - 4.0 mvaddnstr Y - 4.0 mvwaddnstr Y - 4.0 + addwstr Y + waddwstr Y + mvaddwstr Y + mvwaddwstr Y + addnwstr Y + waddnwstr Y + mvaddnwstr Y + mvwaddnwstr Y **man-end****************************************************************/ diff --git a/pdcurses/bkgd.c b/pdcurses/bkgd.c index 2ec8d0d4..55ab6c5d 100644 --- a/pdcurses/bkgd.c +++ b/pdcurses/bkgd.c @@ -13,7 +13,7 @@ #include -RCSID("$Id: bkgd.c,v 1.28 2006/10/23 05:03:30 wmcbrine Exp $"); +RCSID("$Id: bkgd.c,v 1.29 2006/10/23 05:46:32 wmcbrine Exp $"); /*man-start************************************************************** @@ -26,6 +26,13 @@ RCSID("$Id: bkgd.c,v 1.28 2006/10/23 05:03:30 wmcbrine Exp $"); int wbkgd(WINDOW *win, chtype ch); void wbkgdset(WINDOW *win, chtype ch); + int bkgrnd(const cchar_t *wch); + void bkgrndset(const cchar_t *wch); + int getbkgrnd(cchar_t *wch); + int wbkgrnd(WINDOW *win, const cchar_t *wch); + void wbkgrndset(WINDOW *win, const cchar_t *wch); + int wgetbkgrnd(WINDOW *win, cchar_t *wch); + UNIX System V (Rel 3.2 or 4) Description: The bkgdset() and wbkgdset() routines manipulate the backgound of the named window. Background is a chtype consisting of any @@ -67,6 +74,12 @@ RCSID("$Id: bkgd.c,v 1.28 2006/10/23 05:03:30 wmcbrine Exp $"); getbkgd Y wbkgd Y - 4.0 wbkgdset Y - 4.0 + bkgrnd Y + bkgrndset Y + getbkgrnd Y + wbkgrnd Y + wbkgrndset Y + wgetbkgrnd Y **man-end****************************************************************/ diff --git a/pdcurses/border.c b/pdcurses/border.c index da0896d6..7fb3f781 100644 --- a/pdcurses/border.c +++ b/pdcurses/border.c @@ -13,7 +13,7 @@ #include -RCSID("$Id: border.c,v 1.38 2006/10/23 05:03:30 wmcbrine Exp $"); +RCSID("$Id: border.c,v 1.39 2006/10/23 05:46:32 wmcbrine Exp $"); /*man-start************************************************************** @@ -34,6 +34,24 @@ RCSID("$Id: border.c,v 1.38 2006/10/23 05:03:30 wmcbrine Exp $"); int mvwhline(WINDOW *win, int y, int x, chtype ch, int n); int mvwvline(WINDOW *win, int y, int x, chtype ch, int n); + int border_set(const cchar_t *ls, const cchar_t *rs, + const cchar_t *ts, const cchar_t *bs, + const cchar_t *tl, const cchar_t *tr, + const cchar_t *bl, const cchar_t *br); + int wborder_set(WINDOW *win, const cchar_t *ls, const cchar_t *rs, + const cchar_t *ts, const cchar_t *bs, + const cchar_t *tl, const cchar_t *tr, + const cchar_t *bl, const cchar_t *br); + int box_set(WINDOW *win, const cchar_t *verch, const cchar_t *horch); + int hline_set(const cchar_t *wch, int n); + int vline_set(const cchar_t *wch, int n); + int whline_set(WINDOW *win, const cchar_t *wch, int n); + int wvline_set(WINDOW *win, const cchar_t *wch, int n); + int mvhline_set(int y, int x, const cchar_t *wch, int n); + int mvvline_set(int y, int x, const cchar_t *wch, int n); + int mvwhline_set(WINDOW *win, int y, int x, const cchar_t *wch, int n); + int mvwvline_set(WINDOW *win, int y, int x, const cchar_t *wch, int n); + X/Open Description: The border(), wborder(), and box() routines, a border is drawn around the edge of the window. If any of the arguments is zero, @@ -73,6 +91,17 @@ RCSID("$Id: border.c,v 1.38 2006/10/23 05:03:30 wmcbrine Exp $"); mvvline Y mvwhline Y mvwvline Y + border_set Y + wborder_set Y + box_set Y + hline_set Y + vline_set Y + whline_set Y + wvline_set Y + mvhline_set Y + mvvline_set Y + mvwhline_set Y + mvwvline_set Y **man-end****************************************************************/ diff --git a/pdcurses/inch.c b/pdcurses/inch.c index 0be4b41b..13dffb87 100644 --- a/pdcurses/inch.c +++ b/pdcurses/inch.c @@ -13,7 +13,7 @@ #include -RCSID("$Id: inch.c,v 1.25 2006/10/23 05:03:31 wmcbrine Exp $"); +RCSID("$Id: inch.c,v 1.26 2006/10/23 05:46:32 wmcbrine Exp $"); /*man-start************************************************************** @@ -25,6 +25,11 @@ RCSID("$Id: inch.c,v 1.25 2006/10/23 05:03:31 wmcbrine Exp $"); chtype mvinch(int y, int x); chtype mvwinch(WINDOW *win, int y, int x); + int in_wch(cchar_t *wcval); + int win_wch(WINDOW *win, cchar_t *wcval); + int mvin_wch(int y, int x, cchar_t *wcval); + int mvwin_wch(WINDOW *win, int y, int x, cchar_t *wcval); + X/Open Description: Depending upon the state of the raw character output, 7- or 8-bit characters will be output. @@ -37,6 +42,10 @@ RCSID("$Id: inch.c,v 1.25 2006/10/23 05:03:31 wmcbrine Exp $"); winch Y Y Y mvinch Y Y Y mvwinch Y Y Y + in_wch Y + win_wch Y + mvin_wch Y + mvwin_wch Y **man-end****************************************************************/ diff --git a/pdcurses/inchstr.c b/pdcurses/inchstr.c index b60c6181..4ace83b2 100644 --- a/pdcurses/inchstr.c +++ b/pdcurses/inchstr.c @@ -13,7 +13,7 @@ #include -RCSID("$Id: inchstr.c,v 1.24 2006/10/23 05:03:31 wmcbrine Exp $"); +RCSID("$Id: inchstr.c,v 1.25 2006/10/23 05:46:32 wmcbrine Exp $"); /*man-start************************************************************** @@ -29,6 +29,15 @@ RCSID("$Id: inchstr.c,v 1.24 2006/10/23 05:03:31 wmcbrine Exp $"); int mvwinchstr(WINDOW *, int y, int x, chtype *ch); int mvwinchnstr(WINDOW *, int y, int x, chtype *ch, int n); + int in_wchstr(cchar_t *wch); + int in_wchnstr(cchar_t *wch, int n); + int win_wchstr(WINDOW *win, cchar_t *wch); + int win_wchnstr(WINDOW *win, cchar_t *wch, int n); + int mvin_wchstr(int y, int x, cchar_t *wch); + int mvin_wchnstr(int y, int x, cchar_t *wch, int n); + int mvwin_wchstr(WINDOW *win, int y, int x, cchar_t *wch); + int mvwin_wchnstr(WINDOW *win, int y, int x, cchar_t *wch, int n); + X/Open Description: These routines read a chtype string directly from the window structure starting at the current position and ending at the @@ -52,6 +61,14 @@ RCSID("$Id: inchstr.c,v 1.24 2006/10/23 05:03:31 wmcbrine Exp $"); winchnstr Y - 4.0 mvinchnstr Y - 4.0 mvwinchnstr Y - 4.0 + in_wchstr Y + win_wchstr Y + mvin_wchstr Y + mvwin_wchstr Y + in_wchnstr Y + win_wchnstr Y + mvin_wchnstr Y + mvwin_wchnstr Y **man-end****************************************************************/ diff --git a/pdcurses/initscr.c b/pdcurses/initscr.c index c6de2525..d3cf52a3 100644 --- a/pdcurses/initscr.c +++ b/pdcurses/initscr.c @@ -14,7 +14,7 @@ #include #include -RCSID("$Id: initscr.c,v 1.81 2006/10/23 05:03:31 wmcbrine Exp $"); +RCSID("$Id: initscr.c,v 1.82 2006/10/23 05:46:32 wmcbrine Exp $"); const char *_curses_notice = "PDCurses 3.0 - Public Domain 2006"; diff --git a/pdcurses/insch.c b/pdcurses/insch.c index ab28343d..5ea85bec 100644 --- a/pdcurses/insch.c +++ b/pdcurses/insch.c @@ -14,7 +14,7 @@ #include #include -RCSID("$Id: insch.c,v 1.29 2006/10/23 05:03:31 wmcbrine Exp $"); +RCSID("$Id: insch.c,v 1.30 2006/10/23 05:46:32 wmcbrine Exp $"); /*man-start************************************************************** @@ -26,6 +26,11 @@ RCSID("$Id: insch.c,v 1.29 2006/10/23 05:03:31 wmcbrine Exp $"); int mvinsch(int y, int x, chtype ch); int mvwinsch(WINDOW *win, int y, int x, chtype ch); + int ins_wch(const cchar_t *wch); + int wins_wch(WINDOW *win, const cchar_t *wch); + int mvins_wch(int y, int x, const cchar_t *wch); + int mvwins_wch(WINDOW *win, int y, int x, const cchar_t *wch); + int PDC_chins(WINDOW* win, chtype c, bool xlat); X/Open Description: @@ -93,6 +98,10 @@ RCSID("$Id: insch.c,v 1.29 2006/10/23 05:03:31 wmcbrine Exp $"); winsch Y Y Y mvinsch Y Y Y mvwinsch Y Y Y + ins_wch Y + wins_wch Y + mvins_wch Y + mvwins_wch Y PDC_chins - - - **man-end****************************************************************/ diff --git a/pdcurses/insstr.c b/pdcurses/insstr.c index 23eabf24..f1636c05 100644 --- a/pdcurses/insstr.c +++ b/pdcurses/insstr.c @@ -14,7 +14,7 @@ #include #include -RCSID("$Id: insstr.c,v 1.32 2006/10/23 05:03:31 wmcbrine Exp $"); +RCSID("$Id: insstr.c,v 1.33 2006/10/23 05:46:32 wmcbrine Exp $"); /*man-start************************************************************** @@ -61,6 +61,14 @@ RCSID("$Id: insstr.c,v 1.32 2006/10/23 05:03:31 wmcbrine Exp $"); winsnstr Y - 4.0 mvinsnstr Y - 4.0 mvwinsnstr Y - 4.0 + ins_wstr Y + wins_wstr Y + mvins_wstr Y + mvwins_wstr Y + ins_nwstr Y + wins_nwstr Y + mvins_nwstr Y + mvwins_nwstr Y **man-end****************************************************************/ diff --git a/pdcurses/instr.c b/pdcurses/instr.c index 411692f4..4d45c1be 100644 --- a/pdcurses/instr.c +++ b/pdcurses/instr.c @@ -13,7 +13,7 @@ #include -RCSID("$Id: instr.c,v 1.29 2006/10/23 05:03:31 wmcbrine Exp $"); +RCSID("$Id: instr.c,v 1.30 2006/10/23 05:46:32 wmcbrine Exp $"); /*man-start************************************************************** @@ -60,6 +60,14 @@ RCSID("$Id: instr.c,v 1.29 2006/10/23 05:03:31 wmcbrine Exp $"); winnstr Y - 4.0 mvinnstr Y - 4.0 mvwinnstr Y - 4.0 + inwstr Y + winwstr Y + mvinwstr Y + mvwinwstr Y + innwstr Y + winnwstr Y + mvinnwstr Y + mvwinnwstr Y **man-end****************************************************************/ diff --git a/pdcurses/pad.c b/pdcurses/pad.c index efa7edd0..1a2ed005 100644 --- a/pdcurses/pad.c +++ b/pdcurses/pad.c @@ -15,7 +15,7 @@ #include #include -RCSID("$Id: pad.c,v 1.34 2006/10/23 05:03:31 wmcbrine Exp $"); +RCSID("$Id: pad.c,v 1.35 2006/10/23 05:46:32 wmcbrine Exp $"); /* save values for pechochar() */ @@ -35,6 +35,7 @@ static int save_sminrow, save_smincol, save_smaxrow, save_smaxcol; int pnoutrefresh(WINDOW *w, int py, int px, int sy1, int sx1, int sy2, int sx2); int pechochar(WINDOW *pad, chtype ch); + int pecho_wchar(WINDOW *pad, const cchar_t *wch); X/Open Description: newpad() creates a new pad data structure. A pad is a special @@ -90,6 +91,7 @@ static int save_sminrow, save_smincol, save_smaxrow, save_smaxcol; prefresh Y - Y pnoutrefresh Y - Y pechochar Y - 3.0 + pecho_wchar Y **man-end****************************************************************/ diff --git a/pdcurses/termattr.c b/pdcurses/termattr.c index 138f71b9..65e7fc84 100644 --- a/pdcurses/termattr.c +++ b/pdcurses/termattr.c @@ -15,7 +15,7 @@ #include #include -RCSID("$Id: termattr.c,v 1.42 2006/10/23 05:03:31 wmcbrine Exp $"); +RCSID("$Id: termattr.c,v 1.43 2006/10/23 05:46:32 wmcbrine Exp $"); /*man-start************************************************************** @@ -32,11 +32,11 @@ RCSID("$Id: termattr.c,v 1.42 2006/10/23 05:03:31 wmcbrine Exp $"); attr_t term_attrs(void); char *termname(void); - char wordchar(void); - int erasewchar(wchar_t *ch); int killwchar(wchar_t *ch); + char wordchar(void); + X/Open Description: baudrate() returns the output speed of the terminal. The number returned is bits per second, for example 9600, and is an integer. @@ -95,6 +95,8 @@ RCSID("$Id: termattr.c,v 1.42 2006/10/23 05:03:31 wmcbrine Exp $"); longname Y Y Y termattrs Y Y Y termname Y Y Y + erasewchar Y + killwchar Y wordchar - - - **man-end****************************************************************/ diff --git a/pdcurses/util.c b/pdcurses/util.c index 7b0ed1fc..e7480070 100644 --- a/pdcurses/util.c +++ b/pdcurses/util.c @@ -13,7 +13,7 @@ #include -RCSID("$Id: util.c,v 1.52 2006/10/23 05:03:31 wmcbrine Exp $"); +RCSID("$Id: util.c,v 1.53 2006/10/23 05:46:32 wmcbrine Exp $"); /*man-start************************************************************** @@ -25,6 +25,12 @@ RCSID("$Id: util.c,v 1.52 2006/10/23 05:03:31 wmcbrine Exp $"); void filter(void); void use_env(bool x); int delay_output(int ms); + int getcchar(const cchar_t *wcval, wchar_t *wch, attr_t *attrs, + short *color_pair, void *opts); + int setcchar(cchar_t *wcval, const wchar_t *wch, const attr_t attrs, + short color_pair, const void *opts); + wchar_t *wunctrl(cchar_t *wc); + char *key_name(wchar_t c); X/Open Description: The unctrl() routine expands the character c into a character @@ -59,7 +65,10 @@ RCSID("$Id: util.c,v 1.52 2006/10/23 05:03:31 wmcbrine Exp $"); filter Y - 3.0 use_env Y - 4.0 delay_output Y Y Y - flushinp Y Y Y + getcchar Y + setcchar Y + wunctrl Y + key_name Y **man-end****************************************************************/