diff options
Diffstat (limited to 'contrib/ncurses/ncurses/base/lib_bkgd.c')
| -rw-r--r-- | contrib/ncurses/ncurses/base/lib_bkgd.c | 46 |
1 files changed, 32 insertions, 14 deletions
diff --git a/contrib/ncurses/ncurses/base/lib_bkgd.c b/contrib/ncurses/ncurses/base/lib_bkgd.c index a3d7c30..e6a0cb0 100644 --- a/contrib/ncurses/ncurses/base/lib_bkgd.c +++ b/contrib/ncurses/ncurses/base/lib_bkgd.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998,2000,2001 Free Software Foundation, Inc. * + * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -29,11 +29,14 @@ /**************************************************************************** * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * * and: Eric S. Raymond <esr@snark.thyrsus.com> * + * and: Juergen Pfeifer 1997 * + * and: Sven Verdoolaege 2000 * + * and: Thomas E. Dickey 1996-on * ****************************************************************************/ #include <curses.priv.h> -MODULE_ID("$Id: lib_bkgd.c,v 1.26 2001/12/19 01:36:58 tom Exp $") +MODULE_ID("$Id: lib_bkgd.c,v 1.35 2006/05/27 19:20:11 tom Exp $") /* * Set the window's background information. @@ -41,7 +44,7 @@ MODULE_ID("$Id: lib_bkgd.c,v 1.26 2001/12/19 01:36:58 tom Exp $") #if USE_WIDEC_SUPPORT NCURSES_EXPORT(void) #else -static inline void +static NCURSES_INLINE void #endif wbkgrndset(WINDOW *win, const ARG_CH_T ch) { @@ -51,13 +54,26 @@ wbkgrndset(WINDOW *win, const ARG_CH_T ch) attr_t off = AttrOf(win->_nc_bkgd); attr_t on = AttrOf(CHDEREF(ch)); - toggle_attr_off(win->_attrs, off); - toggle_attr_on(win->_attrs, on); + toggle_attr_off(WINDOW_ATTRS(win), off); + toggle_attr_on(WINDOW_ATTRS(win), on); - if (CharOf(CHDEREF(ch)) == L('\0')) +#if NCURSES_EXT_COLORS + { + int pair; + + if ((pair = GetPair(win->_nc_bkgd)) != 0) + SET_WINDOW_PAIR(win, 0); + if ((pair = GetPair(CHDEREF(ch))) != 0) + SET_WINDOW_PAIR(win, pair); + } +#endif + + if (CharOf(CHDEREF(ch)) == L('\0')) { SetChar(win->_nc_bkgd, BLANK_TEXT, AttrOf(CHDEREF(ch))); - else + SetPair(win->_nc_bkgd, GetPair(CHDEREF(ch))); + } else { win->_nc_bkgd = CHDEREF(ch); + } #if USE_WIDEC_SUPPORT /* * If we're compiled for wide-character support, _bkgrnd is the @@ -70,9 +86,11 @@ wbkgrndset(WINDOW *win, const ARG_CH_T ch) int tmp; wgetbkgrnd(win, &wch); - tmp = wctob(CharOf(wch)); + tmp = _nc_to_char((wint_t) CharOf(wch)); - win->_bkgd = ((tmp == EOF) ? ' ' : (chtype) tmp) | AttrOf(wch); + win->_bkgd = (((tmp == EOF) ? ' ' : (chtype) tmp) + | (AttrOf(wch) & ALL_BUT_COLOR) + | COLOR_PAIR(GET_WINDOW_PAIR(win))); } #endif } @@ -93,7 +111,7 @@ wbkgdset(WINDOW *win, chtype ch) #if USE_WIDEC_SUPPORT NCURSES_EXPORT(int) #else -static inline int +static NCURSES_INLINE int #undef wbkgrnd #endif wbkgrnd(WINDOW *win, const ARG_CH_T ch) @@ -113,11 +131,11 @@ wbkgrnd(WINDOW *win, const ARG_CH_T ch) for (y = 0; y <= win->_maxy; y++) { for (x = 0; x <= win->_maxx; x++) { - if (CharEq(win->_line[y].text[x], old_bkgrnd)) + if (CharEq(win->_line[y].text[x], old_bkgrnd)) { win->_line[y].text[x] = win->_nc_bkgd; - else { + } else { NCURSES_CH_T wch = win->_line[y].text[x]; - RemAttr(wch, ~A_ALTCHARSET); + RemAttr(wch, (~(A_ALTCHARSET | A_CHARTEXT))); win->_line[y].text[x] = _nc_render(win, wch); } } @@ -130,7 +148,7 @@ wbkgrnd(WINDOW *win, const ARG_CH_T ch) } NCURSES_EXPORT(int) -wbkgd(WINDOW *win, const chtype ch) +wbkgd(WINDOW *win, chtype ch) { NCURSES_CH_T wch; SetChar2(wch, ch); |
