[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/24] curses: hook up to display registry
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 17/24] curses: hook up to display registry |
Date: |
Fri, 17 Nov 2017 11:30:39 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
include/ui/console.h | 12 ------------
ui/curses.c | 14 +++++++++++++-
vl.c | 17 ++---------------
3 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index 81db3a0f67..c93a331d35 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -475,18 +475,6 @@ static inline int vnc_init_func(void *opaque, QemuOpts
*opts, Error **errp)
}
#endif
-/* 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);
diff --git a/ui/curses.c b/ui/curses.c
index 479b77bd03..d55e6d74a1 100644
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -434,7 +434,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)) {
@@ -455,3 +455,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);
diff --git a/vl.c b/vl.c
index d57671b755..07f049044b 100644
--- a/vl.c
+++ b/vl.c
@@ -2197,12 +2197,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) {
@@ -4766,17 +4761,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:
- qemu_display_init(ds, &dpy);
- break;
- }
+ ds = init_displaystate();
+ qemu_display_init(ds, &dpy);
/* must be after terminal init, SDL library changes signal handlers */
os_setup_signal_handling();
--
2.9.3
- Re: [Qemu-devel] [PATCH 02/24] sdl: remove -alt-grab and -ctrl-grab support, (continued)
[Qemu-devel] [PATCH 17/24] curses: hook up to display registry,
Gerd Hoffmann <=
[Qemu-devel] [PATCH 18/24] egl-headless: hook up to display registry, Gerd Hoffmann, 2017/11/17
[Qemu-devel] [PATCH 01/24] sdl: remove -no-frame support, Gerd Hoffmann, 2017/11/17
[Qemu-devel] [PATCH 23/24] curses: build as module, Gerd Hoffmann, 2017/11/17
[Qemu-devel] [PATCH 16/24] cocoa: hook up to display registry, Gerd Hoffmann, 2017/11/17
[Qemu-devel] [PATCH 24/24] build: opengl should not need X11, Gerd Hoffmann, 2017/11/17
[Qemu-devel] [PATCH 14/24] console: add qemu display registry, add gtk, Gerd Hoffmann, 2017/11/17