The-Homebrew-Cloud/Cemu
2
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2024-11-25 10:36:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better screenshot error handling (#552)

Browse Source
This commit is contained in:
Tom Lally 2022-12-05 16:16:08 +00:00 committed by GitHub
parent c1afa4cad0
commit 445b0afa95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 75 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/Cafe/HW/Latte/Renderer/Renderer.cpp
View File

@ -13,6 +13,7 @@
#include <wx/image.h>
#include <wx/dataobj.h>
#include <wx/clipbrd.h>
#include <wx/log.h>
std::unique_ptr<Renderer> g_renderer;
@ -81,7 +82,7 @@ uint8 Renderer::RGBComponentToSRGB(uint8 cli)
return (uint8)(cs * 255.0f);
}
fs::path _GenerateScreenshotFilename(bool isDRC)
static std::optional<fs::path> GenerateScreenshotFilename(bool isDRC)
{
fs::path screendir = ActiveSettings::GetUserDataPath("screenshots");
// build screenshot name with format Screenshot_YYYY-MM-DD_HH-MM-SS[_GamePad].png
@ -101,19 +102,49 @@ fs::path _GenerateScreenshotFilename(bool isDRC)
screenshotPath.append(fmt::format("{}.png", screenshotFileName));
else
screenshotPath.append(fmt::format("{}_{}.png", screenshotFileName, i + 1));
std::error_code ec;
if (!fs::exists(screenshotPath))
bool exists = fs::exists(screenshotPath, ec);
if (!ec && !exists)
return screenshotPath;
}
return screenshotPath; // if all exist checks fail, return the last path we tried
return std::nullopt;
}
std::mutex s_clipboardMutex;
void Renderer::SaveScreenshot(const std::vector<uint8>& rgb_data, int width, int height, bool mainWindow) const
static bool SaveScreenshotToClipboard(const wxImage &image)
{
const bool save_screenshot = GetConfig().save_screenshot;
std::thread([](std::vector<uint8> data, bool save_screenshot, int width, int height, bool mainWindow)
bool success = false;
s_clipboardMutex.lock();
if (wxTheClipboard->Open())
{
wxTheClipboard->SetData(new wxImageDataObject(image));
wxTheClipboard->Close();
success = true;
}
s_clipboardMutex.unlock();
return success;
}
static bool SaveScreenshotToFile(const wxImage &image, bool mainWindow)
{
auto path = GenerateScreenshotFilename(!mainWindow);
if (!path) return false;
std::error_code ec;
fs::create_directories(path->parent_path(), ec);
if (ec) return false;
// suspend wxWidgets logging for the lifetime this object, to prevent a message box if wxImage::SaveFile fails
wxLogNull _logNo;
return image.SaveFile(path->wstring());
}
static void ScreenshotThread(std::vector<uint8> data, bool save_screenshot, int width, int height, bool mainWindow)
{
#if BOOST_OS_WINDOWS
// on Windows wxWidgets uses OLE API for the clipboard
@ -125,28 +156,20 @@ void Renderer::SaveScreenshot(const std::vector<uint8>& rgb_data, int width, int
if (mainWindow)
{
s_clipboardMutex.lock();
if (wxTheClipboard->Open())
if(SaveScreenshotToClipboard(image))
{
wxTheClipboard->SetData(new wxImageDataObject(image));
wxTheClipboard->Close();
if(!save_screenshot && mainWindow)
if (!save_screenshot)
LatteOverlay_pushNotification("Screenshot saved to clipboard", 2500);
}
else
{
LatteOverlay_pushNotification("Failed to open clipboard", 2500);
}
s_clipboardMutex.unlock();
}
// save to png file
if (save_screenshot)
{
fs::path screendir = _GenerateScreenshotFilename(!mainWindow);
if (!fs::exists(screendir.parent_path()))
fs::create_directories(screendir.parent_path());
if (image.SaveFile(screendir.wstring()))
if (SaveScreenshotToFile(image, mainWindow))
{
if (mainWindow)
LatteOverlay_pushNotification("Screenshot saved", 2500);
@ -156,5 +179,10 @@ void Renderer::SaveScreenshot(const std::vector<uint8>& rgb_data, int width, int
LatteOverlay_pushNotification("Failed to save screenshot to file", 2500);
}
}
}, rgb_data, save_screenshot, width, height, mainWindow).detach();
}
void Renderer::SaveScreenshot(const std::vector<uint8>& rgb_data, int width, int height, bool mainWindow) const
{
const bool save_screenshot = GetConfig().save_screenshot;
std::thread(ScreenshotThread, rgb_data, save_screenshot, width, height, mainWindow).detach();
}