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

Modularize display code and add representation of wrapped line flag

Browse Source
This commit is contained in:
Keith Winstein
2011-02-09 15:30:50 -05:00
parent 1ee54cd70a
commit 71dfd5a763
7 changed files with 141 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
terminaldisplay.cpp
+84 -81
View File
@@ -1,4 +1,4 @@
#include "terminal.hpp"
#include "terminaldisplay.hpp"
using namespace Terminal;
@@ -6,33 +6,34 @@ using namespace Terminal;
std::string Display::new_frame( Framebuffer &f )
{
/* fill in background color on any cells that have been reset
or created since last time */
f.back_color_erase();
std::string screen;
str.clear();
char tmp[ 64 ];
/* has window title changed? */
if ( (!initialized)
|| (f.get_window_title() != last_frame.get_window_title()) ) {
/* set window title */
screen.append( "\033]0;[rtm] " );
str.append( "\033]0;[rtm] " );
std::vector<wchar_t> window_title = f.get_window_title();
for ( std::vector<wchar_t>::iterator i = window_title.begin();
i != window_title.end();
i++ ) {
char utf8[ 8 ];
snprintf( utf8, 8, "%lc", *i );
screen.append( utf8 );
snprintf( tmp, 64, "%lc", *i );
str.append( tmp );
}
screen.append( "\033\\" );
str.append( "\033\\" );
}
/* has reverse video state changed? */
if ( (!initialized)
|| (f.ds.reverse_video != last_frame.ds.reverse_video) ) {
/* set reverse video */
char rev[ 8 ];
snprintf( rev, 8, "\033[?5%c", (f.ds.reverse_video ? 'h' : 'l') );
screen.append( rev );
snprintf( tmp, 64, "\033[?5%c", (f.ds.reverse_video ? 'h' : 'l') );
str.append( tmp );
}
/* has size changed? */
@@ -40,77 +41,16 @@ std::string Display::new_frame( Framebuffer &f )
|| (f.ds.get_width() != last_frame.ds.get_width())
|| (f.ds.get_height() != last_frame.ds.get_height()) ) {
/* clear screen */
screen.append( "\033[0m\033[H\033[2J" );
str.append( "\033[0m\033[H\033[2J" );
initialized = false;
cursor_x = cursor_y = 0;
current_rendition_string = "\033[0m";
}
/* iterate for every cell */
for ( int y = 0; y < f.ds.get_height(); y++ ) {
for ( int x = 0; x < f.ds.get_width(); /* let charwidth handle advance */ ) {
Cell *cell = f.get_cell( y, x );
if ( initialized
&& ( *cell == *(last_frame.get_cell( y, x )) ) ) {
x += cell->width;
continue;
}
if ( (x != cursor_x) || (y != cursor_y) ) {
char curmove[ 32 ];
snprintf( curmove, 32, "\033[%d;%dH", y + 1, x + 1 );
screen.append( curmove );
}
cursor_x = x;
cursor_y = y;
std::string rendition_str = cell->renditions.sgr();
if ( current_rendition_string != rendition_str ) {
/* print renditions */
screen.append( rendition_str );
current_rendition_string = rendition_str;
}
if ( cell->contents.empty() ) {
/* see how far we can stretch a clear */
int clear_count = 0;
for ( int col = x; col < f.ds.get_width(); col++ ) {
Cell *other_cell = f.get_cell( y, col );
if ( (cell->renditions == other_cell->renditions)
&& (other_cell->contents.empty()) ) {
clear_count++;
} else {
break;
}
}
char clearer[ 32 ];
snprintf( clearer, 32, "\033[%dX", clear_count );
screen.append( clearer );
x += clear_count;
continue;
}
/* cells that begin with combining character get combiner attached to no-break space */
if ( cell->fallback ) {
char utf8[ 8 ];
snprintf( utf8, 8, "%lc", 0xA0 );
screen.append( utf8 );
}
for ( std::vector<wchar_t>::iterator i = cell->contents.begin();
i != cell->contents.end();
i++ ) {
char utf8[ 8 ];
snprintf( utf8, 8, "%lc", *i );
screen.append( utf8 );
}
x += cell->width;
cursor_x += cell->width;
for ( y = 0; y < f.ds.get_height(); y++ ) {
for ( x = 0; x < f.ds.get_width(); /* let charwidth handle advance */ ) {
put_cell( f );
}
}
@@ -118,10 +58,9 @@ std::string Display::new_frame( Framebuffer &f )
if ( (!initialized)
|| (f.ds.get_cursor_row() != cursor_y)
|| (f.ds.get_cursor_col() != cursor_x) ) {
char curmove[ 32 ];
snprintf( curmove, 32, "\033[%d;%dH", f.ds.get_cursor_row() + 1,
snprintf( tmp, 64, "\033[%d;%dH", f.ds.get_cursor_row() + 1,
f.ds.get_cursor_col() + 1 );
screen.append( curmove );
str.append( tmp );
cursor_x = f.ds.get_cursor_col();
cursor_y = f.ds.get_cursor_row();
}
@@ -130,14 +69,78 @@ std::string Display::new_frame( Framebuffer &f )
if ( (!initialized)
|| (f.ds.cursor_visible != last_frame.ds.cursor_visible) ) {
if ( f.ds.cursor_visible ) {
screen.append( "\033[?25h" );
str.append( "\033[?25h" );
} else {
screen.append( "\033[?25l" );
str.append( "\033[?25l" );
}
}
last_frame = f;
initialized = true;
return screen;
return str;
}
void Display::put_cell( Framebuffer &f )
{
char tmp[ 64 ];
Cell *cell = f.get_cell( y, x );
Cell *last_cell = last_frame.get_cell( y, x );
if ( initialized
&& ( *cell == *last_cell ) ) {
x += cell->width;
return;
}
if ( (x != cursor_x) || (y != cursor_y) ) {
snprintf( tmp, 64, "\033[%d;%dH", y + 1, x + 1 );
str.append( tmp );
cursor_x = x;
cursor_y = y;
}
std::string rendition_str = cell->renditions.sgr();
if ( current_rendition_string != rendition_str ) {
/* print renditions */
str.append( rendition_str );
current_rendition_string = rendition_str;
}
if ( cell->contents.empty() ) {
/* see how far we can stretch a clear */
int clear_count = 0;
for ( int col = x; col < f.ds.get_width(); col++ ) {
Cell *other_cell = f.get_cell( y, col );
if ( (cell->renditions == other_cell->renditions)
&& (other_cell->contents.empty()) ) {
clear_count++;
} else {
break;
}
}
snprintf( tmp, 64, "\033[%dX", clear_count );
str.append( tmp );
x += clear_count;
return;
}
/* cells that begin with combining character get combiner attached to no-break space */
if ( cell->fallback ) {
snprintf( tmp, 64, "%lc", 0xA0 );
str.append( tmp );
}
for ( std::vector<wchar_t>::iterator i = cell->contents.begin();
i != cell->contents.end();
i++ ) {
snprintf( tmp, 64, "%lc", *i );
str.append( tmp );
}
x += cell->width;
cursor_x += cell->width;
}