Commit 779ce88f authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

console/gtk: add qemu_console_get_label 



Add a new function to get a nice label for a given QemuConsole.
Drop the labeling code in gtk.c and use the new function instead.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent f8c223f6

include/ui/console.h

+1 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ QemuConsole *qemu_console_lookup_by_device(DeviceState *dev, uint32_t head); 
bool qemu_console_is_visible(QemuConsole *con);

bool qemu_console_is_graphic(QemuConsole *con);

bool qemu_console_is_fixedsize(QemuConsole *con);

char *qemu_console_get_label(QemuConsole *con);

int qemu_console_get_index(QemuConsole *con);

uint32_t qemu_console_get_head(QemuConsole *con);

QemuUIInfo *qemu_console_get_ui_info(QemuConsole *con);

ui/console.c

+15 −0
Original line number Diff line number Diff line
@@ -1788,6 +1788,21 @@ bool qemu_console_is_fixedsize(QemuConsole *con) 
    return con && (con->console_type != TEXT_CONSOLE);

}



char *qemu_console_get_label(QemuConsole *con)

{

    if (con->console_type == GRAPHIC_CONSOLE) {

        if (con->device) {

            return g_strdup(object_get_typename(con->device));

        }

        return g_strdup("VGA");

    } else {

        if (con->chr && con->chr->label) {

            return g_strdup(con->chr->label);

        }

        return g_strdup_printf("vc%d", con->index);

    }

}



int qemu_console_get_index(QemuConsole *con)

{

    if (con == NULL) {

ui/gtk.c

+1 −11
Original line number Diff line number Diff line
@@ -1730,17 +1730,7 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc, 
                              QemuConsole *con, int idx,

                              GSList *group, GtkWidget *view_menu)

{

    Object *obj;



    obj = object_property_get_link(OBJECT(con), "device", NULL);

    if (obj) {

        vc->label = g_strdup_printf("%s", object_get_typename(obj));

    } else if (qemu_console_is_graphic(con)) {

        vc->label = g_strdup_printf("VGA");

    } else {

        vc->label = g_strdup_printf("vc%d", idx);

    }



    vc->label = qemu_console_get_label(con);

    vc->s = s;

    vc->gfx.scale_x = 1.0;

    vc->gfx.scale_y = 1.0;