zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-11-17 18:52:06 +00:00
Code Activity

Merge pull request #568 from Laupetin/feature/modman-icon-and-title

Browse Source 
feat: modman icon and title
This commit is contained in:
Jan
2025-11-02 21:08:23 +01:00
committed by GitHub
parent a476f1bca0 2aeaa417b6
commit 69143d80fb
18 changed files with 338 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ModMan/Web/Platform/AssetHandler.h
View File

@@ -1,7 +1,17 @@
#pragma once
#ifdef _WIN32
#include "Windows/AssetHandlerWindows.h"
#elif defined(__linux__)
#include "Linux/AssetHandlerLinux.h"
#include "Web/Platform/Platform.h"
#include "Web/WebViewLib.h"
#include <webview/macros.h>
namespace ui
{
#if defined(PLATFORM_WINDOWS)
constexpr auto URL_PREFIX = "http://modman.local/";
#elif defined(PLATFORM_LINUX)
constexpr auto URL_PREFIX = "modman://localhost/";
#endif
void InstallAssetHandler(webview::webview& wv);
} // namespace ui

10
src/ModMan/Web/Platform/FaviconHandler.h Normal file
View File

@@ -0,0 +1,10 @@
#pragma once
#include "Web/WebViewLib.h"
#include <webview/macros.h>
namespace ui
{
void InstallFaviconHandler(webview::webview& wv);
} // namespace ui

11
src/ModMan/Web/Platform/Linux/AssetHandlerLinux.cpp
View File

@@ -1,6 +1,7 @@
#include "AssetHandlerLinux.h"
#include "Web/Platform/AssetHandler.h"
#include "Web/Platform/Platform.h"
#if defined(WEBVIEW_PLATFORM_LINUX) && defined(WEBVIEW_GTK)
#ifdef PLATFORM_LINUX
#include "Web/UiAssets.h"
@@ -8,8 +9,6 @@
#include <iostream>
#include <unordered_map>
using namespace PLATFORM_NAMESPACE_LINUX;
namespace
{
std::unordered_map<std::string, UiFile> assetLookup;
@@ -37,7 +36,7 @@ namespace
}
} // namespace
namespace PLATFORM_NAMESPACE_LINUX
namespace ui
{
void InstallAssetHandler(webview::webview& wv)
{
@@ -49,6 +48,6 @@ namespace PLATFORM_NAMESPACE_LINUX
webkit_web_context_register_uri_scheme(context, "modman", ModManUriSchemeRequestCb, NULL, nullptr);
}
} // namespace PLATFORM_NAMESPACE_LINUX
} // namespace ui
#endif

18
src/ModMan/Web/Platform/Linux/AssetHandlerLinux.h
View File

@@ -1,18 +0,0 @@
#pragma once
#include "Web/Platform/Platform.h"
#include <webview/macros.h>
#if defined(WEBVIEW_PLATFORM_LINUX) && defined(WEBVIEW_GTK)
#include "Web/WebViewLib.h"
namespace PLATFORM_NAMESPACE_LINUX
{
constexpr auto URL_PREFIX = "modman://localhost/";
void InstallAssetHandler(webview::webview& wv);
} // namespace PLATFORM_NAMESPACE_LINUX
#endif

5
src/ModMan/Web/Platform/Linux/DialogHandlerLinux.cpp
View File

