Changeset 514 for trunk/src/core/ascii_printer.cc

Timestamp:

08/08/16 18:25:48 (9 years ago)

Author:

epyon

Message:

• term_color implementation
• support for background color
• support for RGBA encoding
• initial gfx_terminal implementation

File:

• trunk/src/core/ascii_printer.cc (modified) (2 diffs)

trunk/src/core/ascii_printer.cc

@@ -15 +15 @@
 }
 
-void ascii_printer::print( const string_view& text, const position& p, uint32 color )
+void ascii_printer::print( const string_view& text, const position& p, term_color color )
 {
         position coord( p );
         for ( char c : text )
         {
-                m_terminal->print( coord, color, c );
+                m_terminal->print( coord, color, term_color(), c );
                 ++coord.x;
                 if ( coord.x >= m_terminal->get_size().x ) break;
@@ -26 +26 @@
 }
 
-void nv::ascii_printer::frame( const nv::rectangle& area, const nv::string_view& border_chars, uint32 color )
+void nv::ascii_printer::frame( const nv::rectangle& area, const nv::string_view& border_chars, term_color color )
 {
         if ( border_chars.length() < 8 )
         {
-                m_terminal->clear( area );
+                m_terminal->clear( area, color, term_color() );
                 return;
         }
-        m_terminal->clear( area.shrinked( 1 ) );
+        m_terminal->clear( area.shrinked( 1 ), color, term_color() );
         for ( int x = 0; x < area.get_width(); ++x )
         {
-                m_terminal->print( position( area.ul.x + x, area.ul.y ), color, border_chars[0] );
-                m_terminal->print( position( area.ul.x + x, area.lr.y ), color, border_chars[1] );
+                m_terminal->print( position( area.ul.x + x, area.ul.y ), color, term_color(), border_chars[0] );
+                m_terminal->print( position( area.ul.x + x, area.lr.y ), color, term_color(), border_chars[1] );
         }
 
         for ( int y = 0; y < area.get_height(); ++y )
         {
-                m_terminal->print( position( area.ul.x, area.ul.y + y ), color, border_chars[2] );
-                m_terminal->print( position( area.lr.x, area.ul.y + y ), color, border_chars[3] );
+                m_terminal->print( position( area.ul.x, area.ul.y + y ), color, term_color(), border_chars[2] );
+                m_terminal->print( position( area.lr.x, area.ul.y + y ), color, term_color(), border_chars[3] );
         }
 
-        m_terminal->print( area.ul, color, border_chars[4] );
-        m_terminal->print( area.ur(), color, border_chars[5] );
-        m_terminal->print( area.ll(), color, border_chars[6] );
-        m_terminal->print( area.lr, color, border_chars[7] );
+        m_terminal->print( area.ul, color,   term_color(), border_chars[4] );
+        m_terminal->print( area.ur(), color, term_color(), border_chars[5] );
+        m_terminal->print( area.ll(), color, term_color(), border_chars[6] );
+        m_terminal->print( area.lr, color,   term_color(), border_chars[7] );
 }