diff options
| author | Rong-En Fan <rafan@FreeBSD.org> | 2008-05-09 02:28:12 +0000 |
|---|---|---|
| committer | Rong-En Fan <rafan@FreeBSD.org> | 2008-05-09 02:28:12 +0000 |
| commit | aa59d4d4c5dda7e1c6f9dc0cc6edc58992a525c7 (patch) | |
| tree | 502fa0a691368fb8b60b62eef10b3f3332efe830 /contrib/ncurses/ncurses/base/lib_addch.c | |
| parent | d8977eaf361f5fdc1261c3f3524988f661ed926e (diff) | |
| download | src-aa59d4d4c5dda7e1c6f9dc0cc6edc58992a525c7.tar.gz src-aa59d4d4c5dda7e1c6f9dc0cc6edc58992a525c7.zip | |
Import ncurses 5.6-20080503 snapshot onto the vender branchvendor/ncurses/5.6-20080503
Notes
Notes:
svn path=/vendor/ncurses/dist/; revision=178866
svn path=/vendor/ncurses/5.6-20080503/; revision=178868; tag=vendor/ncurses/5.6-20080503
Diffstat (limited to 'contrib/ncurses/ncurses/base/lib_addch.c')
| -rw-r--r-- | contrib/ncurses/ncurses/base/lib_addch.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/ncurses/ncurses/base/lib_addch.c b/contrib/ncurses/ncurses/base/lib_addch.c index 1ef6cc5803d3..17ba6e2bcd6c 100644 --- a/contrib/ncurses/ncurses/base/lib_addch.c +++ b/contrib/ncurses/ncurses/base/lib_addch.c @@ -36,7 +36,7 @@ #include <curses.priv.h> #include <ctype.h> -MODULE_ID("$Id: lib_addch.c,v 1.108 2008/02/03 18:50:27 tom Exp $") +MODULE_ID("$Id: lib_addch.c,v 1.111 2008/03/29 18:48:02 tom Exp $") static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT); @@ -217,7 +217,9 @@ _nc_build_wch(WINDOW *win, ARG_CH_T ch) buffer, WINDOW_EXT(win, addch_used), &state)) > 0) { attr_t attrs = AttrOf(CHDEREF(ch)); + if_EXT_COLORS(int pair = GetPair(CHDEREF(ch))); SetChar(CHDEREF(ch), result, attrs); + if_EXT_COLORS(SetPair(CHDEREF(ch), pair)); WINDOW_EXT(win, addch_used) = 0; } else if (len == -1) { /* @@ -474,6 +476,7 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch) while (*s) { NCURSES_CH_T sch; SetChar(sch, *s++, AttrOf(ch)); + if_EXT_COLORS(SetPair(sch, GetPair(ch))); if (waddch_literal(win, sch) == ERR) return ERR; } |