X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=25bf01226798c6422ee29bc654daf279a080b635;hp=7dd03c4b742422be2fd2166fb405b700c5015e31;hb=43e0488dad735096164d3088398653097f816424;hpb=c0c8cea57282c56951562e427bc1acb3ee2028a3 diff --git a/src/core/coresession.h b/src/core/coresession.h index 7dd03c4b..25bf0122 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 * @@ -26,18 +26,27 @@ #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 { @@ -48,40 +57,43 @@ public: ~CoreSession(); QList buffers() const; - UserId user() 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; } 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; } - void attachNetworkConnection(NetworkConnection *conn); + 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(QObject *socket); - - void connectToNetwork(NetworkId); - void disconnectFromNetwork(NetworkId id); + void addClient(QIODevice *device); + void addClient(SignalProxy *proxy); 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); + 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. @@ -91,48 +103,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. - */ - void updateNetwork(const NetworkInfo &info); - - //! 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); - void channelJoined(NetworkId id, const QString &channel, const QString &key = QString()); - void channelParted(NetworkId, const QString &channel); 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 bufferInfoUpdated(BufferInfo); - void scriptResult(QString result); //! Identity has been created. @@ -149,54 +146,74 @@ signals: 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 networkConnected(NetworkId networkid); - void networkDisconnected(NetworkId 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 identityUpdated(const QVariantMap &); - //void networkUpdated(const QVariantMap &); + void scriptRequest(QString script); - //! 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 clientsConnected(); + void clientsDisconnected(); - void storeBufferLastSeenMsg(BufferId buffer, const MsgId &msgId); + void updateIdentityBySender(); - void scriptRequest(QString script); + 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; CoreAliasManager _aliasManager; - QHash _connections; + // QHash _connections; QHash _networks; // QHash _networksToRemove; - QHash _identities; + QHash _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 _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