svn commit: r264611 - stable/10/sys/dev/vt

[Aleksandr Rybalko]

Author: ray
Date: Thu Apr 17 14:18:30 2014
New Revision: 264611
URL: http://svnweb.freebsd.org/changeset/base/264611

Log:
  MFC r264258
  
  Fix cursor color in reverse video mode.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/sys/dev/vt/vt_core.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/vt/vt_core.c
==============================================================================
--- stable/10/sys/dev/vt/vt_core.c	Thu Apr 17 14:16:02 2014	(r264610)
+++ stable/10/sys/dev/vt/vt_core.c	Thu Apr 17 14:18:30 2014	(r264611)
@@ -652,24 +652,26 @@ static inline void
 vt_determine_colors(term_char_t c, int cursor,
     term_color_t *fg, term_color_t *bg)
 {
+	term_color_t tmp;
+	int invert;
+
+	invert = 0;
 
 	*fg = TCHAR_FGCOLOR(c);
 	if (TCHAR_FORMAT(c) & TF_BOLD)
 		*fg = TCOLOR_LIGHT(*fg);
 	*bg = TCHAR_BGCOLOR(c);
 
-	if (TCHAR_FORMAT(c) & TF_REVERSE) {
-		term_color_t tmp;
+	if (TCHAR_FORMAT(c) & TF_REVERSE)
+		invert ^= 1;
+	if (cursor)
+		invert ^= 1;
 
+	if (invert) {
 		tmp = *fg;
 		*fg = *bg;
 		*bg = tmp;
 	}
-
-	if (cursor) {
-		*fg = *bg;
-		*bg = TC_WHITE;
-	}
 }
 
 static void