diff options
| -rw-r--r-- | Applications/Help/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Applications/Help/main.cpp | 32 |
2 files changed, 28 insertions, 6 deletions
diff --git a/Applications/Help/CMakeLists.txt b/Applications/Help/CMakeLists.txt index 71bed8e51b..8d1a5038e2 100644 --- a/Applications/Help/CMakeLists.txt +++ b/Applications/Help/CMakeLists.txt @@ -7,4 +7,4 @@ set(SOURCES ) serenity_bin(Help) -target_link_libraries(Help LibWeb LibMarkdown LibGUI) +target_link_libraries(Help LibWeb LibMarkdown LibGUI LibDesktop) diff --git a/Applications/Help/main.cpp b/Applications/Help/main.cpp index 105584915d..145fdd0acf 100644 --- a/Applications/Help/main.cpp +++ b/Applications/Help/main.cpp @@ -29,6 +29,7 @@ #include <AK/ByteBuffer.h> #include <AK/URL.h> #include <LibCore/File.h> +#include <LibDesktop/Launcher.h> #include <LibGUI/AboutDialog.h> #include <LibGUI/Action.h> #include <LibGUI/Application.h> @@ -58,7 +59,7 @@ int main(int argc, char* argv[]) auto app = GUI::Application::construct(argc, argv); - if (pledge("stdio shared_buffer accept rpath", nullptr) < 0) { + if (pledge("stdio shared_buffer accept rpath unix", nullptr) < 0) { perror("pledge"); return 1; } @@ -73,6 +74,11 @@ int main(int argc, char* argv[]) return 1; } + if (unveil("/tmp/portal/launch", "rw") < 0) { + perror("unveil"); + return 1; + } + unveil(nullptr, nullptr); auto app_icon = GUI::Icon::default_icon("app-help"); @@ -159,10 +165,27 @@ int main(int argc, char* argv[]) model->update_section_node_on_toggle(index, open); }; + auto open_external = [&](auto& url) { + if (!Desktop::Launcher::open(url)) { + GUI::MessageBox::show( + String::format("The link to '%s' could not be opened.", url.to_string().characters()), + "Failed to open link", + GUI::MessageBox::Type::Error, + GUI::MessageBox::InputType::OK, + window); + } + }; + page_view.on_link_click = [&](auto& url, auto&, unsigned) { - char* current_path = strdup(history.current().characters()); - char* path = realpath(url.path().characters(), nullptr); - free(current_path); + if (url.protocol() != "file") { + open_external(url); + return; + } + auto path = Core::File::real_path_for(url.path()); + if (!path.starts_with("/usr/share/man/")) { + open_external(url); + return; + } auto tree_view_index = model->index_from_path(path); if (tree_view_index.has_value()) { dbg() << "Found path _" << path << "_ in model at index " << tree_view_index.value(); @@ -172,7 +195,6 @@ int main(int argc, char* argv[]) history.push(path); update_actions(); open_page(path); - free(path); }; go_back_action = GUI::CommonActions::make_go_back_action([&](auto&) { |