From f17167f8c9010877ede773fc692da919b406274b Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sat, 28 Jun 2025 02:46:54 +0300
Subject: [PATCH] add 'onselect' callback & remove 'default' tag

---
 src/graphics/ui/elements/SelectBox.cpp       |  7 ++++-
 src/graphics/ui/elements/SelectBox.hpp       |  3 ++
 src/graphics/ui/elements/UINode.hpp          | 20 ++++++++----
 src/graphics/ui/gui_xml.cpp                  | 32 ++++++++++++--------
 src/logic/scripting/scripting_functional.cpp | 11 +++++++
 src/logic/scripting/scripting_functional.hpp |  6 ++++
 6 files changed, 60 insertions(+), 19 deletions(-)

diff --git a/src/graphics/ui/elements/SelectBox.cpp b/src/graphics/ui/elements/SelectBox.cpp
index d50fc845..98dfc826 100644
--- a/src/graphics/ui/elements/SelectBox.cpp
+++ b/src/graphics/ui/elements/SelectBox.cpp
@@ -26,8 +26,9 @@ SelectBox::SelectBox(
             auto button = std::make_shared<Button>(
                 gui, option.text, glm::vec4(10.0f), nullptr, glm::vec2(-1.0f)
             );
-            button->listenFocus([this, option](GUI&) {
+            button->listenFocus([this, option](GUI& gui) {
                 setSelected(option);
+                changeCallbacks.notify(gui, option.value);
             });
             panel->add(button);
         }
@@ -40,6 +41,10 @@ SelectBox::SelectBox(
     });
 }
 
+void SelectBox::listenChange(onstringchange&& callback) {
+    changeCallbacks.listen(std::move(callback));
+}
+
 void SelectBox::setSelected(const Option& selected) {
     this->selected = selected;
     this->label->setText(selected.text);
diff --git a/src/graphics/ui/elements/SelectBox.hpp b/src/graphics/ui/elements/SelectBox.hpp
index 267e886e..28795f22 100644
--- a/src/graphics/ui/elements/SelectBox.hpp
+++ b/src/graphics/ui/elements/SelectBox.hpp
@@ -14,6 +14,7 @@ namespace gui {
     private:
         std::vector<Option> options;
         Option selected {};
+        StringCallbacksSet changeCallbacks;
     public:
         SelectBox(
             GUI& gui,
@@ -23,6 +24,8 @@ namespace gui {
             const glm::vec4& padding
         );
 
+        void listenChange(onstringchange&& callback);
+
         void setSelected(const Option& selected);
 
         const Option& getSelected() const;
diff --git a/src/graphics/ui/elements/UINode.hpp b/src/graphics/ui/elements/UINode.hpp
index 53854db5..fc64527f 100644
--- a/src/graphics/ui/elements/UINode.hpp
+++ b/src/graphics/ui/elements/UINode.hpp
@@ -21,25 +21,33 @@ namespace gui {
 
     using onaction = std::function<void(GUI&)>;
     using onnumberchange = std::function<void(GUI&, double)>;
+    using onstringchange = std::function<void(GUI&, const std::string&)>;
 
-    class ActionsSet {
-        std::unique_ptr<std::vector<onaction>> callbacks;
+    template<typename... Args>
+    class CallbacksSet {
     public:
-        void listen(const onaction& callback) {
+        using Func = std::function<void(Args...)>;
+    private:
+        std::unique_ptr<std::vector<Func>> callbacks;
+    public:
+        void listen(const Func& callback) {
             if (callbacks == nullptr) {
-                callbacks = std::make_unique<std::vector<onaction>>();
+                callbacks = std::make_unique<std::vector<Func>>();
             }
             callbacks->push_back(callback);
         }
 
-        void notify(GUI& gui) {
+        void notify(Args&&... args) {
             if (callbacks) {
                 for (auto& callback : *callbacks) {
-                    callback(gui);
+                    callback(std::forward<Args>(args)...);
                 }
             }
         }
     };
+
+    using ActionsSet = CallbacksSet<GUI&>;
+    using StringCallbacksSet = CallbacksSet<GUI&, const std::string&>;
     
     enum class Align {
         left, center, right,
diff --git a/src/graphics/ui/gui_xml.cpp b/src/graphics/ui/gui_xml.cpp
index b71c97c1..8dcfa77b 100644
--- a/src/graphics/ui/gui_xml.cpp
+++ b/src/graphics/ui/gui_xml.cpp
@@ -439,19 +439,16 @@ static std::shared_ptr<UINode> read_select(
     SelectBox::Option selected;
     for (const auto& elem : elements) {
         const auto& tag = elem->getTag();
-        if (tag == "option") {
-            auto value = elem->attr("value").getText();
-            auto text = parse_inner_text(*elem, reader.getContext());
-            SelectBox::Option option {std::move(value), std::move(text)};
-            if (elem->attr("selected", "false").asBool()) {
-                selected = option;
-            }
-            options.push_back(std::move(option));
-        } else if (tag == "default") {
-            auto value = elem->attr("value").getText();
-            auto text = parse_inner_text(*elem, reader.getContext());
-            selected = SelectBox::Option {std::move(value), std::move(text)};
+        if (tag != "option") {
+            continue;
         }
+        auto value = elem->attr("value").getText();
+        auto text = parse_inner_text(*elem, reader.getContext());
+        SelectBox::Option option {std::move(value), std::move(text)};
+        if (elem->attr("selected", "false").asBool()) {
+            selected = option;
+        }
+        options.push_back(std::move(option));
     }
 
     auto selectBox = std::make_shared<SelectBox>(
@@ -461,6 +458,17 @@ static std::shared_ptr<UINode> read_select(
         contentWidth,
         std::move(padding)
     );
+    if (element.has("onselect")) {
+        auto callback = scripting::create_string_consumer(
+            reader.getEnvironment(),
+            element.attr("onselect").getText(),
+            reader.getFilename()
+        );
+        selectBox->listenChange(
+        [callback=std::move(callback)](GUI&, const std::string& value) {
+            callback(value);
+        });
+    }
     read_panel_impl(reader, element, *selectBox, false);
     return selectBox;
 }
diff --git a/src/logic/scripting/scripting_functional.cpp b/src/logic/scripting/scripting_functional.cpp
index 96023d6f..554bfffe 100644
--- a/src/logic/scripting/scripting_functional.cpp
+++ b/src/logic/scripting/scripting_functional.cpp
@@ -69,6 +69,17 @@ wstringconsumer scripting::create_wstring_consumer(
     };
 }
 
+stringconsumer scripting::create_string_consumer(
+    const scriptenv& env, const std::string& src, const std::string& file
+) {
+    return [=](const std::string& x) {
+        if (auto L = process_callback(env, src, file)) {
+            lua::pushstring(L, x);
+            lua::call_nothrow(L, 1);
+        }
+    };
+}
+
 wstringsupplier scripting::create_wstring_supplier(
     const scriptenv& env, const std::string& src, const std::string& file
 ) {
diff --git a/src/logic/scripting/scripting_functional.hpp b/src/logic/scripting/scripting_functional.hpp
index e9981fae..0a7953ad 100644
--- a/src/logic/scripting/scripting_functional.hpp
+++ b/src/logic/scripting/scripting_functional.hpp
@@ -23,6 +23,12 @@ namespace scripting {
         const std::string& file = "[string]"
     );
 
+    stringconsumer create_string_consumer(
+        const scriptenv& env,
+        const std::string& src,
+        const std::string& file = "[string]"
+    );
+
     wstringconsumer create_wstring_consumer(
         const scriptenv& env,
         const std::string& src,