Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-02-06 00:01:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Emoji support: fix in Fl_Text_Buffer::next_char() necessary for keycap emoji sequences.
Some checks failed
Build and Test / build-linux (push) Has been cancelled
Details
Build and Test / build-wayland (push) Has been cancelled
Details
Build and Test / build-macos (push) Has been cancelled
Details
Build and Test / build-windows (push) Has been cancelled
Details

Browse Source
This commit is contained in:
ManoloFLTK
2026-01-30 09:40:19 +01:00
parent 2f4e2837e5
commit b42d7a3578
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Fl_Text_Buffer.cxx
View File

@@ -2111,20 +2111,28 @@ int Fl_Text_Buffer::prev_char(int pos) const
int Fl_Text_Buffer::next_char(int pos) const int Fl_Text_Buffer::next_char(int pos) const
{ {
IS_UTF8_ALIGNED2(this, (pos)) IS_UTF8_ALIGNED2(this, (pos))
unsigned l = fl_utf8len1(byte_at(pos)); int l = fl_utf8len(byte_at(pos));
if (l > 2) { // test for composed character only if pos is at long codepoint if (l > 0) { // test for composed character except for bad bytes
int p = pos, ll, b; int p = pos, ll, b, count_points = 0;
char t[40]; // crazyest composed characters I know use 28 bytes in UTF8 (e.g., 🏴󠁧󠁢󠁷󠁬󠁳󠁿) char t[40]; // longest emoji sequences I know use 28 bytes in UTF8 (e.g., 🏴󠁧󠁢󠁷󠁬󠁳󠁿 "Wales flag")
l = 0; l = 0;
// extract bytes after pos stopping after short codepoint or 40 bytes at most // extract bytes after pos stopping after short codepoint or 40 bytes at most
while (p < mLength && l < sizeof(t)) { while (p < mLength && l < sizeof(t)) {
b = byte_at(p++); b = byte_at(p++);
t[l++] = b; t[l++] = b;
ll = fl_utf8len(b); ll = fl_utf8len1(b);
count_points++;
for (int i = 1; i < ll && l < sizeof(t); i++) t[l++] = byte_at(p++); for (int i = 1; i < ll && l < sizeof(t); i++) t[l++] = byte_at(p++);
if (ll == 1 || ll == 2) break; // stop after short codepoint (includes '\n') if (count_points > 1 && (ll == 1 || ll == 2)) {
// stop after short codepoint but not if it's the 1st codepoint which can be inside
// emoji sequence (e.g. 9️⃣ "keycap 9")
break;
}
} }
l = fl_utf8_next_composed_char(t, t + l) - t; // length of possibly composed character starting at pos // length of possibly composed character starting at pos
l = (l > 0 ? fl_utf8_next_composed_char(t, t + l) - t : 0);
} else if (l == -1) {
l = 1;
} }
pos += l; pos += l;
if (pos>=mLength) if (pos>=mLength)