ncurses 5.7 - patch 20110122

[ncurses.git] / ncurses / base / lib_bkgd.c

diff --git a/ncurses/base/lib_bkgd.c b/ncurses/base/lib_bkgd.c
index 3f3a2ac79bd90af8f050cd9f5a06d76d9c0c1475..0396ba8f47a85d27bd8fbb6e34c2a15c0248e30f 100644 (file)
--- a/ncurses/base/lib_bkgd.c
+++ b/ncurses/base/lib_bkgd.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998,2001-2002 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2011 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            *
  *                                                                          *
  * 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>                         *
 /****************************************************************************
  *  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>
 
  ****************************************************************************/
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_bkgd.c,v 1.30 2003/07/05 16:46:49 tom Exp $")
+MODULE_ID("$Id: lib_bkgd.c,v 1.43 2011/01/22 19:47:37 tom Exp $")

 
 /*
  * Set the window's background information.
 
 /*
  * Set the window's background information.


@@ -41,23 +44,36 @@ MODULE_ID("$Id: lib_bkgd.c,v 1.30 2003/07/05 16:46:49 tom Exp $")
 #if USE_WIDEC_SUPPORT
 NCURSES_EXPORT(void)
 #else
 #if USE_WIDEC_SUPPORT
 NCURSES_EXPORT(void)
 #else

-static inline void
+static NCURSES_INLINE void

 #endif
 wbkgrndset(WINDOW *win, const ARG_CH_T ch)
 {
 #endif
 wbkgrndset(WINDOW *win, const ARG_CH_T ch)
 {

-    T((T_CALLED("wbkgdset(%p,%s)"), win, _tracech_t(ch)));
+    T((T_CALLED("wbkgdset(%p,%s)"), (void *) win, _tracech_t(ch)));

 
     if (win) {
        attr_t off = AttrOf(win->_nc_bkgd);
        attr_t on = AttrOf(CHDEREF(ch));
 
 
     if (win) {
        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)));
            SetChar(win->_nc_bkgd, BLANK_TEXT, AttrOf(CHDEREF(ch)));

-       else
+           if_EXT_COLORS(SetPair(win->_nc_bkgd, GetPair(CHDEREF(ch))));
+       } else {

            win->_nc_bkgd = CHDEREF(ch);
            win->_nc_bkgd = CHDEREF(ch);

+       }

 #if USE_WIDEC_SUPPORT
        /*
         * If we're compiled for wide-character support, _bkgrnd is the
 #if USE_WIDEC_SUPPORT
        /*
         * If we're compiled for wide-character support, _bkgrnd is the


@@ -69,10 +85,12 @@ wbkgrndset(WINDOW *win, const ARG_CH_T ch)
            cchar_t wch;
            int tmp;
 
            cchar_t wch;
            int tmp;
 

-           wgetbkgrnd(win, &wch);
-           tmp = _nc_to_char(CharOf(wch));
+           (void) wgetbkgrnd(win, &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)
+                         | (chtype) ColorPair(GET_WINDOW_PAIR(win)));

        }
 #endif
     }
        }
 #endif
     }


@@ -93,7 +111,7 @@ wbkgdset(WINDOW *win, chtype ch)
 #if USE_WIDEC_SUPPORT
 NCURSES_EXPORT(int)
 #else
 #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)
 #undef wbkgrnd
 #endif
 wbkgrnd(WINDOW *win, const ARG_CH_T ch)


@@ -102,22 +120,22 @@ wbkgrnd(WINDOW *win, const ARG_CH_T ch)
     int x, y;
     NCURSES_CH_T new_bkgd = CHDEREF(ch);
 
     int x, y;
     NCURSES_CH_T new_bkgd = CHDEREF(ch);
 

-    T((T_CALLED("wbkgd(%p,%s)"), win, _tracech_t(ch)));
+    T((T_CALLED("wbkgd(%p,%s)"), (void *) win, _tracech_t(ch)));

 
     if (win) {
        NCURSES_CH_T old_bkgrnd;
        wgetbkgrnd(win, &old_bkgrnd);
 
 
     if (win) {
        NCURSES_CH_T old_bkgrnd;
        wgetbkgrnd(win, &old_bkgrnd);
 

-       wbkgrndset(win, CHREF(new_bkgd));
-       wattrset(win, AttrOf(win->_nc_bkgd));
+       (void) wbkgrndset(win, CHREF(new_bkgd));
+       (void) wattrset(win, AttrOf(win->_nc_bkgd));

 
        for (y = 0; y <= win->_maxy; y++) {
            for (x = 0; x <= win->_maxx; x++) {
 
        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;
                    win->_line[y].text[x] = win->_nc_bkgd;

-               else {
+               } else {

                    NCURSES_CH_T wch = win->_line[y].text[x];
                    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);
                }
            }
                    win->_line[y].text[x] = _nc_render(win, wch);
                }
            }