Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Numbering post push #75

Closed
wants to merge 2 commits into from
Closed

Numbering post push #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c69e6ab
Fix typo in CTermData::PutChar()
hwangcc23 Apr 6, 2016
0e6b5f4
Numbering Post-Push
hwangcc23 Apr 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
159 changes: 134 additions & 25 deletions src/core/termdata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,23 +167,24 @@ CTermData::~CTermData()
void CTermData::SetScreenSize( int RowCount, unsigned short RowsPerPage,
unsigned short ColsPerPage)
{
m_RowsPerPage = RowsPerPage;
// if cols per page change, reallocate all existing rows.
if( m_ColsPerPage != ColsPerPage )
{
for(int i=0; i < m_RowCount; i++)
{
char* NewLine = AllocNewLine(ColsPerPage);
unsigned short Cols = (ColsPerPage < m_ColsPerPage)?ColsPerPage:m_ColsPerPage;
//Copy context of old into new one.
memcpy(NewLine, m_Screen[i], Cols);
memcpy(GetLineAttr(NewLine, ColsPerPage), GetLineAttr(m_Screen[i]), sizeof(CTermCharAttr::AttrType)*Cols);
delete []m_Screen[i];
m_Screen[i] = NewLine;
}
m_ColsPerPage = ColsPerPage;
}
SetRowCount(RowCount);
m_RowsPerPage = RowsPerPage;
// if cols per page change, reallocate all existing rows.
if( m_ColsPerPage != ColsPerPage )
{
for(int i=0; i < m_RowCount; i++)
{
char* NewLine = AllocNewLine(ColsPerPage);
unsigned short Cols = (ColsPerPage < m_ColsPerPage)?ColsPerPage:m_ColsPerPage;
//Copy context of old into new one.
memcpy(NewLine, m_Screen[i], Cols);
memcpy(GetLineAttr(NewLine, ColsPerPage), GetLineAttr(m_Screen[i]), sizeof(CTermCharAttr::AttrType)*Cols);
*GetPostPushNum(NewLine) = *GetPostPushNum(m_Screen[i]);
delete []m_Screen[i];
m_Screen[i] = NewLine;
}
m_ColsPerPage = ColsPerPage;
}
SetRowCount(RowCount);
}

// Change row count of screen buffer
Expand Down Expand Up @@ -226,11 +227,19 @@ void CTermData::AllocScreenBuf(int RowCount, unsigned short RowsPerPage,unsigned
}

// Initialize new lines
void CTermData::InitNewLine(char* NewLine, const int ColsPerPage){
void CTermData::InitNewLine(char* NewLine, const int ColsPerPage)
{
memset( NewLine, ' ', ColsPerPage);

NewLine[ColsPerPage] = '\0';
CTermCharAttr DefAttr; DefAttr.SetToDefault(); DefAttr.SetNeedUpdate(true);

CTermCharAttr DefAttr;
DefAttr.SetToDefault();
DefAttr.SetNeedUpdate(true);
memset16( GetLineAttr(NewLine, ColsPerPage), DefAttr.AsType(), ColsPerPage);

unsigned char *num = GetPostPushNum(NewLine);
*num = 0;
}

// LF handler
Expand Down Expand Up @@ -324,7 +333,7 @@ void CTermData::PutChar(unsigned char ch)
Tab();
break;
}
}
}
else // not C0 control characters, check if we're in control sequence.
{
switch( m_CmdLine[0] )
Expand All @@ -342,6 +351,8 @@ void CTermData::PutChar(unsigned char ch)

m_Screen[m_CaretPos.y][m_CaretPos.x] = ch;

NumberingPostPush( m_CaretPos.y );

CTermCharAttr* pAttr = GetLineAttr( m_Screen[m_CaretPos.y] );

// Check if we've changed a character which is part of a URL.
Expand All @@ -367,7 +378,7 @@ void CTermData::PutChar(unsigned char ch)
m_CaretPos.x++;
break;
}
// m_CmdLine[0] == '\0' means we're currently in ANSI control sequence.
// m_CmdLine[0] != '\0' means we're currently in ANSI control sequence.
// Store ch to CmdLine, and parse ANSI escape sequence when ready.
case '\x1b': // ESC, in ANSI escape mode
if( m_pCmdLine < (m_CmdLine +sizeof(m_CmdLine)) )
Expand All @@ -389,7 +400,7 @@ void CTermData::PutChar(unsigned char ch)

