projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bring back highlights
[quassel.git]
/
src
/
client
/
client.cpp
diff --git
a/src/client/client.cpp
b/src/client/client.cpp
index
e532df8
..
110c8ff
100644
(file)
--- a/
src/client/client.cpp
+++ b/
src/client/client.cpp
@@
-321,7
+321,7
@@
void Client::setSyncedToCore() {
// create a new BufferViewManager
_bufferViewManager = new BufferViewManager(signalProxy(), this);
// create a new BufferViewManager
_bufferViewManager = new BufferViewManager(signalProxy(), this);
-
+
_syncedToCore = true;
emit connected();
emit coreConnectionStateChanged(true);
_syncedToCore = true;
emit connected();
emit coreConnectionStateChanged(true);
@@
-335,7
+335,7
@@
void Client::disconnectFromCore() {
if(!isConnected())
return;
_connectedToCore = false;
if(!isConnected())
return;
_connectedToCore = false;
-
+
if(socket) {
socket->close();
socket->deleteLater();
if(socket) {
socket->close();
socket->deleteLater();
@@
-437,8
+437,9
@@
void Client::networkDestroyed() {
}
}
}
}
-void Client::recvMessage(const Message &msg) {
- //checkForHighlight(msg);
+void Client::recvMessage(const Message &msg_) {
+ Message msg = msg_;
+ checkForHighlight(msg);
_messageModel->insertMessage(msg);
}
_messageModel->insertMessage(msg);
}
@@
-447,10
+448,13
@@
void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) {
}
void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) {
}
void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) {
- //
checkForHighlight(msg
);
+ //
QTime start = QTime::currentTime(
);
foreach(QVariant v, msgs) {
foreach(QVariant v, msgs) {
- _messageModel->insertMessage(v.value<Message>());
+ Message msg = v.value<Message>();
+ checkForHighlight(msg);
+ _messageModel->insertMessage(msg);
}
}
+ //qDebug() << "processed" << msgs.count() << "backlog lines in" << start.msecsTo(QTime::currentTime());
}
void Client::layoutMsg() {
}
void Client::layoutMsg() {
@@
-458,7
+462,7
@@
void Client::layoutMsg() {
layoutTimer->stop();
return;
}
layoutTimer->stop();
return;
}
-
+
Buffer *buffer = layoutQueue.takeFirst();
if(buffer->layoutMsg()) {
layoutQueue.append(buffer); // Buffer has more messages in its queue --> Round Robin
Buffer *buffer = layoutQueue.takeFirst();
if(buffer->layoutMsg()) {
layoutQueue.append(buffer); // Buffer has more messages in its queue --> Round Robin
@@
-473,7
+477,11
@@
AbstractUiMsg *Client::layoutMsg(const Message &msg) {
return instance()->mainUi->layoutMsg(msg);
}
return instance()->mainUi->layoutMsg(msg);
}
+// TODO optimize checkForHighlight
void Client::checkForHighlight(Message &msg) {
void Client::checkForHighlight(Message &msg) {
+ if(!((msg.type() & (Message::Plain | Message::Notice | Message::Action)) && !(msg.flags() & Message::Self)))
+ return;
+
NotificationSettings notificationSettings;
const Network *net = network(msg.bufferInfo().networkId());
if(net && !net->myNick().isEmpty()) {
NotificationSettings notificationSettings;
const Network *net = network(msg.bufferInfo().networkId());
if(net && !net->myNick().isEmpty()) {
@@
-487,9
+495,7
@@
void Client::checkForHighlight(Message &msg) {
}
foreach(QString nickname, nickList) {
QRegExp nickRegExp("^(.*\\W)?" + QRegExp::escape(nickname) + "(\\W.*)?$");
}
foreach(QString nickname, nickList) {
QRegExp nickRegExp("^(.*\\W)?" + QRegExp::escape(nickname) + "(\\W.*)?$");
- if((msg.type() & (Message::Plain | Message::Notice | Message::Action))
- && !(msg.flags() & Message::Self)
- && nickRegExp.exactMatch(msg.contents())) {
+ if(nickRegExp.exactMatch(msg.contents())) {
msg.setFlags(msg.flags() | Message::Highlight);
return;
}
msg.setFlags(msg.flags() | Message::Highlight);
return;
}
@@
-507,9
+513,7
@@
void Client::checkForHighlight(Message &msg) {
} else {
userRegExp = QRegExp("^(.*\\W)?" + QRegExp::escape(name) + "(\\W.*)?$", caseSensitivity);
}
} else {
userRegExp = QRegExp("^(.*\\W)?" + QRegExp::escape(name) + "(\\W.*)?$", caseSensitivity);
}
- if((msg.type() & (Message::Plain | Message::Notice | Message::Action))
- && !(msg.flags() & Message::Self)
- && userRegExp.exactMatch(msg.contents())) {
+ if(userRegExp.exactMatch(msg.contents())) {
msg.setFlags(msg.flags() | Message::Highlight);
return;
}
msg.setFlags(msg.flags() | Message::Highlight);
return;
}