izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use shared_ptr and references for Actions.

Browse Source 
This slows terminal emulation slightly.
This commit is contained in:
John Hood
2017-05-11 01:22:12 -04:00
parent c6c7f09954
commit 42d2b5d029
13 changed files with 104 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/statesync/completeterminal.cc
+6 -8
View File
@@ -52,9 +52,8 @@ string Complete::act( const string &str )
for ( Actions::iterator it = actions.begin();
it != actions.end();
it++ ) {
Action *act = *it;
act->act_on_terminal( &terminal );
delete act;
Action &act = **it;
act.act_on_terminal( &terminal );
}
actions.clear();
}
@@ -62,10 +61,10 @@ string Complete::act( const string &str )
return terminal.read_octets_to_host();
}
string Complete::act( const Action *act )
string Complete::act( const Action &act )
{
/* apply action to terminal */
act->act_on_terminal( &terminal );
act.act_on_terminal( &terminal );
return terminal.read_octets_to_host();
}
@@ -112,9 +111,8 @@ void Complete::apply_string( const string & diff )
string terminal_to_host = act( input.instruction( i ).GetExtension( hostbytes ).hoststring() );
assert( terminal_to_host.empty() ); /* server never interrogates client terminal */
} else if ( input.instruction( i ).HasExtension( resize ) ) {
Resize new_size( input.instruction( i ).GetExtension( resize ).width(),
input.instruction( i ).GetExtension( resize ).height() );
act( &new_size );
act( Resize( input.instruction( i ).GetExtension( resize ).width(),
input.instruction( i ).GetExtension( resize ).height() ) );
} else if ( input.instruction( i ).HasExtension( echoack ) ) {
uint64_t inst_echo_ack_num = input.instruction( i ).GetExtension( echoack ).echo_ack_num();
assert( inst_echo_ack_num >= echo_ack );