#include "corebuffersyncer.h"
#include "corebacklogmanager.h"
#include "corebufferviewmanager.h"
+#include "coreeventmanager.h"
#include "coreidentity.h"
#include "coreignorelistmanager.h"
#include "coreirclisthelper.h"
#include "coresessioneventprocessor.h"
#include "coreusersettings.h"
#include "ctcpparser.h"
-#include "eventmanager.h"
#include "eventstringifier.h"
#include "ircchannel.h"
#include "ircparser.h"
_ircListHelper(new CoreIrcListHelper(this)),
_networkConfig(new CoreNetworkConfig("GlobalNetworkConfig", this)),
_coreInfo(this),
- _eventManager(new EventManager(this)),
+ _eventManager(new CoreEventManager(this)),
_eventStringifier(new EventStringifier(this)),
_sessionEventProcessor(new CoreSessionEventProcessor(this)),
_ctcpParser(new CtcpParser(this)),
_ircParser(new IrcParser(this)),
scriptEngine(new QScriptEngine(this)),
+ _processMessages(false),
_ignoreListManager(this)
{
SignalProxy *p = signalProxy();
loadSettings();
initScriptEngine();
- connect(eventManager(), SIGNAL(eventQueueEmptied()), SLOT(processMessages()));
eventManager()->registerObject(ircParser(), EventManager::NormalPriority);
eventManager()->registerObject(sessionEventProcessor(), EventManager::HighPriority); // needs to process events *before* the stringifier!
eventManager()->registerObject(ctcpParser(), EventManager::NormalPriority);
CoreNetwork *net = network(bufinfo.networkId());
if(net) {
net->userInput(bufinfo, msg);
- // FIXME as soon as user input is event-based
- // until then, user input doesn't trigger a message queue flush!
- processMessages();
} else {
qWarning() << "Trying to send to unconnected network:" << msg;
}
return;
_messageQueue << rawMsg;
+ if(!_processMessages) {
+ _processMessages = true;
+ QCoreApplication::postEvent(this, new ProcessMessagesEvent());
+ }
}
void CoreSession::recvStatusMsgFromServer(QString msg) {
return Core::requestBuffers(user());
}
-void CoreSession::processMessages() {
- if(_messageQueue.isEmpty())
+void CoreSession::customEvent(QEvent *event) {
+ if(event->type() != QEvent::User)
return;
+ processMessages();
+ event->accept();
+}
+
+void CoreSession::processMessages() {
if(_messageQueue.count() == 1) {
const RawMessage &rawMsg = _messageQueue.first();
bool createBuffer = !(rawMsg.flags & Message::Redirected);
emit displayMsg(messages[i]);
}
}
+ _processMessages = false;
_messageQueue.clear();
}
void CoreSession::createIdentity(const CoreIdentity &identity) {
CoreIdentity *coreIdentity = new CoreIdentity(identity, this);
_identities[identity.id()] = coreIdentity;
- // CoreIdentity has it's own synchronize method since it's "private" sslManager needs to be synced aswell
+ // CoreIdentity has its own synchronize method since its "private" sslManager needs to be synced as well
coreIdentity->synchronize(signalProxy());
connect(coreIdentity, SIGNAL(updated()), this, SLOT(updateIdentityBySender()));
emit identityCreated(*coreIdentity);
return;
if(net->connectionState() != Network::Disconnected) {
- connect(net, SIGNAL(disconnected(NetworkId)), SLOT(destroyNetwork(NetworkId)));
+ // make sure we no longer receive data from the tcp buffer
+ disconnect(net, SIGNAL(displayMsg(NetworkId, Message::Type, BufferInfo::Type, const QString &, const QString &, const QString &, Message::Flags)), this, 0);
+ disconnect(net, SIGNAL(displayStatusMsg(QString)), this, 0);
+ connect(net, SIGNAL(disconnected(NetworkId)), this, SLOT(destroyNetwork(NetworkId)));
net->disconnectFromIrc();
} else {
destroyNetwork(id);
QList<BufferId> removedBuffers = Core::requestBufferIdsForNetwork(user(), id);
Network *net = _networks.take(id);
if(net && Core::removeNetwork(user(), id)) {
+ // make sure that all unprocessed RawMessages from this network are removed
+ QList<RawMessage>::iterator messageIter = _messageQueue.begin();
+ while(messageIter != _messageQueue.end()) {
+ if(messageIter->networkId == id) {
+ messageIter = _messageQueue.erase(messageIter);
+ } else {
+ messageIter++;
+ }
+ }
+ // remove buffers from syncer
foreach(BufferId bufferId, removedBuffers) {
_bufferSyncer->removeBuffer(bufferId);
}