summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormacallan <macallan@NetBSD.org>2005-05-01 23:19:01 +0000
committermacallan <macallan@NetBSD.org>2005-05-01 23:19:01 +0000
commit80ef75e06163b67e3d4a571cf29f5e565bdf23d1 (patch)
treedd9d3cb09e58d1f5833f28002ab9921b165d9111 /sys/dev
parentc10404e8440239e0a2c567ad7d6dad26b1d1aa7f (diff)
made rasops_allocattr_color() respect WS_DEFAULT_FG and WS_DEFAULT_BG instead of using white on black
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/rasops/rasops.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/sys/dev/rasops/rasops.c b/sys/dev/rasops/rasops.c
index 6832f457139..07ac1f06601 100644
--- a/sys/dev/rasops/rasops.c
+++ b/sys/dev/rasops/rasops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops.c,v 1.46 2005/02/27 00:27:47 perry Exp $ */
+/* $NetBSD: rasops.c,v 1.47 2005/05/01 23:19:01 macallan 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.47 2005/05/01 23:19:01 macallan 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 @@ rasops_allocattr_color(cookie, fg, bg, flg, attr)
return (EINVAL);
if ((flg & WSATTR_WSCOLORS) == 0) {
- fg = WSCOL_WHITE;
- bg = WSCOL_BLACK;
+ #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) {