Improved Ctrl+Tab completion

nickgammon · Aug 10, 2010 · 1d4b17d · 1d4b17d · nickgammon · Aug 10, 2010
1 parent a3cbe39
commit 1d4b17d
Show file tree

Hide file tree

Showing 7 changed files with 520 additions and 448 deletions.
diff --git a/dialogs/CompleteWordDlg.cpp b/dialogs/CompleteWordDlg.cpp
@@ -51,7 +51,7 @@ END_MESSAGE_MAP()
 
 static const char * sNoMatches = "(no matches)";
 
-extern const char * sFunctions [1];
+extern tInternalFunctionsTable InternalFunctionsTable [1];
 
 void CCompleteWordDlg::ReloadList ()
   {
@@ -72,15 +72,15 @@ void CCompleteWordDlg::ReloadList ()
 
   if (m_bFunctions)
     {
-    for (int i = 0; sFunctions [i] [0]; i++)
+    for (int i = 0; InternalFunctionsTable [i].sFunction [0]; i++)
       {
-      strFunction = sFunctions [i];
+      strFunction = InternalFunctionsTable [i].sFunction;
       strFunction.MakeLower ();
       strFunction = strFunction.Left (iFilterLength);
 
       if (m_strFilter == strFunction)
         {
-        m_ctlFunctions.AddString  (sFunctions [i]);
+        m_ctlFunctions.AddString  (InternalFunctionsTable [i].sFunction);
         iCount++;
         }
 
@@ -192,6 +192,17 @@ void CCompleteWordDlg::OnOK()
   // can't return our "no matches" string
   if (m_strResult == sNoMatches)
     m_strResult.Empty ();
+  else
+    {
+    for (int i = 0; InternalFunctionsTable [i].sFunction [0]; i++)
+      {
+      if (m_strResult == InternalFunctionsTable [i].sFunction)
+        {
+        m_strArgs = InternalFunctionsTable [i].sArgs;
+        break;
+        } // end if function found
+      }  // end for
+    }  // not "no matches"
 
 	CDialog::OnOK();
 }
diff --git a/dialogs/CompleteWordDlg.h b/dialogs/CompleteWordDlg.h
@@ -25,6 +25,7 @@ class CCompleteWordDlg : public CDialog
   const char * m_sFunctionsPtr;
   int m_nFunctions;
   CString m_strResult;
+  CString m_strArgs;
 	CString	m_strFilter;
   CPoint m_pt;  // where to put it
 

diff --git a/dialogs/FunctionListDlg.cpp b/dialogs/FunctionListDlg.cpp
@@ -51,7 +51,7 @@ BEGIN_MESSAGE_MAP(CFunctionListDlg, CDialog)
 
 END_MESSAGE_MAP()
 
-extern const char * sFunctions [1];
+extern tInternalFunctionsTable InternalFunctionsTable [1];
 
 BOOL CFunctionListDlg::ReloadList ()
   {
@@ -69,14 +69,14 @@ BOOL CFunctionListDlg::ReloadList ()
 
   int nItem = 0;
 
-  for (int i = 0; sFunctions [i] [0]; i++)
+  for (int i = 0; InternalFunctionsTable [i].sFunction [0]; i++)
     {
-    strFunction = sFunctions [i];
+    strFunction = InternalFunctionsTable [i].sFunction;
     strFunction.MakeLower ();
 
     if (m_strFilter.IsEmpty () || strFunction.Find (m_strFilter) != -1)
       {
-      m_ctlFunctions.InsertItem (nItem, sFunctions [i]);
+      m_ctlFunctions.InsertItem (nItem, InternalFunctionsTable [i].sFunction);
 
       // select the exact match, if any (so, if they highlight world.Note then it is selected)