[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/6] ui/curses: Support line graphics chars on -curse
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 2/6] ui/curses: Support line graphics chars on -curses mode |
Date: |
Tue, 3 Nov 2015 11:01:27 +0100 |
From: OGAWA Hirofumi <address@hidden>
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 <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
include/ui/console.h | 12 +++++++++++-
ui/curses.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index d887f91..c249db4 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -321,13 +321,23 @@ static inline pixman_format_code_t
surface_format(DisplaySurface *s)
#ifdef CONFIG_CURSES
#include <curses.h>
typedef chtype console_ch_t;
+extern chtype vga_to_curses[];
#else
typedef unsigned long console_ch_t;
#endif
static inline void console_write_ch(console_ch_t *dest, uint32_t ch)
{
- if (!(ch & 0xff))
+ uint8_t c = ch;
+#ifdef CONFIG_CURSES
+ if (vga_to_curses[c]) {
+ ch &= ~(console_ch_t)0xff;
+ ch |= vga_to_curses[c];
+ }
+#else
+ if (c == '\0') {
ch |= ' ';
+ }
+#endif
*dest = ch;
}
diff --git a/ui/curses.c b/ui/curses.c
index 35edd5e..266260a 100644
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -42,6 +42,8 @@ static WINDOW *screenpad = NULL;
static int width, height, gwidth, gheight, invalidate;
static int px, py, sminx, sminy, smaxx, smaxy;
+chtype vga_to_curses[256];
+
static void curses_update(DisplayChangeListener *dcl,
int x, int y, int w, int h)
{
@@ -348,6 +350,48 @@ static void curses_setup(void)
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)
--
1.8.3.1
- [Qemu-devel] [PULL 0/6] ui patch queue, Gerd Hoffmann, 2015/11/03
- [Qemu-devel] [PULL 1/6] ui/curses: Fix monitor color with -curses when 256 colors, Gerd Hoffmann, 2015/11/03
- [Qemu-devel] [PULL 6/6] vnc: fix bug: vnc server can't start when 'to' is specified, Gerd Hoffmann, 2015/11/03
- [Qemu-devel] [PULL 4/6] ui/opengl: Reduce build required libraries for opengl, Gerd Hoffmann, 2015/11/03
- [Qemu-devel] [PULL 2/6] ui/curses: Support line graphics chars on -curses mode,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 5/6] vnc: allow fall back to RAW encoding, Gerd Hoffmann, 2015/11/03
- [Qemu-devel] [PULL 3/6] ui/curses: Fix pageup/pagedown on -curses, Gerd Hoffmann, 2015/11/03
- Re: [Qemu-devel] [PULL 0/6] ui patch queue, Peter Maydell, 2015/11/03