Merge pull request #194 from kimkulling/kimkulling/fix_sdl2_input_han…

…dling_issue-192 Add sdl2 handling for ctrl and shift.
kimkulling · Sep 20, 2023 · 9f2a084 · 9f2a084
2 parents dbcc290 + f87ee09
commit 9f2a084
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/include/osre/Platform/KeyTypes.h b/include/osre/Platform/KeyTypes.h
@@ -57,7 +57,7 @@ enum Key {
     KEY_3 = 51,
     KEY_4 = 52,
     KEY_5 = 53,
-    EY_6 = 54,
+    KEY_6 = 54,
     KEY_7 = 55,
     KEY_8 = 56,
     KEY_9 = 57,
@@ -208,7 +208,7 @@ enum Key {
     KEY_UNDO = 322,	///< Atari keyboard has Undo
 
     /* Add any other keys here */
-    KEY_LAST = 323
+    KEY_LAST
 };
 
 } // Namespace Platform

diff --git a/samples/01_ModelLoading/ModelLoading.cpp b/samples/01_ModelLoading/ModelLoading.cpp
@@ -56,9 +56,7 @@ class ModelLoadingApp : public App::AppBase {
         // empty
     }
 
-    ~ModelLoadingApp() override {
-        // empty
-    }
+    ~ModelLoadingApp() override = default;
 
     bool hasModel() const {
         return m_modelNode.isValid();

diff --git a/src/Engine/App/AppBase.cpp b/src/Engine/App/AppBase.cpp
@@ -78,7 +78,6 @@ AppBase::AppBase(i32 argc, const c8 *argv[], const String &supportedArgs, const
 
 AppBase::~AppBase() {
     delete mSettings;
-    mSettings = nullptr;
 }
 
 bool AppBase::initWindow(ui32 x, ui32 y, ui32 width, ui32 height, const String &title, bool fullscreen, bool childWindow,

diff --git a/src/Engine/Platform/PlatformOperations.cpp b/src/Engine/Platform/PlatformOperations.cpp
@@ -65,7 +65,7 @@ void PlatformOperations::getFileOpenDialog(const String &title, const c8 *extens
         location.clear();
     }
 #else
-    osre_warn( Tag, "Not supported," );
+    osre_error( Tag, "Not supported," );
 #endif // OSRE_WINDOWS
 }
 

diff --git a/src/Engine/Platform/sdl2/SDL2EventQueue.cpp b/src/Engine/Platform/sdl2/SDL2EventQueue.cpp
@@ -89,6 +89,7 @@ struct SDL2PeekInputUpdate final : public AbstractSDL2InputUpdate {
         if (0 == ret) {
             return false;
         }
+
         return true;
     }
 };
@@ -154,7 +155,17 @@ bool SDL2EventHandler::update() {
             case SDL_KEYDOWN:
             case SDL_KEYUP: {
                 KeyboardButtonEventData *data = new KeyboardButtonEventData(SDL_KEYDOWN == ev.type, m_eventTriggerer);
-                data->m_key = (Key)ev.key.keysym.sym;
+                if (ev.key.keysym.sym == SDLK_RCTRL) {
+                    data->m_key = KEY_RCTRL;
+                } else if (ev.key.keysym.sym == SDLK_LCTRL) {
+                    data->m_key = KEY_LCTRL;
+                } else if (ev.key.keysym.sym == SDLK_LSHIFT){
+                    data->m_key = KEY_LSHIFT;
+                } else if (ev.key.keysym.sym == SDLK_RSHIFT){
+                    data->m_key = KEY_RSHIFT;
+                } else {
+                    data->m_key = (Key)ev.key.keysym.sym;
+                }
                 activeEventQueue->addBack(data);
             } break;
 

diff --git a/src/Engine/Platform/sdl2/SDL2Initializer.cpp b/src/Engine/Platform/sdl2/SDL2Initializer.cpp
@@ -34,7 +34,7 @@ bool SDL2Initializer::init() {
         return false;
     }
 
-    if( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_TIMER ) < 0 ) {
+    if( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_EVENTS) < 0 ) {
         return false;
     }
     s_inited = true;