Fleck's patch

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@658 17fca916-40b9-46aa-a4ea-0a15b648b75c

4 files changed, 24 insertions, 2 deletions

diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.cpp b/src/kvirc/kvs/kvi_kvs_eventtable.cpp
index b5d53efd0..11621f593 100644
--- a/src/kvirc/kvs/kvi_kvs_eventtable.cpp
+++ b/src/kvirc/kvs/kvi_kvs_eventtable.cpp
@@ -3124,6 +3124,24 @@ channel
 		@description:
 			Triggered when ircd sets a registered user mode.
 	*/
-	EVENT("OnNickServAuth","")
+        EVENT("OnNickServAuth",""),
+        /*
+                @doc: onmeaction
+                @type:
+                        event
+                @title:
+                        OnMeAction
+                @short:
+                        User issued a CTCP ACTION
+                @parameters:
+                        $0 = action message text
+                @window:
+                        Channels and query windows
+                @description:
+                        This event is triggered when user issues a CTCP ACTION.[br]
+                        (The CTCP ACTION is usually triggered by the /me command).[br]
+        */
+
+        EVENT("OnMeAction","$0 = action message text")
 };
 
diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.h b/src/kvirc/kvs/kvi_kvs_eventtable.h
index bf807bb63..05d1b0db5 100644
--- a/src/kvirc/kvs/kvi_kvs_eventtable.h
+++ b/src/kvirc/kvs/kvi_kvs_eventtable.h
@@ -203,7 +203,9 @@
 
 #define KviEvent_OnNickServAuth 138
 
-#define KVI_KVS_NUM_APP_EVENTS 139
+#define KviEvent_OnMeAction 139
+
+#define KVI_KVS_NUM_APP_EVENTS 140
 // compat
 #define KVI_NUM_SCRIPT_EVENTS KVI_KVS_NUM_APP_EVENTS
 
diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
index a18a12e39..430043292 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/kvi_channel.cpp
@@ -1117,6 +1117,7 @@ void KviChannel::ownAction(const QString &buffer)
 	const char * d = szData.data();
 	if(!d)return;
 	if(!connection()->sendFmtData("PRIVMSG %s :%cACTION %s%c",szName.data(),0x01,d,0x01))return;
+	if(KVS_TRIGGER_EVENT_1_HALTED(KviEvent_OnMeAction,this,QString(d)))return;
 	QString szBuffer = "\r!nc\r";
 	szBuffer += connection()->currentNickName();
 	szBuffer += "\r ";
diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp
index bfaf14147..24a361fbc 100644
--- a/src/kvirc/ui/kvi_query.cpp
+++ b/src/kvirc/ui/kvi_query.cpp
@@ -650,6 +650,7 @@ void KviQuery::ownAction(const QString &buffer)
 		if(sz.isEmpty())return;
 		if(!connection()->sendFmtData("PRIVMSG %s :%cACTION %s%c",
 			sz.data(),0x01,szBuffer.data(),0x01))return;
+		if(KVS_TRIGGER_EVENT_1_HALTED(KviEvent_OnMeAction,this,QString(szBuffer.data())))return;
 		output(KVI_OUT_ACTION,"\r!nc\r%Q\r %Q",&(connection()->currentNickName()),&buffer);
 		m_pUserListView->userAction(connection()->currentNickName(),KVI_USERACTION_ACTION);
 	}