From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54403) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Woq3F-0006fd-Lx for qemu-devel@nongnu.org; Mon, 26 May 2014 04:14:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Woq39-0006jW-CO for qemu-devel@nongnu.org; Mon, 26 May 2014 04:14:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Woq39-0006jM-4A for qemu-devel@nongnu.org; Mon, 26 May 2014 04:14:27 -0400 From: Gerd Hoffmann Date: Mon, 26 May 2014 10:14:00 +0200 Message-Id: <1401092059-18503-6-git-send-email-kraxel@redhat.com> In-Reply-To: <1401092059-18503-1-git-send-email-kraxel@redhat.com> References: <1401092059-18503-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 05/24] gtk: remove page numbering assumtions from the code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Anthony Liguori Lookup page numbers using gtk_notebook_page_num() instead. Signed-off-by: Gerd Hoffmann --- ui/gtk.c | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index 6a3fe00..49753ef 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -190,7 +190,11 @@ static bool gd_grab_on_hover(GtkDisplayState *s) static bool gd_on_vga(GtkDisplayState *s) { - return gtk_notebook_get_current_page(GTK_NOTEBOOK(s->notebook)) == 0; + gint p1, p2; + + p1 = gtk_notebook_get_current_page(GTK_NOTEBOOK(s->notebook)); + p2 = gtk_notebook_page_num(GTK_NOTEBOOK(s->notebook), s->drawing_area); + return p1 == p2; } static void gd_update_cursor(GtkDisplayState *s, gboolean override) @@ -805,19 +809,25 @@ static void gd_menu_quit(GtkMenuItem *item, void *opaque) static void gd_menu_switch_vc(GtkMenuItem *item, void *opaque) { GtkDisplayState *s = opaque; + gint page; if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(s->vga_item))) { - gtk_notebook_set_current_page(GTK_NOTEBOOK(s->notebook), 0); + page = gtk_notebook_page_num(GTK_NOTEBOOK(s->notebook), + s->drawing_area); + gtk_notebook_set_current_page(GTK_NOTEBOOK(s->notebook), page); } else { - int i; - gtk_release_modifiers(s); +#if defined(CONFIG_VTE) + gint i; for (i = 0; i < s->nb_vcs; i++) { if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(s->vc[i].menu_item))) { - gtk_notebook_set_current_page(GTK_NOTEBOOK(s->notebook), i + 1); - break; + page = gtk_notebook_page_num(GTK_NOTEBOOK(s->notebook), + s->vc[i].box); + gtk_notebook_set_current_page(GTK_NOTEBOOK(s->notebook), page); + return; } } +#endif } } @@ -1061,12 +1071,14 @@ static void gd_change_page(GtkNotebook *nb, gpointer arg1, guint arg2, { GtkDisplayState *s = data; gboolean on_vga; + gint page; if (!gtk_widget_get_realized(s->notebook)) { return; } - on_vga = arg2 == 0; + page = gtk_notebook_page_num(GTK_NOTEBOOK(s->notebook), s->drawing_area); + on_vga = arg2 == page; if (!on_vga) { gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->grab_item), @@ -1076,12 +1088,20 @@ static void gd_change_page(GtkNotebook *nb, gpointer arg1, guint arg2, TRUE); } - if (arg2 == 0) { + if (on_vga) { gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->vga_item), TRUE); } else { #if defined(CONFIG_VTE) - VirtualConsole *vc = &s->vc[arg2 - 1]; - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(vc->menu_item), TRUE); + VirtualConsole *vc; + gint page, i; + for (i = 0; i < s->nb_vcs; i++) { + vc = &s->vc[i]; + page = gtk_notebook_page_num(GTK_NOTEBOOK(s->notebook), vc->box); + if (page == arg2) { + gtk_check_menu_item_set_active + (GTK_CHECK_MENU_ITEM(vc->menu_item), TRUE); + } + } #else g_assert_not_reached(); #endif -- 1.8.3.1