Change Framebuffer's containers/methods to improve performance.

* Reduce the size of Terminal::Cell.
* Change colors and attributes in Terminal::Rendition to bitfields/bitmask.
* Change Cells to use UTF-8 strings instead of vector<wchar_t>.  Store Rows in a vector instead of a deque.
* Add various Framebuffer::append() methods for more efficient passing of single and repeated characters.
* Change title/icon strings from deques to a vector typedef-- this is more for tidiness than any real performance.
This commit is contained in:
John Hood
2014-06-14 19:16:13 -04:00
parent 8fdcdc88cd
commit 32afa96111
10 changed files with 195 additions and 164 deletions
+7 -7
View File
@@ -61,15 +61,15 @@ void ConditionalOverlayCell::apply( Framebuffer &fb, uint64_t confirmed_epoch, i
if ( unknown ) {
if ( flag && ( col != fb.ds.get_width() - 1 ) ) {
fb.get_mutable_cell( row, col )->renditions.underlined = true;
fb.get_mutable_cell( row, col )->renditions.set_attribute(Renditions::underlined, true);
}
return;
}
if ( !(*(fb.get_cell( row, col )) == replacement) ) {
if ( *fb.get_cell( row, col ) != replacement ) {
*(fb.get_mutable_cell( row, col )) = replacement;
if ( flag ) {
fb.get_mutable_cell( row, col )->renditions.underlined = true;
fb.get_mutable_cell( row, col )->renditions.set_attribute( Renditions::underlined, true );
}
}
}
@@ -275,7 +275,7 @@ void NotificationEngine::apply( Framebuffer &fb ) const
case 2: /* wide character */
this_cell = fb.get_mutable_cell( 0, overlay_col );
fb.reset_cell( this_cell );
this_cell->renditions.bold = true;
this_cell->renditions.set_attribute(Renditions::bold, true);
this_cell->renditions.foreground_color = 37;
this_cell->renditions.background_color = 44;
@@ -296,7 +296,7 @@ void NotificationEngine::apply( Framebuffer &fb ) const
overlay_col++;
}
if ( combining_cell->contents.size() < 16 ) {
if ( combining_cell->contents.size() < 32 ) {
combining_cell->contents.push_back( ch );
}
break;
@@ -345,9 +345,9 @@ void OverlayManager::apply( Framebuffer &fb )
title.apply( fb );
}
void TitleEngine::set_prefix( const wstring s )
void TitleEngine::set_prefix( const wstring &s )
{
prefix = deque<wchar_t>( s.begin(), s.end() );
prefix = Terminal::Framebuffer::title_type( s.begin(), s.end() );
}
void ConditionalOverlayRow::apply( Framebuffer &fb, uint64_t confirmed_epoch, bool flag ) const
+3 -3
View File
@@ -310,12 +310,12 @@ namespace Overlay {
class TitleEngine {
private:
deque<wchar_t> prefix;
Terminal::Framebuffer::title_type prefix;
public:
void apply( Framebuffer &fb ) const { fb.prefix_window_title( prefix ); }
void set_prefix( const wstring s );
TitleEngine() : prefix() {}
void set_prefix( const wstring &s );
};
/* the overlay manager */
@@ -331,7 +331,7 @@ namespace Overlay {
NotificationEngine & get_notification_engine( void ) { return notifications; }
PredictionEngine & get_prediction_engine( void ) { return predictions; }
void set_title_prefix( const wstring s ) { title.set_prefix( s ); }
void set_title_prefix( const wstring &s ) { title.set_prefix( s ); }
OverlayManager() : notifications(), predictions(), title() {}