From fb03d317ce140cd868016c94eb8069a4266fdd3b Mon Sep 17 00:00:00 2001
From: Christian Speckner <christian.speckner@mayflower.de>
Date: Fri, 6 Nov 2020 23:00:27 +0100
Subject: [PATCH] MacOS mappings.

---
 src/common/PKeyboardHandler.cxx | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/common/PKeyboardHandler.cxx b/src/common/PKeyboardHandler.cxx
index 5fb59da65..4c2583187 100644
--- a/src/common/PKeyboardHandler.cxx
+++ b/src/common/PKeyboardHandler.cxx
@@ -657,27 +657,32 @@ PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::FixedEditMap
   {Event::MoveRightChar,            KBDK_RIGHT},
   {Event::SelectLeftChar,           KBDK_LEFT, KBDM_SHIFT},
   {Event::SelectRightChar,          KBDK_RIGHT, KBDM_SHIFT},
-#ifdef BSPF_MACOS
-  {Event::MoveLeftWord,             KBDK_LEFT, CMD},
-//  {Event::MoveRightWord,            KBDK_RIGHT, KBDM_CTRL},
-  {Event::MoveHome,                 KBDK_LEFT, CMD},
+#if defined(BSPF_MACOS) || defined(MACOS_KEYS)
+  {Event::MoveLeftWord,             KBDK_LEFT, OPTION},
+  {Event::MoveRightWord,            KBDK_RIGHT, OPTION},
+  {Event::MoveHome,                 KBDK_HOME},
   {Event::MoveHome,                 KBDK_A, KBDM_CTRL},
-  {Event::MoveEnd,                  KBDK_RIGHT, CMD},
+  {Event::MoveHome,                 KBDK_LEFT, CMD},
+  {Event::MoveEnd,                  KBDK_END},
   {Event::MoveEnd,                  KBDK_E, KBDM_CTRL},
+  {Event::MoveEnd,                  KBDK_RIGHT, CMD},
   {Event::SelectLeftWord,           KBDK_LEFT, KBDM_SHIFT | OPTION},
-//  {Event::SelectRightWord,          KBDK_RIGHT, KBDM_SHIFT | OPTION},
-  {Event::SelectHome,               KBDK_A, KBDM_SHIFT | KBDM_CTRL},
+  {Event::SelectRightWord,          KBDK_RIGHT, KBDM_SHIFT | OPTION},
+  {Event::SelectHome,               KBDK_HOME, KBDM_SHIFT},
   {Event::SelectHome,               KBDK_LEFT, KBDM_SHIFT | CMD},
+  {Event::SelectHome,               KBDK_A, KBDM_CTRL | KBDM_SHIFT},
   {Event::SelectEnd,                KBDK_E, KBDM_SHIFT | KBDM_CTRL},
   {Event::SelectEnd,                KBDK_RIGHT, KBDM_SHIFT | CMD},
+  {Event::SelectEnd,                KBDK_END, KBDM_SHIFT},
   {Event::SelectAll,                KBDK_A, CMD},
   {Event::Delete,                   KBDK_DELETE},
-  {Event::Delete,                   KBDK_KP_PERIOD}, // ???
-//  {Event::DeleteChar,               }, // ???
-  {Event::DeleteWord,               KBDK_W, OPTION},
+  {Event::DeleteChar,               KBDK_D, KBDM_CTRL},
+  {Event::DeleteWord,               KBDK_W, KBDM_CTRL},
+  {Event::DeleteWord,               KBDK_BACKSPACE, KBDM_CTRL},
+  {Event::DeleteHome,               KBDK_U, KBDM_CTRL},
   {Event::DeleteHome,               KBDK_BACKSPACE, CMD},
-  {Event::DeleteEnd,                KBDK_BACKSPACE, KBDM_SHIFT | KBDM_CTRL},
-  {Event::Backspace,                KBDK_BACKSPACE}, // ???
+  {Event::DeleteEnd,                KBDK_K, KBDM_CTRL},
+  {Event::Backspace,                KBDK_BACKSPACE},
   {Event::Undo,                     KBDK_Z, CMD},
   {Event::Redo,                     KBDK_Y, CMD},
   {Event::Redo,                     KBDK_Z, KBDM_SHIFT | CMD},