Merge branch 'grumpycoders:main' into Breakpoints-improvements

Author: rocketz

.github/filter-mips/filter.sh

@@ -32,3 +32,6 @@ git filter-branch -f --tree-filter "find . -name Makefile -exec sed 's|\.\./\.\.
 git filter-branch -f --tree-filter "find . -name Makefile -exec sed 's|\.\./\.\./\.\./third_party/EASTL/|../third_party/EASTL/|' -i {} \;" --tag-name-filter cat --prune-empty
 git filter-branch -f --tree-filter "find . -name '*.mk' -exec sed 's|\.\./\.\./\.\./third_party/EABase/|../third_party/EABase/|' -i {} \;" --tag-name-filter cat --prune-empty
 git filter-branch -f --tree-filter "find . -name '*.mk' -exec sed 's|\.\./\.\./\.\./third_party/EASTL/|../third_party/EASTL/|' -i {} \;" --tag-name-filter cat --prune-empty
+
+# Delete unwanted files
+git filter-branch -f --tree-filter 'find . -name compile_flags.txt -or -name Doxyfile -delete || true' --tag-name-filter cat --prune-empty

.github/workflows/chores.yml

@@ -74,11 +74,14 @@ jobs:
       - uses: n1hility/cancel-previous-runs@v2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Install doxygen
+        run: sudo apt-get install -y doxygen graphviz
       - name: Filter repository
         env:
           FILTER_BRANCH_SQUELCH_WARNING: 1
         run: |
           cp -rv .github/filter-mips /tmp
+          cp src/mips/Doxyfile /tmp
           /tmp/filter-mips/filter.sh
       - name: Pushing result
         env:
@@ -87,6 +90,23 @@ jobs:
           git config -l | grep 'http\..*\.extraheader' | cut -d= -f1 | xargs -L1 git config --unset-all
           git remote add nugget https://nicolasnoble:$PAT@github.com/pcsx-redux/nugget.git
           git push --force https://nicolasnoble:$PAT@github.com/pcsx-redux/nugget.git main
