[vte] Bug 602596 - Cursor can become invisible

[Behdad Esfahbod <behdad src gnome org>]

commit b58bc5359085d2c9233ac6d6a265645bfa217e82
Author: Behdad Esfahbod <behdad behdad org>
Date:   Wed Mar 31 14:05:10 2010 -0400

    Bug 602596 - Cursor can become invisible
    
    Always compute the full fore/back color first, then reverse.
    That's what xterm does also.

 src/vte.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/src/vte.c b/src/vte.c
index 178010b..c6844e9 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -8760,10 +8760,6 @@ vte_terminal_determine_colors(VteTerminal *terminal,
 	if (highlight && !cursor && terminal->pvt->highlight_color_set) {
 		*fore = cell ? cell->attr.fore : VTE_DEF_FG;
 		*back = VTE_DEF_HL;
-	} else
-	if (reverse ^ ((cell != NULL) && (cell->attr.reverse))) {
-		*fore = cell ? cell->attr.back : VTE_DEF_BG;
-		*back = cell ? cell->attr.fore : VTE_DEF_FG;
 	} else {
 		*fore = cell ? cell->attr.fore : VTE_DEF_FG;
 		*back = cell ? cell->attr.back : VTE_DEF_BG;
@@ -8796,6 +8792,13 @@ vte_terminal_determine_colors(VteTerminal *terminal,
 			}
 		}
 	}
+
+	if (reverse ^ ((cell != NULL) && (cell->attr.reverse))) {
+	  int tmp;
+	  tmp = *fore;
+	  *fore = *back;
+	  *back = tmp;
+	}
 }
 
 /* Check if a unicode character is actually a graphic character we draw