summaryrefslogtreecommitdiff
authorzecke <zecke>2002-10-14 23:19:15 (UTC)
committer zecke <zecke>2002-10-14 23:19:15 (UTC)
commit91adb54066037522a619ce5d072c2e932901fd74 (patch) (side-by-side diff)
tree02975c077e20d5f1847c70d98b4bf9fc1c10306a
parentd7290c6b24266303abd95e7f38c0fecae395f355 (diff)
downloadopie-91adb54066037522a619ce5d072c2e932901fd74.zip
opie-91adb54066037522a619ce5d072c2e932901fd74.tar.gz
opie-91adb54066037522a619ce5d072c2e932901fd74.tar.bz2
Fonts are now right!
Close or exit in the console window does make the app han
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/opie-console/emulation_handler.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/noncore/apps/opie-console/emulation_handler.cpp b/noncore/apps/opie-console/emulation_handler.cpp
index 48218e6..9f34d2c 100644
--- a/noncore/apps/opie-console/emulation_handler.cpp
+++ b/noncore/apps/opie-console/emulation_handler.cpp
@@ -23,109 +23,109 @@ EmulationHandler::EmulationHandler( const Profile& prof, QWidget* parent,const c
m_teEmu->setHistory( TRUE );
load( prof );
}
EmulationHandler::~EmulationHandler() {
delete m_teEmu;
delete m_teWid;
}
void EmulationHandler::load( const Profile& prof) {
m_teWid->setVTFont( font( prof.readNumEntry("Font") ) );
int num = prof.readNumEntry("Color");
setColor( foreColor(num), backColor(num) );
m_teWid->setBackgroundColor(backColor(num) );
}
void EmulationHandler::recv( const QByteArray& ar) {
qWarning("received in EmulationHandler!");
m_teEmu->onRcvBlock(ar.data(), ar.count() );
}
void EmulationHandler::recvEmulation(const char* src, int len ) {
qWarning("received from te ");
QByteArray ar(len);
memcpy(ar.data(), src, sizeof(char) * len );
emit send(ar);
}
QWidget* EmulationHandler::widget() {
return m_teWid;
}
/*
* allocate a new table of colors
*/
void EmulationHandler::setColor( const QColor& fore, const QColor& back ) {
ColorEntry table[TABLE_COLORS];
const ColorEntry *defaultCt = m_teWid->getdefaultColorTable();
for (int i = 0; i < TABLE_COLORS; i++ ) {
if ( i == 0 || i == 10 ) {
table[i].color = fore;
}else if ( i == 1 || i == 11 ) {
table[i].color = back;
table[i].transparent = 0;
}else {
table[i].color = defaultCt[i].color;
}
}
-// m_teWid->setColorTable(table );
+ m_teWid->setColorTable(table );
m_teWid->update();
}
QFont EmulationHandler::font( int id ) {
QString name;
int size = 0;
switch(id ) {
default: // fall through
case 0:
name = QString::fromLatin1("Micro");
size = 4;
break;
case 1:
name = QString::fromLatin1("Fixed");
size = 7;
break;
case 2:
name = QString::fromLatin1("Fixed");
size = 12;
break;
}
QFont font(name, size, QFont::Normal );
font.setFixedPitch(TRUE );
return font;
}
QColor EmulationHandler::foreColor(int col) {
QColor co;
/* we need to switch it */
switch( col ) {
default:
case Profile::White:
qWarning("Foreground black");
/* color is black */
- co = Qt::black;
+ co = Qt::white;
break;
case Profile::Black:
qWarning("Foreground white");
- co = Qt::white;
+ co = Qt::black;
break;
}
return co;
}
QColor EmulationHandler::backColor(int col ) {
QColor co;
/* we need to switch it */
switch( col ) {
default:
case Profile::White:
qWarning("Background white");
/* color is white */
- co = Qt::white;
+ co = Qt::black;
break;
case Profile::Black:
qWarning("Background black");
- co = Qt::black;
+ co = Qt::white;
break;
}
return co;
}