From 0547ecc794209a0824fd7662e434706ac625dbb2 Mon Sep 17 00:00:00 2001 From: zecke Date: Mon, 14 Oct 2002 19:58:07 +0000 Subject: Make it work history and other stuff --- (limited to 'noncore') diff --git a/noncore/apps/opie-console/emulation_handler.cpp b/noncore/apps/opie-console/emulation_handler.cpp index c67c7c7..9e7f56c 100644 --- a/noncore/apps/opie-console/emulation_handler.cpp +++ b/noncore/apps/opie-console/emulation_handler.cpp @@ -19,6 +19,7 @@ EmulationHandler::EmulationHandler( const Profile& prof, QWidget* parent,const c connect(m_teEmu, SIGNAL(sndBlock(const char*, int) ), this, SLOT(recvEmulation(const char*, int) ) ); m_teEmu->setConnect( true ); + m_teEmu->setHistory( TRUE ); load( prof ); @@ -32,13 +33,16 @@ void EmulationHandler::load( const Profile& ) { QFont font = QFont("Fixed", 12, QFont::Normal ); font.setFixedPitch(TRUE); m_teWid->setVTFont( font ); - m_teWid->setBackgroundColor(Qt::black ); + m_teWid->setBackgroundColor(Qt::gray ); } 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); diff --git a/noncore/apps/opie-console/profilemanager.cpp b/noncore/apps/opie-console/profilemanager.cpp index e8bdb2e..95a46f9 100644 --- a/noncore/apps/opie-console/profilemanager.cpp +++ b/noncore/apps/opie-console/profilemanager.cpp @@ -72,6 +72,14 @@ Profile::ValueList ProfileManager::all()const { * in TabWidget */ Session* ProfileManager::fromProfile( const Profile& prof, QWidget* parent) { +/* TEST PROFILE!!! + Profile prof; + QString str = "/dev/ttyS0"; + prof.writeEntry("Device",str ); + prof.writeEntry("Baud", 115200 ); + prof.setIOLayer("serial"); + prof.setName( "test"); +*/ Session* session = new Session(); session->setName( prof.name() ); /* translate the internal name to the external */ @@ -85,6 +93,7 @@ Session* ProfileManager::fromProfile( const Profile& prof, QWidget* parent) { stack->addWidget( dummy, 0 ); stack->raiseWidget( 0 ); EmulationHandler* handler = new EmulationHandler(prof,dummy ); + session->setEmulationHandler( handler ); lay->addWidget( handler->widget() ); // WidgetLayer* wid = new EmulationWidget( prof, dummy ); // lay->addWidget( wid ); diff --git a/noncore/apps/opie-console/session.cpp b/noncore/apps/opie-console/session.cpp index 7cae0df..f4fbcf2 100644 --- a/noncore/apps/opie-console/session.cpp +++ b/noncore/apps/opie-console/session.cpp @@ -2,26 +2,25 @@ #include "io_layer.h" #include "file_layer.h" -#include "widget_layer.h" -#include "emulation_layer.h" +#include "emulation_handler.h" #include "session.h" Session::Session() { m_widget = 0l; m_layer = 0l; -// m_widLay = 0l; -// m_emLay = 0l; + m_emu = 0l; } Session::Session( const QString& na, QWidgetStack* widget, IOLayer* lay) : m_name( na ), m_widget( widget ), m_layer( lay ) { // m_widLay = 0l; // m_emLay = 0l; + m_emu = 0l; } Session::~Session() { delete m_layer; -// delete m_emLay; + delete m_emu; delete m_widget; /* the widget layer should be deleted by the m_widget */ } @@ -34,54 +33,58 @@ QWidgetStack* Session::widgetStack() { IOLayer* Session::layer() { return m_layer; } -/*EmulationLayer* Session::emulationLayer() { - return m_emLay; +EmulationHandler* Session::emulationHandler() { + return m_emu; } +/* WidgetLayer* Session::emulationWidget() { return m_widLay; } */ void Session::connect() { -/* if ( !m_layer || !m_emLay ) + if ( !m_layer || !m_emu ) return; + qWarning("connection in session"); QObject::connect(m_layer, SIGNAL(received(const QByteArray&) ), - m_emLay, SLOT(onRcvBlock(const QByteArray&) ) ); - QObject::connect(m_emLay, SIGNAL(sndBlock(const QByteArray&) ), + m_emu, SLOT(recv(const QByteArray&) ) ); + QObject::connect(m_emu, SIGNAL(send(const QByteArray&) ), m_layer, SLOT(send(const QByteArray&) ) ); - */ + } void Session::disconnect() { -/* - if ( !m_layer || !m_emLay ) + + if ( !m_layer || !m_emu ) return; QObject::disconnect(m_layer, SIGNAL(received(const QByteArray&) ), - m_emLay, SLOT(onRcvBlock(const QByteArray&) ) ); - QObject::disconnect(m_emLay, SIGNAL(sndBlock(const QByteArray&) ), + m_emu, SLOT(recv(const QByteArray&) ) ); + QObject::disconnect(m_emu, SIGNAL(send(const QByteArray&) ), m_layer, SLOT(send(const QByteArray&) ) ); - */ } void Session::setName( const QString& na){ m_name = na; } void Session::setWidgetStack( QWidgetStack* wid ) { + delete m_emu; + m_emu = 0l; delete m_widget; /* the EmulationLayer was destroyed... */ - //delete m_emLay; + m_widget = wid; } void Session::setIOLayer( IOLayer* lay ) { delete m_layer; m_layer = lay; } -/* -void Session::setEmulationLayer( EmulationLayer* lay ) { - delete m_emLay; - m_emLay = lay; + +void Session::setEmulationHandler( EmulationHandler* lay ) { + delete m_emu; + m_emu = lay; } +/* void Session::setEmulationWidget( WidgetLayer* lay ) { delete m_widLay; m_widLay = lay; } -*/ \ No newline at end of file +*/ diff --git a/noncore/apps/opie-console/session.h b/noncore/apps/opie-console/session.h index 04bf257..c3f3661 100644 --- a/noncore/apps/opie-console/session.h +++ b/noncore/apps/opie-console/session.h @@ -4,8 +4,7 @@ #include class IOLayer; -class EmulationLayer; -class WidgetLayer; +class EmulationHandler; /** * This is a Session. A session contains * a QWidget pointer and a IOLayer @@ -41,8 +40,7 @@ public: */ IOLayer* layer(); -// EmulationLayer* emulationLayer(); - WidgetLayer* emulationWidget(); + EmulationHandler* emulationHandler(); /* * connects the data flow from @@ -57,8 +55,7 @@ public: void disconnect(); void setWidgetStack( QWidgetStack* widget ); -// void setEmulationLayer( EmulationLayer* lay ); -// void setEmulationWidget( WidgetLayer* lay ); + void setEmulationHandler( EmulationHandler* lay ); void setIOLayer( IOLayer* ); void setName( const QString& ); @@ -66,8 +63,7 @@ private: QString m_name; QWidgetStack* m_widget; IOLayer* m_layer; -// EmulationLayer* m_emLay; -// WidgetLayer* m_widLay; + EmulationHandler* m_emu; }; -- cgit v0.9.0.2