From patchwork Mon Jul 19 21:41:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kim, Dongwon" X-Patchwork-Id: 12386853 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E31AC07E95 for ; Mon, 19 Jul 2021 21:45:21 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9D9B2610C7 for ; Mon, 19 Jul 2021 21:45:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9D9B2610C7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:37962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m5b4h-00025p-MA for qemu-devel@archiver.kernel.org; Mon, 19 Jul 2021 17:45:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35100) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5b3H-0000mb-LV for qemu-devel@nongnu.org; Mon, 19 Jul 2021 17:43:51 -0400 Received: from mga12.intel.com ([192.55.52.136]:65076) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5b3F-0005qj-Bb for qemu-devel@nongnu.org; Mon, 19 Jul 2021 17:43:50 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10050"; a="190722725" X-IronPort-AV: E=Sophos;i="5.84,253,1620716400"; d="scan'208";a="190722725" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jul 2021 14:43:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,253,1620716400"; d="scan'208";a="657044416" Received: from dw-tiger-lake-client-platform.fm.intel.com ([10.105.205.215]) by fmsmga006.fm.intel.com with ESMTP; 19 Jul 2021 14:43:45 -0700 From: Dongwon Kim To: qemu-devel@nongnu.org Subject: [PATCH 1/2] ui/gtk: detach_all option for making all VCs detached upon starting Date: Mon, 19 Jul 2021 14:41:56 -0700 Message-Id: <20210719214157.5863-1-dongwon.kim@intel.com> X-Mailer: git-send-email 2.17.1 Received-SPF: pass client-ip=192.55.52.136; envelope-from=dongwon.kim@intel.com; helo=mga12.intel.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Khairul Anuar Romli , Dongwon Kim Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" With "detach-all=on" for display, all VCs are detached from the beginning. This is useful when there are multiple displays assigned to a guest OS. Signed-off-by: Dongwon Kim Signed-off-by: Khairul Anuar Romli --- qapi/ui.json | 4 +++- ui/gtk.c | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/qapi/ui.json b/qapi/ui.json index 1052ca9c38..ff14bb2f46 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -1141,6 +1141,7 @@ # @show-cursor: Force showing the mouse cursor (default: off). # (since: 5.0) # @gl: Enable OpenGL support (default: off). +# @detach-all: Detatch all VirtualConsoles from beginning (default: off). # # Since: 2.12 # @@ -1150,7 +1151,8 @@ '*full-screen' : 'bool', '*window-close' : 'bool', '*show-cursor' : 'bool', - '*gl' : 'DisplayGLMode' }, + '*gl' : 'DisplayGLMode', + '*detach-all' : 'bool' }, 'discriminator' : 'type', 'data' : { 'gtk' : 'DisplayGTK', 'curses' : 'DisplayCurses', diff --git a/ui/gtk.c b/ui/gtk.c index ce885d2ca3..a07e5a049e 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -2211,6 +2211,7 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts) GdkDisplay *window_display; GtkIconTheme *theme; char *dir; + int i; if (!gtkinit) { fprintf(stderr, "gtk initialization failed\n"); @@ -2290,6 +2291,12 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts) gtk_menu_item_activate(GTK_MENU_ITEM(s->grab_on_hover_item)); } gd_clipboard_init(s); + + if (opts->detach_all) { + for (i = 0; i < s->nb_vcs - 1; i++) { + gtk_menu_item_activate(GTK_MENU_ITEM(s->untabify_item)); + } + } } static void early_gtk_display_init(DisplayOptions *opts) From patchwork Mon Jul 19 21:41:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kim, Dongwon" X-Patchwork-Id: 12386855 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A209C07E9B for ; Mon, 19 Jul 2021 21:45:22 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E797E610C7 for ; Mon, 19 Jul 2021 21:45:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E797E610C7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:38038 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m5b4j-00029U-0q for qemu-devel@archiver.kernel.org; Mon, 19 Jul 2021 17:45:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5b3I-0000mj-0Z for qemu-devel@nongnu.org; Mon, 19 Jul 2021 17:43:52 -0400 Received: from mga12.intel.com ([192.55.52.136]:65077) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5b3G-0005rh-Dy for qemu-devel@nongnu.org; Mon, 19 Jul 2021 17:43:51 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10050"; a="190722727" X-IronPort-AV: E=Sophos;i="5.84,253,1620716400"; d="scan'208";a="190722727" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jul 2021 14:43:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,253,1620716400"; d="scan'208";a="657044422" Received: from dw-tiger-lake-client-platform.fm.intel.com ([10.105.205.215]) by fmsmga006.fm.intel.com with ESMTP; 19 Jul 2021 14:43:47 -0700 From: Dongwon Kim To: qemu-devel@nongnu.org Subject: [PATCH 2/2] ui/gtk: specify detached window's size and location Date: Mon, 19 Jul 2021 14:41:57 -0700 Message-Id: <20210719214157.5863-2-dongwon.kim@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210719214157.5863-1-dongwon.kim@intel.com> References: <20210719214157.5863-1-dongwon.kim@intel.com> Received-SPF: pass client-ip=192.55.52.136; envelope-from=dongwon.kim@intel.com; helo=mga12.intel.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dongwon Kim Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Specify location and size of detached window based on top level window's location and size info when detachment happens. Signed-off-by: Dongwon Kim --- ui/gtk.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ui/gtk.c b/ui/gtk.c index a07e5a049e..9b4e85624a 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -1274,6 +1274,8 @@ static void gd_menu_untabify(GtkMenuItem *item, void *opaque) { GtkDisplayState *s = opaque; VirtualConsole *vc = gd_vc_find_current(s); + gint x, y, w, h; + int i; if (vc->type == GD_VC_GFX && qemu_console_is_graphic(vc->gfx.dcl.con)) { @@ -1284,6 +1286,18 @@ static void gd_menu_untabify(GtkMenuItem *item, void *opaque) gtk_widget_set_sensitive(vc->menu_item, false); vc->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gd_widget_reparent(s->notebook, vc->window, vc->tab_item); + gtk_window_get_position(GTK_WINDOW(s->window), &x, &y); + gtk_window_get_size(GTK_WINDOW(s->window), &w, &h); + + for (i = 0; i < s->nb_vcs; i++) { + if (vc == &s->vc[i]) { + break; + } + } + + gtk_window_move(GTK_WINDOW(vc->window), + x + w * (i % (s->nb_vcs/2) + 1), y + h * (i / (s->nb_vcs/2))); + gtk_window_resize(GTK_WINDOW(vc->window), w, h); g_signal_connect(vc->window, "delete-event", G_CALLBACK(gd_tab_window_close), vc);