[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 24/24] gtk: workaround gtk2 vte resize issue
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 24/24] gtk: workaround gtk2 vte resize issue |
Date: |
Mon, 26 May 2014 10:14:19 +0200 |
Hack isn't pretty, but gets the job done.
See source code comment for details.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/gtk.c | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/ui/gtk.c b/ui/gtk.c
index ac5dbe0..b908936 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -85,6 +85,20 @@
# define VTE_CHECK_VERSION(a, b, c) 0
#endif
+#if defined(CONFIG_VTE) && !GTK_CHECK_VERSION(3, 0, 0)
+/*
+ * The gtk2 vte terminal widget seriously messes up the window resize
+ * for some reason. You basically can't make the qemu window smaller
+ * any more because the toplevel window geoemtry hints are overridden.
+ *
+ * Workaround that by hiding all vte widgets, except the one in the
+ * current tab.
+ *
+ * Luckily everything works smooth in gtk3.
+ */
+# define VTE_RESIZE_HACK 1
+#endif
+
/* Compatibility define to let us build on both Gtk2 and Gtk3 */
#if GTK_CHECK_VERSION(3, 0, 0)
static inline void gdk_drawable_get_size(GdkWindow *w, gint *ww, gint *wh)
@@ -1301,10 +1315,21 @@ static void gd_change_page(GtkNotebook *nb, gpointer
arg1, guint arg2,
return;
}
+#ifdef VTE_RESIZE_HACK
+ vc = gd_vc_find_current(s);
+ if (vc && vc->type == GD_VC_VTE) {
+ gtk_widget_hide(vc->vte.terminal);
+ }
+#endif
vc = gd_vc_find_by_page(s, arg2);
if (!vc) {
return;
}
+#ifdef VTE_RESIZE_HACK
+ if (vc->type == GD_VC_VTE) {
+ gtk_widget_show(vc->vte.terminal);
+ }
+#endif
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(vc->menu_item),
TRUE);
on_vga = (vc->type == GD_VC_GFX);
@@ -1845,6 +1870,21 @@ void gtk_display_init(DisplayState *ds, bool
full_screen, bool grab_on_hover)
gtk_widget_show_all(s->window);
+#ifdef VTE_RESIZE_HACK
+ {
+ VirtualConsole *cur = gd_vc_find_current(s);
+ int i;
+
+ for (i = 0; i < s->nb_vcs; i++) {
+ VirtualConsole *vc = &s->vc[i];
+ if (vc && vc->type == GD_VC_VTE && vc != cur) {
+ gtk_widget_hide(vc->vte.terminal);
+ }
+ }
+ gd_update_windowsize(cur);
+ }
+#endif
+
if (full_screen) {
gtk_menu_item_activate(GTK_MENU_ITEM(s->full_screen_item));
}
--
1.8.3.1
- [Qemu-devel] [PULL 12/24] gtk: add tab to trace events, (continued)
- [Qemu-devel] [PULL 12/24] gtk: add tab to trace events, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 14/24] gtk: keep track of grab owner, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 11/24] gtk: allow moving tabs to windows and back., Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 15/24] gtk: skip keyboard grab when hover autograb is active, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 13/24] gtk: add gd_grab trace event, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 19/24] gtk: detached window pointer grabs, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 02/24] gtk: zap vte size requests, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 16/24] gtk: update gd_update_caption, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 22/24] gtk: zap unused global_state, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 20/24] gtk: enable untabify for gfx, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 24/24] gtk: workaround gtk2 vte resize issue,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 17/24] gtk: fix grab checks, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 07/24] gtk: move vga state into VirtualGfxConsole, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 18/24] gtk: update all windows on mouse mode changes, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 23/24] gtk: window sizing overhaul, Gerd Hoffmann, 2014/05/26
- Re: [Qemu-devel] [PULL 00/24] gtk: ui overhaul, multiwindow support., Peter Maydell, 2014/05/28