[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/10] ui: switch gtk display to qapi parser
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 07/10] ui: switch gtk display to qapi parser |
Date: |
Tue, 15 May 2018 11:18:58 +0200 |
Drop the gtk option parser from parse_display(), so parse_display_qapi()
will handle it instead.
With this change the parser will accept gl=core and gl=es too, gtk
must catch the unsupported gles variant now.
Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden
---
ui/gtk.c | 6 +++++-
vl.c | 32 --------------------------------
2 files changed, 5 insertions(+), 33 deletions(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index 568c9563ce..ef6ca7179e 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -2478,7 +2478,11 @@ static void early_gtk_display_init(DisplayOptions *opts)
}
assert(opts->type == DISPLAY_TYPE_GTK);
- if (opts->has_gl && opts->gl) {
+ if (opts->has_gl && opts->gl != DISPLAYGL_MODE_OFF) {
+ if (opts->gl == DISPLAYGL_MODE_ES) {
+ error_report("gtk: opengl es not supported");
+ return;
+ }
#if defined(CONFIG_OPENGL)
#if defined(CONFIG_GTK_GL) && defined(GDK_WINDOWING_WAYLAND)
if (GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default())) {
diff --git a/vl.c b/vl.c
index 6b8f946d58..5f1734d851 100644
--- a/vl.c
+++ b/vl.c
@@ -2185,38 +2185,6 @@ static void parse_display(const char *p)
error_report("VNC requires a display argument vnc=<display>");
exit(1);
}
- } else if (strstart(p, "gtk", &opts)) {
- dpy.type = DISPLAY_TYPE_GTK;
- while (*opts) {
- const char *nextopt;
-
- if (strstart(opts, ",grab_on_hover=", &nextopt)) {
- opts = nextopt;
- dpy.u.gtk.has_grab_on_hover = true;
- if (strstart(opts, "on", &nextopt)) {
- dpy.u.gtk.grab_on_hover = true;
- } else if (strstart(opts, "off", &nextopt)) {
- dpy.u.gtk.grab_on_hover = false;
- } else {
- goto invalid_gtk_args;
- }
- } else if (strstart(opts, ",gl=", &nextopt)) {
- opts = nextopt;
- dpy.has_gl = true;
- if (strstart(opts, "on", &nextopt)) {
- dpy.gl = DISPLAYGL_MODE_ON;
- } else if (strstart(opts, "off", &nextopt)) {
- dpy.gl = DISPLAYGL_MODE_OFF;
- } else {
- goto invalid_gtk_args;
- }
- } else {
- invalid_gtk_args:
- error_report("invalid GTK option string");
- exit(1);
- }
- opts = nextopt;
- }
} else {
parse_display_qapi(p);
}
--
2.9.3
- [Qemu-devel] [PULL 00/10] Ui 20180515 patches, Gerd Hoffmann, 2018/05/15
- [Qemu-devel] [PULL 08/10] ui: document non-qapi parser cases., Gerd Hoffmann, 2018/05/15
- [Qemu-devel] [PULL 03/10] ui/gtk: Only try to initialize EGL/X11 if GtkGlArea failed, Gerd Hoffmann, 2018/05/15
- [Qemu-devel] [PULL 06/10] ui: switch trivial displays to qapi parser, Gerd Hoffmann, 2018/05/15
- [Qemu-devel] [PULL 07/10] ui: switch gtk display to qapi parser,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 01/10] sdl2: move opts assignment into loop, Gerd Hoffmann, 2018/05/15
- [Qemu-devel] [PULL 04/10] vnc: add magic cookie to VncState, Gerd Hoffmann, 2018/05/15
- [Qemu-devel] [PULL 05/10] ui: add qapi parser for -display, Gerd Hoffmann, 2018/05/15
- [Qemu-devel] [PULL 02/10] gtk: make it possible to hide the menu bar, Gerd Hoffmann, 2018/05/15
- [Qemu-devel] [PULL 10/10] gtk: disable the F10 menubar key, Gerd Hoffmann, 2018/05/15
- [Qemu-devel] [PULL 09/10] console: use linked list for QemuConsoles, Gerd Hoffmann, 2018/05/15
- Re: [Qemu-devel] [PULL 00/10] Ui 20180515 patches, Peter Maydell, 2018/05/15