@@ -1,6 +1,7 @@
#include "Web/Platform/DialogHandler.h"
#include "Web/Platform/Platform.h"
#ifdef __linux__
#ifdef PLATFORM_LINUX
#include <cassert>
#include <cstdint>
@@ -37,8 +38,6 @@ namespace
#endif
}
void OpenFileDialog() {}
void SetFilters(GtkFileDialog* pDialog, const std::vector<ui::FileDialogFilter>& filters)
{
if (filters.empty())

22
src/ModMan/Web/Platform/Linux/FaviconHandlerLinux.cpp Normal file
View File

@@ -0,0 +1,22 @@
#include "Web/Platform/FaviconHandler.h"
#include "Web/Platform/Platform.h"
#ifdef PLATFORM_LINUX
#include "Web/UiAssets.h"
#include <format>
#include <iostream>
#include <unordered_map>
namespace ui
{
void InstallFaviconHandler(webview::webview& wv)
{
// The icon system on Linux works a bit different than on Windows
// and doesn't really support this kind of dynamic icon setting
// we skip it for now
}
} // namespace ui
#endif

30
src/ModMan/Web/Platform/Linux/TitleHandlerLinux.cpp Normal file
View File

@@ -0,0 +1,30 @@
#include "Web/Platform/Platform.h"
#include "Web/Platform/TitleHandler.h"
#ifdef PLATFORM_LINUX
#include "Web/UiAssets.h"
#include <format>
#include <iostream>
#include <unordered_map>
namespace ui
{
void InstallTitleHandler(webview::webview& wv)
{
const auto webViewWidget = static_cast<GtkWidget*>(wv.browser_controller().value());
const auto webView = WEBKIT_WEB_VIEW(webViewWidget);
const auto windowWidget = static_cast<GtkWidget*>(wv.window().value());
const auto window = GTK_WINDOW(windowWidget);
auto on_title_changed = +[](GtkWidget* widget, GParamSpec paramSpec, GtkWindow* window)
{
gtk_window_set_title(window, webkit_web_view_get_title(WEBKIT_WEB_VIEW(widget)));
};
g_signal_connect(G_OBJECT(webView), "notify::title", G_CALLBACK(on_title_changed), (gpointer)window);
}
} // namespace ui
#endif

7
src/ModMan/Web/Platform/Platform.h
View File

@@ -1,10 +1,7 @@
#pragma once
#define PLATFORM_NAMESPACE_WINDOWS windows
#define PLATFORM_NAMESPACE_LINUX linux
#ifdef _WIN32
#define PLATFORM_NAMESPACE PLATFORM_NAMESPACE_WINDOWS
#define PLATFORM_WINDOWS
#elif defined(__linux__)
#define PLATFORM_NAMESPACE PLATFORM_NAMESPACE_LINUX
#define PLATFORM_LINUX
#endif

10
src/ModMan/Web/Platform/TitleHandler.h Normal file
View File

@@ -0,0 +1,10 @@
#pragma once
#include "Web/WebViewLib.h"
#include <webview/macros.h>
namespace ui
{
void InstallTitleHandler(webview::webview& wv);
} // namespace ui

19
src/ModMan/Web/Platform/Windows/AssetHandlerWindows.cpp
View File

@@ -1,6 +1,7 @@
#include "AssetHandlerWindows.h"
#include "Web/Platform/AssetHandler.h"
#include "Web/Platform/Platform.h"
#if defined(WEBVIEW_PLATFORM_WINDOWS) && defined(WEBVIEW_EDGE)
#ifdef PLATFORM_WINDOWS
#include "PlatformUtilsWindows.h"
#include "Web/UiAssets.h"
@@ -12,8 +13,6 @@
#include <webview/detail/backends/win32_edge.hh>
#include <wrl/event.h>
using namespace PLATFORM_NAMESPACE_WINDOWS;
namespace
{
constexpr auto LOCALHOST_PREFIX = "http://localhost:";
@@ -25,7 +24,7 @@ namespace
std::wstringstream wss;
wss << std::format(L"Content-Length: {}\n", contentLength);
wss << L"Content-Type: " << StringToWideString(ui::GetMimeTypeForFileName(assetName));
wss << L"Content-Type: " << utils::StringToWideString(ui::GetMimeTypeForFileName(assetName));
return wss.str();
}
@@ -65,7 +64,7 @@ namespace
Microsoft::WRL::ComPtr<ICoreWebView2WebResourceResponse> response;
const auto uri = WideStringToString(wUri);
const auto uri = utils::WideStringToString(wUri);
bool fileFound = false;
#ifdef _DEBUG
@@ -74,9 +73,9 @@ namespace
return S_OK;
#endif
if (uri.starts_with(URL_PREFIX))
if (uri.starts_with(ui::URL_PREFIX))
{
const auto asset = uri.substr(std::char_traits<char>::length(URL_PREFIX) - 1);
const auto asset = uri.substr(std::char_traits<char>::length(ui::URL_PREFIX) - 1);
const auto foundUiFile = assetLookup.find(asset);
if (foundUiFile != assetLookup.end())
@@ -117,7 +116,7 @@ namespace
}
} // namespace
namespace PLATFORM_NAMESPACE_WINDOWS
namespace ui
{
void InstallAssetHandler(webview::webview& wv)
{
@@ -157,6 +156,6 @@ namespace PLATFORM_NAMESPACE_WINDOWS
std::cerr << "Failed to add resource requested filter\n";
}
}
} // namespace PLATFORM_NAMESPACE_WINDOWS
} // namespace ui
#endif

