external: Update submodules (#3329)

* external: Update CLI11 to version v2.4.2

* external: Update cubeb

* external: Update curl to 8.8.0

* external: Update fmt to 11.0.1

* external: Update googletest to version v1.15.0

* external: Update imgui to version v1.90.9

* external: Update imgui_club

* external: Update nativefiledialog-extended to version v1.2.0

* external: Update pugixml to version v1.14

* external: Update spdlog to v1.14.1

* external: Update stb

* external: Update tracy to version v0.11.0

* external: Update vita-toolchain

external/CMakeLists.txt

@@ -311,7 +311,7 @@ if(NOT CURL_FOUND)
 	option(CURL_CA_FALLBACK "Set ON to use built-in CA store of TLS backend. Defaults to OFF" ON)
 	FetchContent_Declare(curl
 		GIT_REPOSITORY https://github.com/curl/curl.git
-		GIT_TAG        7ab9d43720bc34d9aa351c7ca683c1668ebf8335 # release 8.1.2
+		GIT_TAG        fd567d4f06857f4fc8e2f64ea727b1318f76ad33 # release 8.8.0
 	)
 	FetchContent_MakeAvailable(curl)
 else()

vita3k/gui/src/gui.cpp

@@ -141,7 +141,7 @@ static void init_style(EmuEnvState &emuenv) {
     style->Colors[ImGuiCol_ResizeGripActive] = ImVec4(0.32f, 0.32f, 0.32f, 1.00f);
     style->Colors[ImGuiCol_Tab] = ImVec4(0.80f, 0.80f, 0.83f, 0.31f);
     style->Colors[ImGuiCol_TabHovered] = ImVec4(0.32f, 0.30f, 0.23f, 1.00f);
-    style->Colors[ImGuiCol_TabActive] = ImVec4(0.06f, 0.05f, 0.07f, 1.00f);
+    style->Colors[ImGuiCol_TabSelected] = ImVec4(0.06f, 0.05f, 0.07f, 1.00f);
     style->Colors[ImGuiCol_PlotLines] = ImVec4(1.f, 0.49f, 0.f, 1.f);
     style->Colors[ImGuiCol_PlotLinesHovered] = ImVec4(0.25f, 1.00f, 0.00f, 1.00f);
     style->Colors[ImGuiCol_PlotHistogram] = ImVec4(0.40f, 0.39f, 0.38f, 0.63f);

vita3k/gui/src/imgui_impl_sdl.cpp

@@ -91,12 +91,20 @@ IMGUI_API ImGui_State *ImGui_ImplSdl_Init(renderer::State *renderer, SDL_Window
     state->mouse_cursors[ImGuiMouseCursor_ResizeNWSE] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENWSE);
 
     // TODO: is this needed/useful ?
-#ifdef _WIN32
-    SDL_SysWMinfo wmInfo;
-    SDL_VERSION(&wmInfo.version);
-    SDL_GetWindowWMInfo(state->window, &wmInfo);
-    io.ImeWindowHandle = wmInfo.info.win.window;
+    // Set platform dependent data in viewport
+    // Our mouse update function expect PlatformHandle to be filled for the main viewport
+    ImGuiViewport *main_viewport = ImGui::GetMainViewport();
+    main_viewport->PlatformHandle = (void *)window;
+    main_viewport->PlatformHandleRaw = nullptr;
+    SDL_SysWMinfo info;
+    SDL_VERSION(&info.version);
+    if (SDL_GetWindowWMInfo(window, &info)) {
+#if defined(SDL_VIDEO_DRIVER_WINDOWS)
+        main_viewport->PlatformHandleRaw = (void *)info.info.win.window;
+#elif defined(__APPLE__) && defined(SDL_VIDEO_DRIVER_COCOA)
+        main_viewport->PlatformHandleRaw = (void *)info.info.cocoa.window;
 #endif
+    }
 
     return state;
 }

vita3k/gui/src/imgui_impl_sdl_gl3.cpp

@@ -144,9 +144,9 @@ void ImGui_ImplSdlGL3_RenderDrawData(ImGui_GLState &state) {
     glEnableVertexAttribArray(state.attribute_position_location);
     glEnableVertexAttribArray(state.attribute_uv_location);
     glEnableVertexAttribArray(state.attribute_color_location);
-    glVertexAttribPointer(state.attribute_position_location, 2, GL_FLOAT, GL_FALSE, sizeof(ImDrawVert), (GLvoid *)IM_OFFSETOF(ImDrawVert, pos));
-    glVertexAttribPointer(state.attribute_uv_location, 2, GL_FLOAT, GL_FALSE, sizeof(ImDrawVert), (GLvoid *)IM_OFFSETOF(ImDrawVert, uv));
-    glVertexAttribPointer(state.attribute_color_location, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(ImDrawVert), (GLvoid *)IM_OFFSETOF(ImDrawVert, col));
+    glVertexAttribPointer(state.attribute_position_location, 2, GL_FLOAT, GL_FALSE, sizeof(ImDrawVert), (GLvoid *)offsetof(ImDrawVert, pos));
+    glVertexAttribPointer(state.attribute_uv_location, 2, GL_FLOAT, GL_FALSE, sizeof(ImDrawVert), (GLvoid *)offsetof(ImDrawVert, uv));
+    glVertexAttribPointer(state.attribute_color_location, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(ImDrawVert), (GLvoid *)offsetof(ImDrawVert, col));
 
     // Draw
     for (int n = 0; n < draw_data->CmdListsCount; n++) {

vita3k/util/include/util/fs.h

@@ -20,6 +20,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 #include <fmt/format.h>
+#include <fmt/ostream.h>
 
 namespace fs = boost::filesystem;
 
@@ -73,91 +74,8 @@ void dump_data(const fs::path &path, const void *data, const std::streamsize siz
 
 } // namespace fs_utils
 
-FMT_BEGIN_NAMESPACE
-namespace detail {
-
-template <typename Char, typename PathChar>
-auto get_path_string(const fs::path &p,
-    const std::basic_string<PathChar> &native) {
-    if constexpr (std::is_same_v<Char, char> && std::is_same_v<PathChar, wchar_t>)
-        return to_utf8<wchar_t>(native, to_utf8_error_policy::replace);
-    else
-        return native;
-}
-
-template <typename Char, typename PathChar>
-void write_escaped_path(basic_memory_buffer<Char> &quoted,
-    const fs::path &p,
-    const std::basic_string<PathChar> &native) {
-    if constexpr (std::is_same_v<Char, char> && std::is_same_v<PathChar, wchar_t>) {
-        auto buf = basic_memory_buffer<wchar_t>();
-        write_escaped_string<wchar_t>(std::back_inserter(buf), native);
-        bool valid = to_utf8<wchar_t>::convert(quoted, { buf.data(), buf.size() });
-        FMT_ASSERT(valid, "invalid utf16");
-    } else if constexpr (std::is_same_v<Char, PathChar>) {
-        write_escaped_string<fs::path::value_type>(
-            std::back_inserter(quoted), native);
-    } else {
-        write_escaped_string<Char>(std::back_inserter(quoted), p.string<Char>());
-    }
-}
-
-} // namespace detail
-
-template <typename Char>
-struct formatter<fs::path, Char> {
-private:
-    format_specs<Char> specs_;
-    detail::arg_ref<Char> width_ref_;
-    bool debug_ = false;
-    char path_type_ = 'n';
-
-public:
-    constexpr void set_debug_format(bool set = true) { debug_ = set; }
-
-    template <typename ParseContext>
-    constexpr auto parse(ParseContext &ctx) {
-        auto it = ctx.begin(), end = ctx.end();
-        if (it == end)
-            return it;
-
-        it = detail::parse_align(it, end, specs_);
-        if (it == end)
-            return it;
-
-        it = detail::parse_dynamic_spec(it, end, specs_.width, width_ref_, ctx);
-        if (it != end && *it == '?') {
-            debug_ = true;
-            ++it;
-        }
-        if (it != end && (*it == 'g' || *it == 'n'))
-            path_type_ = *it++;
-        return it;
-    }
-
-    template <typename FormatContext>
-    auto format(const fs::path &p, FormatContext &ctx) const {
-        auto specs = specs_;
-#ifdef _WIN32
-        auto path_string = path_type_ == 'n' ? p.native() : p.generic_wstring();
-#else
-        auto path_string = path_type_ == 'n' ? p.native() : p.generic_string();
-#endif
-
-        detail::handle_dynamic_spec<detail::width_checker>(specs.width, width_ref_,
-            ctx);
-        if (!debug_) {
-            auto s = detail::get_path_string<Char>(p, path_string);
-            return detail::write(ctx.out(), basic_string_view<Char>(s), specs);
-        }
-        auto quoted = basic_memory_buffer<Char>();
-        detail::write_escaped_path(quoted, p, path_string);
-        return detail::write(ctx.out(),
-            basic_string_view<Char>(quoted.data(), quoted.size()),
-            specs);
-    }
-};
-FMT_END_NAMESPACE
+template <>
+struct fmt::formatter<boost::filesystem::path> : ostream_formatter {};
 
 class Root {
     fs::path base_path;