summaryrefslogtreecommitdiff
authorzecke <zecke>2002-10-14 19:58:07 (UTC)
committer zecke <zecke>2002-10-14 19:58:07 (UTC)
commit0547ecc794209a0824fd7662e434706ac625dbb2 (patch) (unidiff)
tree90243ddbca14b2c01552d55b413be0d044c3a108
parent7114c1567399d9b134af337824ef56e7d5facee7 (diff)
downloadopie-0547ecc794209a0824fd7662e434706ac625dbb2.zip
opie-0547ecc794209a0824fd7662e434706ac625dbb2.tar.gz
opie-0547ecc794209a0824fd7662e434706ac625dbb2.tar.bz2
Make it work
history and other stuff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/emulation_handler.cpp6
-rw-r--r--noncore/apps/opie-console/profilemanager.cpp9
-rw-r--r--noncore/apps/opie-console/session.cpp47
-rw-r--r--noncore/apps/opie-console/session.h12
4 files changed, 43 insertions, 31 deletions
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
@@ -16,12 +16,13 @@ EmulationHandler::EmulationHandler( const Profile& prof, QWidget* parent,const c
16 16
17 connect(m_teEmu,SIGNAL(ImageSizeChanged(int, int) ), 17 connect(m_teEmu,SIGNAL(ImageSizeChanged(int, int) ),
18 this, SIGNAL(changeSize(int, int) ) ); 18 this, SIGNAL(changeSize(int, int) ) );
19 connect(m_teEmu, SIGNAL(sndBlock(const char*, int) ), 19 connect(m_teEmu, SIGNAL(sndBlock(const char*, int) ),
20 this, SLOT(recvEmulation(const char*, int) ) ); 20 this, SLOT(recvEmulation(const char*, int) ) );
21 m_teEmu->setConnect( true ); 21 m_teEmu->setConnect( true );
22 m_teEmu->setHistory( TRUE );
22 load( prof ); 23 load( prof );
23 24
24 25
25 26
26} 27}
27EmulationHandler::~EmulationHandler() { 28EmulationHandler::~EmulationHandler() {
@@ -29,19 +30,22 @@ EmulationHandler::~EmulationHandler() {
29 delete m_teWid; 30 delete m_teWid;
30} 31}
31void EmulationHandler::load( const Profile& ) { 32void EmulationHandler::load( const Profile& ) {
32 QFont font = QFont("Fixed", 12, QFont::Normal ); 33 QFont font = QFont("Fixed", 12, QFont::Normal );
33 font.setFixedPitch(TRUE); 34 font.setFixedPitch(TRUE);
34 m_teWid->setVTFont( font ); 35 m_teWid->setVTFont( font );
35 m_teWid->setBackgroundColor(Qt::black ); 36 m_teWid->setBackgroundColor(Qt::gray );
36} 37}
37void EmulationHandler::recv( const QByteArray& ar) { 38void EmulationHandler::recv( const QByteArray& ar) {
39 qWarning("received in EmulationHandler!");
38 m_teEmu->onRcvBlock(ar.data(), ar.count() ); 40 m_teEmu->onRcvBlock(ar.data(), ar.count() );
39} 41}
40void EmulationHandler::recvEmulation(const char* src, int len ) { 42void EmulationHandler::recvEmulation(const char* src, int len ) {
43 qWarning("received from te ");
41 QByteArray ar(len); 44 QByteArray ar(len);
45
42 memcpy(ar.data(), src, sizeof(char) * len ); 46 memcpy(ar.data(), src, sizeof(char) * len );
43 47
44 emit send(ar); 48 emit send(ar);
45} 49}
46QWidget* EmulationHandler::widget() { 50QWidget* EmulationHandler::widget() {
47 return m_teWid; 51 return m_teWid;
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
@@ -69,12 +69,20 @@ Profile::ValueList ProfileManager::all()const {
69 * raise the dummy 69 * raise the dummy
70 * call session->connect(= 70 * call session->connect(=
71 * this way we only need to reparent 71 * this way we only need to reparent
72 * in TabWidget 72 * in TabWidget
73 */ 73 */
74Session* ProfileManager::fromProfile( const Profile& prof, QWidget* parent) { 74Session* ProfileManager::fromProfile( const Profile& prof, QWidget* parent) {
75/* TEST PROFILE!!!
76 Profile prof;
77 QString str = "/dev/ttyS0";
78 prof.writeEntry("Device",str );
79 prof.writeEntry("Baud", 115200 );
80 prof.setIOLayer("serial");
81 prof.setName( "test");
82*/
75 Session* session = new Session(); 83 Session* session = new Session();
76 session->setName( prof.name() ); 84 session->setName( prof.name() );
77 /* translate the internal name to the external */ 85 /* translate the internal name to the external */
78 session->setIOLayer(m_fact->newIOLayer( m_fact->external(prof.ioLayerName()) , 86 session->setIOLayer(m_fact->newIOLayer( m_fact->external(prof.ioLayerName()) ,
79 prof) ); 87 prof) );
80 88
@@ -82,12 +90,13 @@ Session* ProfileManager::fromProfile( const Profile& prof, QWidget* parent) {
82 session->setWidgetStack( stack ); 90 session->setWidgetStack( stack );
83 QWidget* dummy = new QWidget( stack ); 91 QWidget* dummy = new QWidget( stack );
84 QHBoxLayout* lay = new QHBoxLayout( dummy ); 92 QHBoxLayout* lay = new QHBoxLayout( dummy );
85 stack->addWidget( dummy, 0 ); 93 stack->addWidget( dummy, 0 );
86 stack->raiseWidget( 0 ); 94 stack->raiseWidget( 0 );
87 EmulationHandler* handler = new EmulationHandler(prof,dummy ); 95 EmulationHandler* handler = new EmulationHandler(prof,dummy );
96 session->setEmulationHandler( handler );
88 lay->addWidget( handler->widget() ); 97 lay->addWidget( handler->widget() );
89// WidgetLayer* wid = new EmulationWidget( prof, dummy ); 98// WidgetLayer* wid = new EmulationWidget( prof, dummy );
90// lay->addWidget( wid ); 99// lay->addWidget( wid );
91 100
92// session->setEmulationWidget( wid ); 101// session->setEmulationWidget( wid );
93// session->setEmulationLayer( m_fact->newEmulationLayer( m_fact->external( prof.terminalName() ), 102// session->setEmulationLayer( m_fact->newEmulationLayer( m_fact->external( prof.terminalName() ),
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
@@ -1,87 +1,90 @@
1 1
2 2
3#include "io_layer.h" 3#include "io_layer.h"
4#include "file_layer.h" 4#include "file_layer.h"
5#include "widget_layer.h" 5#include "emulation_handler.h"
6#include "emulation_layer.h"
7#include "session.h" 6#include "session.h"
8 7
9 8
10Session::Session() { 9Session::Session() {
11 m_widget = 0l; 10 m_widget = 0l;
12 m_layer = 0l; 11 m_layer = 0l;
13// m_widLay = 0l; 12 m_emu = 0l;
14// m_emLay = 0l;
15} 13}
16Session::Session( const QString& na, QWidgetStack* widget, IOLayer* lay) 14Session::Session( const QString& na, QWidgetStack* widget, IOLayer* lay)
17 : m_name( na ), m_widget( widget ), m_layer( lay ) 15 : m_name( na ), m_widget( widget ), m_layer( lay )
18{ 16{
19// m_widLay = 0l; 17// m_widLay = 0l;
20// m_emLay = 0l; 18// m_emLay = 0l;
19 m_emu = 0l;
21} 20}
22Session::~Session() { 21Session::~Session() {
23 delete m_layer; 22 delete m_layer;
24// delete m_emLay; 23 delete m_emu;
25 delete m_widget; 24 delete m_widget;
26 /* the widget layer should be deleted by the m_widget */ 25 /* the widget layer should be deleted by the m_widget */
27} 26}
28QString Session::name()const { 27QString Session::name()const {
29 return m_name; 28 return m_name;
30} 29}
31QWidgetStack* Session::widgetStack() { 30QWidgetStack* Session::widgetStack() {
32 return m_widget; 31 return m_widget;
33} 32}
34IOLayer* Session::layer() { 33IOLayer* Session::layer() {
35 return m_layer; 34 return m_layer;
36} 35}
37/*EmulationLayer* Session::emulationLayer() { 36EmulationHandler* Session::emulationHandler() {
38 return m_emLay; 37 return m_emu;
39} 38}
39/*
40WidgetLayer* Session::emulationWidget() { 40WidgetLayer* Session::emulationWidget() {
41 return m_widLay; 41 return m_widLay;
42} 42}
43*/ 43*/
44void Session::connect() { 44void Session::connect() {
45/* if ( !m_layer || !m_emLay ) 45 if ( !m_layer || !m_emu )
46 return; 46 return;
47 47
48 qWarning("connection in session");
48 QObject::connect(m_layer, SIGNAL(received(const QByteArray&) ), 49 QObject::connect(m_layer, SIGNAL(received(const QByteArray&) ),
49 m_emLay, SLOT(onRcvBlock(const QByteArray&) ) ); 50 m_emu, SLOT(recv(const QByteArray&) ) );
50 QObject::connect(m_emLay, SIGNAL(sndBlock(const QByteArray&) ), 51 QObject::connect(m_emu, SIGNAL(send(const QByteArray&) ),
51 m_layer, SLOT(send(const QByteArray&) ) ); 52 m_layer, SLOT(send(const QByteArray&) ) );
52 */ 53
53} 54}
54void Session::disconnect() { 55void Session::disconnect() {
55/* 56
56 if ( !m_layer || !m_emLay ) 57 if ( !m_layer || !m_emu )
57 return; 58 return;
58 59
59 QObject::disconnect(m_layer, SIGNAL(received(const QByteArray&) ), 60 QObject::disconnect(m_layer, SIGNAL(received(const QByteArray&) ),
60 m_emLay, SLOT(onRcvBlock(const QByteArray&) ) ); 61 m_emu, SLOT(recv(const QByteArray&) ) );
61 QObject::disconnect(m_emLay, SIGNAL(sndBlock(const QByteArray&) ), 62 QObject::disconnect(m_emu, SIGNAL(send(const QByteArray&) ),
62 m_layer, SLOT(send(const QByteArray&) ) ); 63 m_layer, SLOT(send(const QByteArray&) ) );
63 */
64} 64}
65void Session::setName( const QString& na){ 65void Session::setName( const QString& na){
66 m_name = na; 66 m_name = na;
67} 67}
68void Session::setWidgetStack( QWidgetStack* wid ) { 68void Session::setWidgetStack( QWidgetStack* wid ) {
69 delete m_emu;
70 m_emu = 0l;
69 delete m_widget; 71 delete m_widget;
70 /* the EmulationLayer was destroyed... */ 72 /* the EmulationLayer was destroyed... */
71 //delete m_emLay; 73
72 m_widget = wid; 74 m_widget = wid;
73} 75}
74void Session::setIOLayer( IOLayer* lay ) { 76void Session::setIOLayer( IOLayer* lay ) {
75 delete m_layer; 77 delete m_layer;
76 m_layer = lay; 78 m_layer = lay;
77} 79}
78/* 80
79void Session::setEmulationLayer( EmulationLayer* lay ) { 81void Session::setEmulationHandler( EmulationHandler* lay ) {
80 delete m_emLay; 82 delete m_emu;
81 m_emLay = lay; 83 m_emu = lay;
82} 84}
85/*
83void Session::setEmulationWidget( WidgetLayer* lay ) { 86void Session::setEmulationWidget( WidgetLayer* lay ) {
84 delete m_widLay; 87 delete m_widLay;
85 m_widLay = lay; 88 m_widLay = lay;
86} 89}
87*/ \ No newline at end of file 90*/
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
@@ -1,14 +1,13 @@
1#ifndef OPIE_SESSION_H 1#ifndef OPIE_SESSION_H
2#define OPIE_SESSION_H 2#define OPIE_SESSION_H
3 3
4#include <qwidgetstack.h> 4#include <qwidgetstack.h>
5 5
6class IOLayer; 6class IOLayer;
7class EmulationLayer; 7class EmulationHandler;
8class WidgetLayer;
9/** 8/**
10 * This is a Session. A session contains 9 * This is a Session. A session contains
11 * a QWidget pointer and a IOLayer 10 * a QWidget pointer and a IOLayer
12 * Imagine a session like a collection of what 11 * Imagine a session like a collection of what
13 * is needed to show your widget in a tab ;) 12 * is needed to show your widget in a tab ;)
14 */ 13 */
@@ -38,14 +37,13 @@ public:
38 37
39 /** 38 /**
40 * return the layer 39 * return the layer
41 */ 40 */
42 IOLayer* layer(); 41 IOLayer* layer();
43 42
44// EmulationLayer* emulationLayer(); 43 EmulationHandler* emulationHandler();
45 WidgetLayer* emulationWidget();
46 44
47 /* 45 /*
48 * connects the data flow from 46 * connects the data flow from
49 * the IOLayer to the EmulationLayer 47 * the IOLayer to the EmulationLayer
50 */ 48 */
51 void connect(); 49 void connect();
@@ -54,21 +52,19 @@ public:
54 * disconnect the dataflow 52 * disconnect the dataflow
55 * this will be done for ft 53 * this will be done for ft
56 */ 54 */
57 void disconnect(); 55 void disconnect();
58 56
59 void setWidgetStack( QWidgetStack* widget ); 57 void setWidgetStack( QWidgetStack* widget );
60// void setEmulationLayer( EmulationLayer* lay ); 58 void setEmulationHandler( EmulationHandler* lay );
61// void setEmulationWidget( WidgetLayer* lay );
62 void setIOLayer( IOLayer* ); 59 void setIOLayer( IOLayer* );
63 void setName( const QString& ); 60 void setName( const QString& );
64 61
65private: 62private:
66 QString m_name; 63 QString m_name;
67 QWidgetStack* m_widget; 64 QWidgetStack* m_widget;
68 IOLayer* m_layer; 65 IOLayer* m_layer;
69// EmulationLayer* m_emLay; 66 EmulationHandler* m_emu;
70// WidgetLayer* m_widLay;
71 67
72}; 68};
73 69
74#endif 70#endif