ncurses 6.2 - patch 20200212

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

diff --git a/ncurses/base/lib_bkgd.c b/ncurses/base/lib_bkgd.c
index 48111a7816e593c83a6589aad1a58d42aa7b9ada..2030030f91a5255ec3192bf75eccb6cb3b538c76 100644 (file)
--- a/ncurses/base/lib_bkgd.c
+++ b/ncurses/base/lib_bkgd.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
+ * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 1998-2014,2016 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            *


@@ -36,7 +37,7 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_bkgd.c,v 1.32 2005/04/16 18:03:48 tom Exp $")
+MODULE_ID("$Id: lib_bkgd.c,v 1.54 2020/02/02 23:34:34 tom Exp $")

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


@@ -44,18 +45,18 @@ MODULE_ID("$Id: lib_bkgd.c,v 1.32 2005/04/16 18:03:48 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 NCURSES_EXT_COLORS
        {
 
 #if NCURSES_EXT_COLORS
        {


@@ -70,7 +71,7 @@ wbkgrndset(WINDOW *win, const ARG_CH_T ch)
 
        if (CharOf(CHDEREF(ch)) == L('\0')) {
            SetChar(win->_nc_bkgd, BLANK_TEXT, AttrOf(CHDEREF(ch)));
 
        if (CharOf(CHDEREF(ch)) == L('\0')) {
            SetChar(win->_nc_bkgd, BLANK_TEXT, AttrOf(CHDEREF(ch)));

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

        } else {
            win->_nc_bkgd = CHDEREF(ch);
        }
        } else {
            win->_nc_bkgd = CHDEREF(ch);
        }


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

-           wgetbkgrnd(win, &wch);
+           memset(&wch, 0, sizeof(wch));
+           (void) wgetbkgrnd(win, &wch);

            tmp = _nc_to_char((wint_t) CharOf(wch));
 
            win->_bkgd = (((tmp == EOF) ? ' ' : (chtype) tmp)
                          | (AttrOf(wch) & ALL_BUT_COLOR)
            tmp = _nc_to_char((wint_t) CharOf(wch));
 
            win->_bkgd = (((tmp == EOF) ? ' ' : (chtype) tmp)
                          | (AttrOf(wch) & ALL_BUT_COLOR)

-                         | COLOR_PAIR(GET_WINDOW_PAIR(win)));
+                         | (chtype) ColorPair(GET_WINDOW_PAIR(win)));

        }
 #endif
     }
        }
 #endif
     }


@@ -111,32 +113,103 @@ 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)
 {

+#undef  SP_PARM
+#define SP_PARM SP             /* to use Charable() */

     int code = ERR;
     int code = ERR;

-    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 (SP == 0) {
+       ;
+    } else if (win) {
+       NCURSES_CH_T new_bkgd = CHDEREF(ch);
+       NCURSES_CH_T old_bkgd;
+       int y;
+       NCURSES_CH_T old_char;
+       attr_t old_attr;
+       int old_pair;
+       NCURSES_CH_T new_char;
+       attr_t new_attr;
+       int new_pair;
+
+       /* SVr4 trims color info if non-color terminal */
+       if (!SP->_pair_limit) {
+           RemAttr(new_bkgd, A_COLOR);
+           SetPair(new_bkgd, 0);
+       }

 
 

-    if (win) {
-       NCURSES_CH_T old_bkgrnd;
-       wgetbkgrnd(win, &old_bkgrnd);
+       memset(&old_bkgd, 0, sizeof(old_bkgd));
+       (void) wgetbkgrnd(win, &old_bkgd);

 
 

-       wbkgrndset(win, CHREF(new_bkgd));
-       wattrset(win, AttrOf(win->_nc_bkgd));
+       if (!memcmp(&old_bkgd, &new_bkgd, sizeof(new_bkgd))) {
+           T(("...unchanged"));
+           returnCode(OK);
+       }
+
+       old_char = old_bkgd;
+       RemAttr(old_char, ~A_CHARTEXT);
+       old_attr = AttrOf(old_bkgd);
+       old_pair = GetPair(old_bkgd);
+
+       if (!(old_attr & A_COLOR)) {
+           old_pair = 0;
+       }
+       T(("... old background char %s, attr %s, pair %d",
+          _tracechar(CharOf(old_char)), _traceattr(old_attr), old_pair));
+
+       new_char = new_bkgd;
+       RemAttr(new_char, ~A_CHARTEXT);
+       new_attr = AttrOf(new_bkgd);
+       new_pair = GetPair(new_bkgd);
+
+       /* SVr4 limits background character to printable 7-bits */
+       if (!Charable(new_bkgd)) {
+           new_char = old_char;
+       }
+       if (!(new_attr & A_COLOR)) {
+           new_pair = 0;
+       }
+       T(("... new background char %s, attr %s, pair %d",
+          _tracechar(CharOf(new_char)), _traceattr(new_attr), new_pair));
+
+       (void) wbkgrndset(win, CHREF(new_bkgd));
+
+       /* SVr4 updates color pair if old/new match, otherwise just attrs */
+       if ((new_pair != 0) && (new_pair == old_pair)) {
+           WINDOW_ATTRS(win) = new_attr;
+           SET_WINDOW_PAIR(win, new_pair);
+       } else {
+           WINDOW_ATTRS(win) = new_attr;
+       }

 
        for (y = 0; y <= win->_maxy; y++) {
 
        for (y = 0; y <= win->_maxy; y++) {

+           int x;
+

            for (x = 0; x <= win->_maxx; x++) {
            for (x = 0; x <= win->_maxx; x++) {

-               if (CharEq(win->_line[y].text[x], old_bkgrnd))
-                   win->_line[y].text[x] = win->_nc_bkgd;
-               else {
-                   NCURSES_CH_T wch = win->_line[y].text[x];
-                   RemAttr(wch, (~A_ALTCHARSET));
-                   win->_line[y].text[x] = _nc_render(win, wch);
+               NCURSES_CH_T *cp = &(win->_line[y].text[x]);
+               int tmp_pair = GetPair(*cp);
+               attr_t tmp_attr = AttrOf(*cp);
+
+               if (CharEq(*cp, old_bkgd)) {
+                   SetChar2(*cp, CharOf(new_char));
+               }
+               if (tmp_pair != 0) {
+                   if (tmp_pair == old_pair) {
+                       SetAttr(*cp, (tmp_attr & ~old_attr) | new_attr);
+                       SetPair(*cp, new_pair);
+                   } else {
+                       SetAttr(*cp,
+                               (tmp_attr & (~old_attr | A_COLOR))
+                               | (new_attr & ALL_BUT_COLOR));
+                   }
+               } else {
+                   SetAttr(*cp, (tmp_attr & ~old_attr) | new_attr);
+                   SetPair(*cp, new_pair);

                }
            }
        }
                }
            }
        }