18
src/ModMan/Web/Platform/Windows/AssetHandlerWindows.h
View File

@@ -1,18 +0,0 @@
#pragma once
#include "Web/Platform/Platform.h"
#include <webview/macros.h>
#if defined(WEBVIEW_PLATFORM_WINDOWS) && defined(WEBVIEW_EDGE)
#include "Web/WebViewLib.h"
namespace PLATFORM_NAMESPACE_WINDOWS
{
constexpr auto URL_PREFIX = "http://modman.local/";
void InstallAssetHandler(webview::webview& wv);
} // namespace PLATFORM_NAMESPACE_WINDOWS
#endif

11
src/ModMan/Web/Platform/Windows/DialogHandlerWindows.cpp
View File

@@ -1,6 +1,7 @@
#include "Web/Platform/DialogHandler.h"
#include "Web/Platform/Platform.h"
#ifdef _WIN32
#ifdef PLATFORM_WINDOWS
#include "PlatformUtilsWindows.h"
@@ -8,8 +9,6 @@
#include <thread>
#include <windows.h>
using namespace PLATFORM_NAMESPACE_WINDOWS;
namespace
{
bool SetFilters(IFileDialog* pFileOpen, const std::vector<ui::FileDialogFilter>& filters)
@@ -29,8 +28,8 @@ namespace
const auto& filter = filters[i];
COMDLG_FILTERSPEC filterSpec;
const auto& wName = filterStrings.emplace_back(StringToWideString(filter.m_name));
const auto& wSpec = filterStrings.emplace_back(StringToWideString(filter.m_filter));
const auto& wName = filterStrings.emplace_back(utils::StringToWideString(filter.m_name));
const auto& wSpec = filterStrings.emplace_back(utils::StringToWideString(filter.m_filter));
filterSpec.pszName = wName.c_str();
filterSpec.pszSpec = wSpec.c_str();
@@ -65,7 +64,7 @@ namespace
// Display the file name to the user.
if (SUCCEEDED(hr))
{
result = WideStringToString(pszFilePath);
result = utils::WideStringToString(pszFilePath);
CoTaskMemFree(pszFilePath);
resultType = ui::DialogCallbackResultType::SUCCESSFUL;

150
src/ModMan/Web/Platform/Windows/FaviconHandlerWindows.cpp Normal file
View File

@@ -0,0 +1,150 @@
#include "Web/Platform/FaviconHandler.h"
#include "Web/Platform/Platform.h"
#ifdef PLATFORM_WINDOWS
#include "PlatformUtilsWindows.h"
#include "Web/UiAssets.h"
#include <Windows.h>
#include <format>
#include <gdiplus.h>
#include <iostream>
#include <sstream>
#include <webview/detail/backends/win32_edge.hh>
#include <wrl/event.h>
namespace
{
class UniqueHIcon
{
public:
UniqueHIcon()
: m_icon(nullptr)
{
}
~UniqueHIcon()
{
if (m_icon)
{
DestroyIcon(m_icon);
m_icon = nullptr;
}
}
UniqueHIcon(const UniqueHIcon& other) = default;
UniqueHIcon(UniqueHIcon&& other) noexcept
: m_icon(other.m_icon)
{
other.m_icon = nullptr;
}
UniqueHIcon& operator=(const UniqueHIcon& other) = default;
UniqueHIcon& operator=(UniqueHIcon&& other) noexcept
{
m_icon = other.m_icon;
other.m_icon = nullptr;
return *this;
}
HICON& get()
{
return m_icon;
}
private:
HICON m_icon;
};
std::unordered_map<HWND, UniqueHIcon> icons;
HRESULT HandleFaviconChanged(ICoreWebView2_15* core15, HWND window)
{
LPWSTR url;
if (!SUCCEEDED(core15->get_FaviconUri(&url)))
{
std::cerr << "Failed to get favicon uri\n";
return S_FALSE;
}
const std::wstring strUrl(url);
CoTaskMemFree(url);
if (strUrl.empty())
{
icons.erase(icons.find(window));
SendMessage(window, WM_SETICON, ICON_SMALL, (LPARAM)NULL);
}
else
{
if (!SUCCEEDED(core15->GetFavicon(COREWEBVIEW2_FAVICON_IMAGE_FORMAT_PNG,
Microsoft::WRL::Callback<ICoreWebView2GetFaviconCompletedHandler>(
[window](HRESULT errorCode, IStream* iconStream) -> HRESULT
{
Gdiplus::Bitmap iconBitmap(iconStream);
UniqueHIcon icon;
if (iconBitmap.GetHICON(&icon.get()) == Gdiplus::Status::Ok)
{
SendMessage(window, WM_SETICON, ICON_SMALL, reinterpret_cast<LPARAM>(icon.get()));
icons.emplace(window, std::move(icon)).first->second.get();
}
else
{
icons.erase(icons.find(window));
SendMessage(window, WM_SETICON, ICON_SMALL, NULL);
}
return S_OK;
})
.Get())))
{
std::cerr << "Failed to get favicon\n";
return S_FALSE;
}
}
return S_OK;
}
} // namespace
namespace ui
{
void InstallFaviconHandler(webview::webview& wv)
{
const auto controller = static_cast<ICoreWebView2Controller*>(wv.browser_controller().value());
auto window = static_cast<HWND>(wv.window().value());
Microsoft::WRL::ComPtr<ICoreWebView2> core;
if (!SUCCEEDED(controller->get_CoreWebView2(&core)))
{
std::cerr << "Failed to get webview\n";
return;
}
Microsoft::WRL::ComPtr<ICoreWebView2_15> core15;
if (!SUCCEEDED(core->QueryInterface(IID_PPV_ARGS(&core15))))
{
std::cerr << "Failed to get core15\n";
return;
}
const Gdiplus::GdiplusStartupInput gdiPlusStartupInput;
ULONG_PTR gdiPlusToken;
Gdiplus::GdiplusStartup(&gdiPlusToken, &gdiPlusStartupInput, nullptr);
EventRegistrationToken token;
if (!SUCCEEDED(core15->add_FaviconChanged(Microsoft::WRL::Callback<ICoreWebView2FaviconChangedEventHandler>(
[core15, window](ICoreWebView2* sender, IUnknown* args) -> HRESULT
{
return HandleFaviconChanged(core15.Get(), window);
})
.Get(),
&token)))
{
std::cerr << "Failed to add favicon handler\n";
}
}
} // namespace ui
#endif

6
src/ModMan/Web/Platform/Windows/PlatformUtilsWindows.cpp
View File

@@ -1,12 +1,12 @@
#include "PlatformUtilsWindows.h"
#ifdef _WIN32
#ifdef PLATFORM_WINDOWS
#include <Windows.h>
#include <exception>
#include <format>
namespace PLATFORM_NAMESPACE_WINDOWS
namespace utils
{
std::string WideStringToString(const std::wstring& wideString)
{
@@ -35,6 +35,6 @@ namespace PLATFORM_NAMESPACE_WINDOWS
MultiByteToWideChar(CP_UTF8, 0, string.data(), static_cast<int>(string.size()), result.data(), sizeNeeded);
return result;
}
} // namespace PLATFORM_NAMESPACE_WINDOWS
} // namespace utils
#endif

9
src/ModMan/Web/Platform/Windows/PlatformUtilsWindows.h
View File

@@ -1,16 +1,15 @@
#pragma once
#ifdef _WIN32
#include "Web/Platform/Platform.h"
#include <optional>
#ifdef PLATFORM_WINDOWS
#include <string>
namespace PLATFORM_NAMESPACE_WINDOWS
namespace utils
{
std::string WideStringToString(const std::wstring& wideString);
std::wstring StringToWideString(const std::string& string);
} // namespace PLATFORM_NAMESPACE_WINDOWS
} // namespace utils
#endif

