Commit db71589f authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

console: add qemu display registry, add gtk 



Add a registry for user interfaces.  Add qemu_display_init and
qemu_display_early_init helper functions for display initialization.

Hook up gtk ui as first user.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Message-id: 20180301100547.18962-2-kraxel@redhat.com
parent 136c67e0

include/ui/console.h

+12 −20
Original line number Diff line number Diff line
@@ -432,6 +432,18 @@ void surface_gl_setup_viewport(QemuGLShader *gls, 
                               int ww, int wh);

#endif



typedef struct QemuDisplay QemuDisplay;



struct QemuDisplay {

    DisplayType type;

    void (*early_init)(DisplayOptions *opts);

    void (*init)(DisplayState *ds, DisplayOptions *opts);

};



void qemu_display_register(QemuDisplay *ui);

void qemu_display_early_init(DisplayOptions *opts);

void qemu_display_init(DisplayState *ds, DisplayOptions *opts);



/* sdl.c */

#ifdef CONFIG_SDL

void sdl_display_early_init(DisplayOptions *opts);
@@ -487,26 +499,6 @@ static inline void curses_display_init(DisplayState *ds, DisplayOptions *opts) 
/* input.c */

int index_from_key(const char *key, size_t key_length);



/* gtk.c */

#ifdef CONFIG_GTK

void early_gtk_display_init(DisplayOptions *opts);

void gtk_display_init(DisplayState *ds, DisplayOptions *opts);

#else

static inline void gtk_display_init(DisplayState *ds, DisplayOptions *opts)

{

    /* This must never be called if CONFIG_GTK is disabled */

    error_report("GTK support is disabled");

    abort();

}



static inline void early_gtk_display_init(DisplayOptions *opts)

{

    /* This must never be called if CONFIG_GTK is disabled */

    error_report("GTK support is disabled");

    abort();

}

#endif



/* egl-headless.c */

void egl_headless_init(DisplayOptions *opts);

ui/console.c

+34 −0
Original line number Diff line number Diff line
@@ -2180,6 +2180,40 @@ PixelFormat qemu_default_pixelformat(int bpp) 
    return pf;

}



static QemuDisplay *dpys[DISPLAY_TYPE__MAX];



void qemu_display_register(QemuDisplay *ui)

{

    assert(ui->type < DISPLAY_TYPE__MAX);

    dpys[ui->type] = ui;

}



void qemu_display_early_init(DisplayOptions *opts)

{

    assert(opts->type < DISPLAY_TYPE__MAX);

    if (opts->type == DISPLAY_TYPE_NONE) {

        return;

    }

    if (dpys[opts->type] == NULL) {

        error_report("Display '%s' is not available.",

                     DisplayType_lookup.array[opts->type]);

        exit(1);

    }

    if (dpys[opts->type]->early_init) {

        dpys[opts->type]->early_init(opts);

    }

}



void qemu_display_init(DisplayState *ds, DisplayOptions *opts)

{

    assert(opts->type < DISPLAY_TYPE__MAX);

    if (opts->type == DISPLAY_TYPE_NONE) {

        return;

    }

    assert(dpys[opts->type] != NULL);

    dpys[opts->type]->init(ds, opts);

}



void qemu_chr_parse_vc(QemuOpts *opts, ChardevBackend *backend, Error **errp)

{

    int val;

ui/gtk.c

+15 −2
Original line number Diff line number Diff line
@@ -2297,7 +2297,7 @@ static void gd_create_menus(GtkDisplayState *s) 


static gboolean gtkinit;



void gtk_display_init(DisplayState *ds, DisplayOptions *opts)

static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)

{

    VirtualConsole *vc;
@@ -2407,7 +2407,7 @@ void gtk_display_init(DisplayState *ds, DisplayOptions *opts) 
    }

}



void early_gtk_display_init(DisplayOptions *opts)

static void early_gtk_display_init(DisplayOptions *opts)

{

    /* The QEMU code relies on the assumption that it's always run in

     * the C locale. Therefore it is not prepared to deal with
@@ -2450,3 +2450,16 @@ void early_gtk_display_init(DisplayOptions *opts) 
    type_register(&char_gd_vc_type_info);

#endif

}



static QemuDisplay qemu_display_gtk = {

    .type       = DISPLAY_TYPE_GTK,

    .early_init = early_gtk_display_init,

    .init       = gtk_display_init,

};



static void register_gtk(void)

{

    qemu_display_register(&qemu_display_gtk);

}



type_init(register_gtk);

vl.c

+6 −12
Original line number Diff line number Diff line
@@ -2180,7 +2180,6 @@ static void parse_display(const char *p) 
        exit(1);

#endif

    } else if (strstart(p, "gtk", &opts)) {

#ifdef CONFIG_GTK

        dpy.type = DISPLAY_TYPE_GTK;

        while (*opts) {

            const char *nextopt;
@@ -2212,10 +2211,6 @@ static void parse_display(const char *p) 
            }

            opts = nextopt;

        }

#else

        error_report("GTK support is disabled");

        exit(1);

#endif

    } else if (strstart(p, "none", &opts)) {

        dpy.type = DISPLAY_TYPE_NONE;

    } else {
@@ -4331,6 +4326,9 @@ int main(int argc, char **argv, char **envp) 
        dpy.type = DISPLAY_TYPE_NONE;

#endif

    }

    if (dpy.type == DISPLAY_TYPE_DEFAULT) {

        dpy.type = DISPLAY_TYPE_NONE;

    }



    if ((no_frame || alt_grab || ctrl_grab) && dpy.type != DISPLAY_TYPE_SDL) {

        error_report("-no-frame, -alt-grab and -ctrl-grab are only valid "
@@ -4342,12 +4340,10 @@ int main(int argc, char **argv, char **envp) 
                     "ignoring option");

    }



    if (dpy.type == DISPLAY_TYPE_GTK) {

        early_gtk_display_init(&dpy);

    }



    if (dpy.type == DISPLAY_TYPE_SDL) {

        sdl_display_early_init(&dpy);

    } else {

        qemu_display_early_init(&dpy);

    }



    qemu_console_early_init();
@@ -4687,10 +4683,8 @@ int main(int argc, char **argv, char **envp) 
    case DISPLAY_TYPE_COCOA:

        cocoa_display_init(ds, &dpy);

        break;

    case DISPLAY_TYPE_GTK:

        gtk_display_init(ds, &dpy);

        break;

    default:

        qemu_display_init(ds, &dpy);

        break;

    }