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

WindowServer: Only load /etc/WindowServer.ini once and keep it loaded

Browse source 
Instead of opening and reparsing WindowServer.ini at random occasions,
just keep the file open after loading it in serenity_main().

This avoids a bunch of unnecessary work, and also fixes an issue where
WindowManager::m_config might re-write stale values to disk.
This commit is contained in:
Andreas Kling 2023-01-02 17:13:39 +01:00
parent 481c0419ba
commit f4168be700
6 changed files with 82 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Services/WindowServer/Compositor.cpp
View file

@ -141,8 +141,8 @@ void Compositor::did_construct_window_manager(Badge<WindowManager>)
m_current_window_stack = &wm.current_window_stack();
m_wallpaper_mode = mode_to_enum(wm.config()->read_entry("Background", "Mode", "Center"));
m_custom_background_color = Color::from_string(wm.config()->read_entry("Background", "Color", ""));
m_wallpaper_mode = mode_to_enum(g_config->read_entry("Background", "Mode", "Center"));
m_custom_background_color = Color::from_string(g_config->read_entry("Background", "Color", ""));
invalidate_screen();
invalidate_occlusions();
@ -787,9 +787,8 @@ bool Compositor::set_background_color(DeprecatedString const& background_color)
m_custom_background_color = color;
auto& wm = WindowManager::the();
wm.config()->write_entry("Background", "Color", background_color);
bool succeeded = !wm.config()->sync().is_error();
g_config->write_entry("Background", "Color", background_color);
bool succeeded = !g_config->sync().is_error();
if (succeeded) {
update_wallpaper_bitmap();
@ -801,9 +800,8 @@ bool Compositor::set_background_color(DeprecatedString const& background_color)
bool Compositor::set_wallpaper_mode(DeprecatedString const& mode)
{
auto& wm = WindowManager::the();
wm.config()->write_entry("Background", "Mode", mode);
bool succeeded = !wm.config()->sync().is_error();
g_config->write_entry("Background", "Mode", mode);
bool succeeded = !g_config->sync().is_error();
if (succeeded) {
m_wallpaper_mode = mode_to_enum(mode);