62
src/ModMan/Web/Platform/Windows/TitleHandlerWindows.cpp Normal file
View File

@@ -0,0 +1,62 @@
#include "Web/Platform/Platform.h"
#include "Web/Platform/TitleHandler.h"
#ifdef PLATFORM_WINDOWS
#include "PlatformUtilsWindows.h"
#include "Web/UiAssets.h"
#include <Windows.h>
#include <format>
#include <iostream>
#include <sstream>
#include <webview/detail/backends/win32_edge.hh>
#include <wrl/event.h>
namespace
{
HRESULT HandleTitleChanged(ICoreWebView2* core, HWND window)
{
LPWSTR title;
if (!SUCCEEDED(core->get_DocumentTitle(&title)))
{
std::cerr << "Failed to get title\n";
return S_FALSE;
}
SetWindowTextW(window, title);
CoTaskMemFree(title);
return S_OK;
}
} // namespace
namespace ui
{
void InstallTitleHandler(webview::webview& wv)
{
const auto controller = static_cast<ICoreWebView2Controller*>(wv.browser_controller().value());
auto window = static_cast<HWND>(wv.window().value());
Microsoft::WRL::ComPtr<ICoreWebView2> core;
if (!SUCCEEDED(controller->get_CoreWebView2(&core)))
{
std::cerr << "Failed to get webview\n";
return;
}
EventRegistrationToken token;
if (!SUCCEEDED(core->add_DocumentTitleChanged(Microsoft::WRL::Callback<ICoreWebView2DocumentTitleChangedEventHandler>(
[window](ICoreWebView2* sender, IUnknown* args) -> HRESULT
{
return HandleTitleChanged(sender, window);
})
.Get(),
&token)))
{
std::cerr << "Failed to add title handler\n";
}
}
} // namespace ui
#endif

