Module Name: src
Committed By: blymn
Date: Sun Jul 10 12:11:49 UTC 2011
Modified Files:
src/lib/libcurses: erase.c
Log Message:
Set the background attributes when erasing.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/lib/libcurses/erase.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/erase.c
diff -u src/lib/libcurses/erase.c:1.24 src/lib/libcurses/erase.c:1.25
--- src/lib/libcurses/erase.c:1.24 Wed Jul 22 16:57:14 2009
+++ src/lib/libcurses/erase.c Sun Jul 10 12:11:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: erase.c,v 1.24 2009/07/22 16:57:14 roy Exp $ */
+/* $NetBSD: erase.c,v 1.25 2011/07/10 12:11:49 blymn Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)erase.c 8.2 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: erase.c,v 1.24 2009/07/22 16:57:14 roy Exp $");
+__RCSID("$NetBSD: erase.c,v 1.25 2011/07/10 12:11:49 blymn Exp $");
#endif
#endif /* not lint */
@@ -72,8 +72,8 @@
#ifdef DEBUG
__CTRACE(__CTRACE_ERASE, "werase: (%p)\n", win);
#endif
- if (__using_color && win != curscr)
- attr = win->battr & __COLOR;
+ if (win != curscr)
+ attr = win->battr & __ATTRIBUTES;
else
attr = 0;
for (y = 0; y < win->maxy; y++) {
@@ -86,7 +86,10 @@
if (sp->ch != ( wchar_t )btowc(( int ) win->bch ) ||
(sp->attr & WA_ATTRIBUTES) != 0 || sp->nsp) {
#endif /* HAVE_WCHAR */
- sp->attr = attr;
+ if (sp->attr & __ALTCHARSET)
+ sp->attr = attr | __ALTCHARSET;
+ else
+ sp->attr = attr;
#ifdef HAVE_WCHAR
sp->ch = ( wchar_t )btowc(( int ) win->bch);
if (_cursesi_copy_nsp(win->bnsp, sp) == ERR)
