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

117 lines
5.7 KiB
C++
Raw Normal View History

Ladybird: Add a FontPlugin and try much harder to find suitable fonts Instead of only looking at the SerenityOS default fonts, we now also look recursively in /usr/share/fonts for suitable fonts that we can load and use.
2022-09-08 10:44:17 +00:00
/*
Ladybird: Ignore Qt preferred fonts and just load from our fallback list The Qt StyleHint system didn't work on X11 anyway, and we ended up with the default UI font being used for both `serif` and `sans-serif`. Instead of asking Qt for something it can't do properly, let's just grab the first available font from our list of fallbacks. This should give us better results everywhere.
2023-07-29 08:54:33 +00:00
* Copyright (c) 2022-2023, Andreas Kling <kling@serenityos.org>
Ladybird: Use standard font paths in FontPluginQt This makes vector fonts load on macOS, where /usr/share/fonts doesn't exist and Ladybird would only load the bitmap fonts from ./res/fonts in the SerenityOS resource root directory. Additionally, fonts in {/usr/share/local,~/.local}/fonts are now loaded on Linux.
2023-01-11 20:34:59 +00:00
* Copyright (c) 2023, Linus Groh <linusg@serenityos.org>
Ladybird: Add a FontPlugin and try much harder to find suitable fonts Instead of only looking at the SerenityOS default fonts, we now also look recursively in /usr/share/fonts for suitable fonts that we can load and use.
2022-09-08 10:44:17 +00:00
*
* SPDX-License-Identifier: BSD-2-Clause
*/
Ladybird: Rename classes ending with Ladybird Now that all the classes for Ladybird are in the Ladybird namespace, we don't need them named as Ladybird::FooBarLadybird. For the Qt-specific classes, we can tack on a Qt at the end for clarity, but FontPlugin and ImageCodecPlugin no longer have anything to do with Qt.
2023-08-02 18:01:17 +00:00
#include "FontPlugin.h"
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
#include <AK/ByteString.h>
Ladybird: Use standard font paths in FontPluginQt This makes vector fonts load on macOS, where /usr/share/fonts doesn't exist and Ladybird would only load the bitmap fonts from ./res/fonts in the SerenityOS resource root directory. Additionally, fonts in {/usr/share/local,~/.local}/fonts are now loaded on Linux.
2023-01-11 20:34:59 +00:00
#include <AK/String.h>
Ladybird: Use Core::Resource to locate the emoji lookup path The path we were using is no longer correct, and we've been silently dropping this error. Use Core::Resource instead, which we use for most other Ladybird resources. This would have made it much more obvious that emoji were not installed with the application.
2024-03-19 17:54:38 +00:00
#include <LibCore/Resource.h>
Ladybird: Use standard font paths in FontPluginQt This makes vector fonts load on macOS, where /usr/share/fonts doesn't exist and Ladybird would only load the bitmap fonts from ./res/fonts in the SerenityOS resource root directory. Additionally, fonts in {/usr/share/local,~/.local}/fonts are now loaded on Linux.
2023-01-11 20:34:59 +00:00
#include <LibCore/StandardPaths.h>
Ladybird: Specify the emoji image path in Ladybird's font plugin
2023-03-01 13:44:34 +00:00
#include <LibGfx/Font/Emoji.h>
Ladybird: Add a FontPlugin and try much harder to find suitable fonts Instead of only looking at the SerenityOS default fonts, we now also look recursively in /usr/share/fonts for suitable fonts that we can load and use.
2022-09-08 10:44:17 +00:00
#include <LibGfx/Font/FontDatabase.h>
namespace Ladybird {
Ladybird: Rename classes ending with Ladybird Now that all the classes for Ladybird are in the Ladybird namespace, we don't need them named as Ladybird::FooBarLadybird. For the Qt-specific classes, we can tack on a Qt at the end for clarity, but FontPlugin and ImageCodecPlugin no longer have anything to do with Qt.
2023-08-02 18:01:17 +00:00
FontPlugin::FontPlugin(bool is_layout_test_mode)
LibWeb: Add `--layout-test-mode` flag to HeadlessBrowser The `layout-test-mode` flag changes the font to be SerenitySans as this is the font used for layout tests for cross-platform compatibility of tests.
2023-05-06 10:46:14 +00:00
: m_is_layout_test_mode(is_layout_test_mode)
Ladybird: Add a FontPlugin and try much harder to find suitable fonts Instead of only looking at the SerenityOS default fonts, we now also look recursively in /usr/share/fonts for suitable fonts that we can load and use.
2022-09-08 10:44:17 +00:00
{
Ladybird: Load fonts via Core::Resource URIs instead of filesystem paths
2023-10-03 21:40:24 +00:00
// Load anything we can find in the system's font directories
Ladybird: Use standard font paths in FontPluginQt This makes vector fonts load on macOS, where /usr/share/fonts doesn't exist and Ladybird would only load the bitmap fonts from ./res/fonts in the SerenityOS resource root directory. Additionally, fonts in {/usr/share/local,~/.local}/fonts are now loaded on Linux.
2023-01-11 20:34:59 +00:00
for (auto const& path : Core::StandardPaths::font_directories().release_value_but_fixme_should_propagate_errors())
Ladybird: Load fonts via Core::Resource URIs instead of filesystem paths
2023-10-03 21:40:24 +00:00
Gfx::FontDatabase::the().load_all_fonts_from_uri(MUST(String::formatted("file://{}", path)));
Ladybird: Add a FontPlugin and try much harder to find suitable fonts Instead of only looking at the SerenityOS default fonts, we now also look recursively in /usr/share/fonts for suitable fonts that we can load and use.
2022-09-08 10:44:17 +00:00
Gfx::FontDatabase::set_default_font_query("Katica 10 400 0");
Gfx::FontDatabase::set_fixed_width_font_query("Csilla 10 400 0");
Ladybird: Use Core::Resource to locate the emoji lookup path The path we were using is no longer correct, and we've been silently dropping this error. Use Core::Resource instead, which we use for most other Ladybird resources. This would have made it much more obvious that emoji were not installed with the application.
2024-03-19 17:54:38 +00:00
auto emoji_path = MUST(Core::Resource::load_from_uri("resource://emoji"sv));
VERIFY(emoji_path->is_directory());
Gfx::Emoji::set_emoji_lookup_path(emoji_path->filesystem_path());
Ladybird: Specify the emoji image path in Ladybird's font plugin
2023-03-01 13:44:34 +00:00
Ladybird: Add a FontPlugin and try much harder to find suitable fonts Instead of only looking at the SerenityOS default fonts, we now also look recursively in /usr/share/fonts for suitable fonts that we can load and use.
2022-09-08 10:44:17 +00:00
update_generic_fonts();
Ladybird/FontPluginQt: Implement default font virtuals
2022-09-17 19:25:15 +00:00
auto default_font_name = generic_font_name(Web::Platform::GenericFont::UiSansSerif);
LibWeb: Make FontPlugin::generic_font_name() return FlyString
2023-09-06 05:45:47 +00:00
m_default_font = Gfx::FontDatabase::the().get(default_font_name, 12.0, 400, Gfx::FontWidth::Normal, 0);
Ladybird/FontPluginQt: Implement default font virtuals
2022-09-17 19:25:15 +00:00
VERIFY(m_default_font);
Ladybird/FontPluginQt: Initialize the default fixed-width font
2022-09-18 00:11:48 +00:00
auto default_fixed_width_font_name = generic_font_name(Web::Platform::GenericFont::UiMonospace);
LibWeb: Make FontPlugin::generic_font_name() return FlyString
2023-09-06 05:45:47 +00:00
m_default_fixed_width_font = Gfx::FontDatabase::the().get(default_fixed_width_font_name, 12.0, 400, Gfx::FontWidth::Normal, 0);
Ladybird/FontPluginQt: Initialize the default fixed-width font
2022-09-18 00:11:48 +00:00
VERIFY(m_default_fixed_width_font);
Ladybird: Add a FontPlugin and try much harder to find suitable fonts Instead of only looking at the SerenityOS default fonts, we now also look recursively in /usr/share/fonts for suitable fonts that we can load and use.
2022-09-08 10:44:17 +00:00
}
Ladybird: Rename classes ending with Ladybird Now that all the classes for Ladybird are in the Ladybird namespace, we don't need them named as Ladybird::FooBarLadybird. For the Qt-specific classes, we can tack on a Qt at the end for clarity, but FontPlugin and ImageCodecPlugin no longer have anything to do with Qt.
2023-08-02 18:01:17 +00:00
FontPlugin::~FontPlugin() = default;
Ladybird: Add a FontPlugin and try much harder to find suitable fonts Instead of only looking at the SerenityOS default fonts, we now also look recursively in /usr/share/fonts for suitable fonts that we can load and use.
2022-09-08 10:44:17 +00:00
Ladybird: Rename classes ending with Ladybird Now that all the classes for Ladybird are in the Ladybird namespace, we don't need them named as Ladybird::FooBarLadybird. For the Qt-specific classes, we can tack on a Qt at the end for clarity, but FontPlugin and ImageCodecPlugin no longer have anything to do with Qt.
2023-08-02 18:01:17 +00:00
Gfx::Font& FontPlugin::default_font()
Ladybird/FontPluginQt: Implement default font virtuals
2022-09-17 19:25:15 +00:00
{
return *m_default_font;
}
Ladybird: Rename classes ending with Ladybird Now that all the classes for Ladybird are in the Ladybird namespace, we don't need them named as Ladybird::FooBarLadybird. For the Qt-specific classes, we can tack on a Qt at the end for clarity, but FontPlugin and ImageCodecPlugin no longer have anything to do with Qt.
2023-08-02 18:01:17 +00:00
Gfx::Font& FontPlugin::default_fixed_width_font()
Ladybird/FontPluginQt: Implement default font virtuals
2022-09-17 19:25:15 +00:00
{
return *m_default_fixed_width_font;
}
Ladybird: Rename classes ending with Ladybird Now that all the classes for Ladybird are in the Ladybird namespace, we don't need them named as Ladybird::FooBarLadybird. For the Qt-specific classes, we can tack on a Qt at the end for clarity, but FontPlugin and ImageCodecPlugin no longer have anything to do with Qt.
2023-08-02 18:01:17 +00:00
void FontPlugin::update_generic_fonts()
Ladybird: Add a FontPlugin and try much harder to find suitable fonts Instead of only looking at the SerenityOS default fonts, we now also look recursively in /usr/share/fonts for suitable fonts that we can load and use.
2022-09-08 10:44:17 +00:00
{
// How we choose which system font to use for each CSS font:
Ladybird: Ignore Qt preferred fonts and just load from our fallback list The Qt StyleHint system didn't work on X11 anyway, and we ended up with the default UI font being used for both `serif` and `sans-serif`. Instead of asking Qt for something it can't do properly, let's just grab the first available font from our list of fallbacks. This should give us better results everywhere.
2023-07-29 08:54:33 +00:00
// 1. Try a list of known-suitable fonts with their names hard-coded below.
// 2. If that didn't work, fall back to Gfx::FontDatabase::default_font() (or default_fixed_width_font())
Ladybird: Add a FontPlugin and try much harder to find suitable fonts Instead of only looking at the SerenityOS default fonts, we now also look recursively in /usr/share/fonts for suitable fonts that we can load and use.
2022-09-08 10:44:17 +00:00
Ladybird: Ignore Qt preferred fonts and just load from our fallback list The Qt StyleHint system didn't work on X11 anyway, and we ended up with the default UI font being used for both `serif` and `sans-serif`. Instead of asking Qt for something it can't do properly, let's just grab the first available font from our list of fallbacks. This should give us better results everywhere.
2023-07-29 08:54:33 +00:00
// This is rather weird, but it's how things work right now.
// We should eventually have a way to query the system for the default font.
// Furthermore, we should allow overriding via some kind of configuration mechanism.
Ladybird: Add a FontPlugin and try much harder to find suitable fonts Instead of only looking at the SerenityOS default fonts, we now also look recursively in /usr/share/fonts for suitable fonts that we can load and use.
2022-09-08 10:44:17 +00:00
m_generic_font_names.resize(static_cast<size_t>(Web::Platform::GenericFont::__Count));
LibWeb: Make FontPlugin::generic_font_name() return FlyString
2023-09-06 05:45:47 +00:00
auto update_mapping = [&](Web::Platform::GenericFont generic_font, ReadonlySpan<FlyString> fallbacks) {
LibWeb: Add `--layout-test-mode` flag to HeadlessBrowser The `layout-test-mode` flag changes the font to be SerenitySans as this is the font used for layout tests for cross-platform compatibility of tests.
2023-05-06 10:46:14 +00:00
if (m_is_layout_test_mode) {
LibWeb: Make FontPlugin::generic_font_name() return FlyString
2023-09-06 05:45:47 +00:00
m_generic_font_names[static_cast<size_t>(generic_font)] = "SerenitySans"_fly_string;
LibWeb: Add `--layout-test-mode` flag to HeadlessBrowser The `layout-test-mode` flag changes the font to be SerenitySans as this is the font used for layout tests for cross-platform compatibility of tests.
2023-05-06 10:46:14 +00:00
return;
}
Ladybird: Ignore Qt preferred fonts and just load from our fallback list The Qt StyleHint system didn't work on X11 anyway, and we ended up with the default UI font being used for both `serif` and `sans-serif`. Instead of asking Qt for something it can't do properly, let's just grab the first available font from our list of fallbacks. This should give us better results everywhere.
2023-07-29 08:54:33 +00:00
RefPtr<Gfx::Font const> gfx_font;
Ladybird: Explicitly set the font family for CSS generic fonts We currently query Qt for system fonts using QFont::setStyleHint(). The docs from Qt have the following note regarding this API on X11: Qt does not support style hints on X11 since this information is not provided by the window system. This prevents any monospace font from working on X11 systems. For now, work around this by specifying the font-family for fonts which Qt has listed as mapping to a CSS generic font-family.
2023-04-26 12:17:40 +00:00
Ladybird: Ignore Qt preferred fonts and just load from our fallback list The Qt StyleHint system didn't work on X11 anyway, and we ended up with the default UI font being used for both `serif` and `sans-serif`. Instead of asking Qt for something it can't do properly, let's just grab the first available font from our list of fallbacks. This should give us better results everywhere.
2023-07-29 08:54:33 +00:00
for (auto& fallback : fallbacks) {
LibWeb: Make FontPlugin::generic_font_name() return FlyString
2023-09-06 05:45:47 +00:00
gfx_font = Gfx::FontDatabase::the().get(fallback, 16, 400, Gfx::FontWidth::Normal, 0, Gfx::Font::AllowInexactSizeMatch::Yes);
Ladybird: Ignore Qt preferred fonts and just load from our fallback list The Qt StyleHint system didn't work on X11 anyway, and we ended up with the default UI font being used for both `serif` and `sans-serif`. Instead of asking Qt for something it can't do properly, let's just grab the first available font from our list of fallbacks. This should give us better results everywhere.
2023-07-29 08:54:33 +00:00
if (gfx_font)
break;
Ladybird: Add a FontPlugin and try much harder to find suitable fonts Instead of only looking at the SerenityOS default fonts, we now also look recursively in /usr/share/fonts for suitable fonts that we can load and use.
2022-09-08 10:44:17 +00:00
}
if (!gfx_font) {
if (generic_font == Web::Platform::GenericFont::Monospace || generic_font == Web::Platform::GenericFont::UiMonospace)
gfx_font = Gfx::FontDatabase::default_fixed_width_font();
else
gfx_font = Gfx::FontDatabase::default_font();
}
LibWeb: Make FontPlugin::generic_font_name() return FlyString
2023-09-06 05:45:47 +00:00
m_generic_font_names[static_cast<size_t>(generic_font)] = gfx_font->family();
Ladybird: Add a FontPlugin and try much harder to find suitable fonts Instead of only looking at the SerenityOS default fonts, we now also look recursively in /usr/share/fonts for suitable fonts that we can load and use.
2022-09-08 10:44:17 +00:00
};
Ladybird: Rename FontPluginQt -> Ladybird as it is unrelated to Qt now The Qt relationship was removed in de31a8a4, so let's acknowledge that and make it clearer to potential non-Qt ports that this file is usable by them :^).
2023-07-31 23:52:36 +00:00
// Fallback fonts to look for if Gfx::Font can't load expected font
Ladybird: Add a FontPlugin and try much harder to find suitable fonts Instead of only looking at the SerenityOS default fonts, we now also look recursively in /usr/share/fonts for suitable fonts that we can load and use.
2022-09-08 10:44:17 +00:00
// The lists are basically arbitrary, taken from https://www.w3.org/Style/Examples/007/fonts.en.html
LibWeb: Make FontPlugin::generic_font_name() return FlyString
2023-09-06 05:45:47 +00:00
Vector<FlyString> cursive_fallbacks { "Comic Sans MS"_fly_string, "Comic Sans"_fly_string, "Apple Chancery"_fly_string, "Bradley Hand"_fly_string, "Brush Script MT"_fly_string, "Snell Roundhand"_fly_string, "URW Chancery L"_fly_string };
Vector<FlyString> fantasy_fallbacks { "Impact"_fly_string, "Luminari"_fly_string, "Chalkduster"_fly_string, "Jazz LET"_fly_string, "Blippo"_fly_string, "Stencil Std"_fly_string, "Marker Felt"_fly_string, "Trattatello"_fly_string };
Vector<FlyString> monospace_fallbacks { "Andale Mono"_fly_string, "Courier New"_fly_string, "Courier"_fly_string, "FreeMono"_fly_string, "OCR A Std"_fly_string, "DejaVu Sans Mono"_fly_string, "Liberation Mono"_fly_string, "Csilla"_fly_string };
Vector<FlyString> sans_serif_fallbacks { "Arial"_fly_string, "Helvetica"_fly_string, "Verdana"_fly_string, "Trebuchet MS"_fly_string, "Gill Sans"_fly_string, "Noto Sans"_fly_string, "Avantgarde"_fly_string, "Optima"_fly_string, "Arial Narrow"_fly_string, "Liberation Sans"_fly_string, "Katica"_fly_string };
Vector<FlyString> serif_fallbacks { "Times"_fly_string, "Times New Roman"_fly_string, "Didot"_fly_string, "Georgia"_fly_string, "Palatino"_fly_string, "Bookman"_fly_string, "New Century Schoolbook"_fly_string, "American Typewriter"_fly_string, "Liberation Serif"_fly_string, "Roman"_fly_string };
Ladybird: Add a FontPlugin and try much harder to find suitable fonts Instead of only looking at the SerenityOS default fonts, we now also look recursively in /usr/share/fonts for suitable fonts that we can load and use.
2022-09-08 10:44:17 +00:00
Ladybird: Ignore Qt preferred fonts and just load from our fallback list The Qt StyleHint system didn't work on X11 anyway, and we ended up with the default UI font being used for both `serif` and `sans-serif`. Instead of asking Qt for something it can't do properly, let's just grab the first available font from our list of fallbacks. This should give us better results everywhere.
2023-07-29 08:54:33 +00:00
update_mapping(Web::Platform::GenericFont::Cursive, cursive_fallbacks);
update_mapping(Web::Platform::GenericFont::Fantasy, fantasy_fallbacks);
update_mapping(Web::Platform::GenericFont::Monospace, monospace_fallbacks);
update_mapping(Web::Platform::GenericFont::SansSerif, sans_serif_fallbacks);
update_mapping(Web::Platform::GenericFont::Serif, serif_fallbacks);
update_mapping(Web::Platform::GenericFont::UiMonospace, monospace_fallbacks);
update_mapping(Web::Platform::GenericFont::UiRounded, sans_serif_fallbacks);
update_mapping(Web::Platform::GenericFont::UiSansSerif, sans_serif_fallbacks);
update_mapping(Web::Platform::GenericFont::UiSerif, serif_fallbacks);
Ladybird: Add a FontPlugin and try much harder to find suitable fonts Instead of only looking at the SerenityOS default fonts, we now also look recursively in /usr/share/fonts for suitable fonts that we can load and use.
2022-09-08 10:44:17 +00:00
}
LibWeb: Make FontPlugin::generic_font_name() return FlyString
2023-09-06 05:45:47 +00:00
FlyString FontPlugin::generic_font_name(Web::Platform::GenericFont generic_font)
Ladybird: Add a FontPlugin and try much harder to find suitable fonts Instead of only looking at the SerenityOS default fonts, we now also look recursively in /usr/share/fonts for suitable fonts that we can load and use.
2022-09-08 10:44:17 +00:00
{
return m_generic_font_names[static_cast<size_t>(generic_font)];
}
}
Reference in a new issue Copy permalink