qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Adrian Wowk <dev@adrianwowk.com>
To: qemu-devel@nongnu.org
Cc: Adrian Wowk <dev@adrianwowk.com>
Subject: [PATCH] ui/sdl2: use correct key names in win title on mac
Date: Sun, 29 Oct 2023 22:41:19 -0400	[thread overview]
Message-ID: <20231030024119.28342-1-dev@adrianwowk.com> (raw)

Previously, when using the SDL2 UI on MacOS, the title bar uses incorrect
key names (such as Ctrl and Alt instead of the standard MacOS key symbols
like ⌃ and ⌥). This commit changes sdl_update_caption in ui/sdl2.c to
use the correct symbols when compiling for MacOS (CONFIG_DARWIN is
defined).

Unfortunately, standard Mac keyboards do not include a "Right-Ctrl" key,
so in the case that the SDL grab mode is set to HOT_KEY_MOD_RCTRL, the
default text is still used.

Signed-off-by: Adrian Wowk <dev@adrianwowk.com>
---
Hi! I created this patch after having to compile QEMU from source with the SDL UI enabled to avoid an unrelated bug in the Cocoa UI. I noticed that the title of the window was not correct so I added a quick fix. I have tested this change on MacOS Sonoma (Version 14.1), and it works as expected. I did my best to ensure correctness, but this is my first time contrbuting to QEMU (and also my first time sending git patches over email), so if there is anything I can do better then please let me know. Thank You!

 ui/sdl2.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ui/sdl2.c b/ui/sdl2.c
index fbfdb64e90..4971963f00 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -172,11 +172,19 @@ static void sdl_update_caption(struct sdl2_console *scon)
         status = " [Stopped]";
     } else if (gui_grab) {
         if (alt_grab) {
+#ifdef CONFIG_DARWIN
+            status = " - Press ⌃⌥⇧G to exit grab";
+#else
             status = " - Press Ctrl-Alt-Shift-G to exit grab";
+#endif
         } else if (ctrl_grab) {
             status = " - Press Right-Ctrl-G to exit grab";
         } else {
+#ifdef CONFIG_DARWIN
+            status = " - Press ⌃⌥G to exit grab";
+#else
             status = " - Press Ctrl-Alt-G to exit grab";
+#endif
         }
     }
 
-- 
2.39.3 (Apple Git-145)



             reply	other threads:[~2023-10-30 14:11 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-30  2:41 Adrian Wowk [this message]
2023-10-31 10:19 ` [PATCH] ui/sdl2: use correct key names in win title on mac Marc-André Lureau
2023-11-02  8:59 ` Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231030024119.28342-1-dev@adrianwowk.com \
    --to=dev@adrianwowk.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).