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

LibDraw: Add emoji support to the Font class

Browse source 
https://github.com/SerenityOS/serenity/issues/490
This commit is contained in:
Sergey Bugaev 2019-09-04 23:45:55 +03:00 • committed by Andreas Kling
parent 9d64c60e01
commit 27380b9d2b
3 changed files with 38 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Libraries/LibC/Makefile
View file

@ -12,7 +12,8 @@ AK_OBJS = \
../../AK/JsonObject.o \ ../../AK/JsonObject.o \
../../AK/JsonParser.o \ ../../AK/JsonParser.o \
../../AK/LogStream.o \ ../../AK/LogStream.o \
../../AK/MappedFile.o ../../AK/MappedFile.o \
../../AK/Utf8View.o
LIBC_OBJS = \ LIBC_OBJS = \
SharedBuffer.o \ SharedBuffer.o \

41
Libraries/LibDraw/Font.cpp
View file

@ -8,6 +8,9 @@
#include <LibC/mman.h> #include <LibC/mman.h>
#include <LibC/stdio.h> #include <LibC/stdio.h>
#include <LibC/unistd.h> #include <LibC/unistd.h>
#include <AK/Utf8View.h>
#include "Emoji.h"
#include "GraphicsBitmap.h"
struct [[gnu::packed]] FontFileHeader struct [[gnu::packed]] FontFileHeader
{ {
@ -170,17 +173,37 @@ bool Font::write_to_file(const StringView& path)
return true; return true;
} }
int Font::width(const StringView& string) const int Font::glyph_or_emoji_width(u32 codepoint) const
{ {
if (!string.length()) if (codepoint < 256)
return 0; return glyph_width((char)codepoint);
if (m_fixed_width) if (m_fixed_width)
return string.length() * m_glyph_width; return m_glyph_width;
int width = 0; auto emoji = Emoji::emoji_for_codepoint(codepoint);
for (int i = 0; i < string.length(); ++i) if (emoji == nullptr)
width += glyph_width(string.characters_without_null_termination()[i]) + 1; return glyph_width('?');
return emoji->bitmap().size().width();
return width - 1; }
int Font::width(const StringView& string) const
{
Utf8View utf8 { string };
return width(utf8);
}
int Font::width(const Utf8View& utf8) const
{
bool first = true;
int width = 0;
for (u32 codepoint : utf8) {
if (!first)
width += glyph_spacing();
first = false;
width += glyph_or_emoji_width(codepoint);
}
return width;
} }

5
Libraries/LibDraw/Font.h
View file

@ -6,6 +6,7 @@
#include <AK/RefCounted.h> #include <AK/RefCounted.h>
#include <AK/Types.h> #include <AK/Types.h>
#include <LibDraw/Rect.h> #include <LibDraw/Rect.h>
#include <AK/Utf8View.h>
// FIXME: Make a MutableGlyphBitmap buddy class for FontEditor instead? // FIXME: Make a MutableGlyphBitmap buddy class for FontEditor instead?
class GlyphBitmap { class GlyphBitmap {
@ -58,11 +59,13 @@ public:
GlyphBitmap glyph_bitmap(char ch) const { return GlyphBitmap(&m_rows[(u8)ch * m_glyph_height], { glyph_width(ch), m_glyph_height }); } GlyphBitmap glyph_bitmap(char ch) const { return GlyphBitmap(&m_rows[(u8)ch * m_glyph_height], { glyph_width(ch), m_glyph_height }); }
u8 glyph_width(char ch) const { return m_fixed_width ? m_glyph_width : m_glyph_widths[(u8)ch]; } u8 glyph_width(char ch) const { return m_fixed_width ? m_glyph_width : m_glyph_widths[(u8)ch]; }
int glyph_or_emoji_width(u32 codepoint) const;
u8 glyph_height() const { return m_glyph_height; } u8 glyph_height() const { return m_glyph_height; }
u8 min_glyph_width() const { return m_min_glyph_width; } u8 min_glyph_width() const { return m_min_glyph_width; }
u8 max_glyph_width() const { return m_max_glyph_width; } u8 max_glyph_width() const { return m_max_glyph_width; }
u8 glyph_spacing() const { return m_fixed_width ? 0 : 1; } u8 glyph_spacing() const { return m_fixed_width ? 0 : 1; }
int width(const StringView& string) const; int width(const StringView&) const;
int width(const Utf8View&) const;
String name() const { return m_name; } String name() const { return m_name; }
void set_name(const StringView& name) { m_name = name; } void set_name(const StringView& name) { m_name = name; }