From 3f944874f3c5346bdae9e0b75fde85f6e09ed20f Mon Sep 17 00:00:00 2001
From: Robert MacGregor <ragoradev@gmail.com>
Date: Wed, 25 May 2022 21:46:12 -0400
Subject: [PATCH] * BugFix: Correct MacOS not responding to Command+C,
 Command+X, Command+A and Command+V by removing a hack in guiTextEditCtrl and
 shifting the logic to sdlWindow.

---
 .../source/gui/controls/guiTextEditCtrl.cpp   | 80 -------------------
 Engine/source/windowManager/sdl/sdlWindow.cpp | 13 +++
 2 files changed, 13 insertions(+), 80 deletions(-)

diff --git a/Engine/source/gui/controls/guiTextEditCtrl.cpp b/Engine/source/gui/controls/guiTextEditCtrl.cpp
index da42f8f27..85f76a36a 100644
--- a/Engine/source/gui/controls/guiTextEditCtrl.cpp
+++ b/Engine/source/gui/controls/guiTextEditCtrl.cpp
@@ -804,85 +804,7 @@ bool GuiTextEditCtrl::onKeyDown(const GuiEvent &event)
    {
       switch(event.keyCode)
       {
-#if defined(TORQUE_OS_MAC)
-         // Added UNIX emacs key bindings - just a little hack here...
-
-         // Ctrl-B - move one character back
-         case KEY_B:
-         { 
-            GuiEvent new_event;
-            new_event.modifier = 0;
-            new_event.keyCode = KEY_LEFT;
-            return(onKeyDown(new_event));
-         }
-
-         // Ctrl-F - move one character forward
-         case KEY_F:
-         { 
-            GuiEvent new_event;
-            new_event.modifier = 0;
-            new_event.keyCode = KEY_RIGHT;
-            return(onKeyDown(new_event));
-         }
-
-         // Ctrl-A - move to the beginning of the line
-         case KEY_A:
-         { 
-            GuiEvent new_event;
-            new_event.modifier = 0;
-            new_event.keyCode = KEY_HOME;
-            return(onKeyDown(new_event));
-         }
-
-         // Ctrl-E - move to the end of the line
-         case KEY_E:
-         { 
-            GuiEvent new_event;
-            new_event.modifier = 0;
-            new_event.keyCode = KEY_END;
-            return(onKeyDown(new_event));
-         }
-
-         // Ctrl-P - move backward in history
-         case KEY_P:
-         { 
-            GuiEvent new_event;
-            new_event.modifier = 0;
-            new_event.keyCode = KEY_UP;
-            return(onKeyDown(new_event));
-         }
-
-         // Ctrl-N - move forward in history
-         case KEY_N:
-         { 
-            GuiEvent new_event;
-            new_event.modifier = 0;
-            new_event.keyCode = KEY_DOWN;
-            return(onKeyDown(new_event));
-         }
-
-         // Ctrl-D - delete under cursor
-         case KEY_D:
-         { 
-            GuiEvent new_event;
-            new_event.modifier = 0;
-            new_event.keyCode = KEY_DELETE;
-            return(onKeyDown(new_event));
-         }
-
-         case KEY_U:
-         { 
-            GuiEvent new_event;
-            new_event.modifier = SI_CTRL;
-            new_event.keyCode = KEY_DELETE;
-            return(onKeyDown(new_event));
-         }
-
-         // End added UNIX emacs key bindings
-#endif
-
          // Adding word jump navigation.
-
          case KEY_LEFT:
          {
 
@@ -900,7 +822,6 @@ bool GuiTextEditCtrl::onKeyDown(const GuiEvent &event)
             return true;
          }         
          
-#if !defined(TORQUE_OS_MAC)
          // Select all
          case KEY_A:
          {
@@ -931,7 +852,6 @@ bool GuiTextEditCtrl::onKeyDown(const GuiEvent &event)
                onUndo();
                return true;
             }
-#endif
 
          case KEY_DELETE:
          case KEY_BACKSPACE:
diff --git a/Engine/source/windowManager/sdl/sdlWindow.cpp b/Engine/source/windowManager/sdl/sdlWindow.cpp
index 6b420d080..f210bdb08 100644
--- a/Engine/source/windowManager/sdl/sdlWindow.cpp
+++ b/Engine/source/windowManager/sdl/sdlWindow.cpp
@@ -86,6 +86,19 @@ namespace
          ret |= SI_ALT;
       }
 
+      // NOTE: For MacOS, this will treat command as Left or Right CTRL
+      if (mod & KMOD_LGUI)
+      {
+         ret |= SI_LCTRL;
+         ret |= SI_CTRL;
+      }
+
+      if (mod & KMOD_RGUI)
+      {
+         ret |= SI_RCTRL;
+         ret |= SI_CTRL;
+      }
+
       return ret;
    }
 }