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

LibGfx: Implement Emoji::emoji_for_code_point_iterator for UTF-32 views

Browse source
This commit is contained in:
Timothy Flynn 2023-02-20 14:06:19 -05:00 • committed by Andreas Kling
parent 832e9b8302
commit 71967bc5de
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Libraries/LibGfx/Font/Emoji.cpp
View file

@ -8,6 +8,7 @@
#include <AK/DeprecatedString.h> #include <AK/DeprecatedString.h>
#include <AK/HashMap.h> #include <AK/HashMap.h>
#include <AK/Span.h> #include <AK/Span.h>
#include <AK/Utf32View.h>
#include <AK/Utf8View.h> #include <AK/Utf8View.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/Font/Emoji.h> #include <LibGfx/Font/Emoji.h>
@ -44,7 +45,8 @@ Bitmap const* Emoji::emoji_for_code_points(ReadonlySpan<u32> const& code_points)
return bitmap.ptr(); return bitmap.ptr();
} }
Bitmap const* Emoji::emoji_for_code_point_iterator(Utf8CodePointIterator& it) template<typename CodePointIterator>
static Bitmap const* emoji_for_code_point_iterator_impl(CodePointIterator& it)
{ {
// NOTE: I'm sure this could be more efficient, e.g. by checking if each code point falls // NOTE: I'm sure this could be more efficient, e.g. by checking if each code point falls
// into a certain range in the loop below (emojis, modifiers, variation selectors, ZWJ), // into a certain range in the loop below (emojis, modifiers, variation selectors, ZWJ),
@ -105,7 +107,7 @@ Bitmap const* Emoji::emoji_for_code_point_iterator(Utf8CodePointIterator& it)
} else { } else {
code_points.append(*code_point); code_points.append(*code_point);
} }
if (auto const* emoji = emoji_for_code_points(code_points)) { if (auto const* emoji = Emoji::emoji_for_code_points(code_points)) {
u8 real_codepoint_length = i + 1; u8 real_codepoint_length = i + 1;
possible_emojis.empend(emoji, code_points, real_codepoint_length); possible_emojis.empend(emoji, code_points, real_codepoint_length);
last_codepoint_sequence_found = true; last_codepoint_sequence_found = true;
@ -130,4 +132,14 @@ Bitmap const* Emoji::emoji_for_code_point_iterator(Utf8CodePointIterator& it)
return emoji; return emoji;
} }
Bitmap const* Emoji::emoji_for_code_point_iterator(Utf8CodePointIterator& it)
{
return emoji_for_code_point_iterator_impl(it);
}
Bitmap const* Emoji::emoji_for_code_point_iterator(Utf32CodePointIterator& it)
{
return emoji_for_code_point_iterator_impl(it);
}
} }

2
Userland/Libraries/LibGfx/Font/Emoji.h
View file

@ -8,6 +8,7 @@
#pragma once #pragma once
#include <AK/Forward.h> #include <AK/Forward.h>
#include <AK/Span.h>
#include <AK/Types.h> #include <AK/Types.h>
namespace Gfx { namespace Gfx {
@ -19,6 +20,7 @@ public:
static Gfx::Bitmap const* emoji_for_code_point(u32 code_point); static Gfx::Bitmap const* emoji_for_code_point(u32 code_point);
static Gfx::Bitmap const* emoji_for_code_points(ReadonlySpan<u32> const&); static Gfx::Bitmap const* emoji_for_code_points(ReadonlySpan<u32> const&);
static Gfx::Bitmap const* emoji_for_code_point_iterator(Utf8CodePointIterator&); static Gfx::Bitmap const* emoji_for_code_point_iterator(Utf8CodePointIterator&);
static Gfx::Bitmap const* emoji_for_code_point_iterator(Utf32CodePointIterator&);
}; };
} }