+      - name: Creating documentation
+        run: |
+          doxygen /tmp/Doxyfile
+          mv html /tmp
+          rm -rf latex
+          git checkout --orphan gh_pages
+          git rm -rf .
+          mv /tmp/html/* .
+          git add .
+          git config --global user.email "pixel@nobis-crew.org."
+          git config --global user.name 'Nicolas "Pixel" Noble'
+          git commit -m "Documentation."
+      - name: Pushing documentation
+        env:
+          PAT: ${{ secrets.PAT }}
+        run: |
+          git push --force https://nicolasnoble:$PAT@github.com/pcsx-redux/nugget.git gh_pages
 
   export-support:
     runs-on: ubuntu-latest

.gitmodules

@@ -94,3 +94,6 @@
 [submodule "third_party/uriparser"]
 	path = third_party/uriparser
 	url = https://github.com/uriparser/uriparser.git
+[submodule "third_party/PEGTL"]
+	path = third_party/PEGTL
+	url = https://github.com/taocpp/PEGTL.git

src/core/logger.h

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <stdarg.h>
+#include <utility>
 
 #include "core/system.h"
 #include "fmt/printf.h"
@@ -54,9 +54,9 @@ enum class LogClass : unsigned {
 template <LogClass logClass, bool enabled>
 struct Logger {
     template <typename... Args>
-    static void Log(const char *format, const Args &...args) {
+    static void Log(const char *format, Args &&...args) {
         if (!enabled) return;
-        std::string s = fmt::sprintf(format, args...);
+        std::string s = fmt::sprintf(format, std::forward<Args>(args)...);
         g_system->log(logClass, std::move(s));
     }
     static void Log(std::string &&s) {

src/core/pcsxlua.cc

@@ -178,6 +178,9 @@ void PCSX::LuaFFI::open_pcsx(Lua L) {
     registerAllSymbols(L);
     L.load(pcsxFFI, "src:core/pcsxffi.lua");
     L.getfieldtable("PCSX", LUA_GLOBALSINDEX);
+    L.push("execSlots");
+    L.newtable();
+    L.settable();
     L.declareFunc(
         "getSaveStateProtoSchema",
         [](lua_State* L_) -> int {

src/core/psxhw.cc

@@ -437,10 +437,7 @@ void PCSX::HW::write8(uint32_t add, uint32_t rawvalue) {
                     try {
                         L.pcall();
                     } catch (...) {
-                        g_system->pause();
                     }
-                } else {
-                    g_system->pause();
                 }
                 while (top != L.gettop()) L.pop();
             }

src/gui/luaimguiextra.cc

@@ -17,6 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
+#include <string_view>
+
 #include "gui/luaimguiextra.h"
 
 #include "gui/gui.h"
@@ -70,6 +72,35 @@ void registerAllSymbols(PCSX::Lua L) {
     L.pop();
 }
 
+bool validateColorArgs(PCSX::Lua L, std::string_view funcName) {
+    int n = L.gettop();
+    if (n < 2) return L.error("%s: not enough arguments", funcName);
+    if (n > 4) return L.error("%s: too many arguments", funcName);
+    if (!L.isstring(1)) return L.error("%s: argument 1 must be a string", funcName);
+    if (!L.istable(2)) return L.error("%s: argument 2 must be a table", funcName);
+    if (n == 3 && !L.isnumber(3)) return L.error("%s: argument 3 must be a number", funcName);
+    return true;
+}
+
+void extractColorComponents(PCSX::Lua L, float* col, int components) {
+    static const char* const fields[] = {"r", "g", "b", "a"};
+    for (int i = 0; i < components; i++) {
+        L.getfield(fields[i], 2);
+        col[i] = L.tonumber(-1);
+        L.pop();
+    }
+}
+
+void createColorTable(PCSX::Lua L, const float* col, int components) {
+    static const char* const fields[] = {"r", "g", "b", "a"};
+    L.newtable();
+    for (int i = 0; i < components; i++) {
+        L.push(fields[i]);
+        L.push(col[i]);
+        L.settable();
+    }
+}
+
 }  // namespace
 
 void PCSX::LuaFFI::open_imguiextra(GUI* gui, Lua L) {
@@ -155,6 +186,62 @@ void PCSX::LuaFFI::open_imguiextra(GUI* gui, Lua L) {
             return 2;
         },
         -1);
+    L.declareFunc(
+        "ColorEdit3",
+        [](lua_State* L_) -> int {
+            Lua L(L_);
+            if (!validateColorArgs(L, "ColorEdit3")) return 0;
+            std::string label = L.tostring(1);
+            float col[3];
+            extractColorComponents(L, col, 3);
+            ImGuiColorEditFlags flags = L.gettop() == 3 ? L.tonumber(3) : 0;
+            L.push(ImGui::ColorEdit3(label.c_str(), col, flags));
+            createColorTable(L, col, 3);
+            return 2;
+        },
+        -1);
+    L.declareFunc(
+        "ColorEdit4",
+        [](lua_State* L_) -> int {
+            Lua L(L_);
+            if (!validateColorArgs(L, "ColorEdit4")) return 0;
+            std::string label = L.tostring(1);
+            float col[4];
+            extractColorComponents(L, col, 4);
+            ImGuiColorEditFlags flags = L.gettop() == 3 ? L.tonumber(3) : 0;
+            L.push(ImGui::ColorEdit4(label.c_str(), col, flags));
+            createColorTable(L, col, 4);
+            return 2;
+        },
+        -1);
+    L.declareFunc(
+        "ColorPicker3",
+        [](lua_State* L_) -> int {
+            Lua L(L_);
+            if (!validateColorArgs(L, "ColorPicker3")) return 0;
+            std::string label = L.tostring(1);
+            float col[3];
+            extractColorComponents(L, col, 3);
+            ImGuiColorEditFlags flags = L.gettop() == 3 ? L.tonumber(3) : 0;
+            L.push(ImGui::ColorPicker3(label.c_str(), col, flags));
+            createColorTable(L, col, 3);
+            return 2;
+        },
+        -1);
+    L.declareFunc(
+        "ColorPicker4",
+        [](lua_State* L_) -> int {
+            Lua L(L_);
+            if (!validateColorArgs(L, "ColorPicker4")) return 0;
+            std::string label = L.tostring(1);
+            float col[4];
+            extractColorComponents(L, col, 4);
+            ImGuiColorEditFlags flags = L.gettop() == 3 ? L.tonumber(3) : 0;
+            L.push(ImGui::ColorPicker4(label.c_str(), col, flags));
+            createColorTable(L, col, 4);
+            return 2;
+        },
+        -1);
     L.pop(2);
     assert(L.gettop() == 0);
 }

src/lua/luawrapper.cc

@@ -27,7 +27,7 @@ static int callwrap(lua_State* raw, lua_CFunction func) {
     try {
         return func(raw);
     } catch (std::exception& e) {
-        return L.error(std::string("LuaException: ") + e.what());
+        return L.error("LuaException: %s", e.what());
     }
 }
 

src/lua/luawrapper.h

@@ -24,7 +24,9 @@
 #include <optional>
 #include <string>
 #include <string_view>
+#include <utility>
 
+#include "fmt/printf.h"
 #include "json.hpp"
 #include "lua.hpp"
 #include "support/ssize_t.h"
@@ -177,6 +179,10 @@ class Lua {
     int gettop() { return lua_gettop(L); }
     void pushLuaContext(bool inTable = false);
     int error(std::string_view msg);
+    template <typename... Args>
+    int error(const char* format, Args&&... args) {
+        return error(fmt::sprintf(format, std::forward<Args>(args)...));
+    }
 
     int type(int i = -1) { return lua_type(L, i); }
     const char* typestring(int i = -1) { return lua_typename(L, lua_type(L, i)); }