Changeset 514 for trunk/src

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

Location:

trunk/src

Files:

• core/ascii_printer.cc (modified) (2 diffs)
• core/term_color.cc (added)
• curses/curses_terminal.cc (modified) (2 diffs)
• gfx/gfx_terminal.cc (added)
• gui/gui_ascii_renderer.cc (modified) (5 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] );
 }

trunk/src/curses/curses_terminal.cc

@@ -28 +28 @@
         PDC_save_key_modifiers( true );
 
-        init_pair( 1, 0, 0 );
-        init_pair( 2, 1, 0 );
-        init_pair( 3, 2, 0 );
-        init_pair( 4, 3, 0 );
-        init_pair( 5, 4, 0 );
-        init_pair( 6, 5, 0 );
-        init_pair( 7, 6, 0 );
-        init_pair( 8, 7, 0 );
+        for ( short i = 0; i < 64; ++i )
+                init_pair( i+1, i % 8, i / 8 );
 
         clear();
@@ -53 +47 @@
 }
 
-void curses_terminal::print( position p, uint32 color, char ch )
+void curses_terminal::print( position p, term_color fgcolor, term_color bgcolor, char ch )
 {
+        uint32 fcolor = fgcolor.get_color();
+        uint32 bcolor = ( bgcolor.get_color() % 8 ) * 8;
         m_update_needed = true;
-        if ( color > 7 )
-        {
-                attrset(((static_cast<uint32>(color-7) << 24)  & 0xff000000ul ) | 0x00800000ul);
-        }
-        else
-        {
-                attrset((static_cast<uint32>(color+1) << 24)  & 0xff000000ul);
-        }
+        chtype attr = static_cast<chtype>( ( fcolor > 7 ? fcolor - 7 + bcolor : fcolor + bcolor + 1 ) << 24 );
+        if ( fcolor > 7 ) attr = attr | 0x00800000ul;
+        attrset(attr);
         mvaddch( p.y-1, p.x-1, chtype(ch) );
         ::move( m_cursor.y-1, m_cursor.x-1 );
 }
 
-void curses_terminal::clear( rectangle r )
+void curses_terminal::clear( rectangle r, term_color fgcolor, term_color bgcolor )
 {
-        attrset( 0x00000000ul | 0x00800000ul );
+        uint32 fcolor = fgcolor.get_color();
+        uint32 bcolor = ( bgcolor.get_color() % 8 ) * 8;
+        chtype attr = static_cast<chtype>( ( fcolor > 7 ? fcolor - 7 + bcolor : fcolor + bcolor + 1 ) << 24 );
+        if ( fcolor > 7 ) attr = attr | 0x00800000ul;
+        attrset( attr );
         for ( int x = r.ul.x-1; x <= r.lr.x-1; ++x )
                 for ( int y = r.ul.y-1; y <= r.lr.y-1; ++y )

trunk/src/gui/gui_ascii_renderer.cc

@@ -15 +15 @@
 struct ascii_render_data : public render_data
 {
-        ascii_render_data() {}
-        bool   clear;
-        bool   border;
-        char   border_chars[8];
-        uint32 border_color;
-        uint32 text_color;
+        bool       clear;
+        bool       border;
+        char       border_chars[8];
+        ivec2      padding;
+        term_color border_color;
+        term_color text_color;
 };
 
@@ -38 +38 @@
                 er->border     = false;
                 er->clear      = false;
-                er->text_color = 0;
                 e->m_render_data = er;
         }
@@ -57 +56 @@
                 
                 m_style.get( e, "ascii_color", selector, color );
-                er->text_color = uint32( color );
+                er->text_color = term_color::color( color );
                 er->border     = false;
+                vec4 padding;
+                m_style.get( e, "ascii_padding", selector, padding );
+                er->padding    = ivec2( int( padding.x ), int( padding.y ) );
+
                 if ( m_style.get( e, "ascii_border", selector, path ) )
                 {
@@ -65 +68 @@
                         int border_color = 0;
                         if ( m_style.get( e, "ascii_border_color", selector, border_color ) )
-                                er->border_color = uint32( border_color );
+                                er->border_color = term_color::color( border_color );
                         for ( uint32 i = 0; i < 8 && i < path.length(); i++ )
                                 er->border_chars[i] = path[i];
@@ -76 +79 @@
         ascii_render_data* er = static_cast< ascii_render_data* >( e->m_render_data );
         rectangle abs = e->m_absolute;
-        if ( er->clear ) m_terminal->clear( abs );
+        if ( er->clear ) m_terminal->clear( abs, term_color::LIGHTGRAY, term_color() );
         if ( er->border )
         {
                 for ( int x = 0; x < abs.get_width(); ++x )
                 {
-                        m_terminal->print( position( abs.ul.x + x, abs.ul.y ), er->border_color, er->border_chars[0] );
-                        m_terminal->print( position( abs.ul.x + x, abs.lr.y ), er->border_color, er->border_chars[1] );
+                        m_terminal->print( position( abs.ul.x + x, abs.ul.y ), er->border_color, term_color(), er->border_chars[0] );
+                        m_terminal->print( position( abs.ul.x + x, abs.lr.y ), er->border_color, term_color(), er->border_chars[1] );
                 }
 
                 for ( int y = 0; y < abs.get_height(); ++y )
                 {
-                        m_terminal->print( position( abs.ul.x, abs.ul.y + y ), er->border_color, er->border_chars[2] );
-                        m_terminal->print( position( abs.lr.x, abs.ul.y + y ), er->border_color, er->border_chars[3] );
+                        m_terminal->print( position( abs.ul.x, abs.ul.y + y ), er->border_color, term_color(), er->border_chars[2] );
+                        m_terminal->print( position( abs.lr.x, abs.ul.y + y ), er->border_color, term_color(), er->border_chars[3] );
                 }
 
-                m_terminal->print( abs.ul,   er->border_color, er->border_chars[4] );
-                m_terminal->print( abs.ur(), er->border_color, er->border_chars[5] );
-                m_terminal->print( abs.ll(), er->border_color, er->border_chars[6] );
-                m_terminal->print( abs.lr,   er->border_color, er->border_chars[7] );
+                m_terminal->print( abs.ul,   er->border_color, term_color(), er->border_chars[4] );
+                m_terminal->print( abs.ur(), er->border_color, term_color(), er->border_chars[5] );
+                m_terminal->print( abs.ll(), er->border_color, term_color(), er->border_chars[6] );
+                m_terminal->print( abs.lr,   er->border_color, term_color(), er->border_chars[7] );
                 m_terminal->update();
         }
         if ( !e->m_text.empty() )
         {
-                position p = abs.ul;
+                position p = abs.ul + er->padding;
                 for ( char c : e->m_text )
                 {
-                        m_terminal->print( p, er->text_color, c );
+                        m_terminal->print( p, er->text_color, term_color(), c );
                         ++p.x;
                 }