[src/trunk]: src/sys/dev/rasops Treat highlighted and reversed text in the sa...

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

details:   https://anonhg.NetBSD.org/src/rev/5c7c16d25939
branches:  trunk
changeset: 962731:5c7c16d25939
user:      rin <rin%NetBSD.org@localhost>
date:      Tue Jul 30 12:20:24 2019 +0000

description:
Treat highlighted and reversed text in the same manner to xterm.

diffstat:

 sys/dev/rasops/rasops.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (39 lines):

diff -r 149765c61577 -r 5c7c16d25939 sys/dev/rasops/rasops.c
--- a/sys/dev/rasops/rasops.c   Tue Jul 30 11:16:15 2019 +0000
+++ b/sys/dev/rasops/rasops.c   Tue Jul 30 12:20:24 2019 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: rasops.c,v 1.97 2019/07/29 16:17:29 rin Exp $ */
+/*      $NetBSD: rasops.c,v 1.98 2019/07/30 12:20:24 rin Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.97 2019/07/29 16:17:29 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.98 2019/07/30 12:20:24 rin Exp $");
 
 #include "opt_rasops.h"
 #include "rasops_glue.h"
@@ -618,16 +618,16 @@
 #endif
        }
 
+       if ((flg & WSATTR_HILIT) != 0)
+               fg += 8;
+
        if ((flg & WSATTR_REVERSE) != 0) {
                uint32_t swap = fg;
                fg = bg;
                bg = swap;
        }
 
-       if ((flg & WSATTR_HILIT) != 0)
-               fg += 8;
-
-       flg = flg & WSATTR_USERMASK;
+       flg &= WSATTR_USERMASK;
 
        if (rasops_isgray[fg])
                flg |= WSATTR_PRIVATE1;