Make selections in bufferviews (mostly) synchronous again.

[quassel.git] / core / coreproxy.cpp

diff --git a/core/coreproxy.cpp b/core/coreproxy.cpp
index ab00384..ee9ea2d 100644 (file)
--- a/core/coreproxy.cpp
+++ b/core/coreproxy.cpp
@@ -18,16 +18,60 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "coreproxy.h"
 #include <QDebug>
 
+#include "coreproxy.h"
+#include "global.h"
+#include "util.h"
+#include "core.h"
+
 CoreProxy::CoreProxy() {
-  if(coreProxy) qFatal("Trying to instantiate more than one CoreProxy object!");
+//  connect(global, SIGNAL(dataPutLocally(QString)), this, SLOT(updateGlobalData(QString)));
+//  connect(&server, SIGNAL(newConnection()), this, SLOT(incomingConnection()));
+}
+
+/*
+void CoreProxy::processClientUpdate(QTcpSocket *socket, QString key, QVariant data) {
+  global->updateData(key, data);
+  QList<QVariant> sigdata;
+  sigdata.append(CS_UPDATE_GLOBAL_DATA); sigdata.append(key); sigdata.append(data); sigdata.append(QVariant());
+  QTcpSocket *s;
+  foreach(s, clients) {
+    if(s != socket) writeDataToDevice(s, QVariant(sigdata));
+  }
+}
 
+void CoreProxy::updateGlobalData(QString key) {
+  QVariant data = global->getData(key);
+  emit csUpdateGlobalData(key, data);
 }
+*/
+
+/*
+void CoreProxy::send(CoreSignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
 
-void CoreProxy::csCoreMessage(QString s) {
-  send(CS_CORE_MESSAGE, s);
+  QList<QVariant> sigdata;
+  sigdata.append(sig); sigdata.append(arg1); sigdata.append(arg2); sigdata.append(arg3);
+  //qDebug() << "Sending signal: " << sigdata;
+  QTcpSocket *socket;
+  foreach(socket, clients) {
+    writeDataToDevice(socket, QVariant(sigdata));
+  }
 }
+*/
+
+void CoreProxy::recv(ClientSignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
+  //qDebug() << "[CORE] Received signal" << sig << ":" << arg1<<arg2<<arg3;
+  switch(sig) {
+    case GS_UPDATE_GLOBAL_DATA: emit gsPutGlobalData(arg1.toString(), arg2); break;
+    case GS_USER_INPUT: emit gsUserInput(arg1.value<BufferId>(), arg2.toString()); break;
+    case GS_REQUEST_CONNECT: emit gsRequestConnect(arg1.toStringList()); break;
+    case GS_IMPORT_BACKLOG: emit gsImportBacklog(); break;
+    case GS_REQUEST_BACKLOG: emit gsRequestBacklog(arg1.value<BufferId>(), arg2, arg3); break;
+    //default: qWarning() << "Unknown signal in CoreProxy::recv: " << sig;
+    default: emit gsGeneric(sig, arg1, arg2, arg3);
+  }
+}
+
 
-CoreProxy *coreProxy;
+//CoreProxy *coreProxy;