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

Use TERM env var / terminfo to decide whether to send ECH. Fixes tmux bug.

Browse Source 
Closes #28 github issue.
This commit is contained in:
Keith Winstein
2012-03-10 05:41:03 -05:00
parent ac16f9127c
commit b8457dd308
13 changed files with 114 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/terminal/terminaldisplay.cc
+21 -6
View File
@@ -25,7 +25,7 @@ using namespace Terminal;
/* Print a new "frame" to the terminal, using ANSI/ECMA-48 escape codes. */
std::string Display::new_frame( bool initialized, const Framebuffer &last, const Framebuffer &f )
std::string Display::new_frame( bool initialized, const Framebuffer &last, const Framebuffer &f ) const
{
FrameState frame( last );
@@ -201,7 +201,7 @@ std::string Display::new_frame( bool initialized, const Framebuffer &last, const
return frame.str;
}
void Display::put_cell( bool initialized, FrameState &frame, const Framebuffer &f )
void Display::put_cell( bool initialized, FrameState &frame, const Framebuffer &f ) const
{
char tmp[ 64 ];
@@ -238,13 +238,28 @@ void Display::put_cell( bool initialized, FrameState &frame, const Framebuffer &
}
}
frame.x += clear_count;
if ( frame.x >= f.ds.get_width() ) {
assert( frame.x + clear_count <= f.ds.get_width() );
/* can we go to the end of the line? */
if ( frame.x + clear_count == f.ds.get_width() ) {
snprintf( tmp, 64, "\033[K" );
frame.append( tmp );
frame.x += clear_count;
} else {
snprintf( tmp, 64, "\033[%dX", clear_count );
if ( has_ech ) {
if ( clear_count == 1 ) {
frame.append( "\033[X" );
} else {
snprintf( tmp, 64, "\033[%dX", clear_count );
frame.append( tmp );
}
frame.x += clear_count;
} else { /* no ECH, so just print a space */
frame.append( " " );
frame.cursor_x++;
frame.x++;
}
}
frame.append( tmp );
return;
}