Menu
▾
▴
cadcdev-svn-commits
|
From: <at...@us...> - 2007-08-09 21:57:42
|
Revision: 434
http://cadcdev.svn.sourceforge.net/cadcdev/?rev=434&view=rev
Author: atani
Date: 2007-08-09 14:57:40 -0700 (Thu, 09 Aug 2007)
Log Message:
-----------
initialize ansiptr in constructor, fixes ansi parsing to not ignore first ESC character
Modified Paths:
--------------
tiki/src/gl/drawables/console.cpp
Modified: tiki/src/gl/drawables/console.cpp
===================================================================
--- tiki/src/gl/drawables/console.cpp 2007-08-04 17:39:47 UTC (rev 433)
+++ tiki/src/gl/drawables/console.cpp 2007-08-09 21:57:40 UTC (rev 434)
@@ -48,6 +48,7 @@
m_autoWrap = true;
m_ansi = false;
m_autoRefresh = false;
+ ansiptr = 0;
color(GREY,BLACK);
clear();
@@ -136,34 +137,34 @@
}
if(ansiptr) {
- if(ansiptr > 50) {
- ansiptr = 0;
- }
- ansistr[ansiptr++] = buf[i];
- ansistr[ansiptr] = 0;
- if(!isdigit(buf[i]) && ((buf[i] != '[') && (buf[i] != ';'))) {
- processAnsiString();
- }
- } else if(buf[i] == '\x1b' && m_ansi) {
- ansistr[0] = buf[i];
- ansiptr = 1;
- ansistr[ansiptr] = 0;
- } else {
- if(buf[i] == '\n') {
- m_cursor_y++;
- m_cursor_x=0;
- continue;
- } else if(buf[i] == '\r') {
- m_cursor_x = 0;
- continue;
- } else if(buf[i] == '\b') {
- m_cursor_x--;
- if(m_cursor_x < 0) m_cursor_x = 0;
- continue;
- } else if(buf[i] == 12) { // funky old style clearscreen
- clear();
- continue;
- }
+ if(ansiptr > 50) {
+ ansiptr = 0;
+ }
+ ansistr[ansiptr++] = buf[i];
+ ansistr[ansiptr] = 0;
+ if(!isdigit(buf[i]) && ((buf[i] != '[') && (buf[i] != ';'))) {
+ processAnsiString();
+ }
+ } else if(buf[i] == '\x1b' && m_ansi) {
+ ansistr[0] = buf[i];
+ ansiptr = 1;
+ ansistr[ansiptr] = 0;
+ } else {
+ if(buf[i] == '\n') {
+ m_cursor_y++;
+ m_cursor_x=0;
+ continue;
+ } else if(buf[i] == '\r') {
+ m_cursor_x = 0;
+ continue;
+ } else if(buf[i] == '\b') {
+ m_cursor_x--;
+ if(m_cursor_x < 0) m_cursor_x = 0;
+ continue;
+ } else if(buf[i] == 12) { // funky old style clearscreen
+ clear();
+ continue;
+ }
assert(m_cursor_x >= 0 && m_cursor_y >= 0 && m_cursor_x < m_cols && m_cursor_y < m_rows);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <at...@us...> - 2007-08-10 01:42:23
|
Revision: 438
http://cadcdev.svn.sourceforge.net/cadcdev/?rev=438&view=rev
Author: atani
Date: 2007-08-09 18:42:22 -0700 (Thu, 09 Aug 2007)
Log Message:
-----------
reset ansiptr in clear()
Modified Paths:
--------------
tiki/src/gl/drawables/console.cpp
Modified: tiki/src/gl/drawables/console.cpp
===================================================================
--- tiki/src/gl/drawables/console.cpp 2007-08-09 23:13:03 UTC (rev 437)
+++ tiki/src/gl/drawables/console.cpp 2007-08-10 01:42:22 UTC (rev 438)
@@ -48,7 +48,6 @@
m_autoWrap = true;
m_ansi = false;
m_autoRefresh = false;
- ansiptr = 0;
color(GREY,BLACK);
clear();
@@ -76,6 +75,7 @@
m_cursor_x = 0;
m_cursor_y = 0;
+ ansiptr = 0;
if(m_autoRefresh) refresh();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <at...@us...> - 2007-08-16 23:06:59
|
Revision: 474
http://cadcdev.svn.sourceforge.net/cadcdev/?rev=474&view=rev
Author: atani
Date: 2007-08-16 16:06:56 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
proper fix for assert in previous revisions
Modified Paths:
--------------
tiki/src/gl/drawables/console.cpp
Modified: tiki/src/gl/drawables/console.cpp
===================================================================
--- tiki/src/gl/drawables/console.cpp 2007-08-16 22:39:10 UTC (rev 473)
+++ tiki/src/gl/drawables/console.cpp 2007-08-16 23:06:56 UTC (rev 474)
@@ -1,12 +1,12 @@
/*
- Tiki
-
- console.cpp
-
- Copyright (C)2001 - 2006 Sam Steele
- Portions (C) Atani Software
- */
+Tiki
+console.cpp
+
+Copyright (C)2001 - 2006 Sam Steele
+Portions (C) Atani Software
+*/
+
#include "pch.h"
#include "Tiki/tiki.h"
@@ -17,484 +17,556 @@
using namespace Tiki::GL;
using namespace Tiki::GL::Plxcompat;
-ConsoleText::ConsoleText(int cols, int rows, Texture * texture) {
+ConsoleText::ConsoleText( int cols, int rows, Texture * texture )
+{
m_texture = texture;
m_rows = rows;
m_cols = cols;
- m_palette[0] = Color(0,0,0);
- m_palette[1] = Color(0,0,0.5);
- m_palette[2] = Color(0,0.5,0);
- m_palette[3] = Color(0,0.5,0.5);
- m_palette[4] = Color(0.5,0,0);
- m_palette[5] = Color(0.5,0,0.5);
- m_palette[6] = Color(0.5,0.5,0);
- m_palette[7] = Color(0.5,0.5,0.5);
-
- m_charData.resize(rows*cols, 0);
- m_colorData.resize(rows*cols, 0);
-
+ m_palette[ 0 ] = Color( 0, 0, 0 );
+ m_palette[ 1 ] = Color( 0, 0, 0.5 );
+ m_palette[ 2 ] = Color( 0, 0.5, 0 );
+ m_palette[ 3 ] = Color( 0, 0.5, 0.5 );
+ m_palette[ 4 ] = Color( 0.5, 0, 0 );
+ m_palette[ 5 ] = Color( 0.5, 0, 0.5 );
+ m_palette[ 6 ] = Color( 0.5, 0.5, 0 );
+ m_palette[ 7 ] = Color( 0.5, 0.5, 0.5 );
+
+ m_charData.resize( rows * cols, 0 );
+ m_colorData.resize( rows * cols, 0 );
+
m_texture->select();
-
+
#if TIKI_PLAT != TIKI_DC && TIKI_PLAT != TIKI_NDS
- glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_NEAREST);
+
+ glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
+ glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
#endif
-
+
m_cursor_x = 0;
m_cursor_y = 0;
-
+
m_autoScroll = true;
m_autoWrap = true;
m_ansi = false;
m_autoRefresh = false;
-
- color(GREY,BLACK);
+
+ color( GREY, BLACK );
clear();
}
-ConsoleText::~ConsoleText() {
-}
+ConsoleText::~ConsoleText()
+{}
-void ConsoleText::setTexture(Texture * txr) {
+void ConsoleText::setTexture( Texture * txr )
+{
m_texture = txr;
}
-void ConsoleText::setSize(float w, float h) {
+void ConsoleText::setSize( float w, float h )
+{
m_w = w;
m_h = h;
}
-void ConsoleText::clear() {
+void ConsoleText::clear()
+{
int x;
-
- for(x=0; x<m_rows*m_cols; x++) {
- m_charData[x] = 0;
- m_colorData[x] = m_attr;
+
+ for ( x = 0; x < m_rows*m_cols; x++ )
+ {
+ m_charData[ x ] = 0;
+ m_colorData[ x ] = m_attr;
}
-
+
m_cursor_x = 0;
m_cursor_y = 0;
ansiptr = 0;
-
- if(m_autoRefresh) refresh();
+
+ if ( m_autoRefresh )
+ refresh();
}
-void ConsoleText::scroll(int rows, int top, int left, int bottom, int right) {
- assert(top >= 0 && left >= 0 && bottom <= m_rows && right <= m_cols);
-
- for(int y=top; y<=bottom; y++) {
- for(int x=left; x<=right; x++) {
- if(y + rows < m_rows && y + rows >= 0) {
- m_charData[(y * m_cols) + x] = m_charData[((y + rows) * m_cols) + x];
- m_colorData[(y * m_cols) + x] = m_colorData[((y + rows) * m_cols) + x];
- } else {
- m_charData[(y * m_cols) + x] = 0;
- m_colorData[(y * m_cols) + x] = m_attr;
+void ConsoleText::scroll( int rows, int top, int left, int bottom, int right )
+{
+ assert( top >= 0 && left >= 0 && bottom <= m_rows && right <= m_cols );
+
+ for ( int y = top; y <= bottom; y++ )
+ {
+ for ( int x = left; x <= right; x++ )
+ {
+ if ( y + rows < m_rows && y + rows >= 0 )
+ {
+ m_charData[ ( y * m_cols ) + x ] = m_charData[ ( ( y + rows ) * m_cols ) + x ];
+ m_colorData[ ( y * m_cols ) + x ] = m_colorData[ ( ( y + rows ) * m_cols ) + x ];
}
+ else
+ {
+ m_charData[ ( y * m_cols ) + x ] = 0;
+ m_colorData[ ( y * m_cols ) + x ] = m_attr;
+ }
}
}
-
- if(m_autoRefresh) refresh();
+
+ if ( m_autoRefresh )
+ refresh();
}
-void ConsoleText::scroll(int rows) {
- scroll(rows,0,0,m_rows-1,m_cols-1);
+void ConsoleText::scroll( int rows )
+{
+ scroll( rows, 0, 0, m_rows - 1, m_cols - 1 );
}
-void ConsoleText::locate(int x, int y) {
+void ConsoleText::locate( int x, int y )
+{
m_cursor_x = x;
m_cursor_y = y;
}
-void ConsoleText::color(int fg, int bg) {
+void ConsoleText::color( int fg, int bg )
+{
m_attr = 0x0000;
- if(fg > 7 && fg <= 16) { //Old style high intensity
+ if ( fg > 7 && fg <= 16 )
+ { //Old style high intensity
m_attr |= HIGH_INTENSITY;
fg -= 8;
}
m_attr |= fg;
- m_attr |= (bg << 8);
+ m_attr |= ( bg << 8 );
}
-void ConsoleText::printf(const char *fmt, ...) {
- char buf[1024];
+void ConsoleText::printf( const char *fmt, ... )
+{
+ char buf[ 1024 ];
va_list args;
-
- va_start(args,fmt);
- vsprintf(buf,fmt,args);
- va_end(args);
- for(size_t i=0; i<strlen(buf); i++) {
- if(m_cursor_x >= m_cols && m_autoWrap) {
- m_cursor_y++;
- m_cursor_x = 0;
+ va_start( args, fmt );
+ vsprintf( buf, fmt, args );
+ va_end( args );
+
+ for ( size_t i = 0; i < strlen( buf ); i++ )
+ {
+ if ( ansiptr )
+ {
+ if ( ansiptr > 50 )
+ {
+ ansiptr = 0;
+ }
+ ansistr[ ansiptr++ ] = buf[ i ];
+ ansistr[ ansiptr ] = 0;
+ if ( !isdigit( buf[ i ] ) && ( ( buf[ i ] != '[' ) && ( buf[ i ] != ';' ) ) )
+ {
+ processAnsiString();
+ }
}
-
- if(m_cursor_y >= m_rows && m_autoScroll) {
- scroll(1);
- m_cursor_y = m_rows - 1;
+ else if ( buf[ i ] == '\x1b' && m_ansi )
+ {
+ ansistr[ 0 ] = buf[ i ];
+ ansiptr = 1;
+ ansistr[ ansiptr ] = 0;
}
+ else
+ {
+ if ( buf[ i ] == '\n' )
+ {
+ m_cursor_y++;
+ m_cursor_x = 0;
+ continue;
+ }
+ else if ( buf[ i ] == '\r' )
+ {
+ m_cursor_x = 0;
+ continue;
+ }
+ else if ( buf[ i ] == '\b' )
+ {
+ m_cursor_x--;
+ if ( m_cursor_x < 0 )
+ m_cursor_x = 0;
+ continue;
+ }
+ else if ( buf[ i ] == 12 )
+ { // funky old style clearscreen
+ clear();
+ continue;
+ }
+ if ( m_cursor_x >= m_cols && m_autoWrap )
+ {
+ m_cursor_y++;
+ m_cursor_x = 0;
+ }
- if(ansiptr) {
- if(ansiptr > 50) {
- ansiptr = 0;
- }
- ansistr[ansiptr++] = buf[i];
- ansistr[ansiptr] = 0;
- if(!isdigit(buf[i]) && ((buf[i] != '[') && (buf[i] != ';'))) {
- processAnsiString();
- }
- } else if(buf[i] == '\x1b' && m_ansi) {
- ansistr[0] = buf[i];
- ansiptr = 1;
- ansistr[ansiptr] = 0;
- } else {
- if(buf[i] == '\n') {
- m_cursor_y++;
- m_cursor_x=0;
- continue;
- } else if(buf[i] == '\r') {
- m_cursor_x = 0;
- continue;
- } else if(buf[i] == '\b') {
- m_cursor_x--;
- if(m_cursor_x < 0) m_cursor_x = 0;
- continue;
- } else if(buf[i] == 12) { // funky old style clearscreen
- clear();
- continue;
- }
-
- assert(m_cursor_x >= 0 && m_cursor_y >= 0 && m_cursor_x <= m_cols && m_cursor_y <= m_rows);
-
- m_charData[(m_cursor_y * m_cols) + m_cursor_x] = buf[i];
- m_colorData[(m_cursor_y * m_cols) + m_cursor_x] = m_attr;
-
+ if ( m_cursor_y >= m_rows && m_autoScroll )
+ {
+ scroll( 1 );
+ m_cursor_y = m_rows - 1;
+ }
+
+
+ assert( m_cursor_x >= 0 && m_cursor_y >= 0 && m_cursor_x < m_cols && m_cursor_y < m_rows );
+
+ m_charData[ ( m_cursor_y * m_cols ) + m_cursor_x ] = buf[ i ];
+ m_colorData[ ( m_cursor_y * m_cols ) + m_cursor_x ] = m_attr;
+
m_cursor_x++;
- }
+ }
}
-
- if(m_autoRefresh) refresh();
+
+ if ( m_autoRefresh )
+ refresh();
}
-void ConsoleText::renderCharacter(float x, float y, float w, float h, unsigned char c, int attr) {
+void ConsoleText::renderCharacter( float x, float y, float w, float h, unsigned char c, int attr )
+{
plx_vertex_t vert;
- float u = static_cast<float>((c % 16) * 8);
- float v = static_cast<float>((c / 16) * 8);
+ float u = static_cast<float>( ( c % 16 ) * 8 );
+ float v = static_cast<float>( ( c / 16 ) * 8 );
int color = attr & 0x07;
-
-
+
+
const Vector & sv = getScale();
w *= sv.x;
h *= sv.y;
-
- const Vector & tv = getPosition() + Vector(x, y, 0.01f);
+ const Vector & tv = getPosition() + Vector( x, y, 0.01f );
+
m_texture->select();
- if(attr & HIGH_INTENSITY) {
- vert.argb = Color(0.25, 0.25, 0.25);
+ if ( attr & HIGH_INTENSITY )
+ {
+ vert.argb = Color( 0.25, 0.25, 0.25 );
//color -= 8;
- } else {
- vert.argb = Color(0,0,0);
}
- vert.argb += m_palette[color];
+ else
+ {
+ vert.argb = Color( 0, 0, 0 );
+ }
+ vert.argb += m_palette[ color ];
vert.oargb = 0;
-
+
vert.flags = PLX_VERT;
- vert.x = tv.x-m_w/2;
- vert.y = tv.y+h-m_h/2;
+ vert.x = tv.x - m_w / 2;
+ vert.y = tv.y + h - m_h / 2;
vert.z = tv.z;
- vert.u = u/m_texture->getW();
- vert.v = (v+8)/m_texture->getH();
- plx_prim(&vert, sizeof(vert));
-
- vert.y = tv.y-m_h/2;
- vert.u = u/m_texture->getH();
- vert.v = v/m_texture->getW();
- plx_prim(&vert, sizeof(vert));
-
- vert.x = tv.x+w-m_w/2;
- vert.y = tv.y+h-m_h/2;
- vert.u = (u+8)/m_texture->getW();
- vert.v = (v+8)/m_texture->getH();
- plx_prim(&vert, sizeof(vert));
-
+ vert.u = u / m_texture->getW();
+ vert.v = ( v + 8 ) / m_texture->getH();
+ plx_prim( &vert, sizeof( vert ) );
+
+ vert.y = tv.y - m_h / 2;
+ vert.u = u / m_texture->getH();
+ vert.v = v / m_texture->getW();
+ plx_prim( &vert, sizeof( vert ) );
+
+ vert.x = tv.x + w - m_w / 2;
+ vert.y = tv.y + h - m_h / 2;
+ vert.u = ( u + 8 ) / m_texture->getW();
+ vert.v = ( v + 8 ) / m_texture->getH();
+ plx_prim( &vert, sizeof( vert ) );
+
vert.flags = PLX_VERT_EOS;
- vert.y = tv.y-m_h/2;
- vert.u = (u+8)/m_texture->getW();
- vert.v = v/m_texture->getH();
- plx_prim(&vert, sizeof(vert));
+ vert.y = tv.y - m_h / 2;
+ vert.u = ( u + 8 ) / m_texture->getW();
+ vert.v = v / m_texture->getH();
+ plx_prim( &vert, sizeof( vert ) );
}
-void ConsoleText::renderBackground(float x, float y, float w, float h, int color) {
+void ConsoleText::renderBackground( float x, float y, float w, float h, int color )
+{
plx_vertex_t vert;
const Vector & sv = getScale();
w *= sv.x;
h *= sv.y;
-
- const Vector & tv = getPosition() + Vector(x, y, -0.01f);
-
+
+ const Vector & tv = getPosition() + Vector( x, y, -0.01f );
+
m_texture->deselect();
-
- vert.argb = m_palette[color];
+
+ vert.argb = m_palette[ color ];
vert.oargb = 0;
-
+
vert.flags = PLX_VERT;
- vert.x = tv.x-m_w/2;
- vert.y = tv.y+h-m_h/2;
+ vert.x = tv.x - m_w / 2;
+ vert.y = tv.y + h - m_h / 2;
vert.z = tv.z;
- plx_prim(&vert, sizeof(vert));
-
- vert.y = tv.y-m_h/2;
- plx_prim(&vert, sizeof(vert));
-
- vert.x = tv.x+w-m_w/2;
- vert.y = tv.y+h-m_h/2;
- plx_prim(&vert, sizeof(vert));
-
+ plx_prim( &vert, sizeof( vert ) );
+
+ vert.y = tv.y - m_h / 2;
+ plx_prim( &vert, sizeof( vert ) );
+
+ vert.x = tv.x + w - m_w / 2;
+ vert.y = tv.y + h - m_h / 2;
+ plx_prim( &vert, sizeof( vert ) );
+
vert.flags = PLX_VERT_EOS;
- vert.y = tv.y-m_h/2;
- plx_prim(&vert, sizeof(vert));
+ vert.y = tv.y - m_h / 2;
+ plx_prim( &vert, sizeof( vert ) );
}
-void ConsoleText::draw(ObjType list) {
- int x=0,y=0;
- float x_step=(m_w / m_cols);
- float y_step=(m_h / m_rows);
+void ConsoleText::draw( ObjType list )
+{
+ int x = 0, y = 0;
+ float x_step = ( m_w / m_cols );
+ float y_step = ( m_h / m_rows );
#if TIKI_PLAT != TIKI_NDS
- glDisable(GL_DEPTH_TEST);
+
+ glDisable( GL_DEPTH_TEST );
#endif
-
- for(y=0; y<m_rows; y++) {
- for(x=0; x<m_cols; x++) {
- if(list == Trans) { //Characters!
- renderCharacter(x*x_step, y*y_step, x_step, y_step, m_charData[y*(m_cols) + x], m_colorData[y*(m_cols) + x]);
- } else { //Background blocks!
- renderBackground(x*x_step, y*y_step, x_step, y_step, (m_colorData[y*(m_cols) + x] >> 8) & 0x07);
+
+ for ( y = 0; y < m_rows; y++ )
+ {
+ for ( x = 0; x < m_cols; x++ )
+ {
+ if ( list == Trans )
+ { //Characters!
+ renderCharacter( x * x_step, y * y_step, x_step, y_step, m_charData[ y * ( m_cols ) + x ], m_colorData[ y * ( m_cols ) + x ] );
}
+ else
+ { //Background blocks!
+ renderBackground( x * x_step, y * y_step, x_step, y_step, ( m_colorData[ y * ( m_cols ) + x ] >> 8 ) & 0x07 );
+ }
}
}
}
-void ConsoleText::processAnsiString() {
- if(ansistr[1] == '[')
- {
- int args[11], argptr = 0, ptr = 2, tempptr = 0;
- char cmd, temp[11];
- memset(&args, 0, sizeof(int) * 11);
- cmd = ansistr[ansiptr - 1];
- ansistr[ansiptr - 1] = 0;
- while((ansistr[ptr]) && ((argptr < 10) && (tempptr < 10)))
- {
- if(ansistr[ptr] == ';')
- {
- temp[tempptr] = 0;
- tempptr = 0;
- args[argptr++] = atoi(temp);
- }
- else
- {
- temp[tempptr++] = ansistr[ptr];
- }
- ++ptr;
- }
- if(tempptr && (argptr < 10))
- {
- temp[tempptr] = 0;
- args[argptr++] = atoi(temp);
- }
- if((cmd >= 'A') && (cmd <= 'D') && !args[0])
- {
- args[0] = 1;
- }
- switch(cmd)
- {
- case 'f':
- case 'H': // goto XY
+void ConsoleText::processAnsiString()
+{
+ if ( ansistr[ 1 ] == '[' )
+ {
+ int args[ 11 ], argptr = 0, ptr = 2, tempptr = 0;
+ char cmd, temp[ 11 ];
+ memset( &args, 0, sizeof( int ) * 11 );
+ cmd = ansistr[ ansiptr - 1 ];
+ ansistr[ ansiptr - 1 ] = 0;
+ while ( ( ansistr[ ptr ] ) && ( ( argptr < 10 ) && ( tempptr < 10 ) ) )
+ {
+ if ( ansistr[ ptr ] == ';' )
{
- if(argptr == 0)
+ temp[ tempptr ] = 0;
+ tempptr = 0;
+ args[ argptr++ ] = atoi( temp );
+ }
+ else
+ {
+ temp[ tempptr++ ] = ansistr[ ptr ];
+ }
+ ++ptr;
+ }
+ if ( tempptr && ( argptr < 10 ) )
+ {
+ temp[ tempptr ] = 0;
+ args[ argptr++ ] = atoi( temp );
+ }
+ if ( ( cmd >= 'A' ) && ( cmd <= 'D' ) && !args[ 0 ] )
+ {
+ args[ 0 ] = 1;
+ }
+ switch ( cmd )
+ {
+ case 'f':
+ case 'H': // goto XY
+ {
+ if ( argptr == 0 )
{
m_cursor_x = 0;
m_cursor_y = 0;
}
else
{
- m_cursor_x = args[1]-1;
- m_cursor_y = args[0]-1;
+ m_cursor_x = args[ 1 ] - 1;
+ m_cursor_y = args[ 0 ] - 1;
}
- if(m_cursor_x < 0) m_cursor_x = 0;
- if(m_cursor_y < 0) m_cursor_y = 0;
- if(m_cursor_x > m_cols - 1) m_cursor_x = m_cols - 1;
- if(m_cursor_y > m_rows - 1) m_cursor_y = m_rows - 1;
+ if ( m_cursor_x < 0 )
+ m_cursor_x = 0;
+ if ( m_cursor_y < 0 )
+ m_cursor_y = 0;
+ if ( m_cursor_x > m_cols - 1 )
+ m_cursor_x = m_cols - 1;
+ if ( m_cursor_y > m_rows - 1 )
+ m_cursor_y = m_rows - 1;
//printf("**** GOTO XY(%u,%u) ****\n", m_cursor_x, m_cursor_y);
}
- break;
- case 'A': // UP * lines
- m_cursor_y -= args[0];
- if(m_cursor_x < 0) m_cursor_x = 0;
- if(m_cursor_y < 0) m_cursor_y = 0;
- if(m_cursor_x > m_cols - 1) m_cursor_x = m_cols - 1;
- if(m_cursor_y > m_rows - 1) m_cursor_y = m_rows - 1;
- //printf("**** UP %u ****\n",m_cursor_y);
- break;
- case 'B': // DOWN * lines
- m_cursor_y += args[0];
- if(m_cursor_x < 0) m_cursor_x = 0;
- if(m_cursor_y < 0) m_cursor_y = 0;
- if(m_cursor_x > m_cols - 1) m_cursor_x = m_cols - 1;
- if(m_cursor_y > m_rows - 1) m_cursor_y = m_rows - 1;
- //printf("**** DOWN %u ****\n",m_cursor_y);
- break;
- case 'C': // RIGHT * chars
- m_cursor_x += args[0];
- if(m_cursor_x < 0) m_cursor_x = 0;
- if(m_cursor_y < 0) m_cursor_y = 0;
- if(m_cursor_x > m_cols - 1) m_cursor_x = m_cols - 1;
- if(m_cursor_y > m_rows - 1) m_cursor_y = m_rows - 1;
- //printf("**** RIGHT %u ****\n",m_cursor_y);
- break;
- case 'D': // LEFT * chars
- m_cursor_x -= args[0];
- if(m_cursor_x < 0) m_cursor_x = 0;
- if(m_cursor_y < 0) m_cursor_y = 0;
- if(m_cursor_x > m_cols - 1) m_cursor_x = m_cols - 1;
- if(m_cursor_y > m_rows - 1) m_cursor_y = m_rows - 1;
- //printf("**** LEFT %u ****\n",m_cursor_y);
- break;
- case 'J': // clearscreen
- clear();
- //printf("**** CLEAR SCREEN ****\n");
- break;
- case 's': // save location
- m_save_x = m_cursor_x;
- m_save_y = m_cursor_y;
- //printf("**** SAVE XY (%u, %u) ****\n", save_x, save_y);
- break;
- case 'u': // restore location
- m_cursor_x = m_save_x;
- m_cursor_y = m_save_y;
- m_save_x = m_save_y = 0;
- //printf("**** RESTORE XY (%u, %u) ****\n", m_cursor_x, m_cursor_y);
- break;
- case 'n': // ANSI detect
- //remoteHost->write("\x1b[1;1R", 6);
- //printf("**** ANSI DETECTION ****\n");
- break;
- case 'k':
- case 'K': // clear EOL
+ break;
+ case 'A': // UP * lines
+ m_cursor_y -= args[ 0 ];
+ if ( m_cursor_x < 0 )
+ m_cursor_x = 0;
+ if ( m_cursor_y < 0 )
+ m_cursor_y = 0;
+ if ( m_cursor_x > m_cols - 1 )
+ m_cursor_x = m_cols - 1;
+ if ( m_cursor_y > m_rows - 1 )
+ m_cursor_y = m_rows - 1;
+ //printf("**** UP %u ****\n",m_cursor_y);
+ break;
+ case 'B': // DOWN * lines
+ m_cursor_y += args[ 0 ];
+ if ( m_cursor_x < 0 )
+ m_cursor_x = 0;
+ if ( m_cursor_y < 0 )
+ m_cursor_y = 0;
+ if ( m_cursor_x > m_cols - 1 )
+ m_cursor_x = m_cols - 1;
+ if ( m_cursor_y > m_rows - 1 )
+ m_cursor_y = m_rows - 1;
+ //printf("**** DOWN %u ****\n",m_cursor_y);
+ break;
+ case 'C': // RIGHT * chars
+ m_cursor_x += args[ 0 ];
+ if ( m_cursor_x < 0 )
+ m_cursor_x = 0;
+ if ( m_cursor_y < 0 )
+ m_cursor_y = 0;
+ if ( m_cursor_x > m_cols - 1 )
+ m_cursor_x = m_cols - 1;
+ if ( m_cursor_y > m_rows - 1 )
+ m_cursor_y = m_rows - 1;
+ //printf("**** RIGHT %u ****\n",m_cursor_y);
+ break;
+ case 'D': // LEFT * chars
+ m_cursor_x -= args[ 0 ];
+ if ( m_cursor_x < 0 )
+ m_cursor_x = 0;
+ if ( m_cursor_y < 0 )
+ m_cursor_y = 0;
+ if ( m_cursor_x > m_cols - 1 )
+ m_cursor_x = m_cols - 1;
+ if ( m_cursor_y > m_rows - 1 )
+ m_cursor_y = m_rows - 1;
+ //printf("**** LEFT %u ****\n",m_cursor_y);
+ break;
+ case 'J': // clearscreen
+ clear();
+ //printf("**** CLEAR SCREEN ****\n");
+ break;
+ case 's': // save location
+ m_save_x = m_cursor_x;
+ m_save_y = m_cursor_y;
+ //printf("**** SAVE XY (%u, %u) ****\n", save_x, save_y);
+ break;
+ case 'u': // restore location
+ m_cursor_x = m_save_x;
+ m_cursor_y = m_save_y;
+ m_save_x = m_save_y = 0;
+ //printf("**** RESTORE XY (%u, %u) ****\n", m_cursor_x, m_cursor_y);
+ break;
+ case 'n': // ANSI detect
+ //remoteHost->write("\x1b[1;1R", 6);
+ //printf("**** ANSI DETECTION ****\n");
+ break;
+ case 'k':
+ case 'K': // clear EOL
{
int x = m_cursor_x;
- while(x < m_cols - 1) {
- m_charData[(m_cursor_y * m_cols) + x] = 0;
- m_colorData[(m_cursor_y * m_cols) + x++] = m_attr;
- }
+ while ( x < m_cols - 1 )
+ {
+ m_charData[ ( m_cursor_y * m_cols ) + x ] = 0;
+ m_colorData[ ( m_cursor_y * m_cols ) + x++ ] = m_attr;
+ }
//printf("**** CLEAR EOL %u ****\n", m_cursor_y);
}
- break;
- case 'm': // set color attribute, currently ignored
+ break;
+ case 'm': // set color attribute, currently ignored
{
//printf("**** SET ATTRIBUTE [%u]", argptr);
int i;
- for(i = 0; i < argptr; i++)
+ for ( i = 0; i < argptr; i++ )
{
//printf(" %u", args[i]);
- switch(args[i])
+ switch ( args[ i ] )
{
- case 0:
- m_attr = 0x0007; // all normal
- break;
- case 1:
- m_attr |= 0x1000; // bold (high intensity)
- break;
- case 4:
- m_attr |= 0x2000; // underscore
- break;
- case 5:
- m_attr |= 0x4000; // blink
- break;
- case 7:
- m_attr |= 0x8000; // reverse video
- break;
- case 8:
- m_attr |= 0xA000; // invisible
- break;
- case 30: // black fg
- m_attr &= 0xFF00;
- m_attr |= BLACK;
- break;
- case 31: // red fg
- m_attr &= 0xFF00;
- m_attr |= RED;
- break;
- case 32: // green fg
- m_attr &= 0xFF00;
- m_attr |= GREEN;
- break;
- case 33: // yellow fg
- m_attr &= 0xFF00;
- m_attr |= YELLOW;
- break;
- case 34: // blue fg
- m_attr &= 0xFF00;
- m_attr |= BLUE;
- break;
- case 35: // magenta fg
- m_attr &= 0xFF00;
- m_attr |= MAGENTA;
- break;
- case 36: // cyan fg
- m_attr &= 0xFF00;
- m_attr |= CYAN;
- break;
- case 37: // white fg
- m_attr &= 0xFF00;
- m_attr |= GREY;
- break;
- case 40: // black bg
- m_attr &= 0xF0FF;
- m_attr |= BLACK << 8;
- break;
- case 41: // red bg
- m_attr &= 0xF0FF;
- m_attr |= RED << 8;
- break;
- case 42: // green bg
- m_attr &= 0xF0FF;
- m_attr |= GREEN << 8;
- break;
- case 43: // yellow bg
- m_attr &= 0xF0FF;
- m_attr |= YELLOW << 8;
- break;
- case 44: // blue bg
- m_attr &= 0xF0FF;
- m_attr |= BLUE << 8;
- break;
- case 45: // magenta fg
- m_attr &= 0xF0FF;
- m_attr |= MAGENTA << 8;
- break;
- case 46: // cyan bg
- m_attr &= 0xF0FF;
- m_attr |= CYAN << 8;
- break;
- case 47: // white bg
- m_attr &= 0xF0FF;
- m_attr |= GREY << 8;
- break;
+ case 0:
+ m_attr = 0x0007; // all normal
+ break;
+ case 1:
+ m_attr |= 0x1000; // bold (high intensity)
+ break;
+ case 4:
+ m_attr |= 0x2000; // underscore
+ break;
+ case 5:
+ m_attr |= 0x4000; // blink
+ break;
+ case 7:
+ m_attr |= 0x8000; // reverse video
+ break;
+ case 8:
+ m_attr |= 0xA000; // invisible
+ break;
+ case 30: // black fg
+ m_attr &= 0xFF00;
+ m_attr |= BLACK;
+ break;
+ case 31: // red fg
+ m_attr &= 0xFF00;
+ m_attr |= RED;
+ break;
+ case 32: // green fg
+ m_attr &= 0xFF00;
+ m_attr |= GREEN;
+ break;
+ case 33: // yellow fg
+ m_attr &= 0xFF00;
+ m_attr |= YELLOW;
+ break;
+ case 34: // blue fg
+ m_attr &= 0xFF00;
+ m_attr |= BLUE;
+ break;
+ case 35: // magenta fg
+ m_attr &= 0xFF00;
+ m_attr |= MAGENTA;
+ break;
+ case 36: // cyan fg
+ m_attr &= 0xFF00;
+ m_attr |= CYAN;
+ break;
+ case 37: // white fg
+ m_attr &= 0xFF00;
+ m_attr |= GREY;
+ break;
+ case 40: // black bg
+ m_attr &= 0xF0FF;
+ m_attr |= BLACK << 8;
+ break;
+ case 41: // red bg
+ m_attr &= 0xF0FF;
+ m_attr |= RED << 8;
+ break;
+ case 42: // green bg
+ m_attr &= 0xF0FF;
+ m_attr |= GREEN << 8;
+ break;
+ case 43: // yellow bg
+ m_attr &= 0xF0FF;
+ m_attr |= YELLOW << 8;
+ break;
+ case 44: // blue bg
+ m_attr &= 0xF0FF;
+ m_attr |= BLUE << 8;
+ break;
+ case 45: // magenta fg
+ m_attr &= 0xF0FF;
+ m_attr |= MAGENTA << 8;
+ break;
+ case 46: // cyan bg
+ m_attr &= 0xF0FF;
+ m_attr |= CYAN << 8;
+ break;
+ case 47: // white bg
+ m_attr &= 0xF0FF;
+ m_attr |= GREY << 8;
+ break;
}
}
//printf(" ****\n");
}
- break;
- }
- }
+ break;
+ }
+ }
// else
// {
// printf("Bogus ANSI: %s\n", ansistr);
// }
- ansiptr = 0;
+ ansiptr = 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <c99...@us...> - 2007-11-04 17:20:35
|
Revision: 525
http://cadcdev.svn.sourceforge.net/cadcdev/?rev=525&view=rev
Author: c99koder
Date: 2007-11-04 09:20:24 -0800 (Sun, 04 Nov 2007)
Log Message:
-----------
Tweak the Z offset between Console foreground and background, and keep depth testing enabled
Modified Paths:
--------------
tiki/src/gl/drawables/console.cpp
Modified: tiki/src/gl/drawables/console.cpp
===================================================================
--- tiki/src/gl/drawables/console.cpp 2007-11-04 15:44:30 UTC (rev 524)
+++ tiki/src/gl/drawables/console.cpp 2007-11-04 17:20:24 UTC (rev 525)
@@ -226,7 +226,7 @@
w *= sv.x;
h *= sv.y;
- const Vector & tv = getPosition() + Vector( x, y, 0.01f );
+ const Vector & tv = getPosition() + Vector( x, y, 0.0001f );
Color color = m_palette[BLACK];
if ( attr & HIGH_INTENSITY )
@@ -252,7 +252,7 @@
w *= sv.x;
h *= sv.y;
- const Vector & tv = getPosition() + Vector( x, y, -0.01f );
+ const Vector & tv = getPosition() + Vector( x, y, -0.0001f );
m_palette[ color ].select();
glVertex3f(tv.x - (m_w / 2), tv.y + h - (m_h / 2), tv.z);
@@ -267,9 +267,6 @@
float x_step = ( m_w / m_cols );
float y_step = ( m_h / m_rows );
-#if TIKI_PLAT != TIKI_NDS
- glDisable( GL_DEPTH_TEST );
-#endif
if ( list == Trans )
{ //Characters!
m_texture->select();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X