Added script function SetMainTitle

Author: nickgammon

doc.cpp

@@ -612,6 +612,7 @@ BEGIN_DISPATCH_MAP(CMUSHclientDoc, CDocument)
 	DISP_FUNCTION(CMUSHclientDoc, "UnloadPlugin", UnloadPlugin, VT_I4, VTS_BSTR)
 	DISP_FUNCTION(CMUSHclientDoc, "Bookmark", Bookmark, VT_EMPTY, VTS_I4 VTS_BOOL)
 	DISP_FUNCTION(CMUSHclientDoc, "SetTitle", SetTitle, VT_EMPTY, VTS_BSTR)
+	DISP_FUNCTION(CMUSHclientDoc, "SetMainTitle", SetMainTitle, VT_EMPTY, VTS_BSTR)
 	DISP_PROPERTY_PARAM(CMUSHclientDoc, "NormalColour", GetNormalColour, SetNormalColour, VT_I4, VTS_I2)
 	DISP_PROPERTY_PARAM(CMUSHclientDoc, "BoldColour", GetBoldColour, SetBoldColour, VT_I4, VTS_I2)
 	DISP_PROPERTY_PARAM(CMUSHclientDoc, "CustomColourText", GetCustomColourText, SetCustomColourText, VT_I4, VTS_I2)
@@ -7840,5 +7841,3 @@ void CMUSHclientDoc::FixInputWrap()
     }  // end of for each view
 } // end of CMUSHclientDoc::FixInputWrap()
 
-
-

doc.h

@@ -1338,6 +1338,7 @@ class CMUSHclientDoc : public CDocument
   CString m_strWordUnderMenu;   // word under menu in output window
 
   CString m_strWindowTitle;     // for SetTitle
+  CString m_strMainWindowTitle; // for SetMainTitle
 
 #ifdef PANE
   // for pane windows
@@ -2764,6 +2765,7 @@ class CMUSHclientDoc : public CDocument
 	afx_msg long UnloadPlugin(LPCTSTR PluginID);
 	afx_msg void Bookmark(long LineNumber, BOOL Set);
 	afx_msg void SetTitle(LPCTSTR Title);
+	afx_msg void SetMainTitle(LPCTSTR Title);
 	afx_msg long GetNormalColour(short WhichColour);
 	afx_msg void SetNormalColour(short WhichColour, long nNewValue);
 	afx_msg long GetBoldColour(short WhichColour);

install/readme.txt

@@ -1,7 +1,7 @@
 MUSHclient version 4.88
 =======================
 
-Wednesday, 6th February 2013
+Monday, 11th February 2013
 
 Author: Nick Gammon
 Web support: http://www.gammon.com.au/forum/

mainfrm.cpp

@@ -865,6 +865,8 @@ void CMainFrame::FixUpTitleBar (void)
 
   CString strTitle;
   CString strName;
+  CString strMainTitle;
+
   int nDocCount = 0;
 
  	POSITION pos = App.m_pWorldDocTemplate->GetFirstDocPosition();
