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

curses: switch over to new display registry 



Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Message-id: 20180301100547.18962-5-kraxel@redhat.com
parent 5013b9e4

include/ui/console.h

+0 −12
Original line number Diff line number Diff line
@@ -453,18 +453,6 @@ int vnc_display_pw_expire(const char *id, time_t expires); 
QemuOpts *vnc_parse(const char *str, Error **errp);

int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp);



/* curses.c */

#ifdef CONFIG_CURSES

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

#else

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

{

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

    error_report("curses support is disabled");

    abort();

}

#endif



/* input.c */

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

ui/curses.c

+13 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ static const DisplayChangeListenerOps dcl_ops = { 
    .dpy_text_cursor = curses_cursor_position,

};



void curses_display_init(DisplayState *ds, DisplayOptions *opts)

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

{

#ifndef _WIN32

    if (!isatty(1)) {
@@ -456,3 +456,15 @@ void curses_display_init(DisplayState *ds, DisplayOptions *opts) 


    invalidate = 1;

}



static QemuDisplay qemu_display_curses = {

    .type       = DISPLAY_TYPE_CURSES,

    .init       = curses_display_init,

};



static void register_curses(void)

{

    qemu_display_register(&qemu_display_curses);

}



type_init(register_curses);

vl.c

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

#endif

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

#ifdef CONFIG_CURSES

        dpy.type = DISPLAY_TYPE_CURSES;

#else

        error_report("curses support is disabled");

        exit(1);

#endif

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

        dpy.type = DISPLAY_TYPE_GTK;

        while (*opts) {
@@ -4660,17 +4655,9 @@ int main(int argc, char **argv, char **envp) 
        qemu_register_reset(restore_boot_order, g_strdup(boot_order));

    }



    ds = init_displaystate();



    /* init local displays */

    switch (dpy.type) {

    case DISPLAY_TYPE_CURSES:

        curses_display_init(ds, &dpy);

        break;

    default:

    ds = init_displaystate();

    qemu_display_init(ds, &dpy);

        break;

    }



    /* must be after terminal init, SDL library changes signal handlers */

    os_setup_signal_handling();