Module Name: src
Committed By: jakllsch
Date: Fri Mar 1 23:17:05 UTC 2019
Modified Files:
src/sys/dev/rasops: rasops32.c
Log Message:
Underline when the attribute say underline, not when it says to reverse.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/rasops/rasops32.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/rasops/rasops32.c
diff -u src/sys/dev/rasops/rasops32.c:1.30 src/sys/dev/rasops/rasops32.c:1.31
--- src/sys/dev/rasops/rasops32.c:1.30 Fri Mar 1 23:14:13 2019
+++ src/sys/dev/rasops/rasops32.c Fri Mar 1 23:17:05 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops32.c,v 1.30 2019/03/01 23:14:13 jakllsch Exp $ */
+/* $NetBSD: rasops32.c,v 1.31 2019/03/01 23:17:05 jakllsch Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops32.c,v 1.30 2019/03/01 23:14:13 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops32.c,v 1.31 2019/03/01 23:17:05 jakllsch Exp $");
#include "opt_rasops.h"
@@ -146,7 +146,7 @@ rasops32_putchar(void *cookie, int row,
}
/* Do underline */
- if ((attr & 1) != 0) {
+ if ((attr & WSATTR_UNDERLINE) != 0) {
DELTA(rp, -(ri->ri_stride << 1), int32_t *);
if (ri->ri_hwbits)
DELTA(hrp, -(ri->ri_stride << 1), int32_t *);
@@ -235,7 +235,7 @@ rasops32_putchar_aa(void *cookie, int ro
}
/* Do underline */
- if ((attr & 1) != 0) {
+ if ((attr & WSATTR_UNDERLINE) != 0) {
rp = (uint32_t *)rrp;
height = font->fontheight;
DELTA(rp, (ri->ri_stride * (height - 2)), int32_t *);
