projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reworking handling of Prepared Queries in PostgreSQL
[quassel.git]
/
src
/
core
/
coresession.cpp
diff --git
a/src/core/coresession.cpp
b/src/core/coresession.cpp
index
8d2c877
..
0173a95
100644
(file)
--- a/
src/core/coresession.cpp
+++ b/
src/core/coresession.cpp
@@
-34,6
+34,7
@@
#include "corenetworkconfig.h"
#include "coresessioneventprocessor.h"
#include "coreusersettings.h"
#include "corenetworkconfig.h"
#include "coresessioneventprocessor.h"
#include "coreusersettings.h"
+#include "ctcpparser.h"
#include "eventmanager.h"
#include "eventstringifier.h"
#include "ircchannel.h"
#include "eventmanager.h"
#include "eventstringifier.h"
#include "ircchannel.h"
@@
-63,10
+64,10
@@
CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
_coreInfo(this),
_eventManager(new EventManager(this)),
_eventStringifier(new EventStringifier(this)),
_coreInfo(this),
_eventManager(new EventManager(this)),
_eventStringifier(new EventStringifier(this)),
- _eventProcessor(new CoreSessionEventProcessor(this)),
+ _sessionEventProcessor(new CoreSessionEventProcessor(this)),
+ _ctcpParser(new CtcpParser(this)),
_ircParser(new IrcParser(this)),
scriptEngine(new QScriptEngine(this)),
_ircParser(new IrcParser(this)),
scriptEngine(new QScriptEngine(this)),
- _processMessages(false),
_ignoreListManager(this)
{
SignalProxy *p = signalProxy();
_ignoreListManager(this)
{
SignalProxy *p = signalProxy();
@@
-95,11
+96,15
@@
CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
loadSettings();
initScriptEngine();
loadSettings();
initScriptEngine();
+ connect(eventManager(), SIGNAL(eventQueueEmptied()), SLOT(processMessages()));
eventManager()->registerObject(ircParser(), EventManager::NormalPriority);
eventManager()->registerObject(ircParser(), EventManager::NormalPriority);
- eventManager()->registerObject(
eventStringifier(), EventManager::HighPriority, "earlyProcess"); // some need to be sent before statechange
- eventManager()->registerObject(
eventProcessor(), EventManager::HighPriority); // needs to process events *before* the stringifier!
+ eventManager()->registerObject(
sessionEventProcessor(), EventManager::HighPriority); // needs to process events *before* the stringifier!
+ eventManager()->registerObject(
ctcpParser(), EventManager::NormalPriority);
eventManager()->registerObject(eventStringifier(), EventManager::NormalPriority);
eventManager()->registerObject(this, EventManager::LowPriority); // for sending MessageEvents to the client
eventManager()->registerObject(eventStringifier(), EventManager::NormalPriority);
eventManager()->registerObject(this, EventManager::LowPriority); // for sending MessageEvents to the client
+ // some events need to be handled after msg generation
+ eventManager()->registerObject(sessionEventProcessor(), EventManager::LowPriority, "lateProcess");
+ eventManager()->registerObject(ctcpParser(), EventManager::LowPriority, "send");
// periodically save our session state
connect(&(Core::instance()->syncTimer()), SIGNAL(timeout()), this, SLOT(saveSessionState()));
// periodically save our session state
connect(&(Core::instance()->syncTimer()), SIGNAL(timeout()), this, SLOT(saveSessionState()));
@@
-218,6
+223,9
@@
void CoreSession::msgFromClient(BufferInfo bufinfo, QString msg) {
CoreNetwork *net = network(bufinfo.networkId());
if(net) {
net->userInput(bufinfo, msg);
CoreNetwork *net = network(bufinfo.networkId());
if(net) {
net->userInput(bufinfo, msg);
+ // FIXME as soon as user input is event-based
+ // until then, user input doesn't trigger a message queue flush!
+ processMessages();
} else {
qWarning() << "Trying to send to unconnected network:" << msg;
}
} else {
qWarning() << "Trying to send to unconnected network:" << msg;
}
@@
-242,10
+250,6
@@
void CoreSession::recvMessageFromServer(NetworkId networkId, Message::Type type,
return;
_messageQueue << rawMsg;
return;
_messageQueue << rawMsg;
- if(!_processMessages) {
- _processMessages = true;
- QCoreApplication::postEvent(this, new ProcessMessagesEvent());
- }
}
void CoreSession::recvStatusMsgFromServer(QString msg) {
}
void CoreSession::recvStatusMsgFromServer(QString msg) {
@@
-266,15
+270,10
@@
QList<BufferInfo> CoreSession::buffers() const {
return Core::requestBuffers(user());
}
return Core::requestBuffers(user());
}
-void CoreSession::
customEvent(QEvent *event
) {
- if(
event->type() != QEvent::User
)
+void CoreSession::
processMessages(
) {
+ if(
_messageQueue.isEmpty()
)
return;
return;
- processMessages();
- event->accept();
-}
-
-void CoreSession::processMessages() {
if(_messageQueue.count() == 1) {
const RawMessage &rawMsg = _messageQueue.first();
bool createBuffer = !(rawMsg.flags & Message::Redirected);
if(_messageQueue.count() == 1) {
const RawMessage &rawMsg = _messageQueue.first();
bool createBuffer = !(rawMsg.flags & Message::Redirected);
@@
-330,7
+329,6
@@
void CoreSession::processMessages() {
emit displayMsg(messages[i]);
}
}
emit displayMsg(messages[i]);
}
}
- _processMessages = false;
_messageQueue.clear();
}
_messageQueue.clear();
}