From b9bc4c258a1a3534f24717fc89a52c9deef16a05 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Fri, 27 Sep 2013 18:01:24 +0200 Subject: [PATCH] gtk: Support GTK without VTE Signed-off-by: Stefan Weil --- configure | 54 +++++++++++++++++++++++++++++++++++++----------------- ui/gtk.c | 26 ++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 19 deletions(-) diff --git a/configure b/configure index dffed84..f5517f1 100755 --- a/configure +++ b/configure @@ -246,6 +246,7 @@ glusterfs_discard="no" virtio_blk_data_plane="" gtk="" gtkabi="2.0" +vte="" tpm="no" libssh2="" @@ -974,6 +975,10 @@ for opt do ;; --with-gtkabi=*) gtkabi="$optarg" ;; + --disable-vte) vte="no" + ;; + --enable-vte) vte="yes" + ;; --enable-tpm) tpm="yes" ;; --disable-libssh2) libssh2="no" @@ -1787,30 +1792,41 @@ if test "$gtk" != "no"; then gtkpackage="gtk+-$gtkabi" if test "$gtkabi" = "3.0" ; then gtkversion="3.0.0" + else + gtkversion="2.18.0" + fi + if $pkg_config --exists "$gtkpackage >= $gtkversion"; then + gtk_cflags=`$pkg_config --cflags $gtkpackage` + gtk_libs=`$pkg_config --libs $gtkpackage` + libs_softmmu="$gtk_libs $libs_softmmu" + gtk="yes" + elif test "$gtk" = "yes"; then + feature_not_found "gtk" + else + gtk="no" + fi +fi + +########################################## +# VTE probe + +if test "$vte" != "no"; then + if test "$gtkabi" = "3.0"; then vtepackage="vte-2.90" vteversion="0.32.0" else - gtkversion="2.18.0" vtepackage="vte" vteversion="0.24.0" fi - if ! $pkg_config --exists "$gtkpackage >= $gtkversion"; then - if test "$gtk" = "yes" ; then - feature_not_found "gtk" - fi - gtk="no" - elif ! $pkg_config --exists "$vtepackage >= $vteversion"; then - if test "$gtk" = "yes" ; then - error_exit "libvte not found (required for gtk support)" - fi - gtk="no" + if $pkg_config --exists "$vtepackage >= $vteversion"; then + vte_cflags=`$pkg_config --cflags $vtepackage` + vte_libs=`$pkg_config --libs $vtepackage` + libs_softmmu="$vte_libs $libs_softmmu" + vte="yes" + elif test "$vte" = "yes"; then + feature_not_found "vte" else - gtk_cflags=`$pkg_config --cflags $gtkpackage` - gtk_libs=`$pkg_config --libs $gtkpackage` - vte_cflags=`$pkg_config --cflags $vtepackage` - vte_libs=`$pkg_config --libs $vtepackage` - libs_softmmu="$gtk_libs $vte_libs $libs_softmmu" - gtk="yes" + vte="no" fi fi @@ -3749,6 +3765,7 @@ fi echo "pixman $pixman" echo "SDL support $sdl" echo "GTK support $gtk" +echo "VTE support $vte" echo "curses support $curses" echo "curl support $curl" echo "mingw32 support $mingw32" @@ -4069,6 +4086,9 @@ echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak if test "$gtk" = "yes" ; then echo "CONFIG_GTK=y" >> $config_host_mak echo "GTK_CFLAGS=$gtk_cflags" >> $config_host_mak +fi +if test "$vte" = "yes" ; then + echo "CONFIG_VTE=y" >> $config_host_mak echo "VTE_CFLAGS=$vte_cflags" >> $config_host_mak fi if test "$xen" = "yes" ; then diff --git a/ui/gtk.c b/ui/gtk.c index b5f4f0b..bd17c94 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -50,7 +50,9 @@ #include #include #include +#if defined(CONFIG_VTE) #include +#endif #include #include "ui/console.h" @@ -62,10 +64,21 @@ //#define DEBUG_GTK +#define DPRINTF(fmt, ...) debug_printf(fmt, ## __VA_ARGS__) + +static inline GCC_FMT_ATTR(1, 2) void debug_printf(const char *fmt, ...) +{ #ifdef DEBUG_GTK -#define DPRINTF(fmt, ...) printf(fmt, ## __VA_ARGS__) + va_list arg; + va_start(arg, fmt); + vprintf(fmt, arg); + va_end(arg); #else -#define DPRINTF(fmt, ...) do { } while (0) +#endif +} + +#if !defined(CONFIG_VTE) +# define VTE_CHECK_VERSION(a, b, c) 0 #endif #define MAX_VCS 10 @@ -1063,6 +1076,7 @@ static void gd_change_page(GtkNotebook *nb, gpointer arg1, guint arg2, gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->vga_item), TRUE); } else { VirtualConsole *vc = &s->vc[arg2 - 1]; +#if defined(CONFIG_VTE) VteTerminal *term = VTE_TERMINAL(vc->terminal); int width, height; @@ -1071,6 +1085,10 @@ static void gd_change_page(GtkNotebook *nb, gpointer arg1, guint arg2, gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(vc->menu_item), TRUE); gtk_widget_set_size_request(vc->terminal, width, height); +#else + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(vc->menu_item), TRUE); + gtk_widget_set_size_request(vc->terminal, 640, 480); +#endif } gtk_widget_set_sensitive(s->grab_item, on_vga); @@ -1141,6 +1159,7 @@ void early_gtk_display_init(void) register_vc_handler(gd_vc_handler); } +#if defined(CONFIG_VTE) static gboolean gd_vc_in(GIOChannel *chan, GIOCondition cond, void *opaque) { VirtualConsole *vc = opaque; @@ -1156,10 +1175,12 @@ static gboolean gd_vc_in(GIOChannel *chan, GIOCondition cond, void *opaque) return TRUE; } +#endif static GSList *gd_vc_init(GtkDisplayState *s, VirtualConsole *vc, int index, GSList *group, GtkWidget *view_menu) { +#if defined(CONFIG_VTE) const char *label; char buffer[32]; char path[32]; @@ -1229,6 +1250,7 @@ static GSList *gd_vc_init(GtkDisplayState *s, VirtualConsole *vc, int index, GSL chan = g_io_channel_unix_new(vc->fd); g_io_add_watch(chan, G_IO_IN, gd_vc_in, vc); +#endif /* CONFIG_GTK */ return group; } -- 1.7.10.4