X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=0a52cf10870f1a942d394f8fb200a0313169a47c;hp=73204f64444204abcb8ad5b6566c82cdde36527d;hb=3eebe11329417e77038d860af3b6f35630f40450;hpb=06a03c2c69ee934aaeec83512bae2fffee83a340 diff --git a/src/core/coresession.h b/src/core/coresession.h index 73204f64..0a52cf10 100644 --- a/src/core/coresession.h +++ b/src/core/coresession.h @@ -1,11 +1,11 @@ /*************************************************************************** - * Copyright (C) 2005-07 by The Quassel IRC Development Team * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * + * (at your option) version 3. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * @@ -18,85 +18,201 @@ * 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 -//#include "coreproxy.h" +#include "corecoreinfo.h" +#include "corealiasmanager.h" +#include "coreignorelistmanager.h" #include "message.h" - -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; class CoreSession : public QObject { Q_OBJECT - public: - CoreSession(UserId, Storage *, QObject *parent = 0); - ~CoreSession(); +public: + CoreSession(UserId, bool restoreState, QObject *parent = 0); + ~CoreSession(); + + 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(); + + 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; } + + inline CoreIgnoreListManager *ignoreListManager() { return &_ignoreListManager; } +// void attachNetworkConnection(NetworkConnection *conn); + + //! Return necessary data for restoring the session after restarting the core + void restoreSessionState(); + +public slots: + 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, const QVariantMap &additional); + void createIdentity(const CoreIdentity &identity); - QList buffers() const; - UserId userId() const; - QVariant sessionState(); + //! Remove identity and propagate that fact to the clients. + /** \param identity The identity to be removed. + */ + void removeIdentity(IdentityId identity); - public slots: - //! Store a piece session-wide data and distribute it to connected clients. - void storeSessionData(const QString &key, const QVariant &data); + //! 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()); - void addClient(QIODevice *connection); + //! Remove network and propagate that fact to the clients. + /** \param network The id of the network to be removed. + */ + void removeNetwork(NetworkId network); - public: - //! Retrieve a piece of session-wide data. - QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant()); + //! 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); - //CoreProxy *proxy(); - SignalProxy *signalProxy() const; + QHash persistentChannels(NetworkId) const; - public slots: - void connectToNetwork(QString); - //void processSignal(ClientSignal, QVariant, QVariant, QVariant); - void sendBacklog(BufferId, QVariant, QVariant); - void msgFromGui(BufferId, QString message); - void sendServerStates(); + //! Marks us away (or unaway) on all networks + void globalAway(const QString &msg = QString()); - signals: - //void proxySignal(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant()); +signals: + void initialized(); + void sessionState(const QVariant &); - void msgFromGui(QString net, QString buf, QString message); - void displayMsg(Message message); - void displayStatusMsg(QString, QString); + //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 serverStateRequested(); + void scriptResult(QString result); - void backlogData(BufferId, QVariantList, bool done); + //! 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); - void bufferIdUpdated(BufferId); - void sessionDataChanged(const QString &key); - void sessionDataChanged(const QString &key, const QVariant &data); + //! 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); - private slots: - void recvStatusMsgFromServer(QString msg); - void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None); - void serverConnected(QString net); - void serverDisconnected(QString net); + void networkCreated(NetworkId); + void networkRemoved(NetworkId); - private: - UserId user; +private slots: + void removeClient(QIODevice *dev); - //CoreProxy *coreProxy; - SignalProxy *_signalProxy; - Storage *storage; - QHash servers; + 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); - QVariantMap sessionData; - QMutex mutex; + 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; + 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 *_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