From patchwork Wed Mar 20 09:43:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 229286 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 110032C009E for ; Wed, 20 Mar 2013 20:48:29 +1100 (EST) Received: from localhost ([::1]:44859 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIFdD-000286-9p for incoming@patchwork.ozlabs.org; Wed, 20 Mar 2013 05:48:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38251) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIFYy-0004Lc-DN for qemu-devel@nongnu.org; Wed, 20 Mar 2013 05:44:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UIFYn-0005ox-1I for qemu-devel@nongnu.org; Wed, 20 Mar 2013 05:44:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6889) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIFYm-0005ol-KA for qemu-devel@nongnu.org; Wed, 20 Mar 2013 05:43:52 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2K9hpPQ018865 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 20 Mar 2013 05:43:52 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r2K9hnXI010204; Wed, 20 Mar 2013 05:43:51 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 1A09545BF7; Wed, 20 Mar 2013 10:43:48 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 20 Mar 2013 10:43:44 +0100 Message-Id: <1363772625-9182-23-git-send-email-kraxel@redhat.com> In-Reply-To: <1363772625-9182-1-git-send-email-kraxel@redhat.com> References: <1363772625-9182-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Anthony Liguori , Gerd Hoffmann Subject: [Qemu-devel] [PATCH 22/23] gtk: show a window for each graphical QemuConsole X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Multihead support: For each graphical console we'll create a gtk window, so with multiple graphics cards installed you get a gtk window for each. vte tabs are attached to the console #0 window. --- ui/gtk.c | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index 512e974..1c86054 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -159,8 +159,6 @@ typedef struct GtkDisplayState bool external_pause_update; } GtkDisplayState; -static GtkDisplayState *global_state; - /** Utility Functions **/ static bool gd_is_grab_active(GtkDisplayState *s) @@ -1210,7 +1208,7 @@ static void gd_connect_signals(GtkDisplayState *s) G_CALLBACK(gd_leave_event), s); } -static void gd_create_menus(GtkDisplayState *s) +static void gd_create_menus(GtkDisplayState *s, bool vtetabs) { GtkStockItem item; GtkAccelGroup *accel_group; @@ -1302,11 +1300,13 @@ static void gd_create_menus(GtkDisplayState *s) gtk_accel_map_add_entry("/View/VGA", GDK_KEY_1, GDK_CONTROL_MASK | GDK_MOD1_MASK); gtk_menu_shell_append(GTK_MENU_SHELL(s->view_menu), s->vga_item); - for (i = 0; i < nb_vcs; i++) { - VirtualConsole *vc = &s->vc[i]; + if (vtetabs) { + for (i = 0; i < nb_vcs; i++) { + VirtualConsole *vc = &s->vc[i]; - group = gd_vc_init(s, vc, i, group); - s->nb_vcs++; + group = gd_vc_init(s, vc, i, group); + s->nb_vcs++; + } } separator = gtk_separator_menu_item_new(); @@ -1336,14 +1336,13 @@ static const DisplayChangeListenerOps dcl_ops = { .dpy_cursor_define = gd_cursor_define, }; -void gtk_display_init(DisplayState *ds) +static void gtk_display_init_one(DisplayState *ds, QemuConsole *con, + bool vtetabs) { GtkDisplayState *s = g_malloc0(sizeof(*s)); - gtk_init(NULL, NULL); - s->dcl.ops = &dcl_ops; - s->dcl.con = qemu_console_lookup_by_index(0); + s->dcl.con = con; s->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); #if GTK_CHECK_VERSION(3, 2, 0) @@ -1371,7 +1370,7 @@ void gtk_display_init(DisplayState *ds) gtk_notebook_append_page(GTK_NOTEBOOK(s->notebook), s->drawing_area, gtk_label_new("VGA")); - gd_create_menus(s); + gd_create_menus(s, vtetabs); gd_connect_signals(s); @@ -1400,6 +1399,21 @@ void gtk_display_init(DisplayState *ds) gtk_widget_show_all(s->window); register_displaychangelistener(ds, &s->dcl); +} - global_state = s; +void gtk_display_init(DisplayState *ds) +{ + QemuConsole *con; + int i = 0; + + gtk_init(NULL, NULL); + + con = qemu_console_lookup_by_index(i++); + gtk_display_init_one(ds, con, true); + while ((con = qemu_console_lookup_by_index(i++)) != NULL) { + if (!qemu_console_is_graphic(con)) { + break; + } + gtk_display_init_one(ds, con, false); + } }