mirror of
https://github.com/RGBCube/serenity
synced 2025-10-31 20:52:45 +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.
49 lines
1.8 KiB
C++
49 lines
1.8 KiB
C++
/*
|
||
* Copyright (c) 2020, Hüseyin Aslıtürk <asliturk@hotmail.com>
|
||
* Copyright (c) 2021-2022, Sam Atkins <atkinssj@serenityos.org>
|
||
*
|
||
* SPDX-License-Identifier: BSD-2-Clause
|
||
*/
|
||
|
||
#include "KeyboardSettingsWidget.h"
|
||
#include <LibConfig/Client.h>
|
||
#include <LibCore/ArgsParser.h>
|
||
#include <LibCore/System.h>
|
||
#include <LibGUI/Application.h>
|
||
#include <LibGUI/SettingsWindow.h>
|
||
#include <LibMain/Main.h>
|
||
|
||
ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||
{
|
||
TRY(Core::System::pledge("stdio rpath recvfd sendfd unix proc exec"));
|
||
auto app = TRY(GUI::Application::create(arguments));
|
||
Config::pledge_domain("KeyboardSettings");
|
||
|
||
StringView selected_tab;
|
||
Core::ArgsParser args_parser;
|
||
args_parser.add_option(selected_tab, "Tab, only option is 'keyboard'", "open-tab", 't', "tab");
|
||
args_parser.parse(arguments);
|
||
|
||
TRY(Core::System::pledge("stdio rpath recvfd sendfd proc exec"));
|
||
TRY(Core::System::unveil("/res", "r"));
|
||
TRY(Core::System::unveil("/bin/keymap", "x"));
|
||
TRY(Core::System::unveil("/bin/sysctl", "x"));
|
||
TRY(Core::System::unveil("/sys/kernel/keymap", "r"));
|
||
TRY(Core::System::unveil("/sys/kernel/variables/caps_lock_to_ctrl", "r"));
|
||
TRY(Core::System::unveil("/etc/Keyboard.ini", "r"));
|
||
TRY(Core::System::unveil(nullptr, nullptr));
|
||
|
||
auto app_icon = GUI::Icon::default_icon("app-keyboard-settings"sv);
|
||
|
||
auto window = TRY(GUI::SettingsWindow::create("Keyboard Settings"));
|
||
window->set_icon(app_icon.bitmap_for_size(16));
|
||
auto keyboard_settings_widget = TRY(window->add_tab<KeyboardSettingsWidget>(TRY("Keyboard"_string), "keyboard"sv));
|
||
window->set_active_tab(selected_tab);
|
||
|
||
window->on_active_window_change = [&](bool is_active_window) {
|
||
keyboard_settings_widget->window_activated(is_active_window);
|
||
};
|
||
|
||
window->show();
|
||
return app->exec();
|
||
}
|