X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=1f6f324b46eea8ea94a2c9984e663c941dd45a9c;hp=1c38a87a628dfea7bc8af3b665dbdfda0bfc56f2;hb=bf10e3ead6e50f90c6bb34074e39b938f9d35bc3;hpb=0f667b4d2fb9a34b8ebbfe1d07b47407ce54468a

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 1c38a87a..1f6f324b 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -18,28 +18,32 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include "coresession.h"
+
 #include <QtScript>
 
 #include "core.h"
-#include "coresession.h"
 #include "coreuserinputhandler.h"
-#include "signalproxy.h"
 #include "corebuffersyncer.h"
 #include "corebacklogmanager.h"
 #include "corebufferviewmanager.h"
-#include "coreirclisthelper.h"
-#include "corenetworkconfig.h"
-#include "storage.h"
-
 #include "coreidentity.h"
+#include "coreignorelistmanager.h"
+#include "coreirclisthelper.h"
 #include "corenetwork.h"
-#include "ircuser.h"
-#include "ircchannel.h"
-
-#include "util.h"
+#include "corenetworkconfig.h"
+#include "coresessioneventprocessor.h"
 #include "coreusersettings.h"
+#include "eventmanager.h"
+#include "eventstringifier.h"
+#include "ircchannel.h"
+#include "ircparser.h"
+#include "ircuser.h"
 #include "logger.h"
-#include "coreignorelistmanager.h"
+#include "messageevent.h"
+#include "signalproxy.h"
+#include "storage.h"
+#include "util.h"
 
 class ProcessMessagesEvent : public QEvent {
 public:
@@ -57,6 +61,10 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
     _ircListHelper(new CoreIrcListHelper(this)),
     _networkConfig(new CoreNetworkConfig("GlobalNetworkConfig", this)),
     _coreInfo(this),
+    _eventManager(new EventManager(this)),
+    _eventStringifier(new EventStringifier(this)),
+    _eventProcessor(new CoreSessionEventProcessor(this)),
+    _ircParser(new IrcParser(this)),
     scriptEngine(new QScriptEngine(this)),
     _processMessages(false),
     _ignoreListManager(this)
@@ -87,6 +95,11 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
   loadSettings();
   initScriptEngine();
 
+  eventManager()->registerObject(ircParser(), EventManager::NormalPriority);
+  eventManager()->registerObject(eventProcessor(), EventManager::HighPriority);
+  eventManager()->registerObject(eventStringifier(), EventManager::NormalPriority);
+  eventManager()->registerObject(this, EventManager::LowPriority); // for sending MessageEvents to the client
+
   // periodically save our session state
   connect(&(Core::instance()->syncTimer()), SIGNAL(timeout()), this, SLOT(saveSessionState()));
 
@@ -240,6 +253,14 @@ void CoreSession::recvStatusMsgFromServer(QString msg) {
   emit displayStatusMsg(net->networkName(), msg);
 }
 
+void CoreSession::processMessageEvent(MessageEvent *event) {
+  recvMessageFromServer(event->networkId(), event->msgType(), event->bufferType(),
+                        event->target().isNull()? "" : event->target(),
+                        event->text().isNull()? "" : event->text(),
+                        event->sender().isNull()? "" : event->sender(),
+                        event->msgFlags());
+}
+
 QList<BufferInfo> CoreSession::buffers() const {
   return Core::requestBuffers(user());
 }