diff options
Diffstat (limited to 'input.c')
| -rw-r--r-- | input.c | 37 |
1 files changed, 20 insertions, 17 deletions
@@ -50,6 +50,7 @@ implementation in fish is as of yet incomplete. #include "env.h" #include "expand.h" #include "event.h" +#include "translate.h" static void input_read_inputrc( wchar_t *fn ); @@ -402,7 +403,7 @@ static wchar_t *input_symbolic_sequence( const wchar_t *in ) in++; if( c < L'a' || c > L'z' ) { - debug( 1, L"Invalid Control sequence" ); + debug( 1, _( L"Invalid Control sequence" ) ); return 0; } if( has_meta ) @@ -514,7 +515,7 @@ static wchar_t *input_symbolic_sequence( const wchar_t *in ) } if( !res ) { - debug( 1, L"Could not parse sequence %ls", in ); + debug( 1, _( L"Could not parse sequence '%ls'" ), in ); return 0; } if( !*in || *in == L'\n') @@ -678,7 +679,7 @@ static wchar_t *input_expand_sequence( const wchar_t *in ) if( *in != L'-' ) { error=1; - debug( 1, L"Invalid sequence - no dash after control\n" ); + debug( 1, _( L"Invalid sequence - no dash after control\n" ) ); break; } in++; @@ -696,7 +697,7 @@ static wchar_t *input_expand_sequence( const wchar_t *in ) *(out++)=*in-L'A'+1; break; } - debug( 1, L"Invalid sequence - Control-nothing?\n" ); + debug( 1, _( L"Invalid sequence - Control-nothing?\n" ) ); error = 1; break; @@ -711,12 +712,12 @@ static wchar_t *input_expand_sequence( const wchar_t *in ) if( *in != L'-' ) { error=1; - debug( 1, L"Invalid sequence - no dash after meta\n" ); + debug( 1, _( L"Invalid sequence - no dash after meta\n" ) ); break; } if( !*(in+1) ) { - debug( 1, L"Invalid sequence - Meta-nothing?" ); + debug( 1, _( L"Invalid sequence - Meta-nothing?" ) ); error=1; break; } @@ -761,7 +762,7 @@ static wchar_t *input_expand_sequence( const wchar_t *in ) { if( wcslen( res ) == 0 ) { - debug( 1, L"Invalid sequence - '%ls' expanded to zero characters", in_orig ); + debug( 1, _( L"Invalid sequence - '%ls' expanded to zero characters" ), in_orig ); error =1; res = 0; } @@ -825,7 +826,7 @@ void input_parse_inputrc_line( wchar_t *cmd ) { inputrc_error = 1; debug( 1, - L"Mismatched $endif in inputrc file" ); + _( L"Mismatched $endif in inputrc file" ) ); } } return; @@ -877,7 +878,7 @@ void input_parse_inputrc_line( wchar_t *cmd ) if( !*cmd ) { debug( 1, - L"Mismatched quote" ); + _( L"Mismatched quote" ) ); inputrc_error = 1; return; } @@ -891,7 +892,7 @@ void input_parse_inputrc_line( wchar_t *cmd ) if( *cmd != L':' ) { debug( 1, - L"Expected a \':\'" ); + _( L"Expected a \':\'" ) ); inputrc_error = 1; return; } @@ -936,16 +937,16 @@ void input_parse_inputrc_line( wchar_t *cmd ) if( wcscmp( set, L"set" ) != 0 ) { - debug( 1, L"I don\'t know what %ls means", set ); + debug( 1, _( L"I don\'t know what '%ls' means" ), set ); } else if( end ) { - debug( 1, L"Expected end of line, got '%ls'", end ); + debug( 1, _( L"Expected end of line, got '%ls'" ), end ); } else if( (!key) || (!value) ) { - debug( 1, L"Syntax: set KEY VALUE" ); + debug( 1, _( L"Syntax: set KEY VALUE" ) ); } else { @@ -1011,7 +1012,7 @@ void input_parse_inputrc_line( wchar_t *cmd ) if( !cmd ) { debug( 1, - L"Unable to parse binding" ); + _( L"Unable to parse binding" ) ); inputrc_error = 1; return; } @@ -1037,7 +1038,7 @@ void input_parse_inputrc_line( wchar_t *cmd ) } - debug( 1, L"I don\'t know what %ls means", cmd ); + debug( 1, _( L"I don\'t know what %ls means" ), cmd ); } /** @@ -1063,7 +1064,7 @@ static void input_read_inputrc( wchar_t *fn ) case -1: { debug( 1, - L"Error while reading input information from file: %s", + _( L"Error while reading input information from file '%ls'" ), fn ); wperror( L"fgetws2 (read_ni)" ); @@ -1168,6 +1169,8 @@ static void add_common_bindings() add_terminfo_mapping( name[i], (key_backspace), L"Backspace", L"backward-delete-char" ); add_mapping( name[i], L"\x7f", L"Backspace", L"backward-delete-char" ); + add_mapping( name[i], L"\e[H", L"Home", L"beginning-of-line" ); + add_mapping( name[i], L"\e[F", L"End", L"end-of-line" ); add_terminfo_mapping( name[i], (key_home), L"Home", L"beginning-of-line" ); add_terminfo_mapping( name[i], (key_end), L"End", L"end-of-line" ); @@ -1288,7 +1291,7 @@ int input_init() if( setupterm( 0, STDOUT_FILENO, 0) == ERR ) { - debug( 0, L"Could not set up terminal" ); + debug( 0, _( L"Could not set up terminal" ) ); exit(1); } hash_init( &all_mappings, &hash_wcs_func, &hash_wcs_cmp ); |