Lots of additions again. Working on implementing commands and prettifying the output.

[quassel.git] / core / core.cpp

diff --git a/core/core.cpp b/core/core.cpp
index 7c341d5..44c925a 100644 (file)
--- a/core/core.cpp
+++ b/core/core.cpp
@@ -20,7 +20,7 @@
 
 #include "core.h"
 #include "server.h"
 
 #include "core.h"
 #include "server.h"

-#include "quassel.h"
+#include "global.h"

 #include "coreproxy.h"
 
 #include <QSettings>
 #include "coreproxy.h"
 
 #include <QSettings>


@@ -28,52 +28,72 @@
 Core::Core() {
   if(core) qFatal("Trying to instantiate more than one Core object!");
 
 Core::Core() {
   if(core) qFatal("Trying to instantiate more than one Core object!");
 

-  connect(coreProxy, SIGNAL(gsRequestConnect(QString, quint16)), this, SLOT(connectToIrc(QString, quint16)));
-  connect(coreProxy, SIGNAL(gsUserInput(QString)), this, SLOT(inputLine(QString)));
-
-  connect(&server, SIGNAL(recvLine(QString)), coreProxy, SLOT(csCoreMessage(QString)));
+  connect(coreProxy, SIGNAL(gsRequestConnect(QStringList)), this, SLOT(connectToIrc(QStringList)));
+  connect(coreProxy, SIGNAL(gsUserInput(QString, QString, QString)), this, SIGNAL(msgFromGUI(QString, QString, QString)));
+  connect(this, SIGNAL(displayMsg(QString, QString, Message)), coreProxy, SLOT(csDisplayMsg(QString, QString, Message)));
+  connect(this, SIGNAL(displayStatusMsg(QString, QString)), coreProxy, SLOT(csDisplayStatusMsg(QString, QString)));

 
 

+  // Read global settings from config file

   QSettings s;
   QSettings s;

-  VarMap identities = s.value("Network/Identities").toMap();
-  //VarMap networks   = s.value("Network/
-  quassel->putData("Identities", identities);
-
-  server.start();
-}
-
-void Core::init() {
-
+  s.beginGroup("Global");
+  QString key;
+  foreach(key, s.childKeys()) {
+    global->updateData(key, s.value(key));
+  }
+  global->updateData("CoreReady", true);
+  // Now that we are in sync, we can connect signals to automatically store further updates.
+  // I don't think we care if global data changed locally or if it was updated by a client. 
+  connect(global, SIGNAL(dataUpdatedRemotely(QString)), SLOT(globalDataUpdated(QString)));
+  connect(global, SIGNAL(dataPutLocally(QString)), SLOT(globalDataUpdated(QString)));

 
 }
 
 
 }
 

-/*
-void Core::run() {
-
-  connect(&server, SIGNAL(recvLine(const QString &)), this, SIGNAL(outputLine(const QString &)));
-  //connect(
-  server.start();
-  exec();
+void Core::globalDataUpdated(QString key) {
+  QVariant data = global->getData(key);
+  QSettings s;
+  s.setValue(QString("Global/")+key, data);

 }
 }

-*/

 
 

-void Core::connectToIrc(const QString &h, quint16 port) {
-  qDebug() << "Core: Connecting to " << h << ":" << port;
-  server.connectToIrc(h, port);
+void Core::connectToIrc(QStringList networks) {
+  foreach(QString net, networks) {
+    if(servers.contains(net)) {
+
+    } else {
+      Server *server = new Server(net);
+      connect(this, SIGNAL(connectToIrc(QString)), server, SLOT(connectToIrc(QString)));
+      connect(this, SIGNAL(disconnectFromIrc(QString)), server, SLOT(disconnectFromIrc(QString)));
+      connect(this, SIGNAL(msgFromGUI(QString, QString, QString)), server, SLOT(userInput(QString, QString, QString)));
+      connect(server, SIGNAL(displayMsg(QString, Message)), this, SLOT(recvMessageFromServer(QString, Message)));
+      connect(server, SIGNAL(displayStatusMsg(QString)), this, SLOT(recvStatusMsgFromServer(QString)));
+      connect(server, SIGNAL(modeSet(QString, QString, QString)), coreProxy, SLOT(csModeSet(QString, QString, QString)));
+      connect(server, SIGNAL(topicSet(QString, QString, QString)), coreProxy, SLOT(csTopicSet(QString, QString, QString)));
+      connect(server, SIGNAL(setNicks(QString, QString, QStringList)), coreProxy, SLOT(csSetNicks(QString, QString, QStringList)));
+      connect(server, SIGNAL(nickAdded(QString, QString, VarMap)), coreProxy, SLOT(csNickAdded(QString, QString, VarMap)));
+      connect(server, SIGNAL(nickRemoved(QString, QString)), coreProxy, SLOT(csNickRemoved(QString, QString)));
+      connect(server, SIGNAL(nickUpdated(QString, QString, VarMap)), coreProxy, SLOT(csNickUpdated(QString, QString, VarMap)));
+      connect(server, SIGNAL(ownNickSet(QString, QString)), coreProxy, SLOT(csOwnNickSet(QString, QString)));
+      // add error handling
+
+      server->start();
+      servers[net] = server;
+    }
+    emit connectToIrc(net);
+  }

 }
 
 }
 

-void Core::inputLine(QString s) {
-  server.putRawLine(s);
-
+// ALL messages coming pass through these functions before going to the GUI.
+// So this is the perfect place for storing the backlog and log stuff.
+void Core::recvMessageFromServer(QString buf, Message msg) {
+  Q_ASSERT(sender());
+  QString net = qobject_cast<Server*>(sender())->getNetwork();
+  emit displayMsg(net, buf, msg);

 }
 
 }
 

-VarMap Core::loadIdentities() {
-  QSettings s;
-  return s.value("Network/Identities").toMap();
+void Core::recvStatusMsgFromServer(QString msg) {
+  Q_ASSERT(sender());
+  QString net = qobject_cast<Server*>(sender())->getNetwork();
+  emit displayStatusMsg(net, msg);

 }
 
 }
 

-void Core::storeIdentities(VarMap identities) {
-  QSettings s;
-  s.setValue("Network/Identities", identities);
-}

 
 

-Core *core;
+Core *core = 0;