emacs/gnu.emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2026-09-10 07:46:51 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make 'string-width' return 2 for an Emoji sequence

Browse source 
* lisp/composite.el (compose-gstring-and-emoji): Adjust the widths
of glyphs.
* src/character.c (lisp_string_width): Handle automatic
compositions when HAVE_WINDOW_SYSTEM is not defined.
This commit is contained in:
Kai Ma 2026-08-08 19:42:31 +02:00 committed by Eli Zaretskii
parent 4956e87309
commit 08af2dd7e3
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/composite.el
View file

@ -956,7 +956,9 @@ This function is only called on TTY frames. On graphical displays,
(dotimes (i nglyphs)
(let ((glyph (lgstring-glyph gstring i)))
(when glyph
(lglyph-set-from-to glyph 0 (1- nglyphs))))))
(lglyph-set-from-to glyph 0 (1- nglyphs))
;; Adjust the total width of the gstring to 2.
(lglyph-set-width glyph (if (= i 0) 2 0))))))
gstring)
(provide 'composite)

15
src/character.c
View file

@ -353,12 +353,12 @@ lisp_string_width (Lisp_Object string, ptrdiff_t from, ptrdiff_t to,
ptrdiff_t from_byte = i_byte;
ptrdiff_t width = 0;
struct Lisp_Char_Table *dp = buffer_display_table ();
#ifdef HAVE_WINDOW_SYSTEM
struct frame *f =
(FRAMEP (selected_frame) && FRAME_LIVE_P (XFRAME (selected_frame)))
? XFRAME (selected_frame)
: NULL;
int font_width = -1;
#ifdef HAVE_WINDOW_SYSTEM
Lisp_Object default_font, frame_font;
#endif
@ -379,9 +379,8 @@ lisp_string_width (Lisp_Object string, ptrdiff_t from, ptrdiff_t to,
chars = end - i;
bytes = string_char_to_byte (string, end) - i_byte;
}
#ifdef HAVE_WINDOW_SYSTEM
else if (auto_comp
&& f && FRAME_WINDOW_P (f)
&& f
&& multibyte
&& find_automatic_composition (i, -1, i, &ignore,
&end, &val, string)
@ -394,9 +393,10 @@ lisp_string_width (Lisp_Object string, ptrdiff_t from, ptrdiff_t to,
int pixelwidth = composition_gstring_width (val, 0, j, NULL);
#ifdef HAVE_WINDOW_SYSTEM
/* The below is somewhat expensive, so compute it only once
for the entire loop, and only if needed. */
if (font_width < 0)
if (FRAME_WINDOW_P (f) && font_width < 0)
{
font_width = FRAME_COLUMN_WIDTH (f);
default_font = Fface_font (Qdefault, Qnil, Qnil);
@ -417,11 +417,14 @@ lisp_string_width (Lisp_Object string, ptrdiff_t from, ptrdiff_t to,
}
}
}
thiswidth = (double) pixelwidth / font_width + 0.5;
#endif
thiswidth = FRAME_WINDOW_P (f)
? ((double) pixelwidth / font_width + 0.5)
: pixelwidth;
chars = end - i;
bytes = string_char_to_byte (string, end) - i_byte;
}
#endif /* HAVE_WINDOW_SYSTEM */
else
{
int c;