/***************************************************************************
- * 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 *
#include "corecoreinfo.h"
#include "corealiasmanager.h"
+#include "coreignorelistmanager.h"
#include "message.h"
+#include "storage.h"
-class BufferSyncer;
class CoreBacklogManager;
+class CoreBufferSyncer;
class CoreBufferViewManager;
+class CoreIdentity;
class CoreIrcListHelper;
-class Identity;
-class NetworkConnection;
class CoreNetwork;
-struct NetworkInfo;
+class CoreNetworkConfig;
+class CoreSessionEventProcessor;
+class EventManager;
+class EventStringifier;
+class IrcParser;
+class MessageEvent;
+class NetworkConnection;
class SignalProxy;
+struct NetworkInfo;
+
class QScriptEngine;
class CoreSession : public QObject {
QList<BufferInfo> buffers() const;
inline UserId user() const { return _user; }
CoreNetwork *network(NetworkId) const;
+ CoreIdentity *identity(IdentityId) const;
+ inline CoreNetworkConfig *networkConfig() const { return _networkConfig; }
NetworkConnection *networkConnection(NetworkId) const;
- Identity *identity(IdentityId) const;
QVariant sessionState();
const AliasManager &aliasManager() const { return _aliasManager; }
AliasManager &aliasManager() { return _aliasManager; }
+ inline EventManager *eventManager() const { return _eventManager; }
+ inline EventStringifier *eventStringifier() const { return _eventStringifier; }
+ inline CoreSessionEventProcessor *eventProcessor() const { return _eventProcessor; }
+ inline IrcParser *ircParser() const { return _ircParser; }
+
inline CoreIrcListHelper *ircListHelper() const { return _ircListHelper; }
+ inline CoreIgnoreListManager *ignoreListManager() { return &_ignoreListManager; }
// void attachNetworkConnection(NetworkConnection *conn);
//! Return necessary data for restoring the session after restarting the core
- void saveSessionState() const;
void restoreSessionState();
public slots:
//! Create an identity and propagate the changes to the clients.
/** \param identity The identity to be created.
*/
- void createIdentity(const Identity &identity);
+ void createIdentity(const Identity &identity, const QVariantMap &additional);
+ void createIdentity(const CoreIdentity &identity);
//! Remove identity and propagate that fact to the clients.
/** \param identity The identity to be removed.
//! Create a network and propagate the changes to the clients.
/** \param info The network's settings.
*/
- void createNetwork(const NetworkInfo &info);
+ void createNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList());
- //! Remove identity and propagate that fact to the clients.
- /** \param identity The identity to be removed.
+ //! Remove network and propagate that fact to the clients.
+ /** \param network The id of the network to be removed.
*/
void removeNetwork(NetworkId network);
- //! Remove a buffer and it's backlog permanently
- /** \param bufferId The id of the buffer to be removed.
- * emits bufferRemoved(bufferId) on success.
- */
- void removeBufferRequested(BufferId bufferId);
-
//! Rename a Buffer for a given network
/* \param networkId The id of the network the buffer belongs to
* \param newName The new name of the buffer
* \param oldName The old name of the buffer
- * emits bufferRenamed(bufferId, newName) on success.
*/
void renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName);
QHash<QString, QString> persistentChannels(NetworkId) const;
+ //! Marks us away (or unaway) on all networks
+ void globalAway(const QString &msg = QString());
+
signals:
void initialized();
void sessionState(const QVariant &);
void networkCreated(NetworkId);
void networkRemoved(NetworkId);
- void bufferRemoved(BufferId);
- void bufferRenamed(BufferId, QString);
+ void networkDisconnected(NetworkId);
private slots:
void removeClient(QIODevice *dev);
void recvStatusMsgFromServer(QString msg);
- void recvMessageFromServer(Message::Type, BufferInfo::Type, QString target, QString text, QString sender = "", Message::Flags flags = Message::None);
+ void recvMessageFromServer(NetworkId networkId, Message::Type, BufferInfo::Type, const QString &target, const QString &text, const QString &sender = "", Message::Flags flags = Message::None);
void destroyNetwork(NetworkId);
- void identityUpdated(const QVariantMap &);
-
- void storeBufferLastSeenMsg(BufferId buffer, const MsgId &msgId);
-
void scriptRequest(QString script);
void clientsConnected();
void clientsDisconnected();
+ void updateIdentityBySender();
+
+ void saveSessionState() const;
+
+protected:
+ virtual void customEvent(QEvent *event);
+
private:
void loadSettings();
void initScriptEngine();
+ void processMessages();
+
+ /// Hook for converting events to the old displayMsg() handlers
+ Q_INVOKABLE void processMessageEvent(MessageEvent *event);
UserId _user;
// QHash<NetworkId, NetworkConnection *> _connections;
QHash<NetworkId, CoreNetwork *> _networks;
// QHash<NetworkId, CoreNetwork *> _networksToRemove;
- QHash<IdentityId, Identity *> _identities;
+ QHash<IdentityId, CoreIdentity *> _identities;
- BufferSyncer *_bufferSyncer;
+ CoreBufferSyncer *_bufferSyncer;
CoreBacklogManager *_backlogManager;
CoreBufferViewManager *_bufferViewManager;
CoreIrcListHelper *_ircListHelper;
+ CoreNetworkConfig *_networkConfig;
CoreCoreInfo _coreInfo;
+ EventManager *_eventManager;
+ EventStringifier *_eventStringifier; // should eventually move into client
+ CoreSessionEventProcessor *_eventProcessor;
+ IrcParser *_ircParser;
+
QScriptEngine *scriptEngine;
+ QList<RawMessage> _messageQueue;
+ bool _processMessages;
+ CoreIgnoreListManager _ignoreListManager;
+};
+
+struct RawMessage {
+ NetworkId networkId;
+ Message::Type type;
+ BufferInfo::Type bufferType;
+ QString target;
+ QString text;
+ QString sender;
+ Message::Flags flags;
+ RawMessage(NetworkId networkId, Message::Type type, BufferInfo::Type bufferType, const QString &target, const QString &text, const QString &sender, Message::Flags flags)
+ : networkId(networkId), type(type), bufferType(bufferType), target(target), text(text), sender(sender), flags(flags) {}
};
#endif
projects / quassel.git / blobdiff