3837de0573
The only reason for the inheritance was to add FDs to the select set. Since CNotifier is available (and now also quite useful), we can make use of it instead, and remove the inheritance.
32 lines
874 B
C++
32 lines
874 B
C++
#include <LibCore/CConfigFile.h>
|
|
#include <WindowServer/WSCompositor.h>
|
|
#include <WindowServer/WSEventLoop.h>
|
|
#include <WindowServer/WSScreen.h>
|
|
#include <WindowServer/WSWindowManager.h>
|
|
#include <signal.h>
|
|
#include <stdio.h>
|
|
|
|
int main(int, char**)
|
|
{
|
|
struct sigaction act;
|
|
memset(&act, 0, sizeof(act));
|
|
act.sa_flags = SA_NOCLDWAIT;
|
|
act.sa_handler = SIG_IGN;
|
|
int rc = sigaction(SIGCHLD, &act, nullptr);
|
|
if (rc < 0) {
|
|
perror("sigaction");
|
|
return 1;
|
|
}
|
|
|
|
WSEventLoop loop;
|
|
|
|
auto wm_config = CConfigFile::get_for_app("WindowManager");
|
|
WSScreen screen(wm_config->read_num_entry("Screen", "Width", 1024),
|
|
wm_config->read_num_entry("Screen", "Height", 768));
|
|
WSCompositor::the();
|
|
WSWindowManager window_manager;
|
|
|
|
dbgprintf("Entering WindowServer main loop.\n");
|
|
loop.exec();
|
|
ASSERT_NOT_REACHED();
|
|
}
|