ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

console: nicer initial screen 

Now that we have a function to create a fancy DisplaySurface with a
message for the user, to handle non-existing graphics hardware, we
can make it more generic and use it for other things too.

This patch adds a text line to the in initial DisplaySurface, notifying
the user that the display isn't initialized yet by the guest.

You can see this in action when starting qemu with '-S'.  Also when
booting ovmf in qemu (which needs a few moments to initialize itself
before it initializes the vga).

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2013-04-25 12:10:45 +02:00
parent afff2b15e8
commit 521a580d23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ui/console.c
View File

@ -1271,19 +1271,18 @@ DisplaySurface *qemu_create_displaysurface_from(int width, int height, int bpp,
return surface; return surface;
} }
static DisplaySurface *qemu_create_dummy_surface(void) static DisplaySurface *qemu_create_message_surface(int w, int h,
const char *msg)
{ {
static const char msg[] = DisplaySurface *surface = qemu_create_displaysurface(w, h);
"This VM has no graphic display device.";
DisplaySurface *surface = qemu_create_displaysurface(640, 480);
pixman_color_t bg = color_table_rgb[0][COLOR_BLACK]; pixman_color_t bg = color_table_rgb[0][COLOR_BLACK];
pixman_color_t fg = color_table_rgb[0][COLOR_WHITE]; pixman_color_t fg = color_table_rgb[0][COLOR_WHITE];
pixman_image_t *glyph; pixman_image_t *glyph;
int len, x, y, i; int len, x, y, i;
len = strlen(msg); len = strlen(msg);
x = (640/FONT_WIDTH - len) / 2; x = (w / FONT_WIDTH - len) / 2;
y = (480/FONT_HEIGHT - 1) / 2; y = (h / FONT_HEIGHT - 1) / 2;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
glyph = qemu_pixman_glyph_from_vgafont(FONT_HEIGHT, vgafont16, msg[i]); glyph = qemu_pixman_glyph_from_vgafont(FONT_HEIGHT, vgafont16, msg[i]);
qemu_pixman_glyph_render(glyph, surface->image, &fg, &bg, qemu_pixman_glyph_render(glyph, surface->image, &fg, &bg,
@ -1305,6 +1304,8 @@ void qemu_free_displaysurface(DisplaySurface *surface)
void register_displaychangelistener(DisplayChangeListener *dcl) void register_displaychangelistener(DisplayChangeListener *dcl)
{ {
static const char nodev[] =
"This VM has no graphic display device.";
static DisplaySurface *dummy; static DisplaySurface *dummy;
QemuConsole *con; QemuConsole *con;
@ -1323,7 +1324,7 @@ void register_displaychangelistener(DisplayChangeListener *dcl)
dcl->ops->dpy_gfx_switch(dcl, con->surface); dcl->ops->dpy_gfx_switch(dcl, con->surface);
} else { } else {
if (!dummy) { if (!dummy) {
dummy = qemu_create_dummy_surface(); dummy = qemu_create_message_surface(640, 480, nodev);
} }
dcl->ops->dpy_gfx_switch(dcl, dummy); dcl->ops->dpy_gfx_switch(dcl, dummy);
} }
@ -1590,6 +1591,8 @@ QemuConsole *graphic_console_init(DeviceState *dev, uint32_t head,
const GraphicHwOps *hw_ops, const GraphicHwOps *hw_ops,
void *opaque) void *opaque)
{ {
static const char noinit[] =
"Guest has not initialized the display (yet).";
int width = 640; int width = 640;
int height = 480; int height = 480;
QemuConsole *s; QemuConsole *s;
@ -1605,7 +1608,7 @@ QemuConsole *graphic_console_init(DeviceState *dev, uint32_t head,
&error_abort); &error_abort);
} }
s->surface = qemu_create_displaysurface(width, height); s->surface = qemu_create_message_surface(width, height, noinit);
return s; return s;
} }