[Shell] key

Author: MetsukiMio

include/openminecraft/renderer/common/demiurge/om_demiurge_node.hpp

@@ -10,6 +10,7 @@
 #include <any>
 #include <cmath>
 #include <initializer_list>
+#include <iostream>
 #include <memory>
 #include <string>
 #include <utility>
@@ -126,6 +127,7 @@ class OMDemiurgeNode : public std::enable_shared_from_this<OMDemiurgeNode>
         return Ignored;
     }
     void acceptEvent(float x, float y, OMDemiurgeEventType type, uint8_t, void * = nullptr);
+    void acceptEvent(OMDemiurgeEventType type, uint32_t, void * = nullptr);
 
     inline auto style(std::string s, std::any a) -> std::shared_ptr<OMDemiurgeNode>
     {
@@ -157,10 +159,8 @@ class OMDemiurgeNode : public std::enable_shared_from_this<OMDemiurgeNode>
             acceptEvent(e.mousewheel.x, e.mousewheel.y, demiurge::MouseWheel, -1,
                         std::array<float, 2>{e.mousewheel.wheelx, e.mousewheel.wheely}.data());
         });
-        buswrap.append(event::KeyDown,
-                       [&](event::OMEvent &e) { acceptEvent(INFINITY, INFINITY, demiurge::KeyDown, e.key.keycode); });
-        buswrap.append(event::KeyUp,
-                       [&](event::OMEvent &e) { acceptEvent(INFINITY, INFINITY, demiurge::KeyUp, e.key.keycode); });
+        buswrap.append(event::KeyDown, [&](event::OMEvent &e) { acceptEvent(demiurge::KeyDown, e.key.keycode); });
+        buswrap.append(event::KeyUp, [&](event::OMEvent &e) { acceptEvent(demiurge::KeyUp, e.key.keycode); });
     }
 
   protected:

src/openminecraft-core/renderer/common/demiurge/om_demiurge_node.cpp

@@ -318,13 +318,18 @@ auto OMDemiurgeNode::syncBoundary(float x, float y) -> void
     }
 }
 
+void OMDemiurgeNode::acceptEvent(OMDemiurgeEventType type, uint32_t ext, void *data)
+{
+    std::cout << ext << std::endl;
+}
+
 void OMDemiurgeNode::acceptEvent(float x, float y, OMDemiurgeEventType type, uint8_t ext, void *data)
 {
     try
     {
         auto bo = stylesStorage.get<OMDemiurgeRect>("layoutBound");
-
-        if (x >= bo.x && x <= bo.x + bo.width && y >= bo.y && y <= bo.y + bo.height)
+        if ((x >= bo.x && x <= bo.x + bo.width && y >= bo.y && y <= bo.y + bo.height) ||
+            (std::isinf(x) && std::isinf(y)))
         {
             if (!(mx >= bo.x && mx <= bo.x + bo.width && my >= bo.y && my <= bo.y + bo.height))
             {
@@ -360,8 +365,7 @@ void OMDemiurgeNode::acceptEvent(float x, float y, OMDemiurgeEventType type, uin
                 result = processMouseScroll(x, y, f[0], f[1]);
                 break;
             }
-            case KeyDown:
-            case KeyUp:
+            default:
                 break;
             }