WindowServer: Port to socket takeover

luteresa · Nov 26, 2019 · 22a0562 · 22a0562
1 parent c9e21b2
commit 22a0562
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Base/etc/SystemServer.ini b/Base/etc/SystemServer.ini
@@ -15,6 +15,7 @@ KeepAlive=1
 User=anon
 
 [WindowServer]
+Socket=/tmp/portal/window
 Priority=high
 KeepAlive=1
 User=anon

diff --git a/Libraries/LibGUI/GWindowServerConnection.h b/Libraries/LibGUI/GWindowServerConnection.h
@@ -14,7 +14,7 @@ class GWindowServerConnection : public IPC::Client::Connection<WSAPI_ServerMessa
  C_OBJECT(GWindowServerConnection)
 public:
  GWindowServerConnection()
- : Connection("/tmp/wsportal")
+ : Connection("/tmp/portal/window")
  {}
 
  void handshake() override;

diff --git a/Servers/WindowServer/WSEventLoop.cpp b/Servers/WindowServer/WSEventLoop.cpp
@@ -27,8 +27,8 @@ WSEventLoop::WSEventLoop()
  m_keyboard_fd = open("/dev/keyboard", O_RDONLY | O_NONBLOCK | O_CLOEXEC);
  m_mouse_fd = open("/dev/psaux", O_RDONLY | O_NONBLOCK | O_CLOEXEC);
 
- unlink("/tmp/wsportal");
- m_server->listen("/tmp/wsportal");
+ bool ok = m_server->take_over_from_system_server();
+ ASSERT(ok);
 
  m_server->on_ready_to_accept = [this] {
  auto client_socket = m_server->accept();