if( m_pCmdLine < (m_CmdLine +sizeof(m_CmdLine)) )
*m_pCmdLine = '\0';
// Current ANSI escape type is stored in *m_pBuf.
// Current ANSI escape type is stored in *m_CmdLine.
ParseAnsiEscapeSequence( (const char*)m_CmdLine, ch);
m_CmdLine[0] = '\0';
m_pCmdLine = m_CmdLine;
Expand Down Expand Up @@ -424,6 +435,7 @@ void CTermData::ScrollUp(int n /*=1*/)
{
memset( m_Screen[end+i], ' ', m_ColsPerPage-1 );
memset16( GetLineAttr(m_Screen[end+i]), m_CurAttr.AsType(), m_ColsPerPage-1 );
*GetPostPushNum(m_Screen[end+i]) = 0;
SetWholeLineUpdate(m_Screen[end+i]);
}
}
Expand All @@ -447,6 +459,7 @@ void CTermData::ScrollDown(int n /*=1*/)
{
memset( m_Screen[end-i], ' ', m_ColsPerPage-1 );
memset16( GetLineAttr(m_Screen[end-i]), m_CurAttr.AsType(), m_ColsPerPage-1 );
*GetPostPushNum(m_Screen[end-i]) = 0;
SetWholeLineUpdate(m_Screen[end-i]);
}
}
Expand Down Expand Up @@ -630,7 +643,9 @@ void CTermData::ClearScreen(int p)
if( i < m_RowsPerPage)
break;
memcpy( tmp, m_Screen[i-m_RowsPerPage],m_ColsPerPage);
memcpy( GetLineAttr(tmp),GetLineAttr(m_Screen[i-m_RowsPerPage]),m_ColsPerPage); }
memcpy( GetLineAttr(tmp),GetLineAttr(m_Screen[i-m_RowsPerPage]),m_ColsPerPage);
*GetPostPushNum(tmp) = *GetPostPushNum(m_Screen[i-m_RowsPerPage]);
}
break;
case 0: // Erase from current position to end (inclusive)
default:
Expand All @@ -647,7 +662,9 @@ void CTermData::ClearScreen(int p)
if( i < m_RowsPerPage)
break;
memcpy( tmp, m_Screen[i-m_RowsPerPage],m_ColsPerPage);
memcpy( GetLineAttr(tmp),GetLineAttr(m_Screen[i-m_RowsPerPage]),m_ColsPerPage); }
memcpy( GetLineAttr(tmp),GetLineAttr(m_Screen[i-m_RowsPerPage]),m_ColsPerPage);
*GetPostPushNum(tmp) = *GetPostPushNum(m_Screen[i-m_RowsPerPage]);
}
break;
}
}
Expand Down Expand Up @@ -1288,7 +1305,7 @@ void CTermData::InsertChar( int line, int col, int n )
CTermCharAttr* pattr = GetLineAttr( pline );

int coln = col + n;
for( int end = m_ColsPerPage; end >= coln; end-- )
for( int end = m_ColsPerPage - 1; end >= coln; end-- )
{
pline[ end ] = pline[ end - n ];
pattr[ end ] = pattr[ end - n ];
Expand Down Expand Up @@ -1425,3 +1442,95 @@ void CTermData::OnLineModified(int row UNUSED)
// This function can be overriden in derived class.
}

bool CTermData::PostPushHeaderTest(int iLine)
{
char *line = m_Screen[iLine];
int col;

// FIXME: Hack to detect PostPushHeader on PTT. Have a general method?
if( line[0] == '-' && line[1] == '-' )
{
for( col = 2; col < m_ColsPerPage; col++ )
{
if( line[col] != ' ' )
return false;
}
return true;
}

return false;
}

