@@ -62,6 +62,7 @@ common-obj-y += accel.o
common-obj-y += replay/
common-obj-y += ui/
+common-obj-m += ui/
common-obj-y += bt-host.o bt-vhci.o
bt-host.o-cflags := $(BLUEZ_CFLAGS)
@@ -2185,7 +2185,6 @@ if test "$gtk" != "no"; then
gtk_cflags="$gtk_cflags $x11_cflags"
gtk_libs="$gtk_libs $x11_libs"
fi
- libs_softmmu="$gtk_libs $libs_softmmu"
gtk="yes"
elif test "$gtk" = "yes"; then
feature_not_found "gtk" "Install gtk2 or gtk3 devel"
@@ -2422,7 +2421,6 @@ if test "$vte" != "no"; then
vte_cflags=$($pkg_config --cflags $vtepackage)
vte_libs=$($pkg_config --libs $vtepackage)
vteversion=$($pkg_config --modversion $vtepackage)
- libs_softmmu="$vte_libs $libs_softmmu"
vte="yes"
elif test "$vte" = "yes"; then
if test "$gtkabi" = "3.0"; then
@@ -5166,7 +5164,7 @@ if test "$glib_subprocess" = "yes" ; then
fi
echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak
if test "$gtk" = "yes" ; then
- echo "CONFIG_GTK=y" >> $config_host_mak
+ echo "CONFIG_GTK=m" >> $config_host_mak
echo "CONFIG_GTKABI=$gtkabi" >> $config_host_mak
echo "GTK_CFLAGS=$gtk_cflags" >> $config_host_mak
echo "GTK_LIBS=$gtk_libs" >> $config_host_mak
@@ -5211,6 +5209,7 @@ fi
if test "$vte" = "yes" ; then
echo "CONFIG_VTE=y" >> $config_host_mak
echo "VTE_CFLAGS=$vte_cflags" >> $config_host_mak
+ echo "VTE_LIBS=$vte_libs" >> $config_host_mak
fi
if test "$virglrenderer" = "yes" ; then
echo "CONFIG_VIRGL=y" >> $config_host_mak
@@ -502,8 +502,14 @@ int index_from_key(const char *key, size_t key_length);
/* gtk.c */
#ifdef CONFIG_GTK
+bool gtk_mod_init(void);
void early_gtk_display_init(int opengl);
void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover);
+void early_gtk_display_init_do(int opengl);
+void gtk_display_init_do(DisplayState *ds, bool full_screen,
+ bool grab_on_hover);
+void gtk_register_early_init_fun(void *fn);
+void gtk_register_init_fun(void *fn);
#else
static inline void gtk_display_init(DisplayState *ds, bool full_screen,
bool grab_on_hover)
@@ -15,7 +15,11 @@ common-obj-$(CONFIG_SDL) += sdl.mo x_keymap.o
common-obj-$(CONFIG_COCOA) += cocoa.o
common-obj-$(CONFIG_CURSES) += curses.o
common-obj-$(CONFIG_VNC) += $(vnc-obj-y)
-common-obj-$(CONFIG_GTK) += gtk.o x_keymap.o
+common-obj-$(CONFIG_GTK) += gtk.mo
+
+ifneq ($(CONFIG_GTK),)
+common-obj-y += gtk-init.o x_keymap.o
+endif
ifeq ($(CONFIG_SDLABI),1.2)
sdl.mo-objs := sdl.o sdl_zoom.o
@@ -28,25 +32,27 @@ endif
endif
sdl.mo-cflags := $(SDL_CFLAGS)
+gtk.mo-objs := gtk.o
ifeq ($(CONFIG_OPENGL),y)
common-obj-y += shader.o
common-obj-y += console-gl.o
common-obj-y += egl-helpers.o
common-obj-y += egl-context.o
ifeq ($(CONFIG_GTK_GL),y)
-common-obj-$(CONFIG_GTK) += gtk-gl-area.o
+gtk.mo-objs += gtk-gl-area.o
else
-common-obj-$(CONFIG_GTK) += gtk-egl.o
+gtk.mo-objs += gtk-egl.o
endif
endif
-gtk.o-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS)
+gtk.mo-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS)
gtk-egl.o-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS) $(OPENGL_CFLAGS)
gtk-gl-area.o-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS) $(OPENGL_CFLAGS)
shader.o-cflags += $(OPENGL_CFLAGS)
console-gl.o-cflags += $(OPENGL_CFLAGS)
egl-helpers.o-cflags += $(OPENGL_CFLAGS)
+gtk.mo-libs := $(GTK_LIBS) $(VTE_LIBS)
gtk-egl.o-libs += $(OPENGL_LIBS)
shader.o-libs += $(OPENGL_LIBS)
console-gl.o-libs += $(OPENGL_LIBS)
new file mode 100644
@@ -0,0 +1,64 @@
+/*
+ * QEMU GTK display driver init function
+ *
+ * Copyright (c) 2003 Fabrice Bellard
+ * Copyright (c) 2016 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "qemu/osdep.h"
+#include "ui/console.h"
+#include "qemu/module.h"
+
+static void (*early_init_fn)(int opengl);
+static void (*init_fn)(DisplayState *ds, bool full_screen, bool grab_on_hover);
+
+void gtk_register_early_init_fun(void *fn)
+{
+ assert(!early_init_fn);
+ early_init_fn = fn;
+}
+
+void gtk_register_init_fun(void *fn)
+{
+ assert(!init_fn);
+ init_fn = fn;
+}
+
+bool gtk_mod_init(void)
+{
+ module_load_one("ui-", "gtk");
+ if (!early_init_fn || !init_fn) {
+ return false;
+ }
+ return true;
+}
+
+void early_gtk_display_init(int opengl)
+{
+ assert(early_init_fn);
+ early_init_fn(opengl);
+}
+
+void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover)
+{
+ assert(init_fn);
+ init_fn(ds, full_screen, grab_on_hover);
+}
@@ -2150,7 +2150,7 @@ static void gd_set_keycode_type(GtkDisplayState *s)
static gboolean gtkinit;
-void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover)
+void gtk_display_init_do(DisplayState *ds, bool full_screen, bool grab_on_hover)
{
GtkDisplayState *s = g_malloc0(sizeof(*s));
char *filename;
@@ -2240,7 +2240,7 @@ void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover)
gd_set_keycode_type(s);
}
-void early_gtk_display_init(int opengl)
+void early_gtk_display_init_do(int opengl)
{
/* The QEMU code relies on the assumption that it's always run in
* the C locale. Therefore it is not prepared to deal with
@@ -2288,3 +2288,10 @@ void early_gtk_display_init(int opengl)
register_vc_handler(gd_vc_handler);
#endif
}
+
+__attribute__((constructor))
+static void gtk_init_fn(void)
+{
+ gtk_register_early_init_fun(early_gtk_display_init_do);
+ gtk_register_init_fun(gtk_display_init_do);
+}
@@ -4232,9 +4232,19 @@ int main(int argc, char **argv, char **envp)
display_remote++;
}
#endif
- if (display_type == DT_DEFAULT && !display_remote) {
+ if ((display_type == DT_DEFAULT && !display_remote)
+ || display_type == DT_GTK) {
#if defined(CONFIG_GTK)
- display_type = DT_GTK;
+ if (!gtk_mod_init()) {
+ if (display_type == DT_GTK) {
+ error_report("GTK could not be initialized, exiting");
+ exit(1);
+ }
+ error_report("GTK could not be initialized, using display None");
+ display_type = DT_NONE;
+ } else {
+ display_type = DT_GTK;
+ }
#elif defined(CONFIG_SDL)
display_type = DT_SDL;
#elif defined(CONFIG_COCOA)
Allows GTK to be compiled as a module and loaded at runtime. If GTK is not the display being used, the module will not be loaded. In the case that the GTK module is not present, if GTK was specified explicitly by the user, qemu will exit with an error, otherwise it will default to display type None. This should give improvements in terms of performance, since much less libraries will be loaded at startup if GTK is not being used, and in terms of packaging, since GTK should be able to be packaged separately in binary package managers now. Signed-off-by: Colin Lord <clord@redhat.com> --- Makefile.objs | 1 + configure | 5 ++-- include/ui/console.h | 6 +++++ ui/Makefile.objs | 14 ++++++++---- ui/gtk-init.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ ui/gtk.c | 11 +++++++-- vl.c | 14 ++++++++++-- 7 files changed, 104 insertions(+), 11 deletions(-) create mode 100644 ui/gtk-init.c