summaryrefslogtreecommitdiff
path: root/sys/dev/wscons/wsdisplayvar.h
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2002-07-25 19:03:26 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2002-07-25 19:03:26 +0000
commit48bbde10e0385b5b1c97150234d637538444f51b (patch)
tree184767c4451f5e6d0cd0930b704ab371c059b844 /sys/dev/wscons/wsdisplayvar.h
parentc7866a5b25f02593194ade0e26348772eb9dd911 (diff)
Rework the color usage in wsemul_sun displays, to match SunOS and Solaris
text mode colors. This means black text on white background, even for the kernel messages. Initially based on a patch from jason@, then some tinkering by me.
Diffstat (limited to 'sys/dev/wscons/wsdisplayvar.h')
-rw-r--r--sys/dev/wscons/wsdisplayvar.h16
1 files changed, 14 insertions, 2 deletions
diff --git a/sys/dev/wscons/wsdisplayvar.h b/sys/dev/wscons/wsdisplayvar.h
index 867a5e90349..3b13326aa62 100644
--- a/sys/dev/wscons/wsdisplayvar.h
+++ b/sys/dev/wscons/wsdisplayvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplayvar.h,v 1.13 2002/03/27 18:54:09 jbm Exp $ */
+/* $OpenBSD: wsdisplayvar.h,v 1.14 2002/07/25 19:03:25 miod Exp $ */
/* $NetBSD: wsdisplayvar.h,v 1.14.4.1 2000/06/30 16:27:53 simonb Exp $ */
/*
@@ -66,14 +66,20 @@ struct wsdisplay_emulops {
void (*eraserows)(void *c, int row, int nrows, long);
int (*alloc_attr)(void *c, int fg, int bg, int flags, long *);
/* fg / bg values. Made identical to ANSI terminal color codes. */
+/* XXX should be #if NWSEMUL_SUN > 1 */
+#if defined(__sparc__) || defined(__sparc64__)
+#define WSCOL_WHITE wscol_white
+#define WSCOL_BLACK wscol_black
+#else
#define WSCOL_BLACK 0
+#define WSCOL_WHITE 7
+#endif
#define WSCOL_RED 1
#define WSCOL_GREEN 2
#define WSCOL_BROWN 3
#define WSCOL_BLUE 4
#define WSCOL_MAGENTA 5
#define WSCOL_CYAN 6
-#define WSCOL_WHITE 7
/* flag values: */
#define WSATTR_REVERSE 1
#define WSATTR_HILIT 2
@@ -83,6 +89,12 @@ struct wsdisplay_emulops {
/* XXX need a free_attr() ??? */
};
+/* XXX should be #if NWSEMUL_SUN > 1 */
+#if defined(__sparc__) || defined(__sparc64__)
+extern int wscol_white, wscol_black;
+extern int wskernel_fg, wskernel_bg;
+#endif
+
#define WSSCREEN_NAME_SIZE 16
struct wsscreen_descr {