Add a Feature Support BitArray to the IOLayer

This way we know what an IOLayer supports
Adjust IOSerial and MyPty to that change

Fix the after close window the previous session
window is empty bug
in Mainwindow::remove we had a problem
first we removed the currentSession from the tab and then
deleted the session
The problem is that removePage on OTabWidget does signal currentChanged
so we did not delete the session intended but the wrong one
because m_curSession got adjusted after a removePage...

3rd fix the close and reopen bug in MyPty

11 files changed, 72 insertions, 20 deletions

diff --git a/noncore/apps/opie-console/BUGS b/noncore/apps/opie-console/BUGS
new file mode 100644
index 0000000..ffaceef
--- a/dev/null
+++ b/noncore/apps/opie-console/BUGS
@@ -0,0 +1,9 @@
+Ok we all know we write perfect code
+but sometimes the compiler produces bad code
+and we need to work around some compiler bugs!! -zecke
+
+MyPty is broken in some ways
+ if you do connect/disconnect/connect sh will be executed in the
+ process of opie-console.... funny aye?
+ 
+OTabWidget seems to give us problems too
diff --git a/noncore/apps/opie-console/MyPty.cpp b/noncore/apps/opie-console/MyPty.cpp
index b6ae1d9..565d03f 100644
--- a/noncore/apps/opie-console/MyPty.cpp
+++ b/noncore/apps/opie-console/MyPty.cpp
@@ -119,3 +119,5 @@ void MyPty::donePty()
         delete m_sn_e;
+        delete m_sn_r;
         m_sn_e = 0l;
+        m_sn_r = 0l;
     }
@@ -123,2 +125,3 @@ void MyPty::donePty()
     m_cpid = 0;
+    m_fd = -1;
 //    emit done(status);
@@ -187,6 +190,7 @@ int MyPty::run(const char* cmd, QStrList &, const char*, int)
     // parent - continue as a widget
-    QSocketNotifier* sn_r = new QSocketNotifier(m_fd,QSocketNotifier::Read,this);
+    delete m_sn_r;
+    m_sn_r = new QSocketNotifier(m_fd,QSocketNotifier::Read,this);
     delete m_sn_e;
     m_sn_e = new QSocketNotifier(m_fd,QSocketNotifier::Exception,this);
-    connect(sn_r,SIGNAL(activated(int)),this,SLOT(readPty()));
+    connect(m_sn_r,SIGNAL(activated(int)),this,SLOT(readPty()));
     connect(m_sn_e,SIGNAL(activated(int)),this,SLOT(error()));
@@ -223,3 +227,3 @@ int MyPty::openPty()
     if ( ptyfd < 0 ) {
-	qApp->exit(1);
+//	qApp->exit(1);
 	return -1;
@@ -236,2 +240,3 @@ MyPty::MyPty(const Profile&) : m_cpid(0)
     m_sn_e = 0l;
+    m_sn_r = 0l;
   m_fd = openPty();
@@ -256,2 +261,5 @@ QString MyPty::name()const{
 bool MyPty::open() {
+    if (m_fd < 0)
+        m_fd = openPty();
+
     start();
@@ -261,2 +269,3 @@ void MyPty::close() {
     donePty();
+    m_fd = openPty();
 }
@@ -288,3 +297,2 @@ void MyPty::readPty()
      donePty();
-     delete sender();
      return;
@@ -308,2 +316,9 @@ void MyPty::readPty()
 }
+QBitArray MyPty::supports()const {
+    QBitArray ar(3);
+    ar[0] = 1;
+    ar[1] = 0;
+    ar[2] = 0;
 
+    return ar;
+}
diff --git a/noncore/apps/opie-console/MyPty.h b/noncore/apps/opie-console/MyPty.h
index 3166fa0..ad271df 100644
--- a/noncore/apps/opie-console/MyPty.h
+++ b/noncore/apps/opie-console/MyPty.h
@@ -43,2 +43,3 @@ public:
     QString name()const;
+    QBitArray supports()const;
 
@@ -94,2 +95,3 @@ private:
     QSocketNotifier* m_sn_e;
+    QSocketNotifier* m_sn_r;
 };
diff --git a/noncore/apps/opie-console/io_layer.h b/noncore/apps/opie-console/io_layer.h
index 5f2fa3c..4977e94 100644
--- a/noncore/apps/opie-console/io_layer.h
+++ b/noncore/apps/opie-console/io_layer.h
@@ -3,3 +3,6 @@
 
+#include <qbitarray.h>
 #include <qobject.h>
+
+
 #include <qpe/config.h>
@@ -25,2 +28,7 @@ public:
     };
+    enum Feature {
+        AutoConnect = 0,
+        TransferFile =1,
+        Close =2
+    };
     /**
@@ -67,2 +75,7 @@ public:
 
+    /**
+     * What does the IOLayer support?
+     * Bits are related to features
+     */
+    virtual QBitArray supports()const = 0;
 
@@ -81,2 +94,3 @@ signals:
 
