diff options
Diffstat (limited to 'src/terminal/terminaluserinput.cc')
-rw-r--r-- | src/terminal/terminaluserinput.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/terminal/terminaluserinput.cc b/src/terminal/terminaluserinput.cc index f811900..1c4891f 100644 --- a/src/terminal/terminaluserinput.cc +++ b/src/terminal/terminaluserinput.cc @@ -34,10 +34,9 @@ #include "terminaluserinput.h" using namespace Terminal; -using std::string; -string UserInput::input( const Parser::UserByte *act, - bool application_mode_cursor_keys ) +std::string UserInput::input( const Parser::UserByte *act, + bool application_mode_cursor_keys ) { /* The user will always be in application mode. If stm is not in application mode, convert user's cursor control function to an @@ -54,15 +53,15 @@ string UserInput::input( const Parser::UserByte *act, if ( act->c == 0x1b ) { /* ESC */ state = ESC; } - return string( &act->c, 1 ); + return std::string( &act->c, 1 ); case ESC: if ( act->c == 'O' ) { /* ESC O = 7-bit SS3 */ state = SS3; - return string(); + return std::string(); } state = Ground; - return string( &act->c, 1 ); + return std::string( &act->c, 1 ); case SS3: state = Ground; @@ -70,15 +69,15 @@ string UserInput::input( const Parser::UserByte *act, && (act->c >= 'A') && (act->c <= 'D') ) { char translated_cursor[ 2 ] = { '[', act->c }; - return string( translated_cursor, 2 ); + return std::string( translated_cursor, 2 ); } else { char original_cursor[ 2 ] = { 'O', act->c }; - return string( original_cursor, 2 ); + return std::string( original_cursor, 2 ); } default: assert( !"unexpected state" ); state = Ground; - return string(); + return std::string(); } } |