[src/netbsd-6]: src/lib/libcurses Pull up following revision(s) (requested by...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/29610683d456
branches:  netbsd-6
changeset: 775784:29610683d456
user:      riz <riz%NetBSD.org@localhost>
date:      Sat May 11 21:46:26 2013 +0000

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

diffstat:

 lib/libcurses/border.c |  22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diffs (56 lines):

diff -r cbf5febd8dcb -r 29610683d456 lib/libcurses/border.c
--- a/lib/libcurses/border.c    Sat May 11 21:43:06 2013 +0000
+++ b/lib/libcurses/border.c    Sat May 11 21:46:26 2013 +0000
@@ -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 @@
        /* 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->wattr & ~__COLOR) : win->wattr;
+               (win->battr & ~__COLOR) : win->battr;
 
        endx = win->maxx - 1;
        endy = win->maxy - 1;