mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-12-15 02:40:38 +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.
45 lines
1.6 KiB
C++
45 lines
1.6 KiB
C++
/*
|
|
* Copyright (c) 2021, Nico Weber <thakis@chromium.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include <LibCore/ArgsParser.h>
|
|
#include <LibGUI/Application.h>
|
|
#include <LibGUI/ConnectionToWindowServer.h>
|
|
#include <LibMain/Main.h>
|
|
|
|
ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|
{
|
|
int screen = 0;
|
|
int width = -1;
|
|
int height = -1;
|
|
int scale = -1;
|
|
|
|
Core::ArgsParser args_parser;
|
|
args_parser.set_general_help("Change the screen resolution.");
|
|
args_parser.add_option(screen, "Screen", "screen", 's', "screen");
|
|
args_parser.add_positional_argument(width, "Width", "width");
|
|
args_parser.add_positional_argument(height, "Height", "height");
|
|
args_parser.add_positional_argument(scale, "Scale Factor", "scale", Core::ArgsParser::Required::No);
|
|
args_parser.parse(arguments);
|
|
|
|
// A Core::EventLoop is all we need, but ConnectionToWindowServer needs a full Application object.
|
|
auto app = TRY(GUI::Application::create(arguments));
|
|
auto screen_layout = GUI::ConnectionToWindowServer::the().get_screen_layout();
|
|
if (screen < 0 || (size_t)screen >= screen_layout.screens.size()) {
|
|
warnln("invalid screen index: {}", screen);
|
|
return 1;
|
|
}
|
|
auto& main_screen = screen_layout.screens[screen];
|
|
main_screen.resolution = { width, height };
|
|
if (scale != -1)
|
|
main_screen.scale_factor = scale;
|
|
auto set_result = GUI::ConnectionToWindowServer::the().set_screen_layout(screen_layout, true);
|
|
if (!set_result.success()) {
|
|
warnln("failed to set resolution: {}", set_result.error_msg());
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|