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

Better resize behavior re: combining char and scroll region

Browse Source
This commit is contained in:
Keith Winstein
2011-02-03 23:45:34 -05:00
parent d4be42ac3d
commit f86b6b5e4b
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
terminalframebuffer.cpp
+11 -4
View File
@@ -186,7 +186,9 @@ Cell *Framebuffer::get_cell( int row, int col )
Cell *Framebuffer::get_combining_cell( void ) Cell *Framebuffer::get_combining_cell( void )
{ {
if ( (ds.get_combining_char_col() >= ds.get_width()) if ( (ds.get_combining_char_col() == -1)
|| (ds.get_combining_char_row() == -1)
|| (ds.get_combining_char_col() >= ds.get_width())
|| (ds.get_combining_char_row() >= ds.get_height()) ) { || (ds.get_combining_char_row() >= ds.get_height()) ) {
return NULL; return NULL;
} /* can happen if a resize came in between */ } /* can happen if a resize came in between */
@@ -382,8 +384,6 @@ void DrawState::resize( int s_width, int s_height )
width = s_width; width = s_width;
height = s_height; height = s_height;
snap_cursor_to_border();
if ( scrolling_region_top_row >= height ) { if ( scrolling_region_top_row >= height ) {
scrolling_region_top_row = 0; scrolling_region_top_row = 0;
} }
@@ -392,8 +392,15 @@ void DrawState::resize( int s_width, int s_height )
scrolling_region_bottom_row = height - 1; scrolling_region_bottom_row = height - 1;
} }
snap_cursor_to_border();
tabs.resize( width ); tabs.resize( width );
/* saved cursor will be snapped to border on restore */ /* saved cursor will be snapped to border on restore */
/* combining char cell can now be offscreen */
/* invalidate combining char cell if necessary */
if ( (combining_char_col >= width)
|| (combining_char_row >= height) ) {
combining_char_col = combining_char_row = -1;
}
} }