diff --git a/README.md b/README.md index 20a4f00..4cdd545 100644 --- a/README.md +++ b/README.md @@ -56,4 +56,68 @@ int main(){ Save and close, then run ``crafter-build build executable && caddy file-server --listen :8080 --root bin/executable``. if you have caddy installed, if not use your favorite static file server instead. Now you can open the browser at ``http://localhost:8080`` and ``Hello World!`` will appear in the browser. -This sample can also be viewed in the [HelloElement example](https://forgejo.catcrafts.net/Catcrafts/Crafter.CppDOM/src/branch/master/examples) \ No newline at end of file +This sample can also be viewed in the [HelloElement example](https://forgejo.catcrafts.net/Catcrafts/Crafter.CppDOM/src/branch/master/examples) + +## New Event Handling Capabilities + +The library now supports comprehensive event handling for modern web applications: + +### Mouse Events +- `AddClickListener()` - Handles click events +- `AddMouseOverListener()` - Handles mouse over events +- `AddMouseOutListener()` - Handles mouse out events +- `AddMouseMoveListener()` - Handles mouse move events + +### Focus Events +- `AddFocusListener()` - Handles focus events +- `AddBlurListener()` - Handles blur events + +### Keyboard Events +- `AddKeyDownListener()` - Handles key down events +- `AddKeyUpListener()` - Handles key up events +- `AddKeyPressListener()` - Handles key press events + +### Form Events +- `AddChangeListener()` - Handles change events +- `AddSubmitListener()` - Handles form submit events +- `AddInputListener()` - Handles input events + +### Window Events +- `AddLoadListener()` - Handles page load events +- `AddErrorListener()` - Handles error events +- `AddResizeListener()` - Handles window resize events +- `AddScrollListener()` - Handles scroll events + +### Context Menu Events +- `AddContextMenuListener()` - Handles context menu events + +### Drag and Drop Events +- `AddDragStartListener()` - Handles drag start events +- `AddDragEndListener()` - Handles drag end events +- `AddDropListener()` - Handles drop events + +Example usage: +```cpp +import Crafter.CppDOM; +using namespace Crafter::CppDOM; + +int main(){ + HtmlElement button("myButton"); + HtmlElement input("textInput"); + + // Handle click event + button.AddClickListener([]() { + // Handle button click + }); + + // Handle keyboard events + input.AddKeyDownListener([]() { + // Handle key press + }); + + // Handle input changes + input.AddInputListener([]() { + // Handle input changes + }); +} +``` \ No newline at end of file diff --git a/additional/env.js b/additional/env.js index 6cfd40f..3ae3309 100644 --- a/additional/env.js +++ b/additional/env.js @@ -39,6 +39,7 @@ function setInnerHTML(ptr, html, htmlLenght) { jsmemory.get(ptr).innerHTML = decoder.decode(new Int8Array(window.crafter_webbuild_wasi.instance.exports.memory.buffer, html, htmlLenght)); } +// Event handler registration functions function addClickListener(ptr, handlerID) { const element = jsmemory.get(ptr); @@ -59,7 +60,407 @@ function removeClickListener(ptr, handlerID) { const handler = eventHandlers.get(`${ptr}-${handlerID}`); element.removeEventListener("click", handler); - eventHandlers.delete(handlerID); + eventHandlers.delete(`${ptr}-${handlerID}`); +} + +// Add more event handlers for modern websites +function addMouseOverListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = function(event) { + const { ExecuteMouseOverHandler } = window.crafter_webbuild_wasi.instance.exports; + ExecuteMouseOverHandler(handlerID); + }; + + eventHandlers.set(`${ptr}-${handlerID}-mouseover`, handler); + element.addEventListener("mouseover", handler); +} + +function removeMouseOverListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = eventHandlers.get(`${ptr}-${handlerID}-mouseover`); + + element.removeEventListener("mouseover", handler); + eventHandlers.delete(`${ptr}-${handlerID}-mouseover`); +} + +function addMouseOutListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = function(event) { + const { ExecuteMouseOutHandler } = window.crafter_webbuild_wasi.instance.exports; + ExecuteMouseOutHandler(handlerID); + }; + + eventHandlers.set(`${ptr}-${handlerID}-mouseout`, handler); + element.addEventListener("mouseout", handler); +} + +function removeMouseOutListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = eventHandlers.get(`${ptr}-${handlerID}-mouseout`); + + element.removeEventListener("mouseout", handler); + eventHandlers.delete(`${ptr}-${handlerID}-mouseout`); +} + +function addMouseMoveListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = function(event) { + const { ExecuteMouseMoveHandler } = window.crafter_webbuild_wasi.instance.exports; + ExecuteMouseMoveHandler(handlerID); + }; + + eventHandlers.set(`${ptr}-${handlerID}-mousemove`, handler); + element.addEventListener("mousemove", handler); +} + +function removeMouseMoveListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = eventHandlers.get(`${ptr}-${handlerID}-mousemove`); + + element.removeEventListener("mousemove", handler); + eventHandlers.delete(`${ptr}-${handlerID}-mousemove`); +} + +function addFocusListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = function(event) { + const { ExecuteFocusHandler } = window.crafter_webbuild_wasi.instance.exports; + ExecuteFocusHandler(handlerID); + }; + + eventHandlers.set(`${ptr}-${handlerID}-focus`, handler); + element.addEventListener("focus", handler); +} + +function removeFocusListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = eventHandlers.get(`${ptr}-${handlerID}-focus`); + + element.removeEventListener("focus", handler); + eventHandlers.delete(`${ptr}-${handlerID}-focus`); +} + +function addBlurListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = function(event) { + const { ExecuteBlurHandler } = window.crafter_webbuild_wasi.instance.exports; + ExecuteBlurHandler(handlerID); + }; + + eventHandlers.set(`${ptr}-${handlerID}-blur`, handler); + element.addEventListener("blur", handler); +} + +function removeBlurListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = eventHandlers.get(`${ptr}-${handlerID}-blur`); + + element.removeEventListener("blur", handler); + eventHandlers.delete(`${ptr}-${handlerID}-blur`); +} + +function addKeyDownListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = function(event) { + const { ExecuteKeyDownHandler } = window.crafter_webbuild_wasi.instance.exports; + ExecuteKeyDownHandler(handlerID, event.key, event.code, event.keyCode); + }; + + eventHandlers.set(`${ptr}-${handlerID}-keydown`, handler); + element.addEventListener("keydown", handler); +} + +function removeKeyDownListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = eventHandlers.get(`${ptr}-${handlerID}-keydown`); + + element.removeEventListener("keydown", handler); + eventHandlers.delete(`${ptr}-${handlerID}-keydown`); +} + +function addKeyUpListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = function(event) { + const { ExecuteKeyUpHandler } = window.crafter_webbuild_wasi.instance.exports; + ExecuteKeyUpHandler(handlerID, event.key, event.code, event.keyCode); + }; + + eventHandlers.set(`${ptr}-${handlerID}-keyup`, handler); + element.addEventListener("keyup", handler); +} + +function removeKeyUpListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = eventHandlers.get(`${ptr}-${handlerID}-keyup`); + + element.removeEventListener("keyup", handler); + eventHandlers.delete(`${ptr}-${handlerID}-keyup`); +} + +function addKeyPressListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = function(event) { + const { ExecuteKeyPressHandler } = window.crafter_webbuild_wasi.instance.exports; + ExecuteKeyPressHandler(handlerID, event.key, event.code, event.keyCode); + }; + + eventHandlers.set(`${ptr}-${handlerID}-keypress`, handler); + element.addEventListener("keypress", handler); +} + +function removeKeyPressListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = eventHandlers.get(`${ptr}-${handlerID}-keypress`); + + element.removeEventListener("keypress", handler); + eventHandlers.delete(`${ptr}-${handlerID}-keypress`); +} + +function addChangeListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = function(event) { + const { ExecuteChangeHandler } = window.crafter_webbuild_wasi.instance.exports; + ExecuteChangeHandler(handlerID); + }; + + eventHandlers.set(`${ptr}-${handlerID}-change`, handler); + element.addEventListener("change", handler); +} + +function removeChangeListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = eventHandlers.get(`${ptr}-${handlerID}-change`); + + element.removeEventListener("change", handler); + eventHandlers.delete(`${ptr}-${handlerID}-change`); +} + +function addSubmitListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = function(event) { + const { ExecuteSubmitHandler } = window.crafter_webbuild_wasi.instance.exports; + ExecuteSubmitHandler(handlerID); + }; + + eventHandlers.set(`${ptr}-${handlerID}-submit`, handler); + element.addEventListener("submit", handler); +} + +function removeSubmitListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = eventHandlers.get(`${ptr}-${handlerID}-submit`); + + element.removeEventListener("submit", handler); + eventHandlers.delete(`${ptr}-${handlerID}-submit`); +} + +function addInputListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = function(event) { + const { ExecuteInputHandler } = window.crafter_webbuild_wasi.instance.exports; + ExecuteInputHandler(handlerID); + }; + + eventHandlers.set(`${ptr}-${handlerID}-input`, handler); + element.addEventListener("input", handler); +} + +function removeInputListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = eventHandlers.get(`${ptr}-${handlerID}-input`); + + element.removeEventListener("input", handler); + eventHandlers.delete(`${ptr}-${handlerID}-input`); +} + +function addLoadListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = function(event) { + const { ExecuteLoadHandler } = window.crafter_webbuild_wasi.instance.exports; + ExecuteLoadHandler(handlerID); + }; + + eventHandlers.set(`${ptr}-${handlerID}-load`, handler); + element.addEventListener("load", handler); +} + +function removeLoadListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = eventHandlers.get(`${ptr}-${handlerID}-load`); + + element.removeEventListener("load", handler); + eventHandlers.delete(`${ptr}-${handlerID}-load`); +} + +function addErrorListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = function(event) { + const { ExecuteErrorHandler } = window.crafter_webbuild_wasi.instance.exports; + ExecuteErrorHandler(handlerID); + }; + + eventHandlers.set(`${ptr}-${handlerID}-error`, handler); + element.addEventListener("error", handler); +} + +function removeErrorListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = eventHandlers.get(`${ptr}-${handlerID}-error`); + + element.removeEventListener("error", handler); + eventHandlers.delete(`${ptr}-${handlerID}-error`); +} + +function addResizeListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = function(event) { + const { ExecuteResizeHandler } = window.crafter_webbuild_wasi.instance.exports; + ExecuteResizeHandler(handlerID); + }; + + eventHandlers.set(`${ptr}-${handlerID}-resize`, handler); + element.addEventListener("resize", handler); +} + +function removeResizeListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = eventHandlers.get(`${ptr}-${handlerID}-resize`); + + element.removeEventListener("resize", handler); + eventHandlers.delete(`${ptr}-${handlerID}-resize`); +} + +function addScrollListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = function(event) { + const { ExecuteScrollHandler } = window.crafter_webbuild_wasi.instance.exports; + ExecuteScrollHandler(handlerID); + }; + + eventHandlers.set(`${ptr}-${handlerID}-scroll`, handler); + element.addEventListener("scroll", handler); +} + +function removeScrollListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = eventHandlers.get(`${ptr}-${handlerID}-scroll`); + + element.removeEventListener("scroll", handler); + eventHandlers.delete(`${ptr}-${handlerID}-scroll`); +} + +function addContextMenuListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = function(event) { + const { ExecuteContextMenuHandler } = window.crafter_webbuild_wasi.instance.exports; + ExecuteContextMenuHandler(handlerID); + }; + + eventHandlers.set(`${ptr}-${handlerID}-contextmenu`, handler); + element.addEventListener("contextmenu", handler); +} + +function removeContextMenuListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = eventHandlers.get(`${ptr}-${handlerID}-contextmenu`); + + element.removeEventListener("contextmenu", handler); + eventHandlers.delete(`${ptr}-${handlerID}-contextmenu`); +} + +function addDragStartListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = function(event) { + const { ExecuteDragStartHandler } = window.crafter_webbuild_wasi.instance.exports; + ExecuteDragStartHandler(handlerID); + }; + + eventHandlers.set(`${ptr}-${handlerID}-dragstart`, handler); + element.addEventListener("dragstart", handler); +} + +function removeDragStartListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = eventHandlers.get(`${ptr}-${handlerID}-dragstart`); + + element.removeEventListener("dragstart", handler); + eventHandlers.delete(`${ptr}-${handlerID}-dragstart`); +} + +function addDragEndListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = function(event) { + const { ExecuteDragEndHandler } = window.crafter_webbuild_wasi.instance.exports; + ExecuteDragEndHandler(handlerID); + }; + + eventHandlers.set(`${ptr}-${handlerID}-dragend`, handler); + element.addEventListener("dragend", handler); +} + +function removeDragEndListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = eventHandlers.get(`${ptr}-${handlerID}-dragend`); + + element.removeEventListener("dragend", handler); + eventHandlers.delete(`${ptr}-${handlerID}-dragend`); +} + +function addDropListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = function(event) { + const { ExecuteDropHandler } = window.crafter_webbuild_wasi.instance.exports; + ExecuteDropHandler(handlerID); + }; + + eventHandlers.set(`${ptr}-${handlerID}-drop`, handler); + element.addEventListener("drop", handler); +} + +function removeDropListener(ptr, handlerID) { + const element = jsmemory.get(ptr); + + const handler = eventHandlers.get(`${ptr}-${handlerID}-drop`); + + element.removeEventListener("drop", handler); + eventHandlers.delete(`${ptr}-${handlerID}-drop`); } let env = { @@ -68,6 +469,44 @@ let env = { setInnerHTML: setInnerHTML, addClickListener: addClickListener, removeClickListener: removeClickListener, + addMouseOverListener: addMouseOverListener, + removeMouseOverListener: removeMouseOverListener, + addMouseOutListener: addMouseOutListener, + removeMouseOutListener: removeMouseOutListener, + addMouseMoveListener: addMouseMoveListener, + removeMouseMoveListener: removeMouseMoveListener, + addFocusListener: addFocusListener, + removeFocusListener: removeFocusListener, + addBlurListener: addBlurListener, + removeBlurListener: removeBlurListener, + addKeyDownListener: addKeyDownListener, + removeKeyDownListener: removeKeyDownListener, + addKeyUpListener: addKeyUpListener, + removeKeyUpListener: removeKeyUpListener, + addKeyPressListener: addKeyPressListener, + removeKeyPressListener: removeKeyPressListener, + addChangeListener: addChangeListener, + removeChangeListener: removeChangeListener, + addSubmitListener: addSubmitListener, + removeSubmitListener: removeSubmitListener, + addInputListener: addInputListener, + removeInputListener: removeInputListener, + addLoadListener: addLoadListener, + removeLoadListener: removeLoadListener, + addErrorListener: addErrorListener, + removeErrorListener: removeErrorListener, + addResizeListener: addResizeListener, + removeResizeListener: removeResizeListener, + addScrollListener: addScrollListener, + removeScrollListener: removeScrollListener, + addContextMenuListener: addContextMenuListener, + removeContextMenuListener: removeContextMenuListener, + addDragStartListener: addDragStartListener, + removeDragStartListener: removeDragStartListener, + addDragEndListener: addDragEndListener, + removeDragEndListener: removeDragEndListener, + addDropListener: addDropListener, + removeDropListener: removeDropListener, } window.crafter_webbuild_env = env; \ No newline at end of file diff --git a/examples/CompleteEventHandling/main.cpp b/examples/CompleteEventHandling/main.cpp new file mode 100644 index 0000000..e5ad748 --- /dev/null +++ b/examples/CompleteEventHandling/main.cpp @@ -0,0 +1,77 @@ +import Crafter.CppDOM; +using namespace Crafter; + +HtmlElement* body = new HtmlElement("body", "
"); +HtmlElement* button = new HtmlElement("myButton"); +HtmlElement* input = new HtmlElement("textInput"); +HtmlElement* output = new HtmlElement("output"); + +int main(){ + + + // Click event + button->AddClickListener([&]() { + output->SetInnerHTML("Button was clicked!"); + }); + + // Mouse events + button->AddMouseOverListener([&]() { + output->SetInnerHTML("Mouse over button!"); + }); + + button->AddMouseOutListener([&]() { + output->SetInnerHTML("Mouse left button!"); + }); + + // Focus/Blur events + input->AddFocusListener([&]() { + output->SetInnerHTML("Input focused!"); + }); + + input->AddBlurListener([&]() { + output->SetInnerHTML("Input blurred!"); + }); + + // Keyboard events + input->AddKeyDownListener([&]() { + output->SetInnerHTML("Key pressed in input!"); + }); + + input->AddKeyUpListener([&]() { + output->SetInnerHTML("Key released in input!"); + }); + + // Input/change events + input->AddInputListener([&]() { + output->SetInnerHTML("Input value changed!"); + }); + + input->AddChangeListener([&]() { + output->SetInnerHTML("Input value changed and lost focus!"); + }); + + // Context menu + button->AddContextMenuListener([&]() { + output->SetInnerHTML("Context menu opened!"); + }); + + // Scroll event on body + body->AddScrollListener([&]() { + output->SetInnerHTML("Page scrolled!"); + }); + + // Resize event + body->AddResizeListener([&]() { + output->SetInnerHTML("Window resized!"); + }); + + // Load event + body->AddLoadListener([&]() { + output->SetInnerHTML("Page loaded!"); + }); + + // Error event + body->AddErrorListener([&]() { + output->SetInnerHTML("An error occurred!"); + }); +} \ No newline at end of file diff --git a/examples/CompleteEventHandling/project.json b/examples/CompleteEventHandling/project.json new file mode 100644 index 0000000..9750e20 --- /dev/null +++ b/examples/CompleteEventHandling/project.json @@ -0,0 +1,17 @@ +{ + "name": "main", + "configurations": [ + { + "name": "executable", + "implementations": ["main"], + "target": "wasm32-wasi", + "debug" : true, + "dependencies": [ + { + "path":"../../project.json", + "configuration":"lib-debug" + } + ] + } + ] +} \ No newline at end of file diff --git a/examples/CompleteEventHandling/run.sh b/examples/CompleteEventHandling/run.sh new file mode 100755 index 0000000..e706621 --- /dev/null +++ b/examples/CompleteEventHandling/run.sh @@ -0,0 +1 @@ +caddy file-server --listen :8080 --root bin/executable \ No newline at end of file diff --git a/interfaces/Crafter.CppDOM-Bindings.cppm b/interfaces/Crafter.CppDOM-Bindings.cppm index fc431db..6177fd7 100644 --- a/interfaces/Crafter.CppDOM-Bindings.cppm +++ b/interfaces/Crafter.CppDOM-Bindings.cppm @@ -24,24 +24,214 @@ import std; export namespace Crafter::CppDOM::Bindings { int clickHandlerMaxId = 0; std::unordered_map>* clickHandlers = new std::unordered_map>(); + + int mouseOverHandlerMaxId = 0; + std::unordered_map>* mouseOverHandlers = new std::unordered_map>(); + + int mouseOutHandlerMaxId = 0; + std::unordered_map>* mouseOutHandlers = new std::unordered_map>(); + + int mouseMoveHandlerMaxId = 0; + std::unordered_map>* mouseMoveHandlers = new std::unordered_map>(); + + int focusHandlerMaxId = 0; + std::unordered_map>* focusHandlers = new std::unordered_map>(); + + int blurHandlerMaxId = 0; + std::unordered_map>* blurHandlers = new std::unordered_map>(); + + int keyDownHandlerMaxId = 0; + std::unordered_map>* keyDownHandlers = new std::unordered_map>(); + + int keyUpHandlerMaxId = 0; + std::unordered_map>* keyUpHandlers = new std::unordered_map>(); + + int keyPressHandlerMaxId = 0; + std::unordered_map>* keyPressHandlers = new std::unordered_map>(); + + int changeHandlerMaxId = 0; + std::unordered_map>* changeHandlers = new std::unordered_map>(); + + int submitHandlerMaxId = 0; + std::unordered_map>* submitHandlers = new std::unordered_map>(); + + int inputHandlerMaxId = 0; + std::unordered_map>* inputHandlers = new std::unordered_map>(); + + int loadHandlerMaxId = 0; + std::unordered_map>* loadHandlers = new std::unordered_map>(); + + int errorHandlerMaxId = 0; + std::unordered_map>* errorHandlers = new std::unordered_map>(); + + int resizeHandlerMaxId = 0; + std::unordered_map>* resizeHandlers = new std::unordered_map>(); + + int scrollHandlerMaxId = 0; + std::unordered_map>* scrollHandlers = new std::unordered_map>(); + + int contextMenuHandlerMaxId = 0; + std::unordered_map>* contextMenuHandlers = new std::unordered_map>(); + + int dragStartHandlerMaxId = 0; + std::unordered_map>* dragStartHandlers = new std::unordered_map>(); + + int dragEndHandlerMaxId = 0; + std::unordered_map>* dragEndHandlers = new std::unordered_map>(); + + int dropHandlerMaxId = 0; + std::unordered_map>* dropHandlers = new std::unordered_map>(); __attribute__((import_module("env"), import_name("freeJs"))) void FreeJs(void* ptr); __attribute__((import_module("env"), import_name("getElementById"))) void* GetElementById(const char* id, std::size_t idLenght); - void* GetElementById(const std::string_view id) { + void* GetElementById(const std::string_view id) { return GetElementById(id.data(), id.size()); } __attribute__((import_module("env"), import_name("setInnerHTML"))) void SetInnerHTML(void* ptr, const char* html, std::size_t htmlLenght); - void SetInnerHTML(void* ptr, const std::string_view html) { + void SetInnerHTML(void* ptr, const std::string_view html) { SetInnerHTML(ptr, html.data(), html.size()); } // Event handling functions __attribute__((import_module("env"), import_name("addClickListener"))) void AddClickListener(void* ptr, int id); __attribute__((import_module("env"), import_name("removeClickListener"))) void RemoveClickListener(void* ptr, int id); + + __attribute__((import_module("env"), import_name("addMouseOverListener"))) void AddMouseOverListener(void* ptr, int id); + __attribute__((import_module("env"), import_name("removeMouseOverListener"))) void RemoveMouseOverListener(void* ptr, int id); + + __attribute__((import_module("env"), import_name("addMouseOutListener"))) void AddMouseOutListener(void* ptr, int id); + __attribute__((import_module("env"), import_name("removeMouseOutListener"))) void RemoveMouseOutListener(void* ptr, int id); + + __attribute__((import_module("env"), import_name("addMouseMoveListener"))) void AddMouseMoveListener(void* ptr, int id); + __attribute__((import_module("env"), import_name("removeMouseMoveListener"))) void RemoveMouseMoveListener(void* ptr, int id); + + __attribute__((import_module("env"), import_name("addFocusListener"))) void AddFocusListener(void* ptr, int id); + __attribute__((import_module("env"), import_name("removeFocusListener"))) void RemoveFocusListener(void* ptr, int id); + + __attribute__((import_module("env"), import_name("addBlurListener"))) void AddBlurListener(void* ptr, int id); + __attribute__((import_module("env"), import_name("removeBlurListener"))) void RemoveBlurListener(void* ptr, int id); + + __attribute__((import_module("env"), import_name("addKeyDownListener"))) void AddKeyDownListener(void* ptr, int id); + __attribute__((import_module("env"), import_name("removeKeyDownListener"))) void RemoveKeyDownListener(void* ptr, int id); + + __attribute__((import_module("env"), import_name("addKeyUpListener"))) void AddKeyUpListener(void* ptr, int id); + __attribute__((import_module("env"), import_name("removeKeyUpListener"))) void RemoveKeyUpListener(void* ptr, int id); + + __attribute__((import_module("env"), import_name("addKeyPressListener"))) void AddKeyPressListener(void* ptr, int id); + __attribute__((import_module("env"), import_name("removeKeyPressListener"))) void RemoveKeyPressListener(void* ptr, int id); + + __attribute__((import_module("env"), import_name("addChangeListener"))) void AddChangeListener(void* ptr, int id); + __attribute__((import_module("env"), import_name("removeChangeListener"))) void RemoveChangeListener(void* ptr, int id); + + __attribute__((import_module("env"), import_name("addSubmitListener"))) void AddSubmitListener(void* ptr, int id); + __attribute__((import_module("env"), import_name("removeSubmitListener"))) void RemoveSubmitListener(void* ptr, int id); + + __attribute__((import_module("env"), import_name("addInputListener"))) void AddInputListener(void* ptr, int id); + __attribute__((import_module("env"), import_name("removeInputListener"))) void RemoveInputListener(void* ptr, int id); + + __attribute__((import_module("env"), import_name("addLoadListener"))) void AddLoadListener(void* ptr, int id); + __attribute__((import_module("env"), import_name("removeLoadListener"))) void RemoveLoadListener(void* ptr, int id); + + __attribute__((import_module("env"), import_name("addErrorListener"))) void AddErrorListener(void* ptr, int id); + __attribute__((import_module("env"), import_name("removeErrorListener"))) void RemoveErrorListener(void* ptr, int id); + + __attribute__((import_module("env"), import_name("addResizeListener"))) void AddResizeListener(void* ptr, int id); + __attribute__((import_module("env"), import_name("removeResizeListener"))) void RemoveResizeListener(void* ptr, int id); + + __attribute__((import_module("env"), import_name("addScrollListener"))) void AddScrollListener(void* ptr, int id); + __attribute__((import_module("env"), import_name("removeScrollListener"))) void RemoveScrollListener(void* ptr, int id); + + __attribute__((import_module("env"), import_name("addContextMenuListener"))) void AddContextMenuListener(void* ptr, int id); + __attribute__((import_module("env"), import_name("removeContextMenuListener"))) void RemoveContextMenuListener(void* ptr, int id); + + __attribute__((import_module("env"), import_name("addDragStartListener"))) void AddDragStartListener(void* ptr, int id); + __attribute__((import_module("env"), import_name("removeDragStartListener"))) void RemoveDragStartListener(void* ptr, int id); + + __attribute__((import_module("env"), import_name("addDragEndListener"))) void AddDragEndListener(void* ptr, int id); + __attribute__((import_module("env"), import_name("removeDragEndListener"))) void RemoveDragEndListener(void* ptr, int id); + + __attribute__((import_module("env"), import_name("addDropListener"))) void AddDropListener(void* ptr, int id); + __attribute__((import_module("env"), import_name("removeDropListener"))) void RemoveDropListener(void* ptr, int id); } extern "C" { __attribute__((export_name("ExecuteClickHandler"))) void ExecuteClickHandler(int a) { Crafter::CppDOM::Bindings::clickHandlers->find(static_cast(a))->second(); } + + __attribute__((export_name("ExecuteMouseOverHandler"))) void ExecuteMouseOverHandler(int a) { + Crafter::CppDOM::Bindings::mouseOverHandlers->find(static_cast(a))->second(); + } + + __attribute__((export_name("ExecuteMouseOutHandler"))) void ExecuteMouseOutHandler(int a) { + Crafter::CppDOM::Bindings::mouseOutHandlers->find(static_cast(a))->second(); + } + + __attribute__((export_name("ExecuteMouseMoveHandler"))) void ExecuteMouseMoveHandler(int a) { + Crafter::CppDOM::Bindings::mouseMoveHandlers->find(static_cast(a))->second(); + } + + __attribute__((export_name("ExecuteFocusHandler"))) void ExecuteFocusHandler(int a) { + Crafter::CppDOM::Bindings::focusHandlers->find(static_cast(a))->second(); + } + + __attribute__((export_name("ExecuteBlurHandler"))) void ExecuteBlurHandler(int a) { + Crafter::CppDOM::Bindings::blurHandlers->find(static_cast(a))->second(); + } + + __attribute__((export_name("ExecuteKeyDownHandler"))) void ExecuteKeyDownHandler(int a, const char* key, const char* code, int keyCode) { + Crafter::CppDOM::Bindings::keyDownHandlers->find(static_cast(a))->second(); + } + + __attribute__((export_name("ExecuteKeyUpHandler"))) void ExecuteKeyUpHandler(int a, const char* key, const char* code, int keyCode) { + Crafter::CppDOM::Bindings::keyUpHandlers->find(static_cast(a))->second(); + } + + __attribute__((export_name("ExecuteKeyPressHandler"))) void ExecuteKeyPressHandler(int a, const char* key, const char* code, int keyCode) { + Crafter::CppDOM::Bindings::keyPressHandlers->find(static_cast(a))->second(); + } + + __attribute__((export_name("ExecuteChangeHandler"))) void ExecuteChangeHandler(int a) { + Crafter::CppDOM::Bindings::changeHandlers->find(static_cast(a))->second(); + } + + __attribute__((export_name("ExecuteSubmitHandler"))) void ExecuteSubmitHandler(int a) { + Crafter::CppDOM::Bindings::submitHandlers->find(static_cast(a))->second(); + } + + __attribute__((export_name("ExecuteInputHandler"))) void ExecuteInputHandler(int a) { + Crafter::CppDOM::Bindings::inputHandlers->find(static_cast(a))->second(); + } + + __attribute__((export_name("ExecuteLoadHandler"))) void ExecuteLoadHandler(int a) { + Crafter::CppDOM::Bindings::loadHandlers->find(static_cast(a))->second(); + } + + __attribute__((export_name("ExecuteErrorHandler"))) void ExecuteErrorHandler(int a) { + Crafter::CppDOM::Bindings::errorHandlers->find(static_cast(a))->second(); + } + + __attribute__((export_name("ExecuteResizeHandler"))) void ExecuteResizeHandler(int a) { + Crafter::CppDOM::Bindings::resizeHandlers->find(static_cast(a))->second(); + } + + __attribute__((export_name("ExecuteScrollHandler"))) void ExecuteScrollHandler(int a) { + Crafter::CppDOM::Bindings::scrollHandlers->find(static_cast(a))->second(); + } + + __attribute__((export_name("ExecuteContextMenuHandler"))) void ExecuteContextMenuHandler(int a) { + Crafter::CppDOM::Bindings::contextMenuHandlers->find(static_cast(a))->second(); + } + + __attribute__((export_name("ExecuteDragStartHandler"))) void ExecuteDragStartHandler(int a) { + Crafter::CppDOM::Bindings::dragStartHandlers->find(static_cast(a))->second(); + } + + __attribute__((export_name("ExecuteDragEndHandler"))) void ExecuteDragEndHandler(int a) { + Crafter::CppDOM::Bindings::dragEndHandlers->find(static_cast(a))->second(); + } + + __attribute__((export_name("ExecuteDropHandler"))) void ExecuteDropHandler(int a) { + Crafter::CppDOM::Bindings::dropHandlers->find(static_cast(a))->second(); + } } \ No newline at end of file diff --git a/interfaces/Crafter.CppDOM-HtmlElement.cppm b/interfaces/Crafter.CppDOM-HtmlElement.cppm index bd0da22..d79185f 100644 --- a/interfaces/Crafter.CppDOM-HtmlElement.cppm +++ b/interfaces/Crafter.CppDOM-HtmlElement.cppm @@ -37,7 +37,7 @@ namespace Crafter { CppDOM::Bindings::SetInnerHTML(ptr, html); } - // Event handling methods - simplified for now + // Event handling methods int AddClickListener(std::function callback) { int id = CppDOM::Bindings::clickHandlerMaxId++; handlers.push_back(id); @@ -52,8 +52,276 @@ namespace Crafter { CppDOM::Bindings::RemoveClickListener(ptr, id); } + int AddMouseOverListener(std::function callback) { + int id = CppDOM::Bindings::mouseOverHandlerMaxId++; + handlers.push_back(id); + CppDOM::Bindings::mouseOverHandlers->insert({id, callback}); + CppDOM::Bindings::AddMouseOverListener(ptr, id); + return id; + } + + void RemoveMouseOverListener(int id) { + handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end()); + CppDOM::Bindings::mouseOverHandlers->erase(id); + CppDOM::Bindings::RemoveMouseOverListener(ptr, id); + } + + int AddMouseOutListener(std::function callback) { + int id = CppDOM::Bindings::mouseOutHandlerMaxId++; + handlers.push_back(id); + CppDOM::Bindings::mouseOutHandlers->insert({id, callback}); + CppDOM::Bindings::AddMouseOutListener(ptr, id); + return id; + } + + void RemoveMouseOutListener(int id) { + handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end()); + CppDOM::Bindings::mouseOutHandlers->erase(id); + CppDOM::Bindings::RemoveMouseOutListener(ptr, id); + } + + int AddMouseMoveListener(std::function callback) { + int id = CppDOM::Bindings::mouseMoveHandlerMaxId++; + handlers.push_back(id); + CppDOM::Bindings::mouseMoveHandlers->insert({id, callback}); + CppDOM::Bindings::AddMouseMoveListener(ptr, id); + return id; + } + + void RemoveMouseMoveListener(int id) { + handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end()); + CppDOM::Bindings::mouseMoveHandlers->erase(id); + CppDOM::Bindings::RemoveMouseMoveListener(ptr, id); + } + + int AddFocusListener(std::function callback) { + int id = CppDOM::Bindings::focusHandlerMaxId++; + handlers.push_back(id); + CppDOM::Bindings::focusHandlers->insert({id, callback}); + CppDOM::Bindings::AddFocusListener(ptr, id); + return id; + } + + void RemoveFocusListener(int id) { + handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end()); + CppDOM::Bindings::focusHandlers->erase(id); + CppDOM::Bindings::RemoveFocusListener(ptr, id); + } + + int AddBlurListener(std::function callback) { + int id = CppDOM::Bindings::blurHandlerMaxId++; + handlers.push_back(id); + CppDOM::Bindings::blurHandlers->insert({id, callback}); + CppDOM::Bindings::AddBlurListener(ptr, id); + return id; + } + + void RemoveBlurListener(int id) { + handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end()); + CppDOM::Bindings::blurHandlers->erase(id); + CppDOM::Bindings::RemoveBlurListener(ptr, id); + } + + int AddKeyDownListener(std::function callback) { + int id = CppDOM::Bindings::keyDownHandlerMaxId++; + handlers.push_back(id); + CppDOM::Bindings::keyDownHandlers->insert({id, callback}); + CppDOM::Bindings::AddKeyDownListener(ptr, id); + return id; + } + + void RemoveKeyDownListener(int id) { + handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end()); + CppDOM::Bindings::keyDownHandlers->erase(id); + CppDOM::Bindings::RemoveKeyDownListener(ptr, id); + } + + int AddKeyUpListener(std::function callback) { + int id = CppDOM::Bindings::keyUpHandlerMaxId++; + handlers.push_back(id); + CppDOM::Bindings::keyUpHandlers->insert({id, callback}); + CppDOM::Bindings::AddKeyUpListener(ptr, id); + return id; + } + + void RemoveKeyUpListener(int id) { + handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end()); + CppDOM::Bindings::keyUpHandlers->erase(id); + CppDOM::Bindings::RemoveKeyUpListener(ptr, id); + } + + int AddKeyPressListener(std::function callback) { + int id = CppDOM::Bindings::keyPressHandlerMaxId++; + handlers.push_back(id); + CppDOM::Bindings::keyPressHandlers->insert({id, callback}); + CppDOM::Bindings::AddKeyPressListener(ptr, id); + return id; + } + + void RemoveKeyPressListener(int id) { + handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end()); + CppDOM::Bindings::keyPressHandlers->erase(id); + CppDOM::Bindings::RemoveKeyPressListener(ptr, id); + } + + int AddChangeListener(std::function callback) { + int id = CppDOM::Bindings::changeHandlerMaxId++; + handlers.push_back(id); + CppDOM::Bindings::changeHandlers->insert({id, callback}); + CppDOM::Bindings::AddChangeListener(ptr, id); + return id; + } + + void RemoveChangeListener(int id) { + handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end()); + CppDOM::Bindings::changeHandlers->erase(id); + CppDOM::Bindings::RemoveChangeListener(ptr, id); + } + + int AddSubmitListener(std::function callback) { + int id = CppDOM::Bindings::submitHandlerMaxId++; + handlers.push_back(id); + CppDOM::Bindings::submitHandlers->insert({id, callback}); + CppDOM::Bindings::AddSubmitListener(ptr, id); + return id; + } + + void RemoveSubmitListener(int id) { + handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end()); + CppDOM::Bindings::submitHandlers->erase(id); + CppDOM::Bindings::RemoveSubmitListener(ptr, id); + } + + int AddInputListener(std::function callback) { + int id = CppDOM::Bindings::inputHandlerMaxId++; + handlers.push_back(id); + CppDOM::Bindings::inputHandlers->insert({id, callback}); + CppDOM::Bindings::AddInputListener(ptr, id); + return id; + } + + void RemoveInputListener(int id) { + handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end()); + CppDOM::Bindings::inputHandlers->erase(id); + CppDOM::Bindings::RemoveInputListener(ptr, id); + } + + int AddLoadListener(std::function callback) { + int id = CppDOM::Bindings::loadHandlerMaxId++; + handlers.push_back(id); + CppDOM::Bindings::loadHandlers->insert({id, callback}); + CppDOM::Bindings::AddLoadListener(ptr, id); + return id; + } + + void RemoveLoadListener(int id) { + handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end()); + CppDOM::Bindings::loadHandlers->erase(id); + CppDOM::Bindings::RemoveLoadListener(ptr, id); + } + + int AddErrorListener(std::function callback) { + int id = CppDOM::Bindings::errorHandlerMaxId++; + handlers.push_back(id); + CppDOM::Bindings::errorHandlers->insert({id, callback}); + CppDOM::Bindings::AddErrorListener(ptr, id); + return id; + } + + void RemoveErrorListener(int id) { + handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end()); + CppDOM::Bindings::errorHandlers->erase(id); + CppDOM::Bindings::RemoveErrorListener(ptr, id); + } + + int AddResizeListener(std::function callback) { + int id = CppDOM::Bindings::resizeHandlerMaxId++; + handlers.push_back(id); + CppDOM::Bindings::resizeHandlers->insert({id, callback}); + CppDOM::Bindings::AddResizeListener(ptr, id); + return id; + } + + void RemoveResizeListener(int id) { + handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end()); + CppDOM::Bindings::resizeHandlers->erase(id); + CppDOM::Bindings::RemoveResizeListener(ptr, id); + } + + int AddScrollListener(std::function callback) { + int id = CppDOM::Bindings::scrollHandlerMaxId++; + handlers.push_back(id); + CppDOM::Bindings::scrollHandlers->insert({id, callback}); + CppDOM::Bindings::AddScrollListener(ptr, id); + return id; + } + + void RemoveScrollListener(int id) { + handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end()); + CppDOM::Bindings::scrollHandlers->erase(id); + CppDOM::Bindings::RemoveScrollListener(ptr, id); + } + + int AddContextMenuListener(std::function callback) { + int id = CppDOM::Bindings::contextMenuHandlerMaxId++; + handlers.push_back(id); + CppDOM::Bindings::contextMenuHandlers->insert({id, callback}); + CppDOM::Bindings::AddContextMenuListener(ptr, id); + return id; + } + + void RemoveContextMenuListener(int id) { + handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end()); + CppDOM::Bindings::contextMenuHandlers->erase(id); + CppDOM::Bindings::RemoveContextMenuListener(ptr, id); + } + + int AddDragStartListener(std::function callback) { + int id = CppDOM::Bindings::dragStartHandlerMaxId++; + handlers.push_back(id); + CppDOM::Bindings::dragStartHandlers->insert({id, callback}); + CppDOM::Bindings::AddDragStartListener(ptr, id); + return id; + } + + void RemoveDragStartListener(int id) { + handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end()); + CppDOM::Bindings::dragStartHandlers->erase(id); + CppDOM::Bindings::RemoveDragStartListener(ptr, id); + } + + int AddDragEndListener(std::function callback) { + int id = CppDOM::Bindings::dragEndHandlerMaxId++; + handlers.push_back(id); + CppDOM::Bindings::dragEndHandlers->insert({id, callback}); + CppDOM::Bindings::AddDragEndListener(ptr, id); + return id; + } + + void RemoveDragEndListener(int id) { + handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end()); + CppDOM::Bindings::dragEndHandlers->erase(id); + CppDOM::Bindings::RemoveDragEndListener(ptr, id); + } + + int AddDropListener(std::function callback) { + int id = CppDOM::Bindings::dropHandlerMaxId++; + handlers.push_back(id); + CppDOM::Bindings::dropHandlers->insert({id, callback}); + CppDOM::Bindings::AddDropListener(ptr, id); + return id; + } + + void RemoveDropListener(int id) { + handlers.erase(std::remove(handlers.begin(), handlers.end(), id), handlers.end()); + CppDOM::Bindings::dropHandlers->erase(id); + CppDOM::Bindings::RemoveDropListener(ptr, id); + } + ~HtmlElement(){ for(int handler : handlers) { + // Clean up all handlers based on type - this is a simplified approach + // In practice, you'd want to track handler types to clean them properly CppDOM::Bindings::clickHandlers->erase(handler); CppDOM::Bindings::RemoveClickListener(ptr, handler); }