RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 04:58:13 +00:00
Code Issues Activity Actions

Mandelbrot: Modernize code by using the FileSystemAccessClient

Browse source 
This allows us to stop using raw `FILE*` and reintroduce `unveil` calls.
This commit is contained in:
Lucas CHOLLET 2023-12-28 17:03:22 -05:00 • committed by Andreas Kling
parent 0c8c0ff412
commit 726fa41d4a
2 changed files with 22 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Demos/Mandelbrot/CMakeLists.txt
View file

@ -8,4 +8,4 @@ set(SOURCES
) )
serenity_app(Mandelbrot ICON app-mandelbrot) serenity_app(Mandelbrot ICON app-mandelbrot)
target_link_libraries(Mandelbrot PRIVATE LibGUI LibCore LibGfx LibMain) target_link_libraries(Mandelbrot PRIVATE LibCore LibFileSystemAccessClient LibGfx LibGUI LibMain)

50
Userland/Demos/Mandelbrot/Mandelbrot.cpp
View file

@ -6,9 +6,10 @@
*/ */
#include <LibCore/System.h> #include <LibCore/System.h>
#include <LibFileSystemAccessClient/Client.h>
#include <LibGUI/Action.h> #include <LibGUI/Action.h>
#include <LibGUI/Application.h> #include <LibGUI/Application.h>
#include <LibGUI/FilePicker.h> #include <LibGUI/Frame.h>
#include <LibGUI/Icon.h> #include <LibGUI/Icon.h>
#include <LibGUI/Menu.h> #include <LibGUI/Menu.h>
#include <LibGUI/Menubar.h> #include <LibGUI/Menubar.h>
@ -21,7 +22,6 @@
#include <LibGfx/ImageFormats/PNGWriter.h> #include <LibGfx/ImageFormats/PNGWriter.h>
#include <LibGfx/ImageFormats/QOIWriter.h> #include <LibGfx/ImageFormats/QOIWriter.h>
#include <LibMain/Main.h> #include <LibMain/Main.h>
#include <unistd.h>
class MandelbrotSet { class MandelbrotSet {
public: public:
@ -217,7 +217,7 @@ enum class ImageType {
class Mandelbrot : public GUI::Frame { class Mandelbrot : public GUI::Frame {
C_OBJECT(Mandelbrot) C_OBJECT(Mandelbrot)
ErrorOr<void> export_image(ByteString const& export_path, ImageType image_type); ErrorOr<void> export_image(Core::File& export_path, ImageType image_type);
enum class Zoom { enum class Zoom {
In, In,
@ -366,7 +366,7 @@ void Mandelbrot::resize_event(GUI::ResizeEvent& event)
m_set.resize(event.size()); m_set.resize(event.size());
} }
ErrorOr<void> Mandelbrot::export_image(ByteString const& export_path, ImageType image_type) ErrorOr<void> Mandelbrot::export_image(Core::File& export_file, ImageType image_type)
{ {
m_set.resize(Gfx::IntSize { 1920, 1080 }); m_set.resize(Gfx::IntSize { 1920, 1080 });
ByteBuffer encoded_data; ByteBuffer encoded_data;
@ -384,13 +384,8 @@ ErrorOr<void> Mandelbrot::export_image(ByteString const& export_path, ImageType
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }
m_set.resize(size()); m_set.resize(size());
auto file = fopen(export_path.characters(), "wb");
if (!file) { TRY(export_file.write_until_depleted(encoded_data));
GUI::MessageBox::show(window(), ByteString::formatted("Could not open '{}' for writing.", export_path), "Mandelbrot"sv, GUI::MessageBox::Type::Error);
return {};
}
fwrite(encoded_data.data(), 1, encoded_data.size(), file);
fclose(file);
return {}; return {};
} }
@ -400,10 +395,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(Core::System::pledge("stdio thread recvfd sendfd rpath unix wpath cpath")); TRY(Core::System::pledge("stdio thread recvfd sendfd rpath unix wpath cpath"));
#if 0
TRY(Core::System::unveil("/res", "r")); TRY(Core::System::unveil("/res", "r"));
TRY(unveil(nullptr, nullptr)); TRY(Core::System::unveil("/tmp/session/%sid/portal/filesystemaccess", "rw"));
#endif TRY(Core::System::unveil(nullptr, nullptr));
auto window = GUI::Window::construct(); auto window = GUI::Window::construct();
window->set_double_buffering_enabled(false); window->set_double_buffering_enabled(false);
@ -417,29 +411,27 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto export_submenu = file_menu->add_submenu("&Export"_string); auto export_submenu = file_menu->add_submenu("&Export"_string);
auto const save_image = [&](ImageType type, StringView extension) {
auto const export_path = FileSystemAccessClient::Client::the().save_file(window, "mandelbrot"sv, extension);
if (export_path.is_error())
return;
if (auto result = mandelbrot->export_image(export_path.value().stream(), type); result.is_error())
GUI::MessageBox::show_error(window, ByteString::formatted("{}", result.error()));
};
export_submenu->add_action(GUI::Action::create("As &BMP...", export_submenu->add_action(GUI::Action::create("As &BMP...",
[&](GUI::Action&) { [&](GUI::Action&) {
Optional<ByteString> export_path = GUI::FilePicker::get_save_filepath(window, "untitled", "bmp"); save_image(ImageType::BMP, ".bmp"sv);
if (!export_path.has_value())
return;
if (auto result = mandelbrot->export_image(export_path.value(), ImageType::BMP); result.is_error())
GUI::MessageBox::show_error(window, ByteString::formatted("{}", result.error()));
})); }));
export_submenu->add_action(GUI::Action::create("As &PNG...", { Mod_Ctrl | Mod_Shift, Key_S }, export_submenu->add_action(GUI::Action::create("As &PNG...", { Mod_Ctrl | Mod_Shift, Key_S },
[&](GUI::Action&) { [&](GUI::Action&) {
Optional<ByteString> export_path = GUI::FilePicker::get_save_filepath(window, "untitled", "png"); save_image(ImageType::PNG, ".png"sv);
if (!export_path.has_value())
return;
if (auto result = mandelbrot->export_image(export_path.value(), ImageType::PNG); result.is_error())
GUI::MessageBox::show_error(window, ByteString::formatted("{}", result.error()));
})); }));
export_submenu->add_action(GUI::Action::create("As &QOI...", export_submenu->add_action(GUI::Action::create("As &QOI...",
[&](GUI::Action&) { [&](GUI::Action&) {
Optional<ByteString> export_path = GUI::FilePicker::get_save_filepath(window, "untitled", "qoi"); save_image(ImageType::QOI, ".qoi"sv);
if (!export_path.has_value())
return;
if (auto result = mandelbrot->export_image(export_path.value(), ImageType::QOI); result.is_error())
GUI::MessageBox::show_error(window, ByteString::formatted("{}", result.error()));
})); }));
export_submenu->set_icon(TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/save.png"sv))); export_submenu->set_icon(TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/save.png"sv)));