+    virtual void closed();
 public slots:
diff --git a/noncore/apps/opie-console/io_serial.cpp b/noncore/apps/opie-console/io_serial.cpp
index a4a6f0b..c10d5a8 100644
--- a/noncore/apps/opie-console/io_serial.cpp
+++ b/noncore/apps/opie-console/io_serial.cpp
@@ -189 +189,8 @@ void IOSerial::closeRawIO(int fd) {
 }
+QBitArray IOSerial::supports()const {
+    QBitArray ar(3);
+    ar[0] = ar[2] = 0;
+    ar[1] = 1;
+
+    return ar;
+}
diff --git a/noncore/apps/opie-console/io_serial.h b/noncore/apps/opie-console/io_serial.h
index facbbc1..b1d1be1 100644
--- a/noncore/apps/opie-console/io_serial.h
+++ b/noncore/apps/opie-console/io_serial.h
@@ -39,5 +39,7 @@ public:
     void closeRawIO(int fd );
-signals:
+    QBitArray supports()const;
+/*signals:
     void received(const QByteArray &);
     void error(int, const QString &);
+*/
 public slots:
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 94c99bc..29dbcf3 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -362,7 +362,8 @@ void MainWindow::slotClose() {
 
+    Session* ses = currentSession();
+    qWarning("removing! currentSession %s", currentSession()->name().latin1() );
     tabWidget()->remove( currentSession() );
     /*it's autodelete */
-    m_sessions.remove( m_curSession );
-    m_curSession = m_sessions.first();
-    tabWidget()->setCurrent( m_curSession );
+    m_sessions.remove( ses );
+    qWarning("after remove!!");
 
@@ -397,3 +398,3 @@ void MainWindow::create( const Profile& prof ) {
 			QObject::tr("Session failed"),
-			QObject::tr("Cannot open session: Not all components were found."));
+			QObject::tr("<qt>Cannot open session: Not all components were found.</qt>"));
 		//if(ses) delete ses;
@@ -435,2 +436,3 @@ void MainWindow::slotOpenKeb(bool state) {
 void MainWindow::slotSessionChanged( Session* ses ) {
+    qWarning("changed!");
     if ( ses ) {
diff --git a/noncore/apps/opie-console/profilemanager.cpp b/noncore/apps/opie-console/profilemanager.cpp
index e5aedb6..7c15560 100644
--- a/noncore/apps/opie-console/profilemanager.cpp
+++ b/noncore/apps/opie-console/profilemanager.cpp
@@ -4,2 +4,3 @@
 #include <qfile.h>
+#include <qhbox.h>
 #include <qlayout.h>
@@ -87,15 +88,7 @@ Session* ProfileManager::fromProfile( const Profile& prof,  QWidget* parent) {
     session->setWidgetStack( stack );
-    QWidget* dummy = new QWidget( stack );
-    QHBoxLayout* lay = new QHBoxLayout( dummy );
-    stack->addWidget( dummy, 0 );
-    stack->raiseWidget( 0 );
+    QWidget* dummy = new QHBox( stack );
+    stack->raiseWidget( dummy );
+
     EmulationHandler* handler = new EmulationHandler(prof,dummy );
     session->setEmulationHandler( handler );
-    lay->addWidget( handler->widget() );
-//    WidgetLayer* wid = new EmulationWidget( prof, dummy );
-//    lay->addWidget( wid );
-
-//    session->setEmulationWidget( wid );
-//    session->setEmulationLayer( m_fact->newEmulationLayer( m_fact->external( prof.terminalName() ),
-//                                                        wid ) );
     session->connect();
diff --git a/noncore/apps/opie-console/session.cpp b/noncore/apps/opie-console/session.cpp
index e53dbc4..aad100d 100644
--- a/noncore/apps/opie-console/session.cpp
+++ b/noncore/apps/opie-console/session.cpp
@@ -38,2 +38,8 @@ EmulationHandler* Session::emulationHandler() {
 }
+QWidget* Session::widget() {
+    if (!m_emu )
+        return 0l;
+
+    return m_emu->widget();
+}
 /*
diff --git a/noncore/apps/opie-console/session.h b/noncore/apps/opie-console/session.h
index a1121d3..ff92df3 100644
--- a/noncore/apps/opie-console/session.h
+++ b/noncore/apps/opie-console/session.h
@@ -36,2 +36,3 @@ public:
     QWidgetStack* widgetStack();
+    QWidget* widget();
 
diff --git a/noncore/apps/opie-console/tabwidget.cpp b/noncore/apps/opie-console/tabwidget.cpp
index 8a691f9..419f8ac 100644
--- a/noncore/apps/opie-console/tabwidget.cpp
+++ b/noncore/apps/opie-console/tabwidget.cpp
@@ -13,2 +13,3 @@ TabWidget::~TabWidget() {
 void TabWidget::add( Session* ses ) {
+    qWarning("session ses " + ses->name() );
     if ( !ses->widgetStack() ) return;