From nobody Thu May 8 10:55:08 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass header.i=@intel.com;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=intel.com
ARC-Seal: i=1; a=rsa-sha256; t=1658187646; cv=none;
d=zohomail.com; s=zohoarc;
b=ctlfFzumEcoxnL4yF9CwK2byouoHuhGgQYAArthBn9TDDtup2qaxTbIEzo6vTO1+eaQyXoPOrvj5Jx1hO/AwNTeWmsdLa6XbtTs29BdG8eWMqZynCbKqX7NREHtgidMgCaLObTsl/Y1oWw5xmHJBUkFk+L/Y36Sgqe3CKQZfWXU=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1658187646;
h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
bh=MkhbbJXJ4Nl2oKuKh7p5mB34CF0lLCMZYfTuZ16SVmI=;
b=fh1ee0oZwxjoZFNL8BEojWRXFPeDkD/t8M4pEPfscU8AeDmH0dQTNah71Wh2P9j/IIjej30jBmb/J+AVPjTVFVvsDJJZQOWYLLn35n/P71TVtjdssn7aelBR3wTNR+n7OUJ3D5wgoMAHPrUBnnT7CZovFQu5LGf2rqaX6+PpnLo=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass header.i=@intel.com;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<dongwon.kim@intel.com> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1658187646516500.507205442649;
Mon, 18 Jul 2022 16:40:46 -0700 (PDT)
Received: from localhost ([::1]:54936 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1oDaM1-0008Nj-Hz
for importer@patchew.org; Mon, 18 Jul 2022 19:40:45 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:47332)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <dongwon.kim@intel.com>)
id 1oDaIo-0006FL-Be
for qemu-devel@nongnu.org; Mon, 18 Jul 2022 19:37:26 -0400
Received: from mga18.intel.com ([134.134.136.126]:53822)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <dongwon.kim@intel.com>)
id 1oDaIm-0001gc-HC
for qemu-devel@nongnu.org; Mon, 18 Jul 2022 19:37:26 -0400
Received: from fmsmga001.fm.intel.com ([10.253.24.23])
by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
18 Jul 2022 16:37:11 -0700
Received: from dongwonk-z390-aorus-ultra-intel-gfx.fm.intel.com
([10.105.129.122])
by fmsmga001.fm.intel.com with ESMTP; 18 Jul 2022 16:37:11 -0700
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
d=intel.com; i=@intel.com; q=dns/txt; s=Intel;
t=1658187444; x=1689723444;
h=from:to:cc:subject:date:message-id:in-reply-to:
references:mime-version:content-transfer-encoding;
bh=j5R3MMtCXAlMj4wukTr3/Nbi/5dt9bp/pRu216l5FW8=;
b=ZwOlxeM0lrC40gpa3HKkwVLEyyOtfzpTtdeF4ncpfK8GwULatCxfdvJN
St2NRf4MoUWQFEwE7xtvNh2AQPjYqZEdl7fkh8BId7k8A7sw2uj2bItid
iGUbHf0KoLzfrhJtipYnYkAYCz5BILlXyIYZsIQanRFKultJ7H1eyiUSx
hL3Glsrgb/0GjngydpoeFjTdfnEIU+JEkjedPs+MRde0BQPEPMRHnJul1
0sNDYIjxn54XbhArYAVUo4k5H/VFK50icOFoB2ShnsmulUrJX/6udXnUY
2GE/rED/e5fj8JunZ67wVhn7HQ9Qti82RRj10QW1ZcUcIW/A4zds6aMzC w==;
X-IronPort-AV: E=McAfee;i="6400,9594,10412"; a="269369089"
X-IronPort-AV: E=Sophos;i="5.92,282,1650956400"; d="scan'208";a="269369089"
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.92,282,1650956400"; d="scan'208";a="739652099"
From: Dongwon Kim <dongwon.kim@intel.com>
To: qemu-devel@nongnu.org
Cc: armbru@redhat.com, berrange@redhat.com, kraxel@redhat.com,
pbonzini@redhat.com, f4bug@amsat.org, vivek.kasireddy@intel.com,
Dongwon Kim <dongwon.kim@intel.com>
Subject: [PATCH v5 2/2] ui/gtk: a new array param monitor to specify the
target displays
Date: Mon, 18 Jul 2022 16:30:09 -0700
Message-Id: <20220718233009.18780-3-dongwon.kim@intel.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20220718233009.18780-1-dongwon.kim@intel.com>
References: <20220718233009.18780-1-dongwon.kim@intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=134.134.136.126;
envelope-from=dongwon.kim@intel.com; helo=mga18.intel.com
X-Spam_score_int: -21
X-Spam_score: -2.2
X-Spam_bar: --
X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082,
DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: pass (identity @intel.com)
X-ZM-MESSAGEID: 1658187646909100003
New integer array parameter, 'monitor' is for specifying the target
monitors where individual GTK windows are placed upon launching.
Monitor numbers in the array are associated with virtual consoles
in the order of [VC0, VC1, VC2 ... VCn].
Every GTK window containing each VC will be placed in the region
of corresponding monitors.
Usage: -display gtk,monitor.<id of VC>=3D<target monitor>,..
ex)-display gtk,monitor.0=3D1,monitor.1=3D0
Cc: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Cc: Philippe Mathieu-Daud=C3=A9 <f4bug@amsat.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Vivek Kasireddy <vivek.kasireddy@intel.com>
Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
---
qapi/ui.json | 9 ++++++++-
qemu-options.hx | 3 ++-
ui/gtk.c | 30 ++++++++++++++++++++++++++++--
3 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/qapi/ui.json b/qapi/ui.json
index 413371d5e8..ccc3e56f80 100644
--- a/qapi/ui.json
+++ b/qapi/ui.json
@@ -1195,12 +1195,19 @@
# assuming the guest will resize the display to match
# the window size then. Otherwise it defaults to "off".
# Since 3.1
+# @monitor: List of physical monitor numbers where the GTK windows
+# containing the virtual consoles VC0, VC1, ... are to be
+# placed. If a mapping exists for a VC, then it is to be
+# placed on that specific physical monitor; otherwise,
+# it defaults to the monitor from where it was launched.
+# (Since 7.1)
#
# Since: 2.12
##
{ 'struct' : 'DisplayGTK',
'data' : { '*grab-on-hover' : 'bool',
- '*zoom-to-fit' : 'bool' } }
+ '*zoom-to-fit' : 'bool',
+ '*monitor' : ['uint16'] } }
=20
##
# @DisplayEGLHeadless:
diff --git a/qemu-options.hx b/qemu-options.hx
index 377d22fbd8..aabdfb0636 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1938,7 +1938,8 @@ DEF("display", HAS_ARG, QEMU_OPTION_display,
#endif
#if defined(CONFIG_GTK)
"-display gtk[,full-screen=3Don|off][,gl=3Don|off][,grab-on-hover=3Don=
|off]\n"
- " [,show-cursor=3Don|off][,window-close=3Don|off]\n"
+ " [,monitor.<id of VC>=3D<monitor number>][,show-cursor=3Do=
n|off]"
+ " [,window-close=3Don|off]\n"
#endif
#if defined(CONFIG_VNC)
"-display vnc=3D<display>[,<optargs>]\n"
diff --git a/ui/gtk.c b/ui/gtk.c
index e6878c3209..7dad10b761 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -2316,6 +2316,10 @@ static void gtk_display_init(DisplayState *ds, Displ=
ayOptions *opts)
GtkDisplayState *s =3D g_malloc0(sizeof(*s));
GdkDisplay *window_display;
GtkIconTheme *theme;
+ GtkWidget *win;
+ GdkRectangle dest;
+ uint16List *mon;
+ int n_mon;
int i;
char *dir;
=20
@@ -2393,10 +2397,32 @@ static void gtk_display_init(DisplayState *ds, Disp=
layOptions *opts)
gtk_menu_item_activate(GTK_MENU_ITEM(s->untabify_item));
}
}
- if (opts->has_full_screen &&
- opts->full_screen) {
+
+ if (opts->u.gtk.has_monitor) {
+ i =3D 0;
+ n_mon =3D gdk_display_get_n_monitors(window_display);
+ for (mon =3D opts->u.gtk.monitor; mon; mon =3D mon->next) {
+ if (mon->value < n_mon && i < s->nb_vcs) {
+ win =3D s->vc[i].window ? s->vc[i].window : s->window;
+ if (opts->full_screen) {
+ gtk_window_fullscreen_on_monitor(
+ GTK_WINDOW(win),
+ gdk_display_get_default_screen(window_display),
+ mon->value);
+ } else {
+ gdk_monitor_get_geometry(
+ gdk_display_get_monitor(window_display, mon->value=
),
+ &dest);
+ gtk_window_move(GTK_WINDOW(win),
+ dest.x, dest.y);
+ }
+ i++;
+ }
+ }
+ } else if (opts->full_screen) {
gtk_menu_item_activate(GTK_MENU_ITEM(s->full_screen_item));
}
+
if (opts->u.gtk.has_grab_on_hover &&
opts->u.gtk.grab_on_hover) {
gtk_menu_item_activate(GTK_MENU_ITEM(s->grab_on_hover_item));
--=20
2.20.1