mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui/console: add a dpy_gfx_switch callback helper

Browse Source 
Slight code improvement.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Marc-André Lureau 2022-02-17 12:42:20 +04:00
parent 532042d573
commit 26b032b9b7
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ui/console.c
View File

@ -1058,6 +1058,15 @@ static void console_putchar(QemuConsole *s, int ch)
} }
} }
static void displaychangelistener_gfx_switch(DisplayChangeListener *dcl,
struct DisplaySurface *new_surface)
{
if (dcl->ops->dpy_gfx_switch) {
dcl->ops->dpy_gfx_switch(dcl, new_surface);
}
}
static void displaychangelistener_display_console(DisplayChangeListener *dcl, static void displaychangelistener_display_console(DisplayChangeListener *dcl,
QemuConsole *con, QemuConsole *con,
Error **errp) Error **errp)
@ -1067,13 +1076,10 @@ static void displaychangelistener_display_console(DisplayChangeListener *dcl,
static DisplaySurface *dummy; static DisplaySurface *dummy;
if (!con || !console_compatible_with(con, dcl, errp)) { if (!con || !console_compatible_with(con, dcl, errp)) {
if (!dcl->ops->dpy_gfx_switch) {
return;
}
if (!dummy) { if (!dummy) {
dummy = qemu_create_placeholder_surface(640, 480, nodev); dummy = qemu_create_placeholder_surface(640, 480, nodev);
} }
dcl->ops->dpy_gfx_switch(dcl, dummy); displaychangelistener_gfx_switch(dcl, dummy);
return; return;
} }
@ -1091,9 +1097,8 @@ static void displaychangelistener_display_console(DisplayChangeListener *dcl,
con->scanout.texture.y, con->scanout.texture.y,
con->scanout.texture.width, con->scanout.texture.width,
con->scanout.texture.height); con->scanout.texture.height);
} else if (con->scanout.kind == SCANOUT_SURFACE && } else if (con->scanout.kind == SCANOUT_SURFACE) {
dcl->ops->dpy_gfx_switch) { displaychangelistener_gfx_switch(dcl, con->surface);
dcl->ops->dpy_gfx_switch(dcl, con->surface);
} }
dcl->ops->dpy_gfx_update(dcl, 0, 0, dcl->ops->dpy_gfx_update(dcl, 0, 0,
@ -1677,9 +1682,7 @@ void dpy_gfx_replace_surface(QemuConsole *con,
if (con != (dcl->con ? dcl->con : active_console)) { if (con != (dcl->con ? dcl->con : active_console)) {
continue; continue;
} }
if (dcl->ops->dpy_gfx_switch) { displaychangelistener_gfx_switch(dcl, surface);
dcl->ops->dpy_gfx_switch(dcl, surface);
}
} }
qemu_free_displaysurface(old_surface); qemu_free_displaysurface(old_surface);
} }