[src/netbsd-3]: src/sys/dev/rasops Pull up revisions 1.47-1.48 (requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/de53f8f5966a
branches:  netbsd-3
changeset: 575988:de53f8f5966a
user:      riz <riz%NetBSD.org@localhost>
date:      Fri Jun 03 15:11:54 2005 +0000

description:
Pull up revisions 1.47-1.48 (requested by martin in ticket #366):
1.47:
made rasops_allocattr_color() respect WS_DEFAULT_FG and WS_DEFAULT_BG instead of using white on black

1.48:
fixed tab width and formatting

diffstat:

 sys/dev/rasops/rasops.c |  13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diffs (39 lines):

diff -r 443ac35f18a9 -r de53f8f5966a sys/dev/rasops/rasops.c
--- a/sys/dev/rasops/rasops.c   Thu Jun 02 20:45:41 2005 +0000
+++ b/sys/dev/rasops/rasops.c   Fri Jun 03 15:11:54 2005 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: rasops.c,v 1.46 2005/02/27 00:27:47 perry Exp $       */
+/*      $NetBSD: rasops.c,v 1.46.2.1 2005/06/03 15:11:54 riz Exp $     */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,10 +37,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.46 2005/02/27 00:27:47 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.46.2.1 2005/06/03 15:11:54 riz Exp $");
 
 #include "opt_rasops.h"
 #include "rasops_glue.h"
+#include "opt_wsmsgattrs.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -397,8 +398,16 @@
                return (EINVAL);
 
        if ((flg & WSATTR_WSCOLORS) == 0) {
+#ifdef WS_DEFAULT_FG
+               fg = WS_DEFAULT_FG;
+#else
                fg = WSCOL_WHITE;
+#endif
+#ifdef WS_DEFAULT_BG
+               bg = WS_DEFAULT_BG;
+#else  
                bg = WSCOL_BLACK;
+#endif
        }
 
        if ((flg & WSATTR_REVERSE) != 0) {