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

Set of changes to improve Unicode support with respect to combining characters.

Browse Source 
Should address https://github.com/fish-shell/fish-shell/issues/155
This commit is contained in:
ridiculousfish
2012-07-15 10:45:18 -07:00
parent b1281c3fb9
commit ea1bfd715e
8 changed files with 403 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
output.cpp
View File

@@ -507,8 +507,8 @@ void writestr_ellipsis( const wchar_t *str, int max_width )
while( *str != 0 )
{
int w = wcwidth( *str );
if( written+w+wcwidth( ellipsis_char )>max_width )
int w = fish_wcwidth( *str );
if( written+w+fish_wcwidth( ellipsis_char )>max_width )
{
break;
}
@@ -516,7 +516,7 @@ void writestr_ellipsis( const wchar_t *str, int max_width )
writech( *(str++) );
}
written += wcwidth( ellipsis_char );
written += fish_wcwidth( ellipsis_char );
writech( ellipsis_char );
while( written < max_width )
@@ -541,13 +541,13 @@ int write_escaped_str( const wchar_t *str, int max_len )
if( max_len && (max_len < len))
{
for( i=0; (written+wcwidth(out[i]))<=(max_len-1); i++ )
for( i=0; (written+fish_wcwidth(out[i]))<=(max_len-1); i++ )
{
writech( out[i] );
written += wcwidth( out[i] );
written += fish_wcwidth( out[i] );
}
writech( ellipsis_char );
written += wcwidth( ellipsis_char );
written += fish_wcwidth( ellipsis_char );
for( i=written; i<max_len; i++ )
{