#include "util.h"
QPointer<Client> Client::instanceptr = 0;
+AccountId Client::_currentCoreAccount = 0;
/*** Initialization/destruction ***/
}
void Client::init() {
-
+ _currentCoreAccount = 0;
_networkModel = new NetworkModel(this);
connect(this, SIGNAL(bufferUpdated(BufferInfo)),
_networkModel, SLOT(bufferUpdated(BufferInfo)));
+ connect(this, SIGNAL(networkRemoved(NetworkId)),
+ _networkModel, SLOT(networkRemoved(NetworkId)));
_bufferModel = new BufferModel(_networkModel);
/*** public static methods ***/
+AccountId Client::currentCoreAccount() {
+ return _currentCoreAccount;
+}
+
+void Client::setCurrentCoreAccount(AccountId id) {
+ _currentCoreAccount = id;
+}
+
QList<BufferInfo> Client::allBufferInfos() {
QList<BufferInfo> bufferids;
foreach(Buffer *buffer, buffers()) {
// FIXME remove
-Buffer *Client::buffer(BufferId bufferUid) {
- if(instance()->_buffers.contains(bufferUid))
- return instance()->_buffers[bufferUid];
+Buffer *Client::buffer(BufferId bufferId) {
+ if(instance()->_buffers.contains(bufferId))
+ return instance()->_buffers[bufferId];
else
return 0;
}
// FIXME remove
-Buffer *Client::buffer(BufferInfo id) {
- Buffer *buff = buffer(id.uid());
+Buffer *Client::buffer(BufferInfo bufferInfo) {
+ Buffer *buff = buffer(bufferInfo.bufferId());
if(!buff) {
Client *client = Client::instance();
- buff = new Buffer(id, client);
+ buff = new Buffer(bufferInfo, client);
connect(buff, SIGNAL(destroyed()),
client, SLOT(bufferDestroyed()));
- client->_buffers[id.uid()] = buff;
- emit client->bufferUpdated(id);
+ client->_buffers[bufferInfo.bufferId()] = buff;
+ emit client->bufferUpdated(bufferInfo);
}
Q_ASSERT(buff);
return buff;
/*** core connection stuff ***/
-void Client::setConnectedToCore(QIODevice *sock) {
+void Client::setConnectedToCore(QIODevice *sock, AccountId id) {
socket = sock;
signalProxy()->addPeer(socket);
_connectedToCore = true;
+ setCurrentCoreAccount(id);
}
void Client::setSyncedToCore() {
}
_connectedToCore = false;
_syncedToCore = false;
+ setCurrentCoreAccount(0);
emit disconnected();
emit coreConnectionStateChanged(false);
}
void Client::networkDestroyed() {
- // FIXME this is not gonna work, net is a QObject here already!
Network *net = static_cast<Network *>(sender());
- NetworkId networkId = net->networkId();
- if(_networks.contains(networkId))
- _networks.remove(networkId);
+ QHash<NetworkId, Network *>::iterator netIter = _networks.begin();
+ while(netIter != _networks.end()) {
+ if(*netIter == net) {
+ netIter = _networks.erase(netIter);
+ break;
+ } else {
+ netIter++;
+ }
+ }
}
-void Client::recvMessage(const Message &msg) {
- Buffer *b = buffer(msg.buffer());
+void Client::recvMessage(const Message &message) {
+ Message msg = message;
+ Buffer *b;
+
+ if(msg.type() == Message::Error) {
+ b = buffer(msg.bufferInfo().bufferId());
+ if(!b) {
+ // FIXME: if buffer doesn't exist, forward the message to the status or current buffer
+ b = buffer(msg.bufferInfo());
+ }
+ } else {
+ b = buffer(msg.bufferInfo());
+ }
+
+ checkForHighlight(msg);
b->appendMsg(msg);
networkModel()->updateBufferActivity(msg);
-
+
if(msg.type() == Message::Plain || msg.type() == Message::Notice || msg.type() == Message::Action) {
- QString sender = msg.buffer().network() + ":" + msg.buffer().buffer() + ":" + msg.sender();
- Message mmsg = Message(msg.timestamp(), msg.buffer(), msg.type(), msg.text(), sender, msg.flags());
+ const Network *net = network(msg.bufferInfo().networkId());
+ QString networkName = net != 0
+ ? net->networkName() + ":"
+ : QString();
+ QString sender = networkName + msg.bufferInfo().bufferName() + ":" + msg.sender();
+ Message mmsg = Message(msg.timestamp(), msg.bufferInfo(), msg.type(), msg.text(), sender, msg.flags());
monitorBuffer()->appendMsg(mmsg);
}
Buffer *b = buffer(id);
foreach(QVariant v, msgs) {
Message msg = v.value<Message>();
+ checkForHighlight(msg);
b->prependMsg(msg);
- // networkModel()->updateBufferActivity(msg);
+ networkModel()->updateBufferActivity(msg);
if(!layoutQueue.contains(b)) layoutQueue.append(b);
}
if(layoutQueue.count() && !layoutTimer->isActive()) layoutTimer->start();
return instance()->mainUi->layoutMsg(msg);
}
+void Client::checkForHighlight(Message &msg) const {
+ const Network *net = network(msg.bufferInfo().networkId());
+ if(net && !net->myNick().isEmpty()) {
+ QRegExp nickRegExp("^(.*\\W)?" + QRegExp::escape(net->myNick()) + "(\\W.*)?$");
+ if((msg.type() & (Message::Plain | Message::Notice | Message::Action)) && nickRegExp.exactMatch(msg.text()))
+ msg.setFlags(msg.flags() | Message::Highlight);
+ }
+}