[PATCH 0/2] qemu-options: Improve -display cocoa documentation

[PATCH 0/2] qemu-options: Improve -display cocoa documentation

[Akihiko Odaki]

For the context, see:
https://lore.kernel.org/all/e3839467-6d4c-e8e6-9247-a71fafe5505e@eik.bme.hu/

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
Akihiko Odaki (2):
      qemu-options: Unify the help entries for cocoa
      qemu-options: Tell more for -display cocoa

 qemu-options.hx | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)
---
base-commit: 4705fc0c8511d073bee4751c3c974aab2b10a970
change-id: 20231214-options-386e48b6fa4c

Best regards,
-- 
Akihiko Odaki <akihiko.odaki@daynix.com>

[PATCH 1/2] qemu-options: Unify the help entries for cocoa

[Akihiko Odaki]

Apparently the help entries were not merged when the patches got in.

Fixes: f844cdb99714 ("ui/cocoa: capture all keys and combos when mouse is grabbed")
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
 qemu-options.hx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/qemu-options.hx b/qemu-options.hx
index 42fd09e4de96..28aa26ceb508 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2087,6 +2087,7 @@ DEF("display", HAS_ARG, QEMU_OPTION_display,
 #endif
 #if defined(CONFIG_COCOA)
     "-display cocoa[,full-grab=on|off][,swap-opt-cmd=on|off]\n"
+    "              [,show-cursor=on|off][,left-command-key=on|off]\n"
 #endif
 #if defined(CONFIG_OPENGL)
     "-display egl-headless[,rendernode=<file>]\n"
@@ -2094,9 +2095,6 @@ 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"

-- 
2.43.0

[PATCH 2/2] qemu-options: Tell more for -display cocoa

[Akihiko Odaki]

Some options for -display cocoa were not described or not listed at all.

Reported-by: BALATON Zoltan <balaton@eik.bme.hu>
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
 qemu-options.hx | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/qemu-options.hx b/qemu-options.hx
index 28aa26ceb508..13359d12944a 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2088,6 +2088,7 @@ DEF("display", HAS_ARG, QEMU_OPTION_display,
 #if defined(CONFIG_COCOA)
     "-display cocoa[,full-grab=on|off][,swap-opt-cmd=on|off]\n"
     "              [,show-cursor=on|off][,left-command-key=on|off]\n"
+    "              [,full-screen=on|off][,zoom-to-fit=on|off]\n"
 #endif
 #if defined(CONFIG_OPENGL)
     "-display egl-headless[,rendernode=<file>]\n"
@@ -2189,10 +2190,26 @@ SRST
         provides drop-down menus and other UI elements to configure and
         control the VM during runtime. Valid parameters are:
 
+        ``full-grab=on|off`` : Capture all key presses, including system combos.
+                               This requires accessibility permissions, since it
+                               performs a global grab on key events.
+                               (default: off) See
+                               https://support.apple.com/en-in/guide/mac-help/mh32356/mac
+
+        ``swap-opt-cmd=on|off`` : Swap the Option and Command keys so that their
+                                  key codes match their position on non-Mac
+                                  keyboards and you can use Meta/Super and Alt
+                                  where you expect them.  (default: off)
+
         ``show-cursor=on|off`` :  Force showing the mouse cursor
 
         ``left-command-key=on|off`` : Disable forwarding left command key to host
 
+        ``full-screen=on|off`` : Start in fullscreen mode
+
+        ``zoom-to-fit=on|off`` : Expand video output to the window size,
+                                 defaults to "off"
+
     ``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

-- 
2.43.0

Re: [PATCH 1/2] qemu-options: Unify the help entries for cocoa

[Philippe Mathieu-Daudé]

On 14/12/23 07:31, Akihiko Odaki wrote:
> Apparently the help entries were not merged when the patches got in.
> 
> Fixes: f844cdb99714 ("ui/cocoa: capture all keys and combos when mouse is grabbed")
> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
> ---
>   qemu-options.hx | 4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Re: [PATCH 0/2] qemu-options: Improve -display cocoa documentation

[Markus Armbruster]

Could this go via qemu-trivial?

Akihiko Odaki <akihiko.odaki@daynix.com> writes:

> For the context, see:
> https://lore.kernel.org/all/e3839467-6d4c-e8e6-9247-a71fafe5505e@eik.bme.hu/
>
> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
> ---
> Akihiko Odaki (2):
>       qemu-options: Unify the help entries for cocoa
>       qemu-options: Tell more for -display cocoa
>
>  qemu-options.hx | 21 ++++++++++++++++++---
>  1 file changed, 18 insertions(+), 3 deletions(-)
> ---
> base-commit: 4705fc0c8511d073bee4751c3c974aab2b10a970
> change-id: 20231214-options-386e48b6fa4c
>
> Best regards,

Re: [PATCH 0/2] qemu-options: Improve -display cocoa documentation

[Michael Tokarev]

14.12.2023 09:31, Akihiko Odaki :
> For the context, see:
> https://lore.kernel.org/all/e3839467-6d4c-e8e6-9247-a71fafe5505e@eik.bme.hu/
> 
> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
> ---
> Akihiko Odaki (2):
>        qemu-options: Unify the help entries for cocoa
>        qemu-options: Tell more for -display cocoa
> 
>   qemu-options.hx | 21 ++++++++++++++++++---
>   1 file changed, 18 insertions(+), 3 deletions(-)

Picked up for the trivial tree, finally.

Thanks,

/mjt