mirror of
https://github.com/SerenityOS/serenity
synced 2024-07-24 03:25:02 +00:00
1a97382305
The pattern to construct `Application` was to use the `try_create` method from the `C_OBJECT` macro. While being safe from an OOM perspective, this method doesn't propagate errors from the constructor. This patch make `Application` use the `C_OBJECT_ABSTRACT` and manually define a `create` method that can bubble up errors from the construction stage. This commit also removes the ability to use `argc` and `argv` to create an `Application`, only `Main`'s `Arguments` can be used. From a user point of view, the patch renames `try_create` => `create`, hence the huge number of modified files.
31 lines
879 B
C++
31 lines
879 B
C++
/*
|
|
* Copyright (c) 2021, Timur Sultanov <SultanovTS@yandex.ru>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include "KeymapStatusWindow.h"
|
|
#include <LibCore/System.h>
|
|
#include <LibGUI/Application.h>
|
|
#include <LibGUI/ConnectionToWindowManagerServer.h>
|
|
#include <LibMain/Main.h>
|
|
#include <WindowServer/Window.h>
|
|
|
|
ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|
{
|
|
TRY(Core::System::pledge("stdio recvfd sendfd rpath unix getkeymap proc exec"));
|
|
|
|
auto app = TRY(GUI::Application::create(arguments));
|
|
|
|
auto window = TRY(KeymapStatusWindow::try_create());
|
|
window->set_has_alpha_channel(true);
|
|
window->set_title("Keymap");
|
|
window->resize(16, 16);
|
|
window->show();
|
|
window->make_window_manager(WindowServer::WMEventMask::KeymapChanged);
|
|
|
|
TRY(Core::System::pledge("stdio recvfd sendfd rpath getkeymap proc exec"));
|
|
|
|
return app->exec();
|
|
}
|