RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 22:57:44 +00:00
Code Issues Activity Actions

WindowServer+Userland: Pass wallpapers as Gfx::Bitmap instead of path

Browse source 
The WindowServer _really_ does not need to know the filesystem path to
it's wallpaper, and allows setting arbitrary wallpapers (those outside
of `/res/wallpapers`).

The GUI::Desktop will keep track of the path to the wallpaper (if any),
and save it to config if desired (to be persisted).

This avoids the need to `unveil` paths to the wallpaper, fixing #11158
This commit is contained in:
James Puleo 2022-02-13 13:00:57 -05:00 • committed by Ali Mohammad Pur
parent f538545987
commit a0e7a4b9a8
13 changed files with 61 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Userland/Libraries/LibGUI/Desktop.cpp
View file

@ -5,6 +5,7 @@
*/
#include <AK/Badge.h>
#include <AK/TemporaryChange.h>
#include <LibGUI/Desktop.h>
#include <LibGUI/WindowServerConnection.h>
#include <string.h>
@ -53,22 +54,30 @@ void Desktop::set_wallpaper_mode(StringView mode)
WindowServerConnection::the().async_set_wallpaper_mode(mode);
}
bool Desktop::set_wallpaper(StringView path, bool save_config)
String Desktop::wallpaper_path() const
{
WindowServerConnection::the().async_set_wallpaper(path);
return Config::read_string("WindowManager", "Background", "Wallpaper");
}
RefPtr<Gfx::Bitmap> Desktop::wallpaper_bitmap() const
{
return WindowServerConnection::the().get_wallpaper().bitmap();
}
bool Desktop::set_wallpaper(RefPtr<Gfx::Bitmap> wallpaper_bitmap, Optional<String> path)
{
if (m_is_setting_desktop_wallpaper)
return false;
TemporaryChange is_setting_desktop_wallpaper_change(m_is_setting_desktop_wallpaper, true);
WindowServerConnection::the().async_set_wallpaper(wallpaper_bitmap ? wallpaper_bitmap->to_shareable_bitmap() : Gfx::ShareableBitmap {});
auto ret_val = WindowServerConnection::the().wait_for_specific_message<Messages::WindowClient::SetWallpaperFinished>()->success();
if (ret_val && save_config) {
dbgln("Saving wallpaper path '{}' to ConfigServer", path);
Config::write_string("WindowManager", "Background", "Wallpaper", path);
if (ret_val && path.has_value()) {
dbgln("Saving wallpaper path '{}' to ConfigServer", *path);
Config::write_string("WindowManager", "Background", "Wallpaper", *path);
}
return ret_val;
}
String Desktop::wallpaper() const
{
return WindowServerConnection::the().get_wallpaper();
}
}