X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=f8134ccfeddf250b5fae8f521c07b8e3913ca1a2;hp=ce64b090bf5369e793a2159768e728a9c21dc951;hb=da3aa4136fe01e142238f0f42fe1273481037b9d;hpb=9ac6ae4ee26819874d8843ba09f38a24088d663d diff --git a/src/core/coresession.h b/src/core/coresession.h index ce64b090..f8134ccf 100644 --- a/src/core/coresession.h +++ b/src/core/coresession.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-07 by the Quassel IRC Team * + * Copyright (C) 2005-08 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -21,83 +21,168 @@ #ifndef _CORESESSION_H_ #define _CORESESSION_H_ -#include #include #include #include "message.h" -class Server; +class BufferSyncer; +class Identity; +class NetworkConnection; +class Network; +struct NetworkInfo; class SignalProxy; -class Storage; + +class QScriptEngine; class CoreSession : public QObject { 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 buffers() const; - UserId userId() const; - QVariant sessionState(); + UserId user() const; + Network *network(NetworkId) const; + NetworkConnection *networkConnection(NetworkId) const; + Identity *identity(IdentityId) const; - //! Retrieve a piece of session-wide data. - QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant()); + QVariant sessionState(); SignalProxy *signalProxy() const; - void attachServer(Server *server); + void attachNetworkConnection(NetworkConnection *conn); //! Return necessary data for restoring the session after restarting the core - QVariant state() const; - void restoreState(const QVariant &previousState); + void saveSessionState() const; + void restoreSessionState(); public slots: - //! Store a piece session-wide data and distribute it to connected clients. - void storeSessionData(const QString &key, const QVariant &data); + void networkStateRequested(); - void serverStateRequested(); + void addClient(QObject *socket); - void addClient(QIODevice *connection); - - void connectToNetwork(QString, const QVariant &previousState = QVariant()); - //void connectToNetwork(NetworkId); +// void connectToNetwork(QString, const QVariant &previousState = QVariant()); + void connectToNetwork(NetworkId); + void disconnectFromNetwork(NetworkId id); //void processSignal(ClientSignal, QVariant, QVariant, QVariant); void sendBacklog(BufferInfo, QVariant, QVariant); - void msgFromGui(BufferInfo, QString message); - + 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); + + //! Remove identity and propagate that fact to the clients. + /** \param identity The identity to be removed. + */ + void removeIdentity(IdentityId identity); + + //! Create a network and propagate the changes to the clients. + /** \param info The network's settings. + */ + void createNetwork(const NetworkInfo &info); + + //! 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. + */ + 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); + signals: - void msgFromGui(uint netid, QString buf, QString message); + void initialized(); + + //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 connectToIrc(QString net); + //void disconnectFromIrc(QString net); void backlogData(BufferInfo, QVariantList, bool done); void bufferInfoUpdated(BufferInfo); - void sessionDataChanged(const QString &key); - void sessionDataChanged(const QString &key, const QVariant &data); + + 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 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 bufferRemoved(BufferId); + void bufferRenamed(BufferId, QString); private slots: 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(Message::Type, BufferInfo::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None); + void networkConnected(NetworkId networkid); + void networkDisconnected(NetworkId networkid); + + void destroyNetwork(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 storeBufferLastSeen(BufferId buffer, const QDateTime &lastSeen); + + void scriptRequest(QString script); private: - UserId user; - + void loadSettings(); + void initScriptEngine(); + + UserId _user; + SignalProxy *_signalProxy; - Storage *storage; - QHash servers; - - QVariantMap sessionData; - QMutex mutex; + QHash _connections; + QHash _networks; + QHash _networksToRemove; + QHash _identities; + + BufferSyncer *_bufferSyncer; + + QScriptEngine *scriptEngine; + }; #endif