bool CTermData::PostPushTest(int iLine)
{
char *line = m_Screen[iLine];

// FIXME: Hack to detect PostPush on PTT. Have a general method?
if( line[0] == '\xb1' && line[1] == '\xc0' && line[2] == ' ' ) // like
return true;
if( line[0] == '\xbc' && line[1] == '\x4e' && line[2] == ' ' ) // dislike
return true;
if( line[0] == '\xa1' && line[1] == '\xf7' && line[2] == ' ' ) // line continuation
return true;

return false;
}

void CTermData::NumberingPostPush(int iLine)
{
unsigned char num = 0;
int row;

*GetPostPushNum(m_Screen[iLine]) = 0;

if( !PostPushTest(iLine) )
{
return ;
}

for( row = iLine - 1; row >= m_FirstLine; row-- )
{
if( PostPushHeaderTest(row) )
{
num = 1;
goto Numbering;
}

if( PostPushTest(row) )
{
num = *GetPostPushNum( m_Screen[row] );
if( num )
{
//num += iLine - row;
num++;
goto Numbering;
}
}
}

for( row = iLine + 1; row < m_RowsPerPage; row++ )
{
if( PostPushHeaderTest(row) )
{
goto Numbering;
}

if( PostPushTest(row) )
{
num = *GetPostPushNum( m_Screen[row] );
if( num )
{
//num -= iLine + row;
num--;
goto Numbering;
}
}
}

Numbering:
if( num > 0 )
{
*GetPostPushNum( m_Screen[iLine] ) = num;

}
}
17 changes: 13 additions & 4 deletions src/core/termdata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,11 @@ class X_EXPORT CTermData
return ( CTermCharAttr* ) ( pLine + m_ColsPerPage + 1 );
}

unsigned char* GetPostPushNum( const char* pLine )
{
return ( unsigned char* ) ( pLine + m_ColsPerPage + 1 + m_ColsPerPage * sizeof( CTermCharAttr::AttrType ) );
}

//Get all text from (0,0) to (maxX, maxY), if trim is true, it return text
//without tail black spaces.
string GetAllText( bool trim = true )
Expand All @@ -227,6 +232,7 @@ class X_EXPORT CTermData
#endif
void UpdateDisplay();
void DoUpdateDisplay();
void NumberingPostPush();
static void memset16( void* dest, short val, size_t n );
void ParseAnsiColor( const char* pParam );
void EraseLine( int p );
Expand Down Expand Up @@ -277,11 +283,11 @@ class X_EXPORT CTermData
// Allocate new lines
char* AllocNewLine( const int ColsPerPage )
{
// struct{ char[ColsPerPage], char='\0', CTermCharAttr[ColsPerPage]}
// struct{ char[ColsPerPage], char='\0', CTermCharAttr[ColsPerPage, char=0]}
// Neversay:The structure is show below:
// [ ColsPerPage*char + '\0' + ColsPerPage*CTermCharAttr ]
// so size is: ColsPerPage*1 + 1 + ColsPerPage*sizeof(CTermCharAttr)
char * NewLine = new char[ 1 + ColsPerPage * ( 1 + sizeof( CTermCharAttr::AttrType ) ) ];
// [ ColsPerPage*char + '\0' + ColsPerPage*CTermCharAttr + PostPushNum ]
// so size is: ColsPerPage*1 + 1 + ColsPerPage*sizeof(CTermCharAttr) + 1
char * NewLine = new char[ 1 + ColsPerPage * ( 1 + sizeof( CTermCharAttr::AttrType ) ) + 1 ];

InitNewLine( NewLine, ColsPerPage );
return NewLine;
Expand All @@ -292,6 +298,9 @@ class X_EXPORT CTermData
void AllocScreenBuf( int RowCount, unsigned short RowsPerPage, unsigned short ColsPerPage );
virtual void OnLineModified( int row );

bool PostPushHeaderTest(int iLine);
bool PostPushTest(int iLine);
void NumberingPostPush(int iLine);

///////////////////////////////////////////////////////////////////
//Data Field Section
Expand Down
Loading