From 4dc2c4701d1c9c7e65bfbb2330140d9bcf012075 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sun, 5 May 2024 22:40:24 +0300
Subject: [PATCH] menu page queries

---
 res/layouts/pages/content.xml.lua   |  8 ++++++--
 res/layouts/pages/pause.xml         |  2 +-
 src/coders/commons.cpp              |  8 ++++++++
 src/coders/commons.h                | 11 +++++++----
 src/data/dynamic.cpp                |  4 ++++
 src/data/dynamic.h                  |  1 +
 src/frontend/menu.cpp               | 29 +++++++++++++++++++++++++++--
 src/logic/scripting/lua/libcore.cpp |  3 +--
 8 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/res/layouts/pages/content.xml.lua b/res/layouts/pages/content.xml.lua
index d7480e23..5c6f5638 100644
--- a/res/layouts/pages/content.xml.lua
+++ b/res/layouts/pages/content.xml.lua
@@ -1,4 +1,7 @@
-function on_open()
+function on_open(params)
+    if params then
+        mode = params.mode
+    end
     refresh()
 end
 
@@ -6,7 +9,8 @@ add_packs = {}
 rem_packs = {}
 
 function apply()
-    if not core.reconfig_packs(add_packs, rem_packs) then
+    core.reconfig_packs(add_packs, rem_packs)
+    if mode ~= "world" then
         menu:back()
     end
 end
diff --git a/res/layouts/pages/pause.xml b/res/layouts/pages/pause.xml
index de076c52..63d827e1 100644
--- a/res/layouts/pages/pause.xml
+++ b/res/layouts/pages/pause.xml
@@ -1,6 +1,6 @@
 <panel size='400' color='0' interval='1' context='menu'>
     <button onclick='menu:reset()'>@Continue</button>
-    <button onclick='menu.page="content"'>@Content</button>
+    <button onclick='menu.page="content?mode=world"'>@Content</button>
     <button onclick='menu.page="settings"'>@Settings</button>
     <button onclick='core.close_world(true)'>
         @Save and Quit to Menu
diff --git a/src/coders/commons.cpp b/src/coders/commons.cpp
index 04b0223b..a1fc23e9 100644
--- a/src/coders/commons.cpp
+++ b/src/coders/commons.cpp
@@ -164,6 +164,14 @@ char BasicParser::peek() {
     return source[pos];
 }
 
+std::string BasicParser::readUntil(char c) {
+    int start = pos;
+    while (hasNext() && source[pos] != c) {
+        pos++;
+    }
+    return source.substr(start, pos-start);
+}
+
 std::string BasicParser::parseName() {
     char c = peek();
     if (!is_identifier_start(c)) {
diff --git a/src/coders/commons.h b/src/coders/commons.h
index 7ff70582..68fb4427 100644
--- a/src/coders/commons.h
+++ b/src/coders/commons.h
@@ -82,20 +82,23 @@ protected:
     bool skipTo(const std::string& substring);
     void expect(char expected);
     void expect(const std::string& substring);
-    char peek();
-    char nextChar();
-    bool hasNext();
     bool isNext(const std::string& substring);
     void expectNewLine();
     void goBack();
 
-    std::string parseName();
     int64_t parseSimpleInt(int base);
     bool parseNumber(int sign, number_u& out);
     std::string parseString(char chr, bool closeRequired=true);
 
     parsing_error error(std::string message);
 
+public:
+    std::string readUntil(char c);
+    std::string parseName();
+    bool hasNext();
+    char peek();
+    char nextChar();
+
     BasicParser(const std::string& file, const std::string& source);
 };
 
diff --git a/src/data/dynamic.cpp b/src/data/dynamic.cpp
index 720c5b8b..3f14d4da 100644
--- a/src/data/dynamic.cpp
+++ b/src/data/dynamic.cpp
@@ -386,3 +386,7 @@ std::unique_ptr<Value> Value::of(number_u value) {
 std::unique_ptr<Value> Value::of(const std::string& value) {
     return std::make_unique<Value>(valtype::string, value);
 }
+
+std::unique_ptr<Value> Value::of(std::unique_ptr<Map> value) {
+    return std::make_unique<Value>(valtype::map, value.release());
+}
diff --git a/src/data/dynamic.h b/src/data/dynamic.h
index 6abf9f4c..a2ed3399 100644
--- a/src/data/dynamic.h
+++ b/src/data/dynamic.h
@@ -36,6 +36,7 @@ namespace dynamic {
         static std::unique_ptr<Value> boolean(bool value);
         static std::unique_ptr<Value> of(number_u value);
         static std::unique_ptr<Value> of(const std::string& value);
+        static std::unique_ptr<Value> of(std::unique_ptr<Map> value);
     };
 
     class List {
diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp
index f36e1cfd..1917ed21 100644
--- a/src/frontend/menu.cpp
+++ b/src/frontend/menu.cpp
@@ -13,6 +13,7 @@
 #include "../graphics/ui/GUI.hpp"
 #include "../logic/scripting/scripting.h"
 #include "../settings.h"
+#include "../coders/commons.h"
 #include "../util/stringutil.h"
 #include "../window/Window.hpp"
 #include "locale/langs.h"
@@ -32,13 +33,37 @@ void menus::create_version_label(Engine* engine) {
 }
 
 gui::page_loader_func menus::create_page_loader(Engine* engine) {
-    return [=](auto name) {
+    return [=](const std::string& query) {
+        using namespace dynamic;
+
+        std::vector<std::unique_ptr<Value>> args;
+
+        std::string name;
+        size_t index = query.find('?');
+        if (index != std::string::npos) {
+            auto argstr = query.substr(index+1);
+            name = query.substr(0, index);
+            
+            auto map = std::make_unique<Map>();
+            BasicParser parser("query for "+name, argstr);
+            while (parser.hasNext()) {
+                auto key = parser.readUntil('=');
+                parser.nextChar();
+                auto value = parser.readUntil('&');
+                map->put(key, value);
+            }
+            args.push_back(Value::of(std::move(map)));
+        } else {
+            name = query;
+        }
+
         auto file = engine->getResPaths()->find("layouts/pages/"+name+".xml");
         auto fullname = "core:pages/"+name;
 
         auto document = UiDocument::read(scripting::get_root_environment(), fullname, file).release();
         engine->getAssets()->store(document, fullname);
-        scripting::on_ui_open(document, {});
+
+        scripting::on_ui_open(document, std::move(args));
         return document->getRoot();
     };
 }
diff --git a/src/logic/scripting/lua/libcore.cpp b/src/logic/scripting/lua/libcore.cpp
index bb23db90..667ebad8 100644
--- a/src/logic/scripting/lua/libcore.cpp
+++ b/src/logic/scripting/lua/libcore.cpp
@@ -91,8 +91,7 @@ static int l_reconfig_packs(lua_State* L) {
     }
     auto controller = scripting::engine->getController();
     controller->reconfigPacks(scripting::controller, addPacks, remPacks);
-    lua_pushboolean(L, scripting::controller != nullptr);
-    return 1;
+    return 0;
 }
 
 static int l_get_bindings(lua_State* L) {