Added ability to shift+tab choose from recent command history

Author: nickgammon

dialogs/CompleteWordDlg.cpp

@@ -27,6 +27,7 @@ CCompleteWordDlg::CCompleteWordDlg(CWnd* pParent /*=NULL*/)
 m_bLua = false;
 m_bFunctions = true;
 m_extraItems = NULL;
+m_commandHistoryItems = NULL;
 }
 
 
@@ -49,7 +50,7 @@ END_MESSAGE_MAP()
 // CCompleteWordDlg message handlers
 
 
-static const char * sNoMatches = "(no matches)";
+CString strNoMatches = "(no matches)";
 
 extern tInternalFunctionsTable InternalFunctionsTable [1];
 
@@ -58,6 +59,31 @@ void CCompleteWordDlg::ReloadList ()
 
   m_ctlFunctions.ResetContent ();
 
+  if (m_commandHistoryItems)
+    {
+    strNoMatches = "(no matching commands)";
+    if (m_commandHistoryItems->empty ())
+      {
+      m_ctlFunctions.AddString (strNoMatches);
+      m_ctlFunctions.EnableWindow (FALSE);
+      return;
+      }
+
+    string sLastOne;
+
+    for (vector<string>::const_iterator it = m_commandHistoryItems->begin ();
+         it != m_commandHistoryItems->end ();
+         it++)
+           {
+            m_ctlFunctions.AddString  (it->c_str ());
+            sLastOne = *it;
+           }
+
+//    m_ctlFunctions.SelectString (-1, sLastOne.c_str ());
+
+    return;
+    }
+
   m_strFilter.MakeLower ();
   m_strFilter.TrimLeft ();
   m_strFilter.TrimRight ();
@@ -156,7 +182,7 @@ void CCompleteWordDlg::ReloadList ()
 
   if (iCount == 0)
     {
-    m_ctlFunctions.AddString (sNoMatches);
+    m_ctlFunctions.AddString (strNoMatches);
     m_ctlFunctions.EnableWindow (FALSE);
     }
 
@@ -193,7 +219,7 @@ void CCompleteWordDlg::OnOK()
     m_ctlFunctions.GetText (iWhich, m_strResult);
 
   // can't return our "no matches" string
-  if (m_strResult == sNoMatches)
+  if (m_strResult == strNoMatches)
     m_strResult.Empty ();
   else
     {

dialogs/CompleteWordDlg.h

@@ -31,6 +31,7 @@ class CCompleteWordDlg : public CDialog
   bool m_bLua;
   bool m_bFunctions;
   set<string> * m_extraItems;
+  vector<string> * m_commandHistoryItems;
 
 // Overrides
 	// ClassWizard generated virtual function overrides

sendvw.cpp

@@ -23,6 +23,7 @@
 #include "ActivityView.h"
 
 #include "dialogs\cmdhist.h"
+#include "dialogs\CompleteWordDlg.h"
 
 #include "ActivityDoc.h"
 
@@ -2727,12 +2728,64 @@ void CSendView::OnCompleteFunction()
 	CMUSHclientDoc* pDoc = GetDocument();
 	ASSERT_VALID(pDoc);
 
-  bool bLua = false;
-  
-  if (pDoc->GetScriptEngine () && pDoc->GetScriptEngine ()->L)
-    bLua = true;
+	CString strText;
+  GetEditCtrl().GetWindowText(strText);
+
+  // if line starts with scripting prefix, do a function-completion
+  if (pDoc->m_bEnableScripts &&            // providing scripting active
+      !pDoc->m_strScriptPrefix.IsEmpty () &&    // and we *have* a script prefix
+      strText.Left (pDoc->m_strScriptPrefix.GetLength ()) == pDoc->m_strScriptPrefix  // and it matches
+     )
+    {
+    bool bLua = false;
+
+    if (pDoc->GetScriptEngine () && pDoc->GetScriptEngine ()->L)
+      bLua = true;
+
+    FunctionMenu (GetEditCtrl(), bLua, &pDoc->m_ExtraShiftTabCompleteItems, pDoc->m_bTabCompleteFunctions);
+    return;
+    }
+
+  // otherwise look up old command in command history
+
+  vector<string> vWantedHistory;
+
+   // top
+
+  strText.MakeUpper ();
+
+  for (POSITION pos = m_msgList.GetHeadPosition (); pos; )
+    {
+    CString strLine = m_msgList.GetNext (pos);
+    // add providing matches start of what they typed
+    if (strText.IsEmpty () || strLine.Left (strText.GetLength ()).CompareNoCase (strText) == 0)
+      vWantedHistory.push_back ((LPCTSTR) strLine);
+    }
+
+
+  CCompleteWordDlg dlg;
+
+  int nStartChar,
+      nEndChar;
+
+  // find the selection range
+  GetEditCtrl().GetSel(nStartChar, nEndChar);
+
+  dlg.m_bFunctions = false;
+  dlg.m_commandHistoryItems = &vWantedHistory;
+  dlg.m_pt = GetEditCtrl().PosFromChar (nEndChar - 1);  // strangely doesn't work at end of line
+
+  dlg.m_pt.x += 10;  // small gap
+  dlg.m_pt.y += 10;  // small adjustment lalala
+
+  GetEditCtrl().ClientToScreen(&dlg.m_pt);
+
+  if (dlg.DoModal () == IDCANCEL || dlg.m_strResult.IsEmpty ())
+    return;
+
+  GetEditCtrl().SetSel (0, -1);   // select all
+  GetEditCtrl().ReplaceSel (dlg.m_strResult, TRUE);
 
-  FunctionMenu (GetEditCtrl(), bLua, &pDoc->m_ExtraShiftTabCompleteItems, pDoc->m_bTabCompleteFunctions);
 }
 
 void CSendView::OnUpdateCompleteFunction(CCmdUI* pCmdUI)