RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 19:27:45 +00:00
Code Issues Activity Actions

Taskbar: Port to LibMain :^)

Browse source 
This opens up using TRY() for syscalls, Core::Object creation, and even
some Vector operations.
This commit is contained in:
Andreas Kling 2021-11-23 14:31:53 +01:00
parent b03f8d18c5
commit adc83e5802
2 changed files with 18 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,5 +14,5 @@ set(SOURCES
) )
serenity_bin(Taskbar) serenity_bin(Taskbar)
target_link_libraries(Taskbar LibGUI LibDesktop LibConfig) target_link_libraries(Taskbar LibGUI LibDesktop LibConfig LibMain)
serenity_install_headers(Services/Taskbar) serenity_install_headers(Services/Taskbar)

38
Userland/Services/Taskbar/main.cpp
View file

@ -15,12 +15,14 @@
#include <LibCore/EventLoop.h> #include <LibCore/EventLoop.h>
#include <LibCore/Process.h> #include <LibCore/Process.h>
#include <LibCore/StandardPaths.h> #include <LibCore/StandardPaths.h>
#include <LibCore/System.h>
#include <LibDesktop/AppFile.h> #include <LibDesktop/AppFile.h>
#include <LibGUI/ActionGroup.h> #include <LibGUI/ActionGroup.h>
#include <LibGUI/Application.h> #include <LibGUI/Application.h>
#include <LibGUI/Menu.h> #include <LibGUI/Menu.h>
#include <LibGUI/WindowManagerServerConnection.h> #include <LibGUI/WindowManagerServerConnection.h>
#include <LibGUI/WindowServerConnection.h> #include <LibGUI/WindowServerConnection.h>
#include <LibMain/Main.h>
#include <WindowServer/Window.h> #include <WindowServer/Window.h>
#include <serenity.h> #include <serenity.h>
#include <signal.h> #include <signal.h>
@ -29,16 +31,13 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
static Vector<String> discover_apps_and_categories(); static ErrorOr<Vector<String>> discover_apps_and_categories();
static NonnullRefPtr<GUI::Menu> build_system_menu(); static ErrorOr<NonnullRefPtr<GUI::Menu>> build_system_menu();
int main(int argc, char** argv) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
if (pledge("stdio recvfd sendfd proc exec rpath unix sigaction", nullptr) < 0) { TRY(Core::System::pledge("stdio recvfd sendfd proc exec rpath unix sigaction", nullptr));
perror("pledge"); auto app = TRY(GUI::Application::try_create(arguments));
return 1;
}
auto app = GUI::Application::construct(argc, argv);
Config::pledge_domains("Taskbar"); Config::pledge_domains("Taskbar");
Config::monitor_domain("Taskbar"); Config::monitor_domain("Taskbar");
app->event_loop().register_signal(SIGCHLD, [](int) { app->event_loop().register_signal(SIGCHLD, [](int) {
@ -50,15 +49,12 @@ int main(int argc, char** argv)
// We need to obtain the WM connection here as well before the pledge shortening. // We need to obtain the WM connection here as well before the pledge shortening.
GUI::WindowManagerServerConnection::the(); GUI::WindowManagerServerConnection::the();
if (pledge("stdio recvfd sendfd proc exec rpath", nullptr) < 0) { TRY(Core::System::pledge("stdio recvfd sendfd proc exec rpath", nullptr));
perror("pledge");
return 1;
}
auto menu = build_system_menu(); auto menu = TRY(build_system_menu());
menu->realize_menu_if_needed(); menu->realize_menu_if_needed();
auto window = TaskbarWindow::construct(move(menu)); auto window = TRY(TaskbarWindow::try_create(move(menu)));
window->show(); window->show();
window->make_window_manager( window->make_window_manager(
@ -90,7 +86,7 @@ Vector<ThemeMetadata> g_themes;
RefPtr<GUI::Menu> g_themes_menu; RefPtr<GUI::Menu> g_themes_menu;
GUI::ActionGroup g_themes_group; GUI::ActionGroup g_themes_group;
Vector<String> discover_apps_and_categories() ErrorOr<Vector<String>> discover_apps_and_categories()
{ {
HashTable<String> seen_app_categories; HashTable<String> seen_app_categories;
Desktop::AppFile::for_each([&](auto af) { Desktop::AppFile::for_each([&](auto af) {
@ -102,18 +98,18 @@ Vector<String> discover_apps_and_categories()
quick_sort(g_apps, [](auto& a, auto& b) { return a.name < b.name; }); quick_sort(g_apps, [](auto& a, auto& b) { return a.name < b.name; });
Vector<String> sorted_app_categories; Vector<String> sorted_app_categories;
for (auto& category : seen_app_categories) { TRY(sorted_app_categories.try_ensure_capacity(seen_app_categories.size()));
sorted_app_categories.append(category); for (auto const& category : seen_app_categories)
} sorted_app_categories.unchecked_append(category);
quick_sort(sorted_app_categories); quick_sort(sorted_app_categories);
return sorted_app_categories; return sorted_app_categories;
} }
NonnullRefPtr<GUI::Menu> build_system_menu() ErrorOr<NonnullRefPtr<GUI::Menu>> build_system_menu()
{ {
const Vector<String> sorted_app_categories = discover_apps_and_categories(); Vector<String> const sorted_app_categories = TRY(discover_apps_and_categories());
auto system_menu = GUI::Menu::construct("\xE2\x9A\xA1"); // HIGH VOLTAGE SIGN auto system_menu = TRY(GUI::Menu::try_create("\xE2\x9A\xA1")); // HIGH VOLTAGE SIGN
system_menu->add_action(GUI::Action::create("&About SerenityOS", Gfx::Bitmap::try_load_from_file("/res/icons/16x16/ladyball.png").release_value_but_fixme_should_propagate_errors(), [](auto&) { system_menu->add_action(GUI::Action::create("&About SerenityOS", Gfx::Bitmap::try_load_from_file("/res/icons/16x16/ladyball.png").release_value_but_fixme_should_propagate_errors(), [](auto&) {
Core::Process::spawn("/bin/About"sv); Core::Process::spawn("/bin/About"sv);