beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-25 17:10:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
ladybird/Ladybird/Utilities.cpp

79 lines
2.7 KiB
C++
Raw Normal View History

Ladybird/WebView: Move our PageClient to its own file And rename it to PageClientLadybird while we're at it, it's not "headless" by any means.
2022-09-19 09:06:23 +00:00
/*
* Copyright (c) 2022, Andreas Kling <kling@serenityos.org>
Ladybird: Move Qt-specific classes and functions to a Qt subdirectory This will help a lot with developing chromes for different UI frameworks where we can see which helper classes and processes are really using Qt vs just using it to get at helper data. As a bonus, remove Qt dependency from WebDriver.
2023-08-05 16:42:26 +00:00
* Copyright (c) 2023, Andrew Kaster <akaster@serenityos.org>
Ladybird/WebView: Move our PageClient to its own file And rename it to PageClientLadybird while we're at it, it's not "headless" by any means.
2022-09-19 09:06:23 +00:00
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include "Utilities.h"
Ladybird: Render web content in a separate process :^) This patch brings over the WebContent process over from SerenityOS to Ladybird, along with a new WebContentView widget that renders web content in a separate process. There's a lot of jank and FIXME material here, notably I had to re-add manually pumped Core::EventLoop instances on both sides, in order to get the IPC protocol running. This introduces a lot of latency and we should work towards replacing those loops with improved abstractions. The WebContent process is built separately here (not part of Lagom) and we provide our own main.cpp for it. Like everything, this can be better architected, it's just a starting point. :^)
2022-10-05 13:23:41 +00:00
#include <AK/LexicalPath.h>
#include <AK/Platform.h>
Ladybird: Load fonts via Core::Resource URIs instead of filesystem paths
2023-10-03 21:40:24 +00:00
#include <LibCore/ResourceImplementationFile.h>
Ladybird: Move Qt-specific classes and functions to a Qt subdirectory This will help a lot with developing chromes for different UI frameworks where we can see which helper classes and processes are really using Qt vs just using it to get at helper data. As a bonus, remove Qt dependency from WebDriver.
2023-08-05 16:42:26 +00:00
#include <LibCore/System.h>
Everywhere: Use `LibFileSystem` where trivial
2023-03-21 15:35:30 +00:00
#include <LibFileSystem/FileSystem.h>
Ladybird: Render web content in a separate process :^) This patch brings over the WebContent process over from SerenityOS to Ladybird, along with a new WebContentView widget that renders web content in a separate process. There's a lot of jank and FIXME material here, notably I had to re-add manually pumped Core::EventLoop instances on both sides, in order to get the IPC protocol running. This introduces a lot of latency and we should work towards replacing those loops with improved abstractions. The WebContent process is built separately here (not part of Lagom) and we provide our own main.cpp for it. Like everything, this can be better architected, it's just a starting point. :^)
2022-10-05 13:23:41 +00:00
Ladybird: Move helper processes to CMAKE_INSTALL_LIBEXECDIR It aligns better with the Filesystem Heirarchy Standard[1] to put our program-specific helper programs that are not intended to be executed by the user of the application in $prefix/libexec or in whatever the packager sets as the CMake equivalent. Namely, on Debian systems this should be /usr/lib/Ladybird or similar. [1] https://refspecs.linuxfoundation.org/FHS_3.0/fhs-3.0.html#usrlibexec
2024-02-24 00:02:17 +00:00
#define TOKENCAT(x, y) x##y
#define STRINGIFY(x) TOKENCAT(x, sv)
// This is expected to be set from the build scripts, if a packager desires
#if defined(LADYBIRD_LIBEXECDIR)
constexpr auto libexec_path = STRINGIFY(LADYBIRD_LIBEXECDIR);
#else
constexpr auto libexec_path = "libexec"sv;
#endif
Everywhere: Rename {Deprecated => Byte}String This commit un-deprecates DeprecatedString, and repurposes it as a byte string. As the null state has already been removed, there are no other particularly hairy blockers in repurposing this type as a byte string (what it _really_ is). This commit is auto-generated: $ xs=$(ack -l \bDeprecatedString\b\|deprecated_string AK Userland \ Meta Ports Ladybird Tests Kernel) $ perl -pie 's/\bDeprecatedString\b/ByteString/g; s/deprecated_string/byte_string/g' $xs $ clang-format --style=file -i \ $(git diff --name-only | grep \.cpp\|\.h) $ gn format $(git ls-files '*.gn' '*.gni')
2023-12-16 14:19:34 +00:00
ByteString s_serenity_resource_root;
Ladybird/WebView: Move our PageClient to its own file And rename it to PageClientLadybird while we're at it, it's not "headless" by any means.
2022-09-19 09:06:23 +00:00
Ladybird+Userland: Use ByteString for candidate server paths We've adopted a stance that paths should be ByteStrings rather than UTF-8 strings, so apply that to the Ladybird helpers.
2024-02-22 01:27:05 +00:00
ErrorOr<ByteString> application_directory()
Ladybird/WebView: Move our PageClient to its own file And rename it to PageClientLadybird while we're at it, it's not "headless" by any means.
2022-09-19 09:06:23 +00:00
{
Ladybird: Move Qt-specific classes and functions to a Qt subdirectory This will help a lot with developing chromes for different UI frameworks where we can see which helper classes and processes are really using Qt vs just using it to get at helper data. As a bonus, remove Qt dependency from WebDriver.
2023-08-05 16:42:26 +00:00
auto current_executable_path = TRY(Core::System::current_executable_path());
Ladybird+Userland: Use ByteString for candidate server paths We've adopted a stance that paths should be ByteStrings rather than UTF-8 strings, so apply that to the Ladybird helpers.
2024-02-22 01:27:05 +00:00
return LexicalPath::dirname(current_executable_path);
Ladybird: Add a utility to create a QString from an AK::String
2023-03-13 21:30:31 +00:00
}
Ladybird: Move helper processes to CMAKE_INSTALL_LIBEXECDIR It aligns better with the Filesystem Heirarchy Standard[1] to put our program-specific helper programs that are not intended to be executed by the user of the application in $prefix/libexec or in whatever the packager sets as the CMake equivalent. Namely, on Debian systems this should be /usr/lib/Ladybird or similar. [1] https://refspecs.linuxfoundation.org/FHS_3.0/fhs-3.0.html#usrlibexec
2024-02-24 00:02:17 +00:00
[[gnu::used]] static LexicalPath find_prefix(LexicalPath const& application_directory);
static LexicalPath find_prefix(LexicalPath const& application_directory)
{
if (application_directory.string().ends_with(libexec_path)) {
// Strip libexec_path if it's there
return LexicalPath(application_directory.string().substring_view(0, application_directory.string().length() - libexec_path.length()));
}
// Otherwise, we are in $prefix/bin
return application_directory.parent();
}
Ladybird: Render web content in a separate process :^) This patch brings over the WebContent process over from SerenityOS to Ladybird, along with a new WebContentView widget that renders web content in a separate process. There's a lot of jank and FIXME material here, notably I had to re-add manually pumped Core::EventLoop instances on both sides, in order to get the IPC protocol running. This introduces a lot of latency and we should work towards replacing those loops with improved abstractions. The WebContent process is built separately here (not part of Lagom) and we provide our own main.cpp for it. Like everything, this can be better architected, it's just a starting point. :^)
2022-10-05 13:23:41 +00:00
void platform_init()
{
s_serenity_resource_root = [] {
auto* home = getenv("XDG_CONFIG_HOME") ?: getenv("HOME");
Ladybird: Move helper processes to CMAKE_INSTALL_LIBEXECDIR It aligns better with the Filesystem Heirarchy Standard[1] to put our program-specific helper programs that are not intended to be executed by the user of the application in $prefix/libexec or in whatever the packager sets as the CMake equivalent. Namely, on Debian systems this should be /usr/lib/Ladybird or similar. [1] https://refspecs.linuxfoundation.org/FHS_3.0/fhs-3.0.html#usrlibexec
2024-02-24 00:02:17 +00:00
if (home != nullptr) {
auto home_lagom = ByteString::formatted("{}/.lagom", home);
if (FileSystem::is_directory(home_lagom))
return home_lagom;
}
Ladybird+Userland: Use ByteString for candidate server paths We've adopted a stance that paths should be ByteStrings rather than UTF-8 strings, so apply that to the Ladybird helpers.
2024-02-22 01:27:05 +00:00
auto app_dir = MUST(application_directory());
Ladybird: Add new template Kotlin Android application without Qt This template app from Android Studio should hopefully be more fun to work on than the Qt wrapped application we were using before. :^) It currently builds the native code using gradle rules, and has a stub WebViewImplementationNative class that will wrap a c++ class of the same name that inhertis from WebView::ViewImplementation. Spawning helper processes and creating proper views in Kotlin is next on the list.
2023-09-02 15:30:21 +00:00
#ifdef AK_OS_MACOS
Ladybird: Improve Xcode generator experience and copy helpers to bundle We had a mismatch in the GUI Identifier property, causing warnings in Xcode. It was also missing the Product Identifier Xcode property on ladybird itself, causing another warning. Copy all our helper processes to the ladybird.app bundle directory so that they can be found by ``open ladybird.app`` and the Xcode debugger. For the future, we should look in ../Resources for resources on macOS. Copying resources to that directory requires more CMake-fu.
2023-03-26 15:53:32 +00:00
return LexicalPath(app_dir).parent().append("Resources"sv).string();
Ladybird: Add new template Kotlin Android application without Qt This template app from Android Studio should hopefully be more fun to work on than the Qt wrapped application we were using before. :^) It currently builds the native code using gradle rules, and has a stub WebViewImplementationNative class that will wrap a c++ class of the same name that inhertis from WebView::ViewImplementation. Spawning helper processes and creating proper views in Kotlin is next on the list.
2023-09-02 15:30:21 +00:00
#else
Ladybird: Move helper processes to CMAKE_INSTALL_LIBEXECDIR It aligns better with the Filesystem Heirarchy Standard[1] to put our program-specific helper programs that are not intended to be executed by the user of the application in $prefix/libexec or in whatever the packager sets as the CMake equivalent. Namely, on Debian systems this should be /usr/lib/Ladybird or similar. [1] https://refspecs.linuxfoundation.org/FHS_3.0/fhs-3.0.html#usrlibexec
2024-02-24 00:02:17 +00:00
return find_prefix(LexicalPath(app_dir)).append("share/Lagom"sv).string();
Ladybird: Render web content in a separate process :^) This patch brings over the WebContent process over from SerenityOS to Ladybird, along with a new WebContentView widget that renders web content in a separate process. There's a lot of jank and FIXME material here, notably I had to re-add manually pumped Core::EventLoop instances on both sides, in order to get the IPC protocol running. This introduces a lot of latency and we should work towards replacing those loops with improved abstractions. The WebContent process is built separately here (not part of Lagom) and we provide our own main.cpp for it. Like everything, this can be better architected, it's just a starting point. :^)
2022-10-05 13:23:41 +00:00
#endif
Ladybird: Add new template Kotlin Android application without Qt This template app from Android Studio should hopefully be more fun to work on than the Qt wrapped application we were using before. :^) It currently builds the native code using gradle rules, and has a stub WebViewImplementationNative class that will wrap a c++ class of the same name that inhertis from WebView::ViewImplementation. Spawning helper processes and creating proper views in Kotlin is next on the list.
2023-09-02 15:30:21 +00:00
}();
Ladybird: Remove $SERENITY_SOURCE_DIR from resource root candidates Now we will only load resources from $build/share/Lagom. On macOS, we load from the bundle directory Contents/Resources instead. This simplifies the commands and environment variables needed to execute Ladybird from the build directory, and makes our install setup less awkward for distributions and packagers.
2024-02-23 20:40:16 +00:00
Core::ResourceImplementation::install(make<Core::ResourceImplementationFile>(MUST(String::from_byte_string(s_serenity_resource_root))));
Ladybird: Render web content in a separate process :^) This patch brings over the WebContent process over from SerenityOS to Ladybird, along with a new WebContentView widget that renders web content in a separate process. There's a lot of jank and FIXME material here, notably I had to re-add manually pumped Core::EventLoop instances on both sides, in order to get the IPC protocol running. This introduces a lot of latency and we should work towards replacing those loops with improved abstractions. The WebContent process is built separately here (not part of Lagom) and we provide our own main.cpp for it. Like everything, this can be better architected, it's just a starting point. :^)
2022-10-05 13:23:41 +00:00
}
Ladybird+LibWebView: Move Lagom code to Ladybird, Qt code to Utilities Re-organize our helper files here a bit, to make a clearer distinction between Qt-specific helpers and generic non-serenity helpers. A future commit will move Lagom specific code from LibSQL to ladybird as well, so that we can see about future generic apis for spawning helper procesess.
2023-08-01 17:56:10 +00:00
Ladybird+Userland: Use ByteString for candidate server paths We've adopted a stance that paths should be ByteStrings rather than UTF-8 strings, so apply that to the Ladybird helpers.
2024-02-22 01:27:05 +00:00
ErrorOr<Vector<ByteString>> get_paths_for_helper_process(StringView process_name)
Ladybird+LibWebView: Move Lagom code to Ladybird, Qt code to Utilities Re-organize our helper files here a bit, to make a clearer distinction between Qt-specific helpers and generic non-serenity helpers. A future commit will move Lagom specific code from LibSQL to ladybird as well, so that we can see about future generic apis for spawning helper procesess.
2023-08-01 17:56:10 +00:00
{
Ladybird: Move Qt-specific classes and functions to a Qt subdirectory This will help a lot with developing chromes for different UI frameworks where we can see which helper classes and processes are really using Qt vs just using it to get at helper data. As a bonus, remove Qt dependency from WebDriver.
2023-08-05 16:42:26 +00:00
auto application_path = TRY(application_directory());
Ladybird+Userland: Use ByteString for candidate server paths We've adopted a stance that paths should be ByteStrings rather than UTF-8 strings, so apply that to the Ladybird helpers.
2024-02-22 01:27:05 +00:00
Vector<ByteString> paths;
Ladybird+LibWebView: Move Lagom code to Ladybird, Qt code to Utilities Re-organize our helper files here a bit, to make a clearer distinction between Qt-specific helpers and generic non-serenity helpers. A future commit will move Lagom specific code from LibSQL to ladybird as well, so that we can see about future generic apis for spawning helper procesess.
2023-08-01 17:56:10 +00:00
Ladybird: Move helper processes to CMAKE_INSTALL_LIBEXECDIR It aligns better with the Filesystem Heirarchy Standard[1] to put our program-specific helper programs that are not intended to be executed by the user of the application in $prefix/libexec or in whatever the packager sets as the CMake equivalent. Namely, on Debian systems this should be /usr/lib/Ladybird or similar. [1] https://refspecs.linuxfoundation.org/FHS_3.0/fhs-3.0.html#usrlibexec
2024-02-24 00:02:17 +00:00
#if !defined(AK_OS_MACOS)
auto prefix = find_prefix(LexicalPath(application_path));
TRY(paths.try_append(LexicalPath::join(prefix.string(), libexec_path, process_name).string()));
TRY(paths.try_append(LexicalPath::join(prefix.string(), "bin"sv, process_name).string()));
#endif
Ladybird+Userland: Use ByteString for candidate server paths We've adopted a stance that paths should be ByteStrings rather than UTF-8 strings, so apply that to the Ladybird helpers.
2024-02-22 01:27:05 +00:00
TRY(paths.try_append(ByteString::formatted("{}/{}", application_path, process_name)));
TRY(paths.try_append(ByteString::formatted("./{}", process_name)));
Ladybird+LibWebView: Move Lagom code to Ladybird, Qt code to Utilities Re-organize our helper files here a bit, to make a clearer distinction between Qt-specific helpers and generic non-serenity helpers. A future commit will move Lagom specific code from LibSQL to ladybird as well, so that we can see about future generic apis for spawning helper procesess.
2023-08-01 17:56:10 +00:00
// NOTE: Add platform-specific paths here
return paths;
}
Reference in a new issue Copy permalink