@@ -873,6 +875,7 @@ void CMainFrame::FixUpTitleBar (void)
 	{
     CMUSHclientDoc* pDoc = (CMUSHclientDoc*) App.m_pWorldDocTemplate->GetNextDoc(pos);
 
+    // find the active world
     if (pDoc->m_pActiveCommandView != NULL || pDoc->m_pActiveOutputView != NULL)
       {
       WINDOWPLACEMENT wp;
@@ -883,6 +886,7 @@ void CMainFrame::FixUpTitleBar (void)
         pDoc->m_pActiveOutputView->GetOwner ()->GetOwner ()->GetWindowPlacement (&wp);
 
       strName = pDoc->m_mush_name;    // remember world name
+      strMainTitle = pDoc->m_strMainWindowTitle;
 
       // don't show name again if maximized
       if (wp.showCmd == SW_MAXIMIZE)
@@ -918,6 +922,10 @@ void CMainFrame::FixUpTitleBar (void)
 
   GetWindowText (strOldTitle);
 
+  // use the title from SetMainTitle if the active world had one
+  if (!strMainTitle.IsEmpty ())
+    strTitle = strMainTitle;
+
   // only change title if necessary, to avoid flicker
   if (strTitle != strOldTitle)
     SetWindowText (strTitle);

mushclient.cnt

@@ -488,6 +488,7 @@
 3 SetEntity=FNC_SetEntity 
 3 SetForegroundImage=FNC_SetForegroundImage
 3 SetInputFont=FNC_SetInputFont 
+3 SetMainTitle=FNC_SetMainTitle 
 3 SetNotes=FNC_SetNotes 
 3 SetOption=FNC_SetOption 
 3 SetOutputFont=FNC_SetOutputFont 

mushclient.odl

@@ -70,14 +70,14 @@ library MUSHclient
 			[id(44)] long SetCommand(BSTR Message);
 			[id(45)] BSTR GetNotes();
 			[id(46)] void SetNotes(BSTR Message);
-			[id(410), propget] long NormalColour(short WhichColour);
-			[id(410), propput] void NormalColour(short WhichColour, long nNewValue);
-			[id(411), propget] long BoldColour(short WhichColour);
-			[id(411), propput] void BoldColour(short WhichColour, long nNewValue);
-			[id(412), propget] long CustomColourText(short WhichColour);
-			[id(412), propput] void CustomColourText(short WhichColour, long nNewValue);
-			[id(413), propget] long CustomColourBackground(short WhichColour);
-			[id(413), propput] void CustomColourBackground(short WhichColour, long nNewValue);
+			[id(411), propget] long NormalColour(short WhichColour);
+			[id(411), propput] void NormalColour(short WhichColour, long nNewValue);
+			[id(412), propget] long BoldColour(short WhichColour);
+			[id(412), propput] void BoldColour(short WhichColour, long nNewValue);
+			[id(413), propget] long CustomColourText(short WhichColour);
+			[id(413), propput] void CustomColourText(short WhichColour, long nNewValue);
+			[id(414), propget] long CustomColourBackground(short WhichColour);
+			[id(414), propput] void CustomColourBackground(short WhichColour, long nNewValue);
 			[id(47)] void Redraw();
 			[id(48)] long ResetTimer(BSTR TimerName);
 			[id(49)] void SetOutputFont(BSTR FontName, short PointSize);
@@ -441,6 +441,7 @@ library MUSHclient
 			[id(407)] long UnloadPlugin(BSTR PluginID);
 			[id(408)] void Bookmark(long LineNumber, BOOL Set);
 			[id(409)] void SetTitle(BSTR Title);
+			[id(410)] void SetMainTitle(BSTR Title);
 			//}}AFX_ODL_METHOD
 
 	};

resource.h

@@ -1562,7 +1562,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        367
+#define _APS_NEXT_RESOURCE_VALUE        368
 #define _APS_NEXT_COMMAND_VALUE         33054
 #define _APS_NEXT_CONTROL_VALUE         2897
 #define _APS_NEXT_SYMED_VALUE           312

scripting/functionlist.cpp

@@ -346,6 +346,7 @@ tInternalFunctionsTable InternalFunctionsTable [] = {
 { "SetEntity" ,                  "( Name , Contents )" } ,
 { "SetForegroundImage" ,         "( FileName , Mode )" } ,
 { "SetInputFont" ,               "( FontName , PointSize , Weight , Italic )" } ,
+{ "SetMainTitle" ,               "( Title )" } ,
 { "SetNotes" ,                   "( Message )" } ,
 { "SetOption" ,                  "( OptionName , Value )" } ,
 { "SetOutputFont" ,              "( FontName , PointSize )" } ,

scripting/lua_methods.cpp

@@ -5338,6 +5338,15 @@ static int L_SetInputFont (lua_State *L)
   return 0;  // number of result fields
   } // end of L_SetInputFont
 
+//----------------------------------------
+//  world.SetMainTitle
+//----------------------------------------
+static int L_SetMainTitle (lua_State *L)
+  {
+  CMUSHclientDoc * pDoc = doc (L);  // must do this first
+  pDoc->SetMainTitle (concatArgs (L).c_str ());
+  return 0;  // number of result fields
+  } // end of L_SetMainTitle
 
 //----------------------------------------
 //  world.SetNotes
@@ -6979,6 +6988,7 @@ static const struct luaL_Reg worldlib [] =
   {"SetEntity", L_SetEntity},
   {"SetForegroundImage", L_SetForegroundImage},
   {"SetInputFont", L_SetInputFont},
+  {"SetMainTitle", L_SetMainTitle},
   {"SetNotes", L_SetNotes},
   {"SetOption", L_SetOption},
   {"SetOutputFont", L_SetOutputFont},

scripting/methods/methods_output.cpp

@@ -835,3 +835,10 @@ void CMUSHclientDoc::SetTitle(LPCTSTR Title)
     }   // end of loop through views
 
 }
+
+
+void CMUSHclientDoc::SetMainTitle(LPCTSTR Title) 
+{
+	m_strMainWindowTitle = Title;
+  Frame.FixUpTitleBar ();
+}