From 4859c85586c1e78f15f156d0688e949ef62a3db2 Mon Sep 17 00:00:00 2001 From: thrust26 Date: Tue, 20 Apr 2021 10:02:10 +0200 Subject: [PATCH] updated help key for macOS --- docs/index.html | 10 +++++----- src/common/PKeyboardHandler.cxx | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/docs/index.html b/docs/index.html index 907c9b5fd..3944456f1 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2096,6 +2096,11 @@ Key (Standard) Key (macOS) + + Open context-sensitive help + F1 + Shift-Cmd + ? + Move Up Up arrow @@ -2176,11 +2181,6 @@ Alt + Return Cmd + Return - - Open context-sensitive help - F1 - F1 - Exit emulator Control + Q diff --git a/src/common/PKeyboardHandler.cxx b/src/common/PKeyboardHandler.cxx index 853ed4cea..a3bfb5720 100644 --- a/src/common/PKeyboardHandler.cxx +++ b/src/common/PKeyboardHandler.cxx @@ -811,8 +811,12 @@ PhysicalKeyboardHandler::DefaultMenuMapping = { {Event::UITabNext, KBDK_BACKSPACE}, // back (FRY) #else // defining duplicate keys must be avoided! {Event::UIPrevDir, KBDK_BACKSPACE}, +#ifdef BSPF_MACOS + {Event::UIHelp, KBDK_SLASH, KBDM_SHIFT | CMD}, +#else {Event::UIHelp, KBDK_F1}, #endif +#endif }; #ifdef GUI_SUPPORT