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

Fix valgrind error with 1-col char then 2-col char in a 1x1 terminal

Browse Source
This commit is contained in:
Keith Winstein
2012-04-15 17:11:40 -04:00
parent cd2d482484
commit 6b6747cda7
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/terminal/terminal.cc
+2 -4
View File
@@ -60,12 +60,10 @@ void Emulator::print( const Parser::Print *act )
fb.get_mutable_row( -1 )->set_wrap( true ); fb.get_mutable_row( -1 )->set_wrap( true );
fb.ds.move_col( 0 ); fb.ds.move_col( 0 );
fb.move_rows_autoscroll( 1 ); fb.move_rows_autoscroll( 1 );
} } else if ( fb.ds.auto_wrap_mode
/* wrap 2-cell chars if no room, even without will-wrap flag */
if ( fb.ds.auto_wrap_mode
&& (chwidth == 2) && (chwidth == 2)
&& (fb.ds.get_cursor_col() == fb.ds.get_width() - 1) ) { && (fb.ds.get_cursor_col() == fb.ds.get_width() - 1) ) {
/* wrap 2-cell chars if no room, even without will-wrap flag */
fb.reset_cell( this_cell ); fb.reset_cell( this_cell );
fb.get_mutable_row( -1 )->set_wrap( false ); fb.get_mutable_row( -1 )->set_wrap( false );
/* There doesn't seem to be a consistent way to get the /* There doesn't seem to be a consistent way to get the