13
src/ModMan/main.cpp
View File

@@ -3,6 +3,8 @@
#include "ModManArgs.h"
#include "Web/Binds/Binds.h"
#include "Web/Platform/AssetHandler.h"
#include "Web/Platform/FaviconHandler.h"
#include "Web/Platform/TitleHandler.h"
#include "Web/UiCommunication.h"
#include "Web/ViteAssets.h"
#include "Web/WebViewLib.h"
@@ -17,7 +19,6 @@
#endif
using namespace std::string_literals;
using namespace PLATFORM_NAMESPACE;
namespace
{
@@ -32,6 +33,8 @@ namespace
{
context.m_dev_tools_webview = std::make_unique<webview::webview>(false, nullptr);
auto& newWindow = *context.m_dev_tools_webview;
ui::InstallFaviconHandler(newWindow);
ui::InstallTitleHandler(newWindow);
newWindow.set_title("Devtools");
newWindow.set_size(640, 480, WEBVIEW_HINT_NONE);
@@ -65,11 +68,13 @@ namespace
newWindow.set_size(1280, 640, WEBVIEW_HINT_NONE);
newWindow.set_size(640, 480, WEBVIEW_HINT_MIN);
InstallAssetHandler(newWindow);
ui::InstallAssetHandler(newWindow);
ui::InstallFaviconHandler(newWindow);
ui::InstallTitleHandler(newWindow);
ui::RegisterAllBinds(newWindow);
#ifdef _DEBUG
newWindow.navigate(VITE_DEV_SERVER ? std::format("http://localhost:{}", VITE_DEV_SERVER_PORT) : std::format("{}index.html", URL_PREFIX));
newWindow.navigate(VITE_DEV_SERVER ? std::format("http://localhost:{}", VITE_DEV_SERVER_PORT) : std::format("{}index.html", ui::URL_PREFIX));
if (VITE_DEV_SERVER)
{
@@ -80,7 +85,7 @@ namespace
});
}
#else
newWindow.navigate(std::format("{}index.html", URL_PREFIX));
newWindow.navigate(std::format("{}index.html", ui::URL_PREFIX));
#endif
newWindow.run();
}

1
thirdparty/webview.lua vendored
View File

@@ -13,6 +13,7 @@ function webview:link(links)
if os.host() == "windows" then
links:add("WebView2LoaderStatic")
links:add("gdiplus.lib")
filter "platforms:x86"
libdirs {