OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

ui/sdl2: use correct key names in win title on mac

Browse Source 
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>
Acked-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20231030024119.28342-1-dev@adrianwowk.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Adrian Wowk 2023-10-29 22:41:19 -04:00 committed by Philippe Mathieu-Daudé
parent 51145a0d87
commit 547ec5a0a4
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/sdl2.c
View File

@ -172,11 +172,19 @@ static void sdl_update_caption(struct sdl2_console *scon)
status = " [Stopped]"; status = " [Stopped]";
} else if (gui_grab) { } else if (gui_grab) {
if (alt_grab) { if (alt_grab) {
#ifdef CONFIG_DARWIN
status = " - Press ⌃⌥⇧G to exit grab";
#else
status = " - Press Ctrl-Alt-Shift-G to exit grab"; status = " - Press Ctrl-Alt-Shift-G to exit grab";
#endif
} else if (ctrl_grab) { } else if (ctrl_grab) {
status = " - Press Right-Ctrl-G to exit grab"; status = " - Press Right-Ctrl-G to exit grab";
} else { } else {
#ifdef CONFIG_DARWIN
status = " - Press ⌃⌥G to exit grab";
#else
status = " - Press Ctrl-Alt-G to exit grab"; status = " - Press Ctrl-Alt-G to exit grab";
#endif
} }
} }