/***************************************************************************
- * 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 *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifndef _CORESESSION_H_
-#define _CORESESSION_H_
+#ifndef CORESESSION_H
+#define CORESESSION_H
-#include <QObject>
#include <QString>
#include <QVariant>
+#include "corecoreinfo.h"
+#include "corealiasmanager.h"
+#include "coreignorelistmanager.h"
#include "message.h"
-
-class Identity;
-class Server;
+#include "storage.h"
+
+class CoreBacklogManager;
+class CoreBufferSyncer;
+class CoreBufferViewManager;
+class CoreIdentity;
+class CoreIrcListHelper;
+class CoreNetwork;
+class CoreNetworkConfig;
+class CoreSessionEventProcessor;
+class EventManager;
+class EventStringifier;
+class IrcParser;
+class MessageEvent;
+class NetworkConnection;
class SignalProxy;
-class Storage;
+
+struct NetworkInfo;
class QScriptEngine;
Q_OBJECT
public:
- CoreSession(UserId, Storage *, QObject *parent = 0);
- virtual ~CoreSession();
+ CoreSession(UserId, bool restoreState, QObject *parent = 0);
+ ~CoreSession();
- NetworkId getNetworkId(const QString &network) const;
QList<BufferInfo> buffers() const;
- UserId userId() 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;
+
QVariant sessionState();
- //! Retrieve a piece of session-wide data.
- QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
+ inline SignalProxy *signalProxy() const { return _signalProxy; }
- SignalProxy *signalProxy() const;
+ const AliasManager &aliasManager() const { return _aliasManager; }
+ AliasManager &aliasManager() { return _aliasManager; }
- void attachServer(Server *server);
+ inline EventManager *eventManager() const { return _eventManager; }
+ inline EventStringifier *eventStringifier() const { return _eventStringifier; }
+ inline CoreSessionEventProcessor *eventProcessor() const { return _eventProcessor; }
+ inline IrcParser *ircParser() const { return _ircParser; }
- //! Return necessary data for restoring the session after restarting the core
- QVariant state() const;
- void restoreState(const QVariant &previousState);
+ inline CoreIrcListHelper *ircListHelper() const { return _ircListHelper; }
-public slots:
- //! Store a piece session-wide data and distribute it to connected clients.
- void storeSessionData(const QString &key, const QVariant &data);
+ inline CoreIgnoreListManager *ignoreListManager() { return &_ignoreListManager; }
+// void attachNetworkConnection(NetworkConnection *conn);
- void serverStateRequested();
-
- void addClient(QIODevice *connection);
+ //! Return necessary data for restoring the session after restarting the core
+ void restoreSessionState();
- void connectToNetwork(QString, const QVariant &previousState = QVariant());
- //void connectToNetwork(NetworkId);
+public slots:
+ void addClient(QIODevice *device);
+ void addClient(SignalProxy *proxy);
- //void processSignal(ClientSignal, QVariant, QVariant, QVariant);
- void sendBacklog(BufferInfo, QVariant, QVariant);
- void msgFromGui(BufferInfo, QString message);
+ void msgFromClient(BufferInfo, QString message);
- //! Create or update an identity and propagate the changes to the clients.
- /** \param identity The identity to be created/updated.
+ //! Create an identity and propagate the changes to the clients.
+ /** \param identity The identity to be created.
*/
- void createOrUpdateIdentity(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.
*/
void removeIdentity(IdentityId identity);
-signals:
- void msgFromGui(uint netid, QString buf, QString message);
- void displayMsg(Message message);
- void displayStatusMsg(QString, QString);
+ //! Create a network and propagate the changes to the clients.
+ /** \param info The network's settings.
+ */
+ void createNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList());
+
+ //! Remove network and propagate that fact to the clients.
+ /** \param network The id of the network to be removed.
+ */
+ void removeNetwork(NetworkId network);
+
+ //! 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
+ */
+ void renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName);
- void connectToIrc(QString net);
- void disconnectFromIrc(QString net);
+ QHash<QString, QString> persistentChannels(NetworkId) const;
- void backlogData(BufferInfo, QVariantList, bool done);
+ //! Marks us away (or unaway) on all networks
+ void globalAway(const QString &msg = QString());
- void bufferInfoUpdated(BufferInfo);
- void sessionDataChanged(const QString &key);
- void sessionDataChanged(const QString &key, const QVariant &data);
+signals:
+ void initialized();
+ void sessionState(const QVariant &);
+
+ //void msgFromGui(uint netid, QString buf, QString message);
+ void displayMsg(Message message);
+ void displayStatusMsg(QString, QString);
void scriptResult(QString result);
*/
void identityRemoved(IdentityId identity);
+ void networkCreated(NetworkId);
+ void networkRemoved(NetworkId);
+ void networkDisconnected(NetworkId);
+
private slots:
+ void removeClient(QIODevice *dev);
+
void recvStatusMsgFromServer(QString msg);
- void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
- void serverConnected(uint networkid);
- void serverDisconnected(uint networkid);
+ 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 scriptRequest(QString script);
-
+
+ void clientsConnected();
+ void clientsDisconnected();
+
+ void updateIdentityBySender();
+
+ void saveSessionState() const;
+
+protected:
+ virtual void customEvent(QEvent *event);
+
private:
+ void loadSettings();
void initScriptEngine();
-
- UserId user;
-
+ void processMessages();
+
+ /// Hook for converting events to the old displayMsg() handlers
+ Q_INVOKABLE void processMessageEvent(MessageEvent *event);
+
+ UserId _user;
+
SignalProxy *_signalProxy;
- Storage *storage;
- QHash<NetworkId, Server *> servers;
-
- QVariantMap sessionData;
- QMutex mutex;
+ CoreAliasManager _aliasManager;
+ // QHash<NetworkId, NetworkConnection *> _connections;
+ QHash<NetworkId, CoreNetwork *> _networks;
+ // QHash<NetworkId, CoreNetwork *> _networksToRemove;
+ QHash<IdentityId, CoreIdentity *> _identities;
+
+ 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;
- QHash<IdentityId, Identity *> _identities;
+ 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