aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp4
-rw-r--r--src/kvirc/ui/kvi_channel.cpp24
-rw-r--r--src/kvirc/ui/kvi_channel.h3
-rw-r--r--src/kvirc/ui/kvi_query.cpp26
-rw-r--r--src/kvirc/ui/kvi_query.h3
-rw-r--r--src/kvirc/ui/kvi_window.h2
-rw-r--r--src/modules/dcc/canvas.cpp10
-rw-r--r--src/modules/dcc/canvas.h2
-rw-r--r--src/modules/dcc/chat.cpp36
-rw-r--r--src/modules/dcc/chat.h2
-rw-r--r--src/modules/dcc/video.cpp36
-rw-r--r--src/modules/dcc/video.h2
12 files changed, 90 insertions, 60 deletions
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
index 07b4ab5f9..49aeb760e 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
@@ -950,8 +950,8 @@ namespace KviKvsCoreSimpleCommands
KviWindow * w = KVSCSC_pConnection->findChannel(szTarget);
if(!w)w = KVSCSC_pConnection->findQuery(szTarget);
- if(!KVSCSC_pSwitches->find('q',"quiet") && w)
- w->ownMessage(szText);
+ if(w)
+ w->ownMessage(szText, !KVSCSC_pSwitches->find('q',"quiet"));
else {
QByteArray szT = KVSCSC_pConnection->encodeText(szTarget);
QByteArray szD = w ? w->encodeText(szText) : KVSCSC_pConnection->encodeText(szText);
diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
index 771f0b0d0..12adee1b3 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/kvi_channel.cpp
@@ -1086,7 +1086,7 @@ void KviChannel::fillCaptionBuffers()
m_szPlainTextCaption += szNickOnServer;
}
-void KviChannel::ownMessage(const QString & szBuffer)
+void KviChannel::ownMessage(const QString & szBuffer, bool bUserFeedback)
{
if(!connection())
return;
@@ -1130,17 +1130,21 @@ void KviChannel::ownMessage(const QString & szBuffer)
case KviCryptEngine::Encrypted:
if(!connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),encrypted.ptr()))
return;
- m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
- QString(),QString(),QString(),szBuffer,KviConsole::NoNotifications);
+ if(bUserFeedback)
+ m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
+ QString(),QString(),QString(),szBuffer,KviConsole::NoNotifications);
break;
case KviCryptEngine::Encoded:
{
if(!connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),encrypted.ptr()))
return;
- // ugly ,but we must redecode here
- QString szRedecoded = decodeText(encrypted.ptr());
- m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
- QString(),QString(),QString(),szRedecoded,KviConsole::NoNotifications);
+ if(bUserFeedback)
+ {
+ // ugly ,but we must redecode here
+ QString szRedecoded = decodeText(encrypted.ptr());
+ m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
+ QString(),QString(),QString(),szRedecoded,KviConsole::NoNotifications);
+ }
}
break;
default: // also case KviCryptEngine::EncryptError
@@ -1232,7 +1236,8 @@ void KviChannel::ownMessage(const QString & szBuffer)
if(connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),szTmp.data()))
{
//feeedback the user
- m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString(),QString(),QString(),szCurSubString,KviConsole::NoNotifications);
+ if(bUserFeedback)
+ m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString(),QString(),QString(),szCurSubString,KviConsole::NoNotifications);
userAction(connection()->currentNickName(),KVI_USERACTION_PRIVMSG);
} else {
// skipped a part in this multi message.. we don't want to continue
@@ -1247,7 +1252,8 @@ void KviChannel::ownMessage(const QString & szBuffer)
} else {
if(connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),d))
{
- m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString(),QString(),QString(),szTmpBuffer,KviConsole::NoNotifications);
+ if(bUserFeedback)
+ m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString(),QString(),QString(),szTmpBuffer,KviConsole::NoNotifications);
userAction(connection()->currentNickName(),KVI_USERACTION_PRIVMSG);
}
}
diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h
index 88a37615e..8434b85ed 100644
--- a/src/kvirc/ui/kvi_channel.h
+++ b/src/kvirc/ui/kvi_channel.h
@@ -889,9 +889,10 @@ public:
/**
* \brief Called when we send a message
* \param szBuffer The buffer :)
+ * \param bUserFeedback Whether to display the echo feedback to the user
* \return void
*/
- void ownMessage(const QString & szBuffer);
+ void ownMessage(const QString & szBuffer, bool bUserFeedback = true);
/**
* \brief Called when we perform an action
diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp
index 90d9d664d..95ce3f8d9 100644
--- a/src/kvirc/ui/kvi_query.cpp
+++ b/src/kvirc/ui/kvi_query.cpp
@@ -546,7 +546,7 @@ QSize KviQuery::sizeHint() const
return ret;
}
-void KviQuery::ownMessage(const QString & szBuffer)
+void KviQuery::ownMessage(const QString & szBuffer, bool bUserFeedback)
{
if(!connection())
{
@@ -593,19 +593,21 @@ void KviQuery::ownMessage(const QString & szBuffer)
case KviCryptEngine::Encrypted:
if(!connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),encrypted.ptr()))
return;
-
- m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
- QString(),QString(),QString(),szBuffer,KviConsole::NoNotifications);
+ if(bUserFeedback)
+ m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
+ QString(),QString(),QString(),szBuffer,KviConsole::NoNotifications);
break;
case KviCryptEngine::Encoded:
{
if(!connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),encrypted.ptr()))
return;
-
- // ugly ,but we must redecode here
- QString szRedecoded = decodeText(encrypted.ptr());
- m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
- QString(),QString(),QString(),szRedecoded,KviConsole::NoNotifications);
+ if(bUserFeedback)
+ {
+ // ugly ,but we must redecode here
+ QString szRedecoded = decodeText(encrypted.ptr());
+ m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
+ QString(),QString(),QString(),szRedecoded,KviConsole::NoNotifications);
+ }
}
break;
default: // also case KviCryptEngine::EncryptError
@@ -699,7 +701,8 @@ void KviQuery::ownMessage(const QString & szBuffer)
if(connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),szTmp.data()))
{
//feeedback the user
- m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString(),QString(),QString(),szCurSubString,KviConsole::NoNotifications);
+ if(bUserFeedback)
+ m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString(),QString(),QString(),szCurSubString,KviConsole::NoNotifications);
userAction(connection()->currentNickName(),KVI_USERACTION_PRIVMSG);
} else {
// skipped a part in this multi message.. we don't want to continue
@@ -714,7 +717,8 @@ void KviQuery::ownMessage(const QString & szBuffer)
} else {
if(connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),d))
{
- m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString(),QString(),QString(),szTmpBuffer,KviConsole::NoNotifications);
+ if(bUserFeedback)
+ m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString(),QString(),QString(),szTmpBuffer,KviConsole::NoNotifications);
userAction(connection()->currentNickName(),KVI_USERACTION_PRIVMSG);
}
}
diff --git a/src/kvirc/ui/kvi_query.h b/src/kvirc/ui/kvi_query.h
index 4f0eeb00d..75f3cf97e 100644
--- a/src/kvirc/ui/kvi_query.h
+++ b/src/kvirc/ui/kvi_query.h
@@ -163,9 +163,10 @@ public:
/**
* \brief Called when we send a message to the query target
* \param szBuffer The buffer where to store the data
+ * \param bUserFeedback Whether to display the echo feedback to the user
* \return void
*/
- void ownMessage(const QString & szBuffer);
+ void ownMessage(const QString & szBuffer, bool bUserFeedback = true);
/**
* \brief Called when we perform an action
diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h
index 1ed5392da..209565046 100644
--- a/src/kvirc/ui/kvi_window.h
+++ b/src/kvirc/ui/kvi_window.h
@@ -272,7 +272,7 @@ public:
virtual void updateCaption();
virtual void applyOptions();
virtual void updateIcon();
- virtual void ownMessage(const QString &){};
+ virtual void ownMessage(const QString &, bool = true){};
virtual void ownAction(const QString &){};
virtual const QString & plainTextCaption(){ return m_szPlainTextCaption; };
virtual void setFocus();
diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp
index 4038e969e..2d66a98a0 100644
--- a/src/modules/dcc/canvas.cpp
+++ b/src/modules/dcc/canvas.cpp
@@ -156,13 +156,15 @@
buffer.sprintf("%s_%s_%s",m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data());
}
- void KviDccCanvas::ownMessage(const char * text)
+ void KviDccCanvas::ownMessage(const char * text, bool bUserFeedback)
{
KviStr buf(KviStr::Format,"%s\r\n",text);
// m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
- m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
- m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
- m_pDescriptor->szLocalHost.toUtf8().data(),text);
+
+ if(bUserFeedback)
+ m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
+ m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
+ m_pDescriptor->szLocalHost.toUtf8().data(),text);
}
void KviDccCanvas::ownAction(const char * text)
diff --git a/src/modules/dcc/canvas.h b/src/modules/dcc/canvas.h
index 3853a33c2..6447fbac9 100644
--- a/src/modules/dcc/canvas.h
+++ b/src/modules/dcc/canvas.h
@@ -58,7 +58,7 @@
virtual void resizeEvent(QResizeEvent *e);
virtual QSize sizeHint() const;
virtual bool event(QEvent *e);
- virtual void ownMessage(const char *text);
+ virtual void ownMessage(const char *text, bool bUserFeedback = true);
virtual void ownAction(const char *text);
protected slots:
void handleMarshalError(int err);
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 7c8c09fee..bf78c5857 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -290,7 +290,7 @@ void KviDccChat::getBaseLogFileName(QString &buffer)
buffer.sprintf("%s_%s_%s",m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data());
}
-void KviDccChat::ownMessage(const QString &text)
+void KviDccChat::ownMessage(const QString &text, bool bUserFeedback)
{
if(!m_pSlaveThread)
{
@@ -317,19 +317,23 @@ void KviDccChat::ownMessage(const QString &text)
{
KviStr buf(KviStr::Format,"%s\r\n",encrypted.ptr());
m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
- m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
- m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
- m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications);
+ if(bUserFeedback)
+ m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
+ m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
+ m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications);
}
break;
case KviCryptEngine::Encoded:
{
KviStr buf(KviStr::Format,"%s\r\n",encrypted.ptr());
m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
- QString encr = decodeText(encrypted.ptr());
- m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
- m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
- m_pDescriptor->szLocalHost.toUtf8().data(),encr,KviConsole::NoNotifications);
+ if(bUserFeedback)
+ {
+ QString encr = decodeText(encrypted.ptr());
+ m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
+ m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
+ m_pDescriptor->szLocalHost.toUtf8().data(),encr,KviConsole::NoNotifications);
+ }
}
break;
default: // also case KviCryptEngine::EncryptError
@@ -347,9 +351,11 @@ void KviDccChat::ownMessage(const QString &text)
KviStr buf(KviStr::Format,"%s\r\n",d);
QString tmp = text.right(text.length() - 1);
m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
- m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
- m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
- m_pDescriptor->szLocalHost.toUtf8().data(),tmp,KviConsole::NoNotifications);
+
+ if(bUserFeedback)
+ m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
+ m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
+ m_pDescriptor->szLocalHost.toUtf8().data(),tmp,KviConsole::NoNotifications);
return;
}
}
@@ -357,9 +363,11 @@ void KviDccChat::ownMessage(const QString &text)
#endif
KviStr buf(KviStr::Format,"%s\r\n",d);
m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
- m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
- m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
- m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications);
+
+ if(bUserFeedback)
+ m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
+ m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
+ m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications);
}
const QString & KviDccChat::localNick()
diff --git a/src/modules/dcc/chat.h b/src/modules/dcc/chat.h
index 930a7e81e..e4050e6cd 100644
--- a/src/modules/dcc/chat.h
+++ b/src/modules/dcc/chat.h
@@ -87,7 +87,7 @@ protected:
virtual QSize sizeHint() const;
virtual const QString & localNick();
virtual bool event(QEvent *e);
- virtual void ownMessage(const QString &text);
+ virtual void ownMessage(const QString &text, bool bUserFeedback = true);
virtual void ownAction(const QString &text);
virtual void triggerCreationEvents();
virtual void triggerDestructionEvents();
diff --git a/src/modules/dcc/video.cpp b/src/modules/dcc/video.cpp
index 7d6bd6833..131ce71dc 100644
--- a/src/modules/dcc/video.cpp
+++ b/src/modules/dcc/video.cpp
@@ -636,7 +636,7 @@ QPixmap * KviDccVideo::myIconPtr()
return g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCVOICE);
}
-void KviDccVideo::ownMessage(const QString &text)
+void KviDccVideo::ownMessage(const QString &text, bool bUserFeedback)
{
if(!m_pSlaveThread)
{
@@ -663,19 +663,23 @@ void KviDccVideo::ownMessage(const QString &text)
{
KviStr buf(KviStr::Format,"%s\r\n",encrypted.ptr());
m_tmpTextDataOut.append(buf.ptr(), buf.len());
- m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
- m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
- m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications);
+ if(bUserFeedback)
+ m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
+ m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
+ m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications);
}
break;
case KviCryptEngine::Encoded:
{
KviStr buf(KviStr::Format,"%s\r\n",encrypted.ptr());
m_tmpTextDataOut.append(buf.ptr(), buf.len());
- QString encr = decodeText(encrypted.ptr());
- m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
- m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
- m_pDescriptor->szLocalHost.toUtf8().data(),encr,KviConsole::NoNotifications);
+ if(bUserFeedback)
+ {
+ QString encr = decodeText(encrypted.ptr());
+ m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
+ m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
+ m_pDescriptor->szLocalHost.toUtf8().data(),encr,KviConsole::NoNotifications);
+ }
}
break;
default: // also case KviCryptEngine::EncryptError
@@ -693,9 +697,11 @@ void KviDccVideo::ownMessage(const QString &text)
KviStr buf(KviStr::Format,"%s\r\n",d);
QString tmp = text.right(text.length() - 1);
m_tmpTextDataOut.append(buf.ptr(), buf.len());
- m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
- m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
- m_pDescriptor->szLocalHost.toUtf8().data(),tmp,KviConsole::NoNotifications);
+
+ if(bUserFeedback)
+ m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
+ m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
+ m_pDescriptor->szLocalHost.toUtf8().data(),tmp,KviConsole::NoNotifications);
return;
}
}
@@ -703,9 +709,11 @@ void KviDccVideo::ownMessage(const QString &text)
#endif
KviStr buf(KviStr::Format,"%s\r\n",d);
m_tmpTextDataOut.append(buf.ptr(), buf.len());
- m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
- m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
- m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications);
+
+ if(bUserFeedback)
+ m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
+ m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
+ m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications);
}
const QString & KviDccVideo::localNick()
diff --git a/src/modules/dcc/video.h b/src/modules/dcc/video.h
index f385ef8f0..311c38d50 100644
--- a/src/modules/dcc/video.h
+++ b/src/modules/dcc/video.h
@@ -134,7 +134,7 @@ protected:
void stopTalking();
void startConnection();
virtual const QString & localNick();
- virtual void ownMessage(const QString &text);
+ virtual void ownMessage(const QString &text, bool bUserFeedback = true);
virtual void ownAction(const QString &text);
protected slots:
void handleMarshalError(int err);
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 06:24:59 +0000