X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=3eecc4bb84fe05f4f6b64c3e038a8a8cbb0d22b5;hp=51c14a7225cf4f314b6fed9b8aaf8aae3bdcdfdb;hb=921e54680da16fcf2adb7a90506875aceb6633a4;hpb=5b083e1f67c77ceb7d1d134e976cd6081b70bf12 diff --git a/src/core/coresession.h b/src/core/coresession.h index 51c14a72..3eecc4bb 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-2015 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,153 +15,219 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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 "protocol.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 CoreTransferManager; +class CtcpParser; +class EventManager; +class EventStringifier; +class InternalPeer; +class IrcParser; +class Peer; +class MessageEvent; class NetworkConnection; -class Network; -struct NetworkInfo; +class RemotePeer; class SignalProxy; +struct NetworkInfo; + class QScriptEngine; -class CoreSession : public QObject { - Q_OBJECT +class CoreSession : public QObject +{ + Q_OBJECT public: - CoreSession(UserId, bool restoreState, QObject *parent = 0); - ~CoreSession(); + CoreSession(UserId, bool restoreState, QObject *parent = 0); + ~CoreSession(); - QList buffers() const; - UserId user() const; - Network *network(NetworkId) const; - NetworkConnection *networkConnection(NetworkId) const; - Identity *identity(IdentityId) const; + QList 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; - QVariant sessionState(); + Protocol::SessionState sessionState() const; - SignalProxy *signalProxy() const; + inline SignalProxy *signalProxy() const { return _signalProxy; } - void attachNetworkConnection(NetworkConnection *conn); + const AliasManager &aliasManager() const { return _aliasManager; } + AliasManager &aliasManager() { return _aliasManager; } - //! Return necessary data for restoring the session after restarting the core - void saveSessionState() const; - void restoreSessionState(); + 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; } -public slots: - void networkStateRequested(); + inline CoreIrcListHelper *ircListHelper() const { return _ircListHelper; } - void addClient(QObject *socket); + inline CoreIgnoreListManager *ignoreListManager() { return &_ignoreListManager; } + inline CoreTransferManager *transferManager() const { return _transferManager; } - void connectToNetwork(QString, const QVariant &previousState = QVariant()); - void connectToNetwork(NetworkId, const QVariant &previousState = QVariant()); - void disconnectFromNetwork(NetworkId id); +// void attachNetworkConnection(NetworkConnection *conn); - //void processSignal(ClientSignal, QVariant, QVariant, QVariant); - void sendBacklog(BufferInfo, QVariant, QVariant); - void msgFromClient(BufferInfo, QString message); + //! Return necessary data for restoring the session after restarting the core + void restoreSessionState(); - //! Create an identity and propagate the changes to the clients. - /** \param identity The identity to be created. - */ - void createIdentity(const Identity &identity); +public slots: + void addClient(RemotePeer *peer); + void addClient(InternalPeer *peer); - //! Update an identity and propagate the changes to the clients. - /** \param identity The identity to be updated. - */ - void updateIdentity(const Identity &identity); + void msgFromClient(BufferInfo, QString message); - //! Remove identity and propagate that fact to the clients. - /** \param identity The identity to be removed. - */ - void removeIdentity(IdentityId identity); + //! Create an identity and propagate the changes to the clients. + /** \param identity The identity to be created. + */ + void createIdentity(const Identity &identity, const QVariantMap &additional); + void createIdentity(const CoreIdentity &identity); - //! Create a network and propagate the changes to the clients. - /** \param info The network's settings. - */ - void createNetwork(const NetworkInfo &info); + //! Remove identity and propagate that fact to the clients. + /** \param identity The identity to be removed. + */ + void removeIdentity(IdentityId identity); - //! Update a network and propagate the changes to the clients. - /** \param info The updated network settings. - */ - void updateNetwork(const NetworkInfo &info); + //! 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 identity and propagate that fact to the clients. - /** \param identity The identity to be removed. - */ - void removeNetwork(NetworkId network); + //! Remove network and propagate that fact to the clients. + /** \param network The id of the network to be removed. + */ + void removeNetwork(NetworkId network); -signals: - void initialized(); + //! 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 msgFromGui(uint netid, QString buf, QString message); - void displayMsg(Message message); - void displayStatusMsg(QString, QString); + QHash persistentChannels(NetworkId) const; - //void connectToIrc(QString net); - //void disconnectFromIrc(QString net); + //! Marks us away (or unaway) on all networks + void globalAway(const QString &msg = QString()); - void backlogData(BufferInfo, QVariantList, bool done); +signals: + void initialized(); + void sessionState(const Protocol::SessionState &sessionState); + + //void msgFromGui(uint netid, QString buf, QString message); + void displayMsg(Message message); + void displayStatusMsg(QString, QString); - void bufferInfoUpdated(BufferInfo); + void scriptResult(QString result); - void scriptResult(QString result); + //! Identity has been created. + /** This signal is propagated to the clients to tell them that the given identity has been created. + * \param identity The new identity. + */ + void identityCreated(const Identity &identity); - //! Identity has been created. - /** This signal is propagated to the clients to tell them that the given identity has been created. - * \param identity The new identity. - */ - void identityCreated(const Identity &identity); + //! Identity has been removed. + /** This signal is propagated to the clients to inform them about the removal of the given identity. + * \param identity The identity that has been removed. + */ + void identityRemoved(IdentityId identity); - //! Identity has been removed. - /** This signal is propagated to the clients to inform them about the removal of the given identity. - * \param identity The identity that has been removed. - */ - void identityRemoved(IdentityId identity); + void networkCreated(NetworkId); + void networkRemoved(NetworkId); + void networkDisconnected(NetworkId); - void networkCreated(NetworkId); - void networkRemoved(NetworkId); +protected: + virtual void customEvent(QEvent *event); private slots: - 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); + void removeClient(Peer *peer); - void destroyNetwork(NetworkId); + void recvStatusMsgFromServer(QString msg); + void recvMessageFromServer(NetworkId networkId, Message::Type, BufferInfo::Type, const QString &target, const QString &text, const QString &sender = "", Message::Flags flags = Message::None); - //! 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 destroyNetwork(NetworkId); - void scriptRequest(QString script); + void scriptRequest(QString script); -private: - void loadSettings(); - void initScriptEngine(); + void clientsConnected(); + void clientsDisconnected(); - UserId _user; + void updateIdentityBySender(); - SignalProxy *_signalProxy; - QHash _connections; - QHash _networks; - QHash _networksToRemove; - QHash _identities; + void saveSessionState() const; + +private: + void processMessages(); + + void loadSettings(); + void initScriptEngine(); + + /// Hook for converting events to the old displayMsg() handlers + Q_INVOKABLE void processMessageEvent(MessageEvent *event); + + UserId _user; + + SignalProxy *_signalProxy; + CoreAliasManager _aliasManager; + // QHash _connections; + QHash _networks; + // QHash _networksToRemove; + QHash _identities; + + CoreBufferSyncer *_bufferSyncer; + CoreBacklogManager *_backlogManager; + CoreBufferViewManager *_bufferViewManager; + CoreIrcListHelper *_ircListHelper; + CoreNetworkConfig *_networkConfig; + CoreCoreInfo _coreInfo; + CoreTransferManager *_transferManager; + + EventManager *_eventManager; + EventStringifier *_eventStringifier; // should eventually move into client + CoreSessionEventProcessor *_sessionEventProcessor; + CtcpParser *_ctcpParser; + IrcParser *_ircParser; + + QScriptEngine *scriptEngine; + + QList _messageQueue; + bool _processMessages; + CoreIgnoreListManager _ignoreListManager; +}; - QScriptEngine *scriptEngine; +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