[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 18/22] ui/cocoa: add option to disable left-command forwarding
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v7 18/22] ui/cocoa: add option to disable left-command forwarding to guest |
Date: |
Mon, 7 Mar 2022 00:17:49 +0100 |
From: Carwyn Ellis <carwynellis@gmail.com>
When switching between guest and host on a Mac using command-tab the
command key is sent to the guest which can trigger functionality in the
guest OS. Specifying left-command-key=off disables forwarding this key
to the guest. Defaults to enabled.
Also updated the cocoa display documentation to reference the new
left-command-key option along with the existing show-cursor option.
Signed-off-by: Carwyn Ellis <carwynellis@gmail.com>
Reviewed-by: Akihiko Odaki <akihiko.odaki@gmail.com>
[PMD: Set QAPI structure @since tag to 7.0]
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
qapi/ui.json | 18 ++++++++++++++++++
qemu-options.hx | 12 ++++++++++++
ui/cocoa.m | 8 +++++++-
3 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/qapi/ui.json b/qapi/ui.json
index 4a13f883a3..4dea35a819 100644
--- a/qapi/ui.json
+++ b/qapi/ui.json
@@ -1260,6 +1260,23 @@
{ 'struct' : 'DisplayCurses',
'data' : { '*charset' : 'str' } }
+##
+# @DisplayCocoa:
+#
+# Cocoa display options.
+#
+# @left-command-key: Enable/disable forwarding of left command key to
+# guest. Allows command-tab window switching on the
+# host without sending this key to the guest when
+# "off". Defaults to "on"
+#
+# Since: 7.0
+##
+{ 'struct': 'DisplayCocoa',
+ 'data': {
+ '*left-command-key': 'bool'
+ } }
+
##
# @DisplayType:
#
@@ -1338,6 +1355,7 @@
'discriminator' : 'type',
'data' : {
'gtk': { 'type': 'DisplayGTK', 'if': 'CONFIG_GTK' },
+ 'cocoa': { 'type': 'DisplayCocoa', 'if': 'CONFIG_COCOA' },
'curses': { 'type': 'DisplayCurses', 'if': 'CONFIG_CURSES' },
'egl-headless': { 'type': 'DisplayEGLHeadless',
'if': { 'all': ['CONFIG_OPENGL', 'CONFIG_GBM'] } },
diff --git a/qemu-options.hx b/qemu-options.hx
index 094a6c1d7c..ffaeab61ed 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1922,6 +1922,9 @@ DEF("display", HAS_ARG, QEMU_OPTION_display,
#if defined(CONFIG_DBUS_DISPLAY)
"-display dbus[,addr=<dbusaddr>]\n"
" [,gl=on|core|es|off][,rendernode=<file>]\n"
+#endif
+#if defined(CONFIG_COCOA)
+ "-display cocoa[,show-cursor=on|off][,left-command-key=on|off]\n"
#endif
"-display none\n"
" select display backend type\n"
@@ -2009,6 +2012,15 @@ SRST
``charset=CP850`` for IBM CP850 encoding. The default is
``CP437``.
+ ``cocoa``
+ Display video output in a Cocoa window. Mac only. This interface
+ provides drop-down menus and other UI elements to configure and
+ control the VM during runtime. Valid parameters are:
+
+ ``show-cursor=on|off`` : Force showing the mouse cursor
+
+ ``left-command-key=on|off`` : Disable forwarding left command key to
host
+
``egl-headless[,rendernode=<file>]``
Offload all OpenGL operations to a local DRI device. For any
graphical display, this display needs to be paired with either
diff --git a/ui/cocoa.m b/ui/cocoa.m
index a6db8ebfb6..319af5045b 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -95,6 +95,7 @@ static DisplayChangeListener dcl = {
};
static int last_buttons;
static int cursor_hide = 1;
+static int left_command_key_enabled = 1;
static int gArgc;
static char **gArgv;
@@ -853,7 +854,8 @@ QemuCocoaView *cocoaView;
/* Don't pass command key changes to guest unless mouse is
grabbed */
case kVK_Command:
if (isMouseGrabbed &&
- !!(modifiers & NSEventModifierFlagCommand)) {
+ !!(modifiers & NSEventModifierFlagCommand) &&
+ left_command_key_enabled) {
[self toggleKey:Q_KEY_CODE_META_L];
}
break;
@@ -2068,6 +2070,10 @@ static void cocoa_display_init(DisplayState *ds,
DisplayOptions *opts)
cursor_hide = 0;
}
+ if (opts->u.cocoa.has_left_command_key && !opts->u.cocoa.left_command_key)
{
+ left_command_key_enabled = 0;
+ }
+
// register vga output callbacks
register_displaychangelistener(&dcl);
--
2.34.1
- [PATCH v7 13/22] osdep: Avoid using Clang-specific __builtin_available(), (continued)
- [PATCH v7 13/22] osdep: Avoid using Clang-specific __builtin_available(), Philippe Mathieu-Daudé, 2022/03/06
- [PATCH v7 14/22] meson: Resolve the entitlement.sh script once for good, Philippe Mathieu-Daudé, 2022/03/06
- [PATCH v7 15/22] meson: Log QEMU_CXXFLAGS content in summary, Philippe Mathieu-Daudé, 2022/03/06
- [PATCH v7 16/22] configure: Pass filtered QEMU_OBJCFLAGS to meson, Philippe Mathieu-Daudé, 2022/03/06
- [PATCH v7 17/22] ui/cocoa: Constify qkeycode translation arrays, Philippe Mathieu-Daudé, 2022/03/06
- [PATCH v7 18/22] ui/cocoa: add option to disable left-command forwarding to guest,
Philippe Mathieu-Daudé <=
- [PATCH v7 19/22] ui/cocoa: release mouse when user switches away from QEMU window, Philippe Mathieu-Daudé, 2022/03/06
- [PATCH v7 20/22] ui/cocoa: capture all keys and combos when mouse is grabbed, Philippe Mathieu-Daudé, 2022/03/06
- [PATCH v7 21/22] ui/cocoa: add option to swap Option and Command, Philippe Mathieu-Daudé, 2022/03/06
- [PATCH v7 22/22] gitlab-ci: Support macOS 12 via cirrus-run, Philippe Mathieu-Daudé, 2022/03/06