X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Flib_bkgd.c;h=410ee0580433b6d7a91015b4cbf8c6b9c46e19aa;hp=1bf03870e57c91aac03b3c31b205cd9fa1e70eab;hb=refs%2Ftags%2Fv4.2;hpb=3a9b6a3bf0269231bef7de74757a910dedd04e0c

diff --git a/ncurses/lib_bkgd.c b/ncurses/lib_bkgd.c
index 1bf03870..410ee058 100644
--- a/ncurses/lib_bkgd.c
+++ b/ncurses/lib_bkgd.c
@@ -1,52 +1,86 @@
+/****************************************************************************
+ * Copyright (c) 1998 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            *
+ * "Software"), to deal in the Software without restriction, including      *
+ * without limitation the rights to use, copy, modify, merge, publish,      *
+ * distribute, distribute with modifications, sublicense, and/or sell       *
+ * copies of the Software, and to permit persons to whom the Software is    *
+ * furnished to do so, subject to the following conditions:                 *
+ *                                                                          *
+ * The above copyright notice and this permission notice shall be included  *
+ * in all copies or substantial portions of the Software.                   *
+ *                                                                          *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+ *                                                                          *
+ * Except as contained in this notice, the name(s) of the above copyright   *
+ * holders shall not be used in advertising or otherwise to promote the     *
+ * sale, use or other dealings in this Software without prior written       *
+ * authorization.                                                           *
+ ****************************************************************************/
 
-/***************************************************************************
-*                            COPYRIGHT NOTICE                              *
-****************************************************************************
-*                ncurses is copyright (C) 1992-1995                        *
-*                          Zeyd M. Ben-Halim                               *
-*                          zmbenhal@netcom.com                             *
-*                          Eric S. Raymond                                 *
-*                          esr@snark.thyrsus.com                           *
-*                                                                          *
-*        Permission is hereby granted to reproduce and distribute ncurses  *
-*        by any means and for any fee, whether alone or as part of a       *
-*        larger distribution, in source or in binary form, PROVIDED        *
-*        this notice is included with any such distribution, and is not    *
-*        removed from any of its header files. Mention of ncurses in any   *
-*        applications linked with it is highly appreciated.                *
-*                                                                          *
-*        ncurses comes AS IS with no warranty, implied or expressed.       *
-*                                                                          *
-***************************************************************************/
+/****************************************************************************
+ *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
+ *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ ****************************************************************************/
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_bkgd.c,v 1.7 1997/04/12 17:44:37 tom Exp $")
+MODULE_ID("$Id: lib_bkgd.c,v 1.12 1998/02/11 12:13:54 tom Exp $")
+
+void wbkgdset(WINDOW *win, chtype ch)
+{
+  T((T_CALLED("wbkgdset(%p,%s)"), win, _tracechtype(ch)));
+    
+  if (win) {
+    chtype off = AttrOf(win->_bkgd);
+    chtype on  = AttrOf(ch);
+    
+    toggle_attr_off(win->_attrs,off);
+    toggle_attr_on (win->_attrs,on);
+    
+    if (TextOf(ch)==0)
+      ch |= BLANK;
+    win->_bkgd = ch;
+  }
+  returnVoid;
+}
 
 int wbkgd(WINDOW *win, const chtype ch)
 {
-int x, y;
-chtype old_bkgd = getbkgd(win);
-chtype new_bkgd = ch;
-
-	T((T_CALLED("wbkgd(%p,%s)"), win, _tracechtype(new_bkgd)));
-
-	if (TextOf(new_bkgd) == 0)
-		new_bkgd |= BLANK;
-	wbkgdset(win, new_bkgd);
-	wattrset(win, AttrOf(new_bkgd));
-
-	for (y = 0; y <= win->_maxy; y++) {
-		for (x = 0; x <= win->_maxx; x++) {
-			if (win->_line[y].text[x] == old_bkgd)
-				win->_line[y].text[x] = new_bkgd;
-			else
-				win->_line[y].text[x] =
-					TextOf(win->_line[y].text[x])
-					| AttrOf(new_bkgd);
-		}
-	}
-	touchwin(win);
-	_nc_synchook(win);
-	returnCode(OK);
+  int code = ERR;
+  int x, y;
+  chtype new_bkgd = ch;
+
+  T((T_CALLED("wbkgd(%p,%s)"), win, _tracechtype(new_bkgd)));
+
+  if (win) {
+    chtype old_bkgd = getbkgd(win);
+
+    wbkgdset(win, new_bkgd);
+    wattrset(win, AttrOf(win->_bkgd));
+    
+    for (y = 0; y <= win->_maxy; y++) {
+      for (x = 0; x <= win->_maxx; x++) {
+	if (win->_line[y].text[x] == old_bkgd)
+	  win->_line[y].text[x] = win->_bkgd;
+	else 
+	  win->_line[y].text[x] =
+	    _nc_render(win,(A_ALTCHARSET & 
+			    AttrOf(win->_line[y].text[x])) 
+		       | TextOf(win->_line[y].text[x]));
+      }
+    }
+    touchwin(win);
+    _nc_synchook(win);
+    code = OK;
+  }
+  returnCode(code);
 }