diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2026-01-21 14:00:26 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2026-01-21 14:00:26 +0100 |
| commit | 14a5f705c8e3385a637be3377f0800b30c38e589 (patch) | |
| tree | c8199a77311468cec3cc7fc2e0b168e60b39a109 /src/Fl_x.cxx | |
| parent | 2f7d7adfcf4bec55fa5e007947e4a455e85d8930 (diff) | |
Improve handling of text containing context-dependent unicode points.
This commit makes platforms Windows and macOS compute string widths
with the same mechanism as what is in place for platforms Wayland/X11:
- the width of a string containing a single codepoint is computed and
memorized in the table of character widths;
- the width of a string containing several codepoints is computed as
such rather than as the sum of the widths of its composing characters.
The result is that FLTK text widgets input and draw correctly also
complex emojis encoded with context-dependent codepoints.
Function fl_utf8_remove_context_dependent() is no longer necessary.
Diffstat (limited to 'src/Fl_x.cxx')
| -rw-r--r-- | src/Fl_x.cxx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index 02ff2f5ed..c690e750b 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -101,7 +101,6 @@ extern Fl_Window *fl_xmousewin; static void open_display_i(Display *d); // open display (internal) extern int fl_send_system_handlers(void *e); -extern int fl_utf8_remove_context_dependent(char *text, int len); #if FLTK_CONSOLIDATE_MOTION static Fl_Window *send_motion; @@ -1841,7 +1840,6 @@ int fl_handle(const XEvent& thisevent) len = XUtf8LookupString(Fl_X11_Screen_Driver::xim_ic, (XKeyPressedEvent *)&xevent.xkey, kp_buffer, kp_buffer_len, &keysym, &status); } - len = fl_utf8_remove_context_dependent(kp_buffer, len); keysym = fl_KeycodeToKeysym(fl_display, keycode, 0); } else { //static XComposeStatus compose; |
