Rename EventType KeyPress etc. to prevent collisions with X11/X.h

ComputationalBiomechanicsLab · Sep 18, 2024 · c3fb1cf · c3fb1cf
1 parent 349d845
commit c3fb1cf
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 25 deletions.
diff --git a/src/OpenSimCreator/UI/FrameDefinition/FrameDefinitionTab.cpp b/src/OpenSimCreator/UI/FrameDefinition/FrameDefinitionTab.cpp
@@ -1082,8 +1082,8 @@ class osc::FrameDefinitionTab::Impl final : public IEditorAPI {
 
     bool onEvent(const Event& e)
     {
-        if (e.type() == EventType::KeyPress) {
-            return onKeyPress(dynamic_cast<const KeyEvent&>(e));
+        if (e.type() == EventType::KeyDown) {
+            return onKeyDown(dynamic_cast<const KeyEvent&>(e));
         }
         else {
             return false;
@@ -1110,7 +1110,7 @@ class osc::FrameDefinitionTab::Impl final : public IEditorAPI {
     }
 
 private:
-    bool onKeyPress(const KeyEvent& e)
+    bool onKeyDown(const KeyEvent& e)
     {
         if (e.matches(KeyModifier::CtrlORGui, KeyModifier::Shift, Key::Z)) {
             // Ctrl+Shift+Z: redo

diff --git a/src/OpenSimCreator/UI/MainUIScreen.cpp b/src/OpenSimCreator/UI/MainUIScreen.cpp
@@ -78,7 +78,7 @@ class osc::MainUIScreen::Impl final :
     public std::enable_shared_from_this<Impl> {
 public:
 
-    bool onUnhandledKeyRelease(const KeyEvent& e)
+    bool onUnhandledKeyUp(const KeyEvent& e)
     {
         if (e.matches(KeyModifier::CtrlORGui, Key::P)) {
             // `Ctrl+P` or `Super+P`: "take a screenshot"
@@ -115,8 +115,8 @@ class osc::MainUIScreen::Impl final :
     // either the global 2D UI context or the active tab
     bool onUnhandledEvent(const Event& e)
     {
-        if (e.type() == EventType::KeyRelease) {
-            return onUnhandledKeyRelease(dynamic_cast<const KeyEvent&>(e));
+        if (e.type() == EventType::KeyUp) {
+            return onUnhandledKeyUp(dynamic_cast<const KeyEvent&>(e));
         }
         return false;
     }
@@ -176,9 +176,9 @@ class osc::MainUIScreen::Impl final :
     bool onEvent(const Event& ev)
     {
         bool handled = false;
-        if (ev.type() == EventType::KeyPress or
-            ev.type() == EventType::KeyRelease or
-            ev.type() == EventType::MouseButtonRelease or
+        if (ev.type() == EventType::KeyDown or
+            ev.type() == EventType::KeyUp or
+            ev.type() == EventType::MouseButtonUp or
             ev.type() == EventType::MouseMove or
             ev.type() == EventType::MouseWheel) {
 

diff --git a/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTab.cpp b/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTab.cpp
@@ -117,7 +117,7 @@ class osc::MeshWarpingTab::Impl final {
 
     bool onEvent(const Event& e)
     {
-        if (e.type() == EventType::KeyPress) {
+        if (e.type() == EventType::KeyDown) {
             return onKeydownEvent(dynamic_cast<const KeyEvent&>(e));
         }
         else {

diff --git a/src/OpenSimCreator/UI/ModelEditor/ModelEditorTab.cpp b/src/OpenSimCreator/UI/ModelEditor/ModelEditorTab.cpp
@@ -183,7 +183,7 @@ class osc::ModelEditorTab::Impl final : public IEditorAPI {
     bool onEvent(const Event& ev)
     {
         switch (ev.type()) {
-        case EventType::KeyPress: return onKeydownEvent(dynamic_cast<const KeyEvent&>(ev));
+        case EventType::KeyDown:  return onKeydownEvent(dynamic_cast<const KeyEvent&>(ev));
         case EventType::DropFile: return onDropEvent(dynamic_cast<const DropFileEvent&>(ev));
         default:                  return false;
         }

diff --git a/src/OpenSimCreator/UI/Simulation/SimulationTab.cpp b/src/OpenSimCreator/UI/Simulation/SimulationTab.cpp
@@ -218,7 +218,7 @@ class osc::SimulationTab::Impl final : public ISimulatorUIAPI {
 
     bool onEvent(const Event& e)
     {
-        if (e.type() == EventType::KeyPress) {
+        if (e.type() == EventType::KeyDown) {
             if (dynamic_cast<const KeyEvent&>(e).matches(Key::Space)) {
                 togglePlaybackMode();
                 return true;

diff --git a/src/oscar/Platform/Event.cpp b/src/oscar/Platform/Event.cpp
@@ -122,7 +122,7 @@ osc::DropFileEvent::DropFileEvent(const SDL_Event& e) :
 }
 
 osc::KeyEvent::KeyEvent(const SDL_Event& e) :
-    Event{e, e.type == SDL_KEYUP ? EventType::KeyRelease : EventType::KeyPress},
+    Event{e, e.type == SDL_KEYUP ? EventType::KeyUp : EventType::KeyDown},
     modifier_{to<KeyModifier>(e.key.keysym.mod)},
     key_{to<Key>(e.key.keysym.sym)}
 {
@@ -136,7 +136,7 @@ osc::QuitEvent::QuitEvent(const SDL_Event& e) :
 }
 
 osc::MouseEvent::MouseEvent(const SDL_Event& e) :
-    Event{e, e.type == SDL_MOUSEBUTTONDOWN ? EventType::MouseButtonPress : (e.type == SDL_MOUSEBUTTONUP ? EventType::MouseButtonRelease : EventType::MouseMove)},
+    Event{e, e.type == SDL_MOUSEBUTTONDOWN ? EventType::MouseButtonDown : (e.type == SDL_MOUSEBUTTONUP ? EventType::MouseButtonUp : EventType::MouseMove)},
     relative_delta_{static_cast<float>(e.motion.xrel), static_cast<float>(e.motion.yrel)}
 {
     OSC_ASSERT(e.type == SDL_MOUSEBUTTONDOWN or e.type == SDL_MOUSEBUTTONUP or e.type == SDL_MOUSEMOTION);

diff --git a/src/oscar/Platform/Event.h b/src/oscar/Platform/Event.h
@@ -14,10 +14,10 @@ namespace osc
     enum class EventType {
         Raw,
         DropFile,
-        KeyPress,
-        KeyRelease,
-        MouseButtonPress,
-        MouseButtonRelease,
+        KeyDown,
+        KeyUp,
+        MouseButtonDown,
+        MouseButtonUp,
         MouseMove,
         MouseWheel,
         Quit,

diff --git a/src/oscar/UI/MouseCapturingCamera.cpp b/src/oscar/UI/MouseCapturingCamera.cpp
@@ -18,13 +18,13 @@ void osc::MouseCapturingCamera::on_unmount()
 
 bool osc::MouseCapturingCamera::on_event(const Event& e)
 {
-    if (e.type() == EventType::KeyRelease) {
+    if (e.type() == EventType::KeyUp) {
         if (dynamic_cast<const KeyEvent&>(e).matches(Key::Escape)) {
             mouse_captured_ = false;
             return true;
         }
     }
-    else if (e.type() == EventType::MouseButtonPress) {
+    else if (e.type() == EventType::MouseButtonDown) {
         if (ui::is_mouse_in_main_viewport_workspace()) {
             mouse_captured_ = true;
             return true;

diff --git a/src/oscar/UI/ui_context.cpp b/src/oscar/UI/ui_context.cpp
@@ -797,10 +797,10 @@ bool osc::ui::context::on_event(const Event& ev)
 {
     ImGui_ImplSDL2_ProcessEvent(ev);
 
-    if (ImGui::GetIO().WantCaptureKeyboard and (ev.type() == EventType::KeyPress or ev.type() == EventType::KeyRelease)) {
+    if (ImGui::GetIO().WantCaptureKeyboard and (ev.type() == EventType::KeyDown or ev.type() == EventType::KeyUp)) {
         return true;
     }
-    if (ImGui::GetIO().WantCaptureMouse and (ev.type() == EventType::MouseWheel or ev.type() == EventType::MouseMove or ev.type() == EventType::MouseButtonRelease or ev.type() == EventType::MouseButtonPress)) {
+    if (ImGui::GetIO().WantCaptureMouse and (ev.type() == EventType::MouseWheel or ev.type() == EventType::MouseMove or ev.type() == EventType::MouseButtonUp or ev.type() == EventType::MouseButtonDown)) {
         return true;
     }
     return false;

diff --git a/src/oscar_demos/MandelbrotTab.cpp b/src/oscar_demos/MandelbrotTab.cpp
@@ -41,7 +41,7 @@ class osc::MandelbrotTab::Impl final : public StandardTabImpl {
 
     bool impl_on_event(const Event& ev) final
     {
-        if (ev.type() == EventType::KeyRelease) {
+        if (ev.type() == EventType::KeyUp) {
             return on_keyup(dynamic_cast<const KeyEvent&>(ev));
         }
         else if (ev.type() == EventType::MouseWheel) {

diff --git a/src/oscar_simbody/UI/RendererGeometryShaderTab.cpp b/src/oscar_simbody/UI/RendererGeometryShaderTab.cpp
@@ -56,13 +56,13 @@ class osc::RendererGeometryShaderTab::Impl final {
 
     bool onEvent(const Event& e)
     {
-        if (e.type() == EventType::KeyPress) {
+        if (e.type() == EventType::KeyDown) {
             if (dynamic_cast<const KeyEvent&>(e).matches(Key::Escape)) {
                 m_IsMouseCaptured = false;
                 return true;
             }
         }
-        else if (e.type() == EventType::MouseButtonPress) {
+        else if (e.type() == EventType::MouseButtonDown) {
             if (ui::is_mouse_in_main_viewport_workspace()) {
                 m_IsMouseCaptured = true;
                 return true;