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

append_move(): improve awkward control flow, naming

Browse Source
This commit is contained in:
John Hood
2016-11-19 17:14:37 -05:00
parent 11190526ad
commit e8f1004f94
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/terminal/terminaldisplay.cc
+12 -11
View File
@@ -488,29 +488,30 @@ void FrameState::append_silent_move( int y, int x )
void FrameState::append_move( int y, int x ) void FrameState::append_move( int y, int x )
{ {
const int last_x = cursor_x;
const int last_y = cursor_y;
cursor_x = x;
cursor_y = y;
// Only optimize if cursor pos is known // Only optimize if cursor pos is known
if ( cursor_x != -1 && cursor_y != -1 ) { if ( last_x != -1 && last_y != -1 ) {
// Can we use CR and/or LF? They're cheap and easier to trace. // Can we use CR and/or LF? They're cheap and easier to trace.
if ( x == 0 && y - cursor_y >= 0 && y - cursor_y < 5 ) { if ( x == 0 && y - last_y >= 0 && y - last_y < 5 ) {
if ( cursor_x != 0 ) { if ( last_x != 0 ) {
append( '\r' ); append( '\r' );
} }
append( y - cursor_y, '\n' ); append( y - last_y, '\n' );
goto positioned; return;
} }
// Backspaces are good too. // Backspaces are good too.
if ( y == cursor_y && x - cursor_x < 0 && x - cursor_x > -5 ) { if ( y == last_y && x - last_x < 0 && x - last_x > -5 ) {
append( cursor_x - x, '\b' ); append( last_x - x, '\b' );
goto positioned; return;
} }
// More optimizations are possible. // More optimizations are possible.
} }
char tmp[ 64 ]; char tmp[ 64 ];
snprintf( tmp, 64, "\033[%d;%dH", y + 1, x + 1 ); snprintf( tmp, 64, "\033[%d;%dH", y + 1, x + 1 );
append( tmp ); append( tmp );
positioned:
cursor_x = x;
cursor_y = y;
} }
void FrameState::update_rendition(const Renditions &r, bool force) { void FrameState::update_rendition(const Renditions &r, bool force) {