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

curses: switch over to new display registry 

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20180301100547.18962-5-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2018-03-01 11:05:38 +01:00
parent 5013b9e46a
commit b0766612d1
3 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/ui/console.h
View File

@ -453,18 +453,6 @@ int vnc_display_pw_expire(const char *id, time_t expires);
QemuOpts *vnc_parse(const char *str, Error **errp); QemuOpts *vnc_parse(const char *str, Error **errp);
int vnc_init_func(void *opaque, QemuOpts *opts, 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 */ /* input.c */
int index_from_key(const char *key, size_t key_length); int index_from_key(const char *key, size_t key_length);

14
ui/curses.c
View File

@ -435,7 +435,7 @@ static const DisplayChangeListenerOps dcl_ops = {
.dpy_text_cursor = curses_cursor_position, .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 #ifndef _WIN32
if (!isatty(1)) { if (!isatty(1)) {
@ -456,3 +456,15 @@ void curses_display_init(DisplayState *ds, DisplayOptions *opts)
invalidate = 1; 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);

17
vl.c
View File

@ -2168,12 +2168,7 @@ static void parse_display(const char *p)
exit(1); exit(1);
#endif #endif
} else if (strstart(p, "curses", &opts)) { } else if (strstart(p, "curses", &opts)) {
#ifdef CONFIG_CURSES
dpy.type = DISPLAY_TYPE_CURSES; dpy.type = DISPLAY_TYPE_CURSES;
#else
error_report("curses support is disabled");
exit(1);
#endif
} else if (strstart(p, "gtk", &opts)) { } else if (strstart(p, "gtk", &opts)) {
dpy.type = DISPLAY_TYPE_GTK; dpy.type = DISPLAY_TYPE_GTK;
while (*opts) { while (*opts) {
@ -4660,17 +4655,9 @@ int main(int argc, char **argv, char **envp)
qemu_register_reset(restore_boot_order, g_strdup(boot_order)); qemu_register_reset(restore_boot_order, g_strdup(boot_order));
} }
ds = init_displaystate();
/* init local displays */ /* init local displays */
switch (dpy.type) { ds = init_displaystate();
case DISPLAY_TYPE_CURSES: qemu_display_init(ds, &dpy);
curses_display_init(ds, &dpy);
break;
default:
qemu_display_init(ds, &dpy);
break;
}
/* must be after terminal init, SDL library changes signal handlers */ /* must be after terminal init, SDL library changes signal handlers */
os_setup_signal_handling(); os_setup_signal_handling();