Skip to content
Snippets Groups Projects
Commit 547ec5a0 authored by Adrian Wowk's avatar Adrian Wowk Committed by Philippe Mathieu-Daudé
Browse files

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


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: default avatarAdrian Wowk <dev@adrianwowk.com>
Acked-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20231030024119.28342-1-dev@adrianwowk.com>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@linaro.org>
parent 51145a0d
No related branches found
No related tags found
No related merge requests found
......@@ -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
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment