CVS commit: [netbsd-6] src/lib/libcurses

[Jeff Rizzo]

Module Name:    src
Committed By:   riz
Date:           Sat May 11 21:46:26 UTC 2013

Modified Files:
        src/lib/libcurses [netbsd-6]: border.c

Log Message:
Pull up following revision(s) (requested by jdc in ticket #884):
        lib/libcurses/border.c: revision 1.15
Also merge in background attributes.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.8.1 src/lib/libcurses/border.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/border.c
diff -u src/lib/libcurses/border.c:1.14 src/lib/libcurses/border.c:1.14.8.1
--- src/lib/libcurses/border.c:1.14	Sat Dec 25 09:59:52 2010
+++ src/lib/libcurses/border.c	Sat May 11 21:46:26 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: border.c,v 1.14 2010/12/25 09:59:52 blymn Exp $	*/
+/*	$NetBSD: border.c,v 1.14.8.1 2013/05/11 21:46:26 riz Exp $	*/
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: border.c,v 1.14 2010/12/25 09:59:52 blymn Exp $");
+__RCSID("$NetBSD: border.c,v 1.14.8.1 2013/05/11 21:46:26 riz Exp $");
 #endif				/* not lint */
 
 #include <stdlib.h>
@@ -261,20 +261,36 @@ int wborder_set(WINDOW *win, const cchar
 	/* Merge window attributes */
 	left.attributes |= (left.attributes & __COLOR) ?
 		(win->wattr & ~__COLOR) : win->wattr;
+	left.attributes |= (left.attributes & __COLOR) ?
+		(win->battr & ~__COLOR) : win->battr;
 	right.attributes |= (right.attributes & __COLOR) ?
 		(win->wattr & ~__COLOR) : win->wattr;
+	right.attributes |= (right.attributes & __COLOR) ?
+		(win->battr & ~__COLOR) : win->battr;
 	top.attributes |= (top.attributes & __COLOR) ?
 		(win->wattr & ~__COLOR) : win->wattr;
+	top.attributes |= (top.attributes & __COLOR) ?
+		(win->battr & ~__COLOR) : win->battr;
 	bottom.attributes |= (bottom.attributes & __COLOR) ?
 		(win->wattr & ~__COLOR) : win->wattr;
+	bottom.attributes |= (bottom.attributes & __COLOR) ?
+		(win->battr & ~__COLOR) : win->battr;
 	topleft.attributes |= (topleft.attributes & __COLOR) ?
 		(win->wattr & ~__COLOR) : win->wattr;
+	topleft.attributes |= (topleft.attributes & __COLOR) ?
+		(win->battr & ~__COLOR) : win->battr;
 	topright.attributes |= (topright.attributes & __COLOR) ?
 		(win->wattr & ~__COLOR) : win->wattr;
+	topright.attributes |= (topright.attributes & __COLOR) ?
+		(win->battr & ~__COLOR) : win->battr;
 	botleft.attributes |= (botleft.attributes & __COLOR) ?
 		(win->wattr & ~__COLOR) : win->wattr;
+	botleft.attributes |= (botleft.attributes & __COLOR) ?
+		(win->battr & ~__COLOR) : win->battr;
 	botright.attributes |= (botright.attributes & __COLOR) ?
 		(win->wattr & ~__COLOR) : win->wattr;
+	botright.attributes |= (botright.attributes & __COLOR) ?
+		(win->battr & ~__COLOR) : win->battr;
 
 	endx = win->maxx - 1;
 	endy = win->maxy - 1;