From 4c51f9602d4d96f38504a1b9e80b67e4a44c62c8 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 8 Dec 2013 01:28:50 +0000 Subject: [PATCH] [fbcon] Always draw cursor using current foreground and background colours Signed-off-by: Michael Brown --- src/core/fbcon.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/core/fbcon.c b/src/core/fbcon.c index 90786fe0..df287078 100644 --- a/src/core/fbcon.c +++ b/src/core/fbcon.c @@ -340,16 +340,14 @@ static void fbcon_scroll ( struct fbcon *fbcon ) { static void fbcon_draw_cursor ( struct fbcon *fbcon, int show_cursor ) { struct fbcon_text_cell cell; size_t offset; - uint32_t background; offset = ( ( ( fbcon->ypos * fbcon->character.width ) + fbcon->xpos ) * sizeof ( cell ) ); copy_from_user ( &cell, fbcon->text.start, offset, sizeof ( cell ) ); if ( show_cursor ) { - background = cell.background; - cell.background = cell.foreground; - cell.foreground = ( ( background == FBCON_TRANSPARENT ) ? - 0 : background ); + cell.background = fbcon->foreground; + cell.foreground = ( ( fbcon->background == FBCON_TRANSPARENT ) ? + 0 : fbcon->background ); } fbcon_draw_character ( fbcon, &cell, fbcon->xpos, fbcon->ypos ); }