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

WindowServer: Port to LibMain :^)

Browse source 
This simplifies some pledge(), unveil() and sigaction() calls.
This commit is contained in:
Andreas Kling 2021-11-22 23:20:52 +01:00
parent 97eb662e62
commit 9cf874ef9a
2 changed files with 15 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Services/WindowServer/CMakeLists.txt
View file

@ -39,5 +39,5 @@ set(SOURCES
) )
serenity_bin(WindowServer) serenity_bin(WindowServer)
target_link_libraries(WindowServer LibCore LibGfx LibThreading LibIPC) target_link_libraries(WindowServer LibCore LibGfx LibThreading LibIPC LibMain)
serenity_install_headers(Services/WindowServer) serenity_install_headers(Services/WindowServer)

61
Userland/Services/WindowServer/main.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2021, Andreas Kling <kling@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -14,47 +14,23 @@
#include <LibCore/File.h> #include <LibCore/File.h>
#include <LibGfx/Palette.h> #include <LibGfx/Palette.h>
#include <LibGfx/SystemTheme.h> #include <LibGfx/SystemTheme.h>
#include <LibMain/Main.h>
#include <LibSystem/Wrappers.h>
#include <signal.h> #include <signal.h>
#include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h>
int main(int, char**) ErrorOr<int> serenity_main(Main::Arguments)
{ {
if (pledge("stdio video thread sendfd recvfd accept rpath wpath cpath unix proc sigaction", nullptr) < 0) { TRY(System::pledge("stdio video thread sendfd recvfd accept rpath wpath cpath unix proc sigaction", nullptr));
perror("pledge"); TRY(System::unveil("/res", "r"));
return 1; TRY(System::unveil("/tmp", "cw"));
} TRY(System::unveil("/etc/WindowServer.ini", "rwc"));
TRY(System::unveil("/dev", "rw"));
if (unveil("/res", "r") < 0) { struct sigaction act = {};
perror("unveil /res");
return 1;
}
if (unveil("/tmp", "cw") < 0) {
perror("unveil /tmp cw");
return 1;
}
if (unveil("/etc/WindowServer.ini", "rwc") < 0) {
perror("unveil /etc/WindowServer.ini");
return 1;
}
if (unveil("/dev", "rw") < 0) {
perror("unveil /dev rw");
return 1;
}
struct sigaction act;
memset(&act, 0, sizeof(act));
act.sa_flags = SA_NOCLDWAIT; act.sa_flags = SA_NOCLDWAIT;
act.sa_handler = SIG_IGN; act.sa_handler = SIG_IGN;
int rc = sigaction(SIGCHLD, &act, nullptr); TRY(System::sigaction(SIGCHLD, &act, nullptr));
if (rc < 0) {
perror("sigaction");
return 1;
}
auto wm_config = Core::ConfigFile::open("/etc/WindowServer.ini"); auto wm_config = Core::ConfigFile::open("/etc/WindowServer.ini");
auto theme_name = wm_config->read_entry("Theme", "Name", "Default"); auto theme_name = wm_config->read_entry("Theme", "Name", "Default");
@ -72,10 +48,7 @@ int main(int, char**)
WindowServer::EventLoop loop; WindowServer::EventLoop loop;
if (pledge("stdio video thread sendfd recvfd accept rpath wpath cpath proc", nullptr) < 0) { TRY(System::pledge("stdio video thread sendfd recvfd accept rpath wpath cpath proc", nullptr));
perror("pledge");
return 1;
}
// First check which screens are explicitly configured // First check which screens are explicitly configured
{ {
@ -141,19 +114,13 @@ int main(int, char**)
auto am = WindowServer::AppletManager::construct(); auto am = WindowServer::AppletManager::construct();
auto mm = WindowServer::MenuManager::construct(); auto mm = WindowServer::MenuManager::construct();
if (unveil("/tmp", "") < 0) { TRY(System::unveil("/tmp", ""));
perror("unveil /tmp");
return 1;
}
// NOTE: Because we dynamically need to be able to open new /dev/fb* // NOTE: Because we dynamically need to be able to open new /dev/fb*
// devices we can't really unveil all of /dev unless we have some // devices we can't really unveil all of /dev unless we have some
// other mechanism that can hand us file descriptors for these. // other mechanism that can hand us file descriptors for these.
if (unveil(nullptr, nullptr) < 0) { TRY(System::unveil(nullptr, nullptr));
perror("unveil");
return 1;
}
dbgln("Entering WindowServer main loop"); dbgln("Entering WindowServer main loop");
loop.exec(); loop.exec();