Allow %N for the name of the trigger/alias in send box

Author: nickgammon

doc.h

@@ -1671,7 +1671,8 @@ class CMUSHclientDoc : public CDocument
                             const bool bExpandWildcards,
                             const bool bFixRegexps, // convert \ to \\ for instance
                             const bool bIsRegexp,   // true = regexp trigger
-                            const bool bThrowExceptions);   // throw exception on error
+                            const bool bThrowExceptions,   // throw exception on error
+                            const char * sName);           // the name of the trigger/timer/alias (for %N)
 
 #ifdef PANE
 

evaluate.cpp

@@ -338,7 +338,8 @@ int iCount = GetTriggerArray ().GetSize ();    // how many there are
                                         false,    // expand wildcards
                                         true,     // convert regexps
                                         trigger_item->bRegexp,  // is it regexp or normal?
-                                        false);   // don't throw exceptions
+                                        false,         // don't throw exceptions
+                                        NULL);    // no name substitution in match text
 
 
         LONGLONG iOldTimeTaken = 0;
@@ -420,6 +421,11 @@ int iCount = GetTriggerArray ().GetSize ();    // how many there are
 
 // copy contents to output area, replacing %1, %2 etc. with appropriate contents
 
+    // get unlabelled trigger's internal name
+    const char * pLabel = trigger_item->strLabel;
+    if (pLabel [0] == 0)
+       pLabel = GetTriggerRevMap () [trigger_item].c_str ();
+
     output += FixSendText (::FixupEscapeSequences (trigger_item->contents), 
                             trigger_item->iSendTo,    // where it is going
                             trigger_item->regexp,     // regexp
@@ -429,7 +435,8 @@ int iCount = GetTriggerArray ().GetSize ();    // how many there are
                             true,      // expand wildcards
                             false,     // convert regexps
                             false,     // is it regexp or normal?
-                            false);    // don't throw exceptions
+                            false,         // don't throw exceptions
+                            pLabel);   
 
     break;   // break out of loop, we have a trigger match
 
@@ -846,6 +853,11 @@ bool CMUSHclientDoc::ProcessOneAliasSequence (const CString strCurrentLine,
     else
       Trace ("Matched alias %s", (LPCTSTR) alias_item->strLabel);
 
+    // get unlabelled alias's internal name
+    const char * pLabel = alias_item->strLabel;
+    if (pLabel [0] == 0)
+       pLabel = GetAliasRevMap () [alias_item].c_str ();
+
     // if we have to do parameter substitution on the alias, do it now
 
     CString strSendText;
@@ -863,7 +875,8 @@ bool CMUSHclientDoc::ProcessOneAliasSequence (const CString strCurrentLine,
                               true,      // expand wildcards
                               false,     // convert regexps
                               false,     // is it regexp or normal?
-                              true);     // throw exceptions
+                              true,         // throw exceptions
+                              pLabel);   
       }
 	  catch (CException* e)
 	    {
@@ -1022,6 +1035,7 @@ bool CMUSHclientDoc::ExecuteAliasScript (CAlias * alias_item,
 //      %<22> :  contents of wildcard 22
 //      %% :     %
 //      %C :     contents of (text) clipboard
+//      %N :     name of trigger / timer / alias
 
 // If bThrowExceptions is set certain conditions (such as variable not existing)
 // cause an exception to be thrown (eg. for alias handling), 
@@ -1037,7 +1051,8 @@ CString CMUSHclientDoc::FixSendText (const CString strSource,
                                      const bool bExpandWildcards,   // convert %x
                                      const bool bFixRegexps, // convert \ to \\ for instance
                                      const bool bIsRegexp,   // true = regexp trigger
-                                     const bool bThrowExceptions)
+                                     const bool bThrowExceptions,   // throw exception on error
+                                     const char * sName)            // the name of the trigger/timer/alias (for %N)
   {
 CString strOutput;   // result of expansion
 
@@ -1324,6 +1339,26 @@ const char * pText,
              }
              break; // end of %c
 
+/* -------------------------------------------------------------------- *
+ *  %N - name of the thing                                              *
+ * -------------------------------------------------------------------- */
+
+           case 'N':
+           case 'n':
+             {
+            // copy up to the percent sign
+              strOutput += CString (pStartOfGroup, pText - pStartOfGroup);
+
+              if (sName)
+                strOutput += sName;
+
+        // get ready for next batch from beyond the 'n'
+
+              pText += 2;
+              pStartOfGroup = pText;
+             }
+             break; // end of %n
+
 /* -------------------------------------------------------------------- *
  *  %(something else)                                                   *
  * -------------------------------------------------------------------- */