From: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Date: Mon, 19 Oct 2015 12:23:10 +0000 (+0900)
Subject: ui/curses: Fix monitor color with -curses when 256 colors
X-Git-Tag: v2.5.0-rc0~35^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=615220ddaf23db4c5686053257c568b46967e4b5;p=thirdparty%2Fqemu.git

ui/curses: Fix monitor color with -curses when 256 colors

If TERM=xterm-256color, COLOR_PAIRS==256 and monitor passes chtype
like 0x74xx. Then, the code uses uninitialized color pair. As result,
monitor uses black for both of fg and bg color, i.e. terminal is
filled by black.

To fix, this initialize above than 64 with default color (fg=white,bg=black).

FIXME: on 256 color, curses may be possible better vga color emulation.

Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/ui/curses.c b/ui/curses.c
index 8edb038bb34..35edd5e1d25 100644
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -341,8 +341,13 @@ static void curses_setup(void)
     nodelay(stdscr, TRUE); nonl(); keypad(stdscr, TRUE);
     start_color(); raw(); scrollok(stdscr, FALSE);
 
-    for (i = 0; i < 64; i ++)
+    for (i = 0; i < 64; i++) {
         init_pair(i, colour_default[i & 7], colour_default[i >> 3]);
+    }
+    /* Set default color for more than 64. (monitor uses 0x74xx for example) */
+    for (i = 64; i < COLOR_PAIRS; i++) {
+        init_pair(i, COLOR_WHITE, COLOR_BLACK);
+    }
 }
 
 static void curses_keyboard_setup(void)