h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-31 20:31:19 -03:00
Code Issues Packages Projects Releases Wiki Activity

Use Rust version of global fallback variables

Browse Source
This commit is contained in:
Mahmoud Al-Qudsi
2023-05-16 14:09:30 -05:00
parent 3ee71772f1
commit 3ab8b34b1e
4 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/fallback.cpp
View File

@@ -129,16 +129,9 @@ 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.
// 1 is the typical emoji width in Unicode 8.
int g_fish_emoji_width = 1;
static int fish_get_emoji_width(wchar_t c) {
(void)c;
return g_fish_emoji_width;
return FISH_EMOJI_WIDTH;
}
// Big hack to use our versions of wcswidth where we know them to be broken, which is
@@ -179,7 +172,7 @@ int fish_wcwidth(wchar_t wc) {
case widechar_ambiguous:
case widechar_private_use:
// TR11: "All private-use characters are by default classified as Ambiguous".
return g_fish_ambiguous_width;
return FISH_AMBIGUOUS_WIDTH;
case widechar_widened_in_9:
return fish_get_emoji_width(wc);
default: