This converts vga code to curses code in console_write_bh().
With this changes, we can see line graphics (for example, dialog uses)
correctly.
Signed-off-by: OGAWA Hirofumi <hirof...@mail.parknet.co.jp>
---
include/ui/console.h | 9 ++------
ui/console.c | 13 ++++++++++++
ui/curses.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 70 insertions(+), 6 deletions(-)
diff -puN include/ui/console.h~support-curses-border include/ui/console.h
--- qemu/include/ui/console.h~support-curses-border 2015-10-15
18:58:35.454187841 +0900
+++ qemu-hirofumi/include/ui/console.h 2015-10-15 18:58:35.462187825 +0900
@@ -287,12 +287,9 @@ typedef chtype console_ch_t;
#else
typedef unsigned long console_ch_t;
#endif
-static inline void console_write_ch(console_ch_t *dest, uint32_t ch)
-{
- if (!(ch & 0xff))
- ch |= ' ';
- *dest = ch;
-}
+typedef void (hw_text_update_t)(console_ch_t *, uint32_t);
+void register_hw_text_update_cb(hw_text_update_t *cb);
+void console_write_ch(console_ch_t *dest, uint32_t ch);
typedef struct GraphicHwOps {
void (*invalidate)(void *opaque);
diff -puN ui/curses.c~support-curses-border ui/curses.c
--- qemu/ui/curses.c~support-curses-border 2015-10-15 18:58:35.458187833
+0900
+++ qemu-hirofumi/ui/curses.c 2015-10-15 19:00:06.182005139 +0900
@@ -41,6 +41,17 @@ static console_ch_t screen[160 * 100];
static WINDOW *screenpad = NULL;
static int width, height, gwidth, gheight, invalidate;
static int px, py, sminx, sminy, smaxx, smaxy;
+static chtype vga_to_curses[256];
+
+static void curses_write_ch(console_ch_t *dest, uint32_t ch)
+{
+ uint8_t c = ch;
+ if (vga_to_curses[c]) {
+ ch &= ~(console_ch_t)0xff;
+ ch |= vga_to_curses[c];
+ }
+ *dest = ch;
+}
static void curses_update(DisplayChangeListener *dcl,
int x, int y, int w, int h)
@@ -346,6 +357,48 @@ static void curses_setup(void)
/* 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);
+
+ /*
+ * Setup mapping for vga to curses line graphics.
+ * FIXME: for better font, have to use ncursesw and setlocale()
+ */
+#if 0
+ /* FIXME: map from where? */
+ ACS_S1;
+ ACS_S3;
+ ACS_S7;
+ ACS_S9;
+#endif
+ /* ACS_* is not constant. So, we can't initialize statically. */
+ vga_to_curses['\0'] = ' ';
+ vga_to_curses[0x04] = ACS_DIAMOND;
+ vga_to_curses[0x0a] = ACS_RARROW;
+ vga_to_curses[0x0b] = ACS_LARROW;
+ vga_to_curses[0x18] = ACS_UARROW;
+ vga_to_curses[0x19] = ACS_DARROW;
+ vga_to_curses[0x9c] = ACS_STERLING;
+ vga_to_curses[0xb0] = ACS_BOARD;
+ vga_to_curses[0xb1] = ACS_CKBOARD;
+ vga_to_curses[0xb3] = ACS_VLINE;
+ vga_to_curses[0xb4] = ACS_RTEE;
+ vga_to_curses[0xbf] = ACS_URCORNER;
+ vga_to_curses[0xc0] = ACS_LLCORNER;
+ vga_to_curses[0xc1] = ACS_BTEE;
+ vga_to_curses[0xc2] = ACS_TTEE;
+ vga_to_curses[0xc3] = ACS_LTEE;
+ vga_to_curses[0xc4] = ACS_HLINE;
+ vga_to_curses[0xc5] = ACS_PLUS;
+ vga_to_curses[0xce] = ACS_LANTERN;
+ vga_to_curses[0xd8] = ACS_NEQUAL;
+ vga_to_curses[0xd9] = ACS_LRCORNER;
+ vga_to_curses[0xda] = ACS_ULCORNER;
+ vga_to_curses[0xdb] = ACS_BLOCK;
+ vga_to_curses[0xe3] = ACS_PI;
+ vga_to_curses[0xf1] = ACS_PLMINUS;
+ vga_to_curses[0xf2] = ACS_GEQUAL;
+ vga_to_curses[0xf3] = ACS_LEQUAL;
+ vga_to_curses[0xf8] = ACS_DEGREE;
+ vga_to_curses[0xfe] = ACS_BULLET;
}
static void curses_keyboard_setup(void)
@@ -379,6 +432,7 @@ void curses_display_init(DisplayState *d
}
#endif
+ register_hw_text_update_cb(curses_write_ch);
curses_setup();
curses_keyboard_setup();
atexit(curses_atexit);
diff -puN ui/console.c~support-curses-border ui/console.c
--- qemu/ui/console.c~support-curses-border 2015-10-15 18:58:35.458187833
+0900
+++ qemu-hirofumi/ui/console.c 2015-10-15 18:58:35.466187817 +0900
@@ -333,6 +333,19 @@ void qmp_screendump(const char *filename
ppm_save(filename, surface, errp);
}
+static hw_text_update_t *hw_text_update_cb;
+
+void register_hw_text_update_cb(hw_text_update_t *cb)
+{
+ hw_text_update_cb = cb;
+}
+
+void console_write_ch(console_ch_t *dest, uint32_t ch)
+{
+ if (hw_text_update_cb)
+ hw_text_update_cb(dest, ch);
+}
+
void graphic_hw_text_update(QemuConsole *con, console_ch_t *chardata)
{
if (!con) {
_
