More IPC integtration

OCOPClient::self() added so we keep
the connections low

5 files changed, 69 insertions, 23 deletions

diff --git a/x11/ipc/client/ocopclient.cpp b/x11/ipc/client/ocopclient.cpp
index c1def73..6085481 100644
--- a/x11/ipc/client/ocopclient.cpp
+++ b/x11/ipc/client/ocopclient.cpp
@@ -15,4 +15,13 @@
 #include "ocopclient.h"
 
+OCOPClient* OCOPClient::m_self = 0;
+
+OCOPClient*  OCOPClient::self() {
+    if (!m_self ) {
+        m_self = new OCOPClient();
+    }
+    return m_self;
+}
+
 OCOPClient::OCOPClient( const QString& path, QObject* obj )
     : QObject( obj )
diff --git a/x11/ipc/client/ocopclient.h b/x11/ipc/client/ocopclient.h
index 53018a5..ee2015a 100644
--- a/x11/ipc/client/ocopclient.h
+++ b/x11/ipc/client/ocopclient.h
@@ -21,5 +21,9 @@ class OCOPClient : public QObject{
     Q_OBJECT
 public:
-
+    /*
+     * this is  the static
+     * OCopClient
+     */
+    static OCOPClient* self();
     /**
      * Occasionally I decide to start a Server from here
@@ -57,4 +61,5 @@ private:
     int m_tries;
 
+    static OCOPClient*  m_self;
 };
 
diff --git a/x11/ipc/server/ocopserver.cpp b/x11/ipc/server/ocopserver.cpp
index 421e49c..4940cb8 100644
--- a/x11/ipc/server/ocopserver.cpp
+++ b/x11/ipc/server/ocopserver.cpp
@@ -215,5 +215,5 @@ void OCopServer::deregisterClient(int fd ) {
     QMap<int, OCOPClient>::Iterator it = m_clients.find( fd );
     if (it != m_clients.end() ) {
-        OCOPClient client = (*it);
+        OCOPClient client = it.data();
         delete client.notify;
         m_clients.remove(fd );
@@ -228,11 +228,14 @@ void OCopServer::deregisterClient(int fd ) {
          * otherwise replace QArray<int>
          */
-        QMap<QCString, QValueList<int> >::Iterator it;
-        for ( it = m_channels.begin(); it != m_channels.end(); ++it ) {
+        QMap<QCString, QValueList<int> >::Iterator it2;
+    repeatIt:
+        for ( it2 = m_channels.begin(); it2 != m_channels.end(); ++it2 ) {
             /*
              * The channel contains this fd
              */
-            if ( it.data().contains( fd ) ) {
-                QValueList<int> array = it.data();
+            qWarning("Channel %s", it2.key().data() );
+            if ( it2.data().contains( fd ) ) {
+                qWarning("contains");
+                QValueList<int> array = it2.data();
 
                 /*
@@ -240,9 +243,19 @@ void OCopServer::deregisterClient(int fd ) {
                  */
                 if ( array.count() == 1 ) {
+                    qWarning("Invalidate!");
                     /* is the list now invalidatet? */
-                    m_channels.remove( it );
+                    m_channels.remove( it2 );
+                    /* That is the first go to of my life
+                     * but Iterator remove( Iterator )
+                     * does not exist
+                     * it2 = --it2;
+                     * does not work reliable too
+                     * so the only way is to reiterate :(
+                     */
+                    goto repeatIt;
                 }else{
+                    qWarning("removing");
                     array.remove( fd );
-                    it = m_channels.replace( it.key(), array );
+                    it2 = m_channels.replace( it2.key(), array );
                 }
             }
diff --git a/x11/libqpe-x11/qt/qcopchannel_qws.cpp b/x11/libqpe-x11/qt/qcopchannel_qws.cpp
index c315d66..e90f056 100644
--- a/x11/libqpe-x11/qt/qcopchannel_qws.cpp
+++ b/x11/libqpe-x11/qt/qcopchannel_qws.cpp
@@ -4,17 +4,29 @@
 #include <qcopchannel_qws.h>
 
+QList<QCopChannel>* QCopChannel::m_list = 0;
+
 QCopChannel::QCopChannel( const QCString& channel, QObject* parent,
                           const char* name )
     : QObject( parent, name ),m_chan(channel) {
     init();
+    if (!m_list ) {
+        m_list = new QList<QCopChannel>;
+    }
+    m_list->append(this);
+}
+void QCopChannel::receive( const QCString& msg, const QByteArray& ar ) {
+    emit received( msg, ar );
 }
 QCopChannel::~QCopChannel() {
-    m_client->delChannel( m_chan );
-    delete m_client;
+    m_list->remove(this);
+    if (m_list->count() == 0 ) {
+        delete m_list;
+        m_list = 0;
+    }
+    OCOPClient::self()->delChannel( m_chan );
 }
 void QCopChannel::init() {
-    m_client = new OCOPClient(QString::null, this );
-    m_client->addChannel(m_chan );
-    connect(m_client, SIGNAL(called(const QCString&, const QCString&, const QByteArray& ) ),
+    OCOPClient::self()->addChannel( m_chan );
+    connect(OCOPClient::self(), SIGNAL(called(const QCString&, const QCString&, const QByteArray& ) ),
             this, SLOT(rev(const QCString&, const QCString&, const QByteArray&) ) );
 }
@@ -22,20 +34,25 @@ QCString QCopChannel::channel()const {
     return m_chan;
 }
-bool QCopChannel::isRegistered( const QCString& chan) {
-    OCOPClient client;
-    return client.isRegistered( chan );
+bool QCopChannel::isRegistered( const QCString& chan) {;
+    return OCOPClient::self()->isRegistered( chan );
 }
 bool QCopChannel::send( const QCString& chan, const QCString& msg ) {
-    QByteArray ar(0);
-    return sendLocally(chan, msg, ar );
+    QByteArray ar;
+    return send(chan, msg, ar );
 }
 bool QCopChannel::send( const QCString& chan, const QCString& msg,
                      const QByteArray& ar ) {
-    return sendLocally( chan, msg, ar );
+    OCOPClient::self()->send( chan, msg, ar );
+    return true;
 }
-bool QCopChannel::sendLocally( const QCString& chan, const QCString& msg,
+bool QCopChannel::sendLocally( const QCString& chann, const QCString& msg,
                                const QByteArray& ar ) {
-    OCOPClient client;
-    client.send( chan, msg, ar );
+    if (!m_list )
+        return true;
+    QCopChannel* chan;
+    for ( chan = m_list->first(); chan; chan = m_list->next() ) {
+        if ( chan->channel() == chann )
+            chan->receive( msg, ar );
+    }
 
     return true;
diff --git a/x11/libqpe-x11/qt/qcopchannel_qws.h b/x11/libqpe-x11/qt/qcopchannel_qws.h
index b0a6ce0..94b199e 100644
--- a/x11/libqpe-x11/qt/qcopchannel_qws.h
+++ b/x11/libqpe-x11/qt/qcopchannel_qws.h
@@ -4,4 +4,5 @@
 #include <qobject.h>
 #include <qcstring.h>
+#include <qlist.h>
 
 class OCOPClient;
@@ -21,4 +22,5 @@ public:
     static bool sendLocally( const QCString& chan, const QCString& msg,
                              const QByteArray& data );
+    void receive( const QCString& msg, const QByteArray& ar );
 
 signals:
@@ -30,5 +32,5 @@ private slots:
 private:
     void init();
-    OCOPClient* m_client;
+    static QList<QCopChannel> *m_list;
     /* the channel */
     QCString m_chan;