瀏覽代碼

WindowServer: Move configuration file into /etc/WindowServer

This is in preparation for running WindowServer as a separate user.
Andreas Kling 5 年之前
父節點
當前提交
0415db30c6

+ 1 - 1
Applications/DisplayProperties/DisplayProperties.cpp

@@ -47,7 +47,7 @@
 #include <Servers/WindowServer/WindowManager.h>
 
 DisplayPropertiesWidget::DisplayPropertiesWidget()
-    : m_wm_config(Core::ConfigFile::get_for_app("WindowManager"))
+    : m_wm_config(Core::ConfigFile::open("/etc/WindowServer/WindowServer.ini"))
 {
     create_resolution_list();
     create_wallpaper_list();

+ 0 - 0
Base/home/anon/WindowManager.ini → Base/etc/WindowServer/WindowServer.ini


+ 1 - 1
Servers/WindowServer/AppletManager.cpp

@@ -38,7 +38,7 @@ AppletManager::AppletManager()
 {
     s_the = this;
 
-    auto wm_config = Core::ConfigFile::get_for_app("WindowManager");
+    auto wm_config = Core::ConfigFile::open("/etc/WindowServer/WindowServer.ini");
     auto order = wm_config->read_entry("Applet", "Order");
     order_vector = order.split(',');
 }

+ 2 - 2
Servers/WindowServer/WindowManager.cpp

@@ -102,7 +102,7 @@ NonnullRefPtr<Cursor> WindowManager::get_cursor(const String& name)
 
 void WindowManager::reload_config(bool set_screen)
 {
-    m_wm_config = Core::ConfigFile::get_for_app("WindowManager");
+    m_wm_config = Core::ConfigFile::open("/etc/WindowServer/WindowServer.ini");
 
     m_double_click_speed = m_wm_config->read_num_entry("Input", "DoubleClickSpeed", 250);
 
@@ -1241,7 +1241,7 @@ void WindowManager::update_theme(String theme_path, String theme_name)
         }
         return IterationDecision::Continue;
     });
-    auto wm_config = Core::ConfigFile::get_for_app("WindowManager");
+    auto wm_config = Core::ConfigFile::open("/etc/WindowServer/WindowServer.ini");
     wm_config->write_entry("Theme", "Name", theme_name);
     wm_config->sync();
     invalidate();

+ 2 - 5
Servers/WindowServer/main.cpp

@@ -58,10 +58,7 @@ int main(int, char**)
         return 1;
     }
 
-    // FIXME: WindowServer should obviously not hardcode this.
-    //        Instead, we should have a ConfigServer or similar that allows programs
-    //        to get/set user settings over IPC without giving them access to any files.
-    if (unveil("/home/anon/WindowManager.ini", "rwc") < 0) {
+    if (unveil("/etc/WindowServer/WindowServer.ini", "rwc") < 0) {
         perror("unveil");
         return 1;
     }
@@ -81,7 +78,7 @@ int main(int, char**)
         return 1;
     }
 
-    auto wm_config = Core::ConfigFile::get_for_app("WindowManager");
+    auto wm_config = Core::ConfigFile::open("/etc/WindowServer/WindowServer.ini");
     auto theme_name = wm_config->read_entry("Theme", "Name", "Default");
 
     auto theme = Gfx::load_system_theme(String::format("/res/themes/%s.ini", theme_name.characters()));