X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.h;h=d44319ca64773f5e9918d1198e6864790a84b2df;hp=93d9d515a401fda318d1c212850f457ada9278c3;hb=4aca5963302eb2f6dfc41b723df4b362704f1b2b;hpb=fd7c2c4a41b5bb9cffcfe7a8f86a28ab7f38ac27 diff --git a/src/common/network.h b/src/common/network.h index 93d9d515..d44319ca 100644 --- a/src/common/network.h +++ b/src/common/network.h @@ -21,12 +21,14 @@ #ifndef _NETWORK_H_ #define _NETWORK_H_ +#include #include #include #include #include #include #include +#include #include "types.h" #include "syncableobject.h" @@ -35,29 +37,45 @@ class SignalProxy; class IrcUser; class IrcChannel; +// defined below! +struct NetworkInfo; + +// TODO: ConnectionInfo to propagate and sync the current state of NetworkConnection, encodings etcpp class Network : public SyncableObject { Q_OBJECT + Q_ENUMS(ConnectionState Network::ConnectionState) Q_PROPERTY(QString networkName READ networkName WRITE setNetworkName STORED false) Q_PROPERTY(QString currentServer READ currentServer WRITE setCurrentServer STORED false) Q_PROPERTY(QString myNick READ myNick WRITE setMyNick STORED false) + Q_PROPERTY(QByteArray codecForEncoding READ codecForEncoding WRITE setCodecForEncoding STORED false) + Q_PROPERTY(QByteArray codecForDecoding READ codecForDecoding WRITE setCodecForDecoding STORED false) + Q_PROPERTY(IdentityId identityId READ identity WRITE setIdentity STORED false) + Q_PROPERTY(bool isConnected READ isConnected WRITE setConnected STORED false) + //Q_PROPERTY(Network::ConnectionState connectionState READ connectionState WRITE setConnectionState STORED false) + Q_PROPERTY(int connectionState READ connectionState WRITE setConnectionState STORED false) public: - Network(const uint &networkid, QObject *parent = 0); - //virtual ~Network(); + enum ConnectionState { Disconnected, Connecting, Initializing, Initialized, Disconnecting }; + + Network(const NetworkId &networkid, QObject *parent = 0); + ~Network(); NetworkId networkId() const; - bool initialized() const; SignalProxy *proxy() const; void setProxy(SignalProxy *proxy); bool isMyNick(const QString &nick) const; - bool isMyNick(IrcUser *ircuser) const; + bool isMe(IrcUser *ircuser) const; bool isChannelName(const QString &channelname) const; + bool isConnected() const; + //Network::ConnectionState connectionState() const; + int connectionState() const; + QString prefixToMode(const QString &prefix); QString prefixToMode(const QCharRef &prefix); QString modeToPrefix(const QString &mode); @@ -66,8 +84,13 @@ public: QString networkName() const; QString currentServer() const; QString myNick() const; + IdentityId identity() const; QStringList nicks() const; QStringList channels() const; + QVariantList serverList() const; + + NetworkInfo networkInfo() const; + void setNetworkInfo(const NetworkInfo &); QString prefixes(); QString prefixModes(); @@ -80,19 +103,18 @@ public: IrcUser *ircUser(QString nickname) const; IrcUser *ircUser(const QByteArray &nickname) const; QList ircUsers() const; + quint32 ircUserCount() const; IrcChannel *newIrcChannel(const QString &channelname); IrcChannel *newIrcChannel(const QByteArray &channelname); - IrcChannel *ircChannel(QString channelname); - IrcChannel *ircChannel(const QByteArray &channelname); - + IrcChannel *ircChannel(QString channelname) const; + IrcChannel *ircChannel(const QByteArray &channelname) const; QList ircChannels() const; + quint32 ircChannelCount() const; - QTextCodec *codecForEncoding() const; - QTextCodec *codecForDecoding() const; - void setCodecForEncoding(const QString &codecName); + QByteArray codecForEncoding() const; + QByteArray codecForDecoding() const; void setCodecForEncoding(QTextCodec *codec); - void setCodecForDecoding(const QString &codecName); void setCodecForDecoding(QTextCodec *codec); QString decodeString(const QByteArray &text) const; @@ -101,7 +123,16 @@ public: public slots: void setNetworkName(const QString &networkName); void setCurrentServer(const QString ¤tServer); + void setConnected(bool isConnected); + //void setConnectionState(Network::ConnectionState state); + void setConnectionState(int state); void setMyNick(const QString &mynick); + void setIdentity(IdentityId); + + void setServerList(const QVariantList &serverList); + + void setCodecForEncoding(const QByteArray &codecName); + void setCodecForDecoding(const QByteArray &codecName); void addSupport(const QString ¶m, const QString &value = QString()); void removeSupport(const QString ¶m); @@ -111,11 +142,13 @@ public slots: //init geters QVariantMap initSupports() const; + QVariantList initServerList() const; QStringList initIrcUsers() const; QStringList initIrcChannels() const; //init seters void initSetSupports(const QVariantMap &supports); + void initSetServerList(const QVariantList &serverList); void initSetIrcUsers(const QStringList &hostmasks); void initSetChannels(const QStringList &channels); @@ -124,37 +157,62 @@ public slots: // these slots are to keep the hashlists of all users and the // channel lists up to date void ircUserNickChanged(QString newnick); - void setInitialized(); + + void requestConnect() const; + void requestDisconnect() const; + + void emitConnectionError(const QString &); private slots: - void ircUserDestroyed(); void channelDestroyed(); void removeIrcUser(IrcUser *ircuser); - + void ircUserInitDone(); + void ircChannelInitDone(); + signals: void networkNameSet(const QString &networkName); void currentServerSet(const QString ¤tServer); + void connectedSet(bool isConnected); + void connectionStateSet(Network::ConnectionState); + void connectionStateSet(int); + void connectionError(const QString &errorMsg); void myNickSet(const QString &mynick); + void identitySet(IdentityId); + + void serverListSet(QVariantList serverList); + + void codecForEncodingSet(const QString &codecName); + void codecForDecodingSet(const QString &codecName); void supportAdded(const QString ¶m, const QString &value); void supportRemoved(const QString ¶m); - - void ircUserAdded(QString hostmask); - void ircChannelAdded(QString channelname); - void ircUserRemoved(QString nick); - - void initDone(); - void ircUserInitDone(); - void ircChannelInitDone(); - + void ircUserAdded(const QString &hostmask); + void ircUserAdded(IrcUser *); + void ircChannelAdded(const QString &channelname); + void ircChannelAdded(IrcChannel *); + + void ircUserRemoved(const QString &nick); + + // needed for client sync progress + void ircUserRemoved(QObject *); + void ircChannelRemoved(QObject *); + + void ircUserInitDone(IrcUser *); + void ircChannelInitDone(IrcChannel *); + + void connectRequested(NetworkId id = 0) const; + void disconnectRequested(NetworkId id = 0) const; + private: - uint _networkId; - bool _initialized; - + NetworkId _networkId; + IdentityId _identity; + QString _myNick; QString _networkName; QString _currentServer; + bool _connected; + ConnectionState _connectionState; QString _prefixes; QString _prefixModes; @@ -163,9 +221,10 @@ private: QHash _ircChannels; // stores all known channels QHash _supports; // stores results from RPL_ISUPPORT + QVariantList _serverList; + QStringList _perform; //QVariantMap networkSettings; - //QVariantMap identity; - + QPointer _proxy; void determinePrefixes(); @@ -174,4 +233,38 @@ private: }; +//! Stores all editable information about a network (as opposed to runtime state). +struct NetworkInfo { + NetworkId networkId; + QString networkName; + IdentityId identity; + + bool useCustomEncodings; + QByteArray codecForEncoding; + QByteArray codecForDecoding; + + // Server entry: QString "Host", uint "Port", QString "Password", bool "UseSSL" + QVariantList serverList; + bool useRandomServer; + + QStringList perform; + + bool useAutoIdentify; + QString autoIdentifyService; + QString autoIdentifyPassword; + + bool useAutoReconnect; + quint32 autoReconnectInterval; + qint16 autoReconnectRetries; // -1 => Unlimited + bool rejoinChannels; + + bool operator==(const NetworkInfo &other) const; + bool operator!=(const NetworkInfo &other) const; +}; + +QDataStream &operator<<(QDataStream &out, const NetworkInfo &info); +QDataStream &operator>>(QDataStream &in, NetworkInfo &info); + +Q_DECLARE_METATYPE(NetworkInfo); + #endif