diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-01-08 12:50:19 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-01-08 12:50:19 +0000 |
| commit | 6bb9ead762bf749af11ea225fc2a74db1b93c105 (patch) | |
| tree | 599fe48ac364f15e925f65dea7c4294133b9cb7c /hw | |
| parent | 9df2513730c5902813f575a74ac9303388fd029d (diff) | |
| parent | cb47dc9ab9f55083017291b2b8fbae639c576ec2 (diff) | |
| download | qemu-6bb9ead762bf749af11ea225fc2a74db1b93c105.zip qemu-6bb9ead762bf749af11ea225fc2a74db1b93c105.tar.gz qemu-6bb9ead762bf749af11ea225fc2a74db1b93c105.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160108-1' into staging
sdl2/opengl: add opengl context and scanout support
ui/curses: Fix color attribute of monitor for curses
# gpg: Signature made Fri 08 Jan 2016 12:42:02 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-ui-20160108-1:
sdl2/opengl: add opengl context and scanout support
ui/curses: Fix color attribute of monitor for curses
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/display/jazz_led.c | 6 | ||||
| -rw-r--r-- | hw/display/vga.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/hw/display/jazz_led.c b/hw/display/jazz_led.c index 12b1707..1ea49b7 100644 --- a/hw/display/jazz_led.c +++ b/hw/display/jazz_led.c @@ -233,8 +233,10 @@ static void jazz_led_text_update(void *opaque, console_ch_t *chardata) /* TODO: draw the segments */ snprintf(buf, 2, "%02hhx\n", s->segments); - console_write_ch(chardata++, 0x00200100 | buf[0]); - console_write_ch(chardata++, 0x00200100 | buf[1]); + console_write_ch(chardata++, ATTR2CHTYPE(buf[0], QEMU_COLOR_BLUE, + QEMU_COLOR_BLACK, 1)); + console_write_ch(chardata++, ATTR2CHTYPE(buf[1], QEMU_COLOR_BLUE, + QEMU_COLOR_BLACK, 1)); dpy_text_update(s->con, 0, 0, 2, 1); } diff --git a/hw/display/vga.c b/hw/display/vga.c index 9f68394..84ce0af 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -1979,7 +1979,8 @@ static void vga_update_text(void *opaque, console_ch_t *chardata) width = (s->last_width - size) / 2; dst = chardata + s->last_width + width; for (i = 0; i < size; i ++) - console_write_ch(dst ++, 0x00200100 | msg_buffer[i]); + console_write_ch(dst ++, ATTR2CHTYPE(msg_buffer[i], QEMU_COLOR_BLUE, + QEMU_COLOR_BLACK, 1)); dpy_text_update(s->con, 0, 0, s->last_width, height); } |