Skip to content

Commit

Permalink
ui/sdl2: use correct key names in win title on mac
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
wowkster authored and philmd committed Nov 6, 2023
1 parent 3cb98c8 commit 3068b3a
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions ui/sdl2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down

0 comments on commit 3068b3a

Please sign in to comment.