X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=ef3b397b8ae6104655a7f215da5622b7c6be0f3d;hp=491e99a882ff82c97deb4feb837042b37b06c1c5;hb=371368423788eec9f5756dc4cebb01aeb93d0e7a;hpb=558260f52de5a9b1364f5672ace17554efc10a74 diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp index 491e99a8..ef3b397b 100644 --- a/src/core/coresession.cpp +++ b/src/core/coresession.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -39,6 +39,11 @@ #include "coreusersettings.h" #include "logger.h" +class ProcessMessagesEvent : public QEvent { +public: + ProcessMessagesEvent() : QEvent(QEvent::User) {} +}; + CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) : QObject(parent), _user(uid), @@ -49,7 +54,8 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) _bufferViewManager(new CoreBufferViewManager(_signalProxy, this)), _ircListHelper(new CoreIrcListHelper(this)), _coreInfo(this), - scriptEngine(new QScriptEngine(this)) + scriptEngine(new QScriptEngine(this)), + _processMessages(false) { SignalProxy *p = signalProxy(); connect(p, SIGNAL(peerRemoved(QIODevice *)), this, SLOT(removeClient(QIODevice *))); @@ -68,7 +74,7 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) p->attachSignal(this, SIGNAL(networkCreated(NetworkId))); p->attachSignal(this, SIGNAL(networkRemoved(NetworkId))); - p->attachSlot(SIGNAL(createNetwork(const NetworkInfo &)), this, SLOT(createNetwork(const NetworkInfo &))); + p->attachSlot(SIGNAL(createNetwork(const NetworkInfo &, const QStringList &)), this, SLOT(createNetwork(const NetworkInfo &, const QStringList &))); p->attachSlot(SIGNAL(removeNetwork(NetworkId)), this, SLOT(removeNetwork(NetworkId))); loadSettings(); @@ -133,12 +139,6 @@ void CoreSession::loadSettings() { foreach(CoreIdentity identity, Core::identities(user())) { createIdentity(identity); } - if(!_identities.count()) { - Identity identity; - identity.setToDefaults(); - identity.setIdentityName(tr("Default Identity")); - createIdentity(identity, QVariantMap()); - } foreach(NetworkInfo info, Core::networks(user())) { createNetwork(info); @@ -188,7 +188,6 @@ void CoreSession::removeClient(QIODevice *iodev) { QHash CoreSession::persistentChannels(NetworkId id) const { return Core::persistentChannels(user(), id); - return QHash(); } // FIXME switch to BufferId @@ -203,16 +202,13 @@ void CoreSession::msgFromClient(BufferInfo bufinfo, QString msg) { // 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 CoreSession::recvMessageFromServer(Message::Type type, BufferInfo::Type bufferType, - QString target, QString text, QString sender, Message::Flags flags) { - CoreNetwork *net = qobject_cast(this->sender()); - Q_ASSERT(net); - - BufferInfo bufferInfo = Core::bufferInfo(user(), net->networkId(), bufferType, target); - Message msg(bufferInfo, type, text, sender, flags); - msg.setMsgId(Core::storeMessage(msg)); - Q_ASSERT(msg.msgId() != 0); - emit displayMsg(msg); +void CoreSession::recvMessageFromServer(NetworkId networkId, Message::Type type, BufferInfo::Type bufferType, + const QString &target, const QString &text, const QString &sender, Message::Flags flags) { + _messageQueue << RawMessage(networkId, type, bufferType, target, text, sender, flags); + if(!_processMessages) { + _processMessages = true; + QCoreApplication::postEvent(this, new ProcessMessagesEvent()); + } } void CoreSession::recvStatusMsgFromServer(QString msg) { @@ -225,6 +221,44 @@ QList CoreSession::buffers() const { return Core::requestBuffers(user()); } +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(); + BufferInfo bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, rawMsg.bufferType, rawMsg.target); + Message msg(bufferInfo, rawMsg.type, rawMsg.text, rawMsg.sender, rawMsg.flags); + Core::storeMessage(msg); + emit displayMsg(msg); + } else { + QHash > bufferInfoCache; + MessageList messages; + BufferInfo bufferInfo; + for(int i = 0; i < _messageQueue.count(); i++) { + const RawMessage &rawMsg = _messageQueue.at(i); + if(bufferInfoCache.contains(rawMsg.networkId) && bufferInfoCache[rawMsg.networkId].contains(rawMsg.target)) { + bufferInfo = bufferInfoCache[rawMsg.networkId][rawMsg.target]; + } else { + bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, rawMsg.bufferType, rawMsg.target); + bufferInfoCache[rawMsg.networkId][rawMsg.target] = bufferInfo; + } + messages << Message(bufferInfo, rawMsg.type, rawMsg.text, rawMsg.sender, rawMsg.flags); + } + Core::storeMessages(messages); + // FIXME: extend protocol to a displayMessages(MessageList) + for(int i = 0; i < messages.count(); i++) { + emit displayMsg(messages[i]); + } + } + _processMessages = false; + _messageQueue.clear(); +} QVariant CoreSession::sessionState() { QVariantMap v; @@ -279,6 +313,7 @@ void CoreSession::createIdentity(const Identity &identity, const QVariantMap &ad if(additional.contains("CertPem")) coreIdentity.setSslCert(additional["CertPem"].toByteArray()); #endif + qDebug() << Q_FUNC_INFO; IdentityId id = Core::createIdentity(user(), coreIdentity); if(!id.isValid()) return; @@ -313,7 +348,7 @@ void CoreSession::removeIdentity(IdentityId id) { /*** Network Handling ***/ -void CoreSession::createNetwork(const NetworkInfo &info_) { +void CoreSession::createNetwork(const NetworkInfo &info_, const QStringList &persistentChans) { NetworkInfo info = info_; int id; @@ -327,10 +362,24 @@ void CoreSession::createNetwork(const NetworkInfo &info_) { id = info.networkId.toInt(); if(!_networks.contains(id)) { + + // create persistent chans + QRegExp rx("\\s*(\\S+)(?:\\s*(\\S+))?\\s*"); + foreach(QString channel, persistentChans) { + if(!rx.exactMatch(channel)) { + qWarning() << QString("Invalid persistent channel declaration: %1").arg(channel); + continue; + } + Core::bufferInfo(user(), info.networkId, BufferInfo::ChannelBuffer, rx.cap(1), true); + Core::setChannelPersistent(user(), info.networkId, rx.cap(1), true); + if(!rx.cap(2).isEmpty()) + Core::setPersistentChannelKey(user(), info.networkId, rx.cap(1), rx.cap(2)); + } + CoreNetwork *net = new CoreNetwork(id, this); - connect(net, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, Message::Flags)), - this, SLOT(recvMessageFromServer(Message::Type, BufferInfo::Type, QString, QString, QString, Message::Flags))); - connect(net, SIGNAL(displayStatusMsg(QString)), this, SLOT(recvStatusMsgFromServer(QString))); + connect(net, SIGNAL(displayMsg(NetworkId, Message::Type, BufferInfo::Type, const QString &, const QString &, const QString &, Message::Flags)), + SLOT(recvMessageFromServer(NetworkId, Message::Type, BufferInfo::Type, const QString &, const QString &, const QString &, Message::Flags))); + connect(net, SIGNAL(displayStatusMsg(QString)), SLOT(recvStatusMsgFromServer(QString))); net->setNetworkInfo(info); net->setProxy(signalProxy()); @@ -381,7 +430,6 @@ void CoreSession::clientsConnected() { Identity *identity = 0; CoreNetwork *net = 0; IrcUser *me = 0; - QString awayReason; while(netIter != _networks.end()) { net = *netIter; netIter++; @@ -421,10 +469,8 @@ void CoreSession::clientsDisconnected() { continue; if(identity->detachAwayEnabled() && !me->isAway()) { - if(identity->detachAwayReasonEnabled()) + if(!identity->detachAwayReason().isEmpty()) awayReason = identity->detachAwayReason(); - else - awayReason = identity->awayReason(); net->setAutoAwayActive(true); net->userInputHandler()->handleAway(BufferInfo(), awayReason); }