h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-22 15:51:18 -03:00
Code Issues Packages Projects Releases Wiki Activity

Add support for fish_ambiguous_width

Browse Source 
fish_ambiguous_width is a variable which controls the width of ambiguous CJK
characters.

Fixes #5149
This commit is contained in:
ridiculousfish
2018-08-18 15:38:05 -07:00
parent d40a82b4d3
commit cbcabf6d00
4 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/fallback.cpp
View File

@@ -249,6 +249,10 @@ int killpg(int pgr, int sig) {
}
#endif
// Width of ambiguous characters. 1 is typical default.
int g_fish_ambiguous_width = 1;
// Width of emoji characters.
int g_fish_emoji_width = 0;
// 1 is the typical emoji width in Unicode 8.
@@ -289,8 +293,10 @@ int fish_wcwidth(wchar_t wc) {
// Fall back to system wcwidth in this case.
return wcwidth(wc);
case widechar_ambiguous:
return g_fish_ambiguous_width;
case widechar_private_use:
return 1;
// TR11: "All private-use characters are by default classified as Ambiguous".
return g_fish_ambiguous_width;
case widechar_widened_in_9:
return fish_get_emoji_width(wc);
default: