X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=3dd77f3541ecf28de6aaa83357bc1c65f54246ad;hp=06f7ee658e0d4588cdd89fb4276f70c083e0f1b2;hb=283fdb2c49e5efa1d497d8c3e6f624f86d008ff8;hpb=5b560ec1a01349562ac58051ca7e7fa899d4b994 diff --git a/src/core/coresession.h b/src/core/coresession.h index 06f7ee65..3dd77f35 100644 --- a/src/core/coresession.h +++ b/src/core/coresession.h @@ -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 * @@ -18,20 +18,36 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef _CORESESSION_H_ -#define _CORESESSION_H_ +#ifndef CORESESSION_H +#define CORESESSION_H #include #include +#include "corecoreinfo.h" +#include "corealiasmanager.h" +#include "coreignorelistmanager.h" #include "message.h" - -class Identity; +#include "storage.h" + +class CoreBacklogManager; +class CoreBufferSyncer; +class CoreBufferViewManager; +class CoreIdentity; +class CoreIrcListHelper; +class CoreNetwork; +class CoreNetworkConfig; +class CoreSessionEventProcessor; +class CtcpParser; +class EventManager; +class EventStringifier; +class IrcParser; +class MessageEvent; class NetworkConnection; -class Network; -struct NetworkInfo; class SignalProxy; +struct NetworkInfo; + class QScriptEngine; class CoreSession : public QObject { @@ -42,43 +58,44 @@ public: ~CoreSession(); QList buffers() const; - UserId user() const; - Network *network(NetworkId) 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(); - SignalProxy *signalProxy() const; + inline SignalProxy *signalProxy() const { return _signalProxy; } - void attachNetworkConnection(NetworkConnection *conn); + const AliasManager &aliasManager() const { return _aliasManager; } + AliasManager &aliasManager() { return _aliasManager; } + + inline EventManager *eventManager() const { return _eventManager; } + inline EventStringifier *eventStringifier() const { return _eventStringifier; } + inline CoreSessionEventProcessor *sessionEventProcessor() const { return _sessionEventProcessor; } + inline CtcpParser *ctcpParser() const { return _ctcpParser; } + 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: - void networkStateRequested(); + void addClient(QIODevice *device); + void addClient(SignalProxy *proxy); - void addClient(QObject *socket); - - void connectToNetwork(QString, const QVariant &previousState = QVariant()); - void connectToNetwork(NetworkId, const QVariant &previousState = QVariant()); - void disconnectFromNetwork(NetworkId id); - - //void processSignal(ClientSignal, QVariant, QVariant, QVariant); - void sendBacklog(BufferInfo, QVariant, QVariant); void msgFromClient(BufferInfo, QString message); //! Create an identity and propagate the changes to the clients. /** \param identity The identity to be created. */ - void createIdentity(const Identity &identity); - - //! Update an identity and propagate the changes to the clients. - /** \param identity The identity to be updated. - */ - void updateIdentity(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. @@ -88,32 +105,33 @@ public slots: //! 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()); - //! Update a network and propagate the changes to the clients. - /** \param info The updated network settings. + //! Remove network and propagate that fact to the clients. + /** \param network The id of the network to be removed. */ - void updateNetwork(const NetworkInfo &info); + void removeNetwork(NetworkId network); - //! Remove identity and propagate that fact to the clients. - /** \param identity The identity to be removed. + //! 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 removeNetwork(NetworkId network); + void renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName); + + QHash 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 msgFromGui(uint netid, QString buf, QString message); void displayMsg(Message message); void displayStatusMsg(QString, QString); - //void connectToIrc(QString net); - //void disconnectFromIrc(QString net); - - void backlogData(BufferInfo, QVariantList, bool done); - - void bufferInfoUpdated(BufferInfo); - void scriptResult(QString result); //! Identity has been created. @@ -130,35 +148,75 @@ signals: void networkCreated(NetworkId); void networkRemoved(NetworkId); + 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 = "", quint8 flags = Message::None); - void networkConnected(NetworkId networkid); - void networkDisconnected(NetworkId networkid); - - //! Called when storage updated a BufferInfo. - /** This emits bufferInfoUpdated() via SignalProxy, iff it's one of our buffers. - * \param user The buffer's owner (not necessarily us) - * \param bufferInfo The updated BufferInfo - */ - void updateBufferInfo(UserId user, const BufferInfo &bufferInfo); + 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(); + void processMessages(); + + /// Hook for converting events to the old displayMsg() handlers + Q_INVOKABLE void processMessageEvent(MessageEvent *event); UserId _user; SignalProxy *_signalProxy; - QHash _connections; - QHash _networks; - QHash _identities; + CoreAliasManager _aliasManager; + // QHash _connections; + QHash _networks; + // QHash _networksToRemove; + QHash _identities; + + CoreBufferSyncer *_bufferSyncer; + CoreBacklogManager *_backlogManager; + CoreBufferViewManager *_bufferViewManager; + CoreIrcListHelper *_ircListHelper; + CoreNetworkConfig *_networkConfig; + CoreCoreInfo _coreInfo; + + EventManager *_eventManager; + EventStringifier *_eventStringifier; // should eventually move into client + CoreSessionEventProcessor *_sessionEventProcessor; + CtcpParser *_ctcpParser; + IrcParser *_ircParser; QScriptEngine *scriptEngine; + QList _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