To: vim-dev@vim.org

Subject: Patch 7.2.150 (extra)

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=ISO-8859-1

Content-Transfer-Encoding: 8bit

------------

Note: I haven't tested this myself, since I don't have a compiler that

works for this code.

Patch 7.2.150 (extra)

Problem:    Can't use tab pages from VisVim.

Solution:   Add tab page support to VisVim. (Adam Slater)

Files:	    src/VisVim/Commands.cpp, src/VisVim/Resource.h,

	    src/VisVim/VisVim.rc

*** ../vim-7.2.149/src/VisVim/Commands.cpp	Thu May 10 20:45:34 2007

--- src/VisVim/Commands.cpp	Mon Mar  2 00:52:15 2009

***************

*** 20,39 ****

  static BOOL g_bEnableVim = TRUE;	// Vim enabled

  static BOOL g_bDevStudioEditor = FALSE;	// Open file in Dev Studio editor simultaneously

  static int g_ChangeDir = CD_NONE;	// CD after file open?

! static void VimSetEnableState (BOOL bEnableState);

! static BOOL VimOpenFile (BSTR& FileName, long LineNr);

! static DISPID VimGetDispatchId (COleAutomationControl& VimOle, char* Method);

! static void VimErrDiag (COleAutomationControl& VimOle);

! static void VimChangeDir (COleAutomationControl& VimOle, DISPID DispatchId, BSTR& FileName);

! static void DebugMsg (char* Msg, char* Arg = NULL);

  /////////////////////////////////////////////////////////////////////////////

  // CCommands

! CCommands::CCommands ()

  {

  	// m_pApplication == NULL; M$ Code generation bug!!!

  	m_pApplication = NULL;

--- 20,40 ----

  static BOOL g_bEnableVim = TRUE;	// Vim enabled

  static BOOL g_bDevStudioEditor = FALSE;	// Open file in Dev Studio editor simultaneously

+ static BOOL g_bNewTabs = FALSE;

  static int g_ChangeDir = CD_NONE;	// CD after file open?

! static void VimSetEnableState(BOOL bEnableState);

! static BOOL VimOpenFile(BSTR& FileName, long LineNr);

! static DISPID VimGetDispatchId(COleAutomationControl& VimOle, char* Method);

! static void VimErrDiag(COleAutomationControl& VimOle);

! static void VimChangeDir(COleAutomationControl& VimOle, DISPID DispatchId, BSTR& FileName);

! static void DebugMsg(char* Msg, char* Arg = NULL);

  /////////////////////////////////////////////////////////////////////////////

  // CCommands

! CCommands::CCommands()

  {

  	// m_pApplication == NULL; M$ Code generation bug!!!

  	m_pApplication = NULL;

***************

*** 41,57 ****

  	m_pDebuggerEventsObj = NULL;

  }

! CCommands::~CCommands ()

  {

! 	ASSERT (m_pApplication != NULL);

  	if (m_pApplication)

  	{

! 		m_pApplication->Release ();

  		m_pApplication = NULL;

  	}

  }

! void CCommands::SetApplicationObject (IApplication * pApplication)

  {

  	// This function assumes pApplication has already been AddRef'd

  	// for us, which CDSAddIn did in it's QueryInterface call

--- 42,58 ----

  	m_pDebuggerEventsObj = NULL;

  }

! CCommands::~CCommands()

  {

! 	ASSERT(m_pApplication != NULL);

  	if (m_pApplication)

  	{

! 		m_pApplication->Release();

  		m_pApplication = NULL;

  	}

  }

! void CCommands::SetApplicationObject(IApplication * pApplication)

  {

  	// This function assumes pApplication has already been AddRef'd

  	// for us, which CDSAddIn did in it's QueryInterface call

***************

*** 61,115 ****

  		return;

  	// Create Application event handlers

! 	XApplicationEventsObj::CreateInstance (&m_pApplicationEventsObj);

  	if (! m_pApplicationEventsObj)

  	{

! 		ReportInternalError ("XApplicationEventsObj::CreateInstance");

  		return;

  	}

! 	m_pApplicationEventsObj->AddRef ();

! 	m_pApplicationEventsObj->Connect (m_pApplication);

  	m_pApplicationEventsObj->m_pCommands = this;

  #ifdef NEVER

  	// Create Debugger event handler

  	CComPtr < IDispatch > pDebugger;

! 	if (SUCCEEDED (m_pApplication->get_Debugger (&pDebugger))

  	    && pDebugger != NULL)

  	{

! 		XDebuggerEventsObj::CreateInstance (&m_pDebuggerEventsObj);

! 		m_pDebuggerEventsObj->AddRef ();

! 		m_pDebuggerEventsObj->Connect (pDebugger);

  		m_pDebuggerEventsObj->m_pCommands = this;

  	}

  #endif

  	// Get settings from registry HKEY_CURRENT_USER\Software\Vim\VisVim

! 	HKEY hAppKey = GetAppKey ("Vim");

  	if (hAppKey)

  	{

! 		HKEY hSectionKey = GetSectionKey (hAppKey, "VisVim");

  		if (hSectionKey)

  		{

! 			g_bEnableVim = GetRegistryInt (hSectionKey, "EnableVim",

  						       g_bEnableVim);

! 			g_bDevStudioEditor = GetRegistryInt(hSectionKey,"DevStudioEditor",

! 							    g_bDevStudioEditor);

! 			g_ChangeDir = GetRegistryInt (hSectionKey, "ChangeDir",

  						      g_ChangeDir);

! 			RegCloseKey (hSectionKey);

  		}

! 		RegCloseKey (hAppKey);

  	}

  }

! void CCommands::UnadviseFromEvents ()

  {

! 	ASSERT (m_pApplicationEventsObj != NULL);

  	if (m_pApplicationEventsObj)

  	{

! 		m_pApplicationEventsObj->Disconnect (m_pApplication);

! 		m_pApplicationEventsObj->Release ();

  		m_pApplicationEventsObj = NULL;

  	}

--- 62,118 ----

  		return;

  	// Create Application event handlers

! 	XApplicationEventsObj::CreateInstance(&m_pApplicationEventsObj);

  	if (! m_pApplicationEventsObj)

  	{

! 		ReportInternalError("XApplicationEventsObj::CreateInstance");

  		return;

  	}

! 	m_pApplicationEventsObj->AddRef();

! 	m_pApplicationEventsObj->Connect(m_pApplication);

  	m_pApplicationEventsObj->m_pCommands = this;

  #ifdef NEVER

  	// Create Debugger event handler

  	CComPtr < IDispatch > pDebugger;

! 	if (SUCCEEDED(m_pApplication->get_Debugger(&pDebugger))

  	    && pDebugger != NULL)

  	{

! 		XDebuggerEventsObj::CreateInstance(&m_pDebuggerEventsObj);

! 		m_pDebuggerEventsObj->AddRef();

! 		m_pDebuggerEventsObj->Connect(pDebugger);

  		m_pDebuggerEventsObj->m_pCommands = this;

  	}

  #endif

  	// Get settings from registry HKEY_CURRENT_USER\Software\Vim\VisVim

! 	HKEY hAppKey = GetAppKey("Vim");

  	if (hAppKey)

  	{

! 		HKEY hSectionKey = GetSectionKey(hAppKey, "VisVim");

  		if (hSectionKey)

  		{

! 			g_bEnableVim = GetRegistryInt(hSectionKey, "EnableVim",

  						       g_bEnableVim);

! 			g_bDevStudioEditor = GetRegistryInt(hSectionKey,

! 					"DevStudioEditor", g_bDevStudioEditor);

! 			g_bNewTabs = GetRegistryInt(hSectionKey, "NewTabs",

! 						    g_bNewTabs);

! 			g_ChangeDir = GetRegistryInt(hSectionKey, "ChangeDir",

  						      g_ChangeDir);

! 			RegCloseKey(hSectionKey);

  		}

! 		RegCloseKey(hAppKey);

  	}

  }

! void CCommands::UnadviseFromEvents()

  {

! 	ASSERT(m_pApplicationEventsObj != NULL);

  	if (m_pApplicationEventsObj)

  	{

! 		m_pApplicationEventsObj->Disconnect(m_pApplication);

! 		m_pApplicationEventsObj->Release();

  		m_pApplicationEventsObj = NULL;

  	}

***************

*** 121,130 ****

  		// unadvise from its events (thus the VERIFY_OK below--see

  		// stdafx.h).

  		CComPtr < IDispatch > pDebugger;

! 		VERIFY_OK (m_pApplication->get_Debugger (&pDebugger));

! 		ASSERT (pDebugger != NULL);

! 		m_pDebuggerEventsObj->Disconnect (pDebugger);

! 		m_pDebuggerEventsObj->Release ();

  		m_pDebuggerEventsObj = NULL;

  	}

  #endif

--- 124,133 ----

  		// unadvise from its events (thus the VERIFY_OK below--see

  		// stdafx.h).

  		CComPtr < IDispatch > pDebugger;

! 		VERIFY_OK(m_pApplication->get_Debugger(&pDebugger));

! 		ASSERT(pDebugger != NULL);

! 		m_pDebuggerEventsObj->Disconnect(pDebugger);

! 		m_pDebuggerEventsObj->Release();

  		m_pDebuggerEventsObj = NULL;

  	}

  #endif

***************

*** 136,156 ****

  // Application events

! HRESULT CCommands::XApplicationEvents::BeforeBuildStart ()

  {

! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());

  	return S_OK;

  }

! HRESULT CCommands::XApplicationEvents::BuildFinish (long nNumErrors, long nNumWarnings)

  {

! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());

  	return S_OK;

  }

! HRESULT CCommands::XApplicationEvents::BeforeApplicationShutDown ()

  {

! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());

  	return S_OK;

  }

--- 139,159 ----

  // Application events

! HRESULT CCommands::XApplicationEvents::BeforeBuildStart()

  {

! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());

  	return S_OK;

  }

! HRESULT CCommands::XApplicationEvents::BuildFinish(long nNumErrors, long nNumWarnings)

  {

! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());

  	return S_OK;

  }

! HRESULT CCommands::XApplicationEvents::BeforeApplicationShutDown()

  {

! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());

  	return S_OK;

  }

***************

*** 158,166 ****

  // is done.

  // Vim gets called from here.

  //

! HRESULT CCommands::XApplicationEvents::DocumentOpen (IDispatch * theDocument)

  {

! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());

  	if (! g_bEnableVim)

  		// Vim not enabled or empty command line entered

--- 161,169 ----

  // is done.

  // Vim gets called from here.

  //

! HRESULT CCommands::XApplicationEvents::DocumentOpen(IDispatch * theDocument)

  {

! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());

  	if (! g_bEnableVim)

  		// Vim not enabled or empty command line entered

***************

*** 169,175 ****

  	// First get the current file name and line number

  	// Get the document object

! 	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc (theDocument);

  	if (! pDoc)

  		return S_OK;

--- 172,178 ----

  	// First get the current file name and line number

  	// Get the document object

! 	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc(theDocument);

  	if (! pDoc)

  		return S_OK;

***************

*** 177,202 ****

  	long LineNr = -1;

  	// Get the document name

! 	if (FAILED (pDoc->get_FullName (&FileName)))

  		return S_OK;

  	LPDISPATCH pDispSel;

  	// Get a selection object dispatch pointer

! 	if (SUCCEEDED (pDoc->get_Selection (&pDispSel)))

  	{

  		// Get the selection object

! 		CComQIPtr < ITextSelection, &IID_ITextSelection > pSel (pDispSel);

  		if (pSel)

  			// Get the selection line number

! 			pSel->get_CurrentLine (&LineNr);

! 		pDispSel->Release ();

  	}

  	// Open the file in Vim and position to the current line

! 	if (VimOpenFile (FileName, LineNr))

  	{

  		if (! g_bDevStudioEditor)

  		{

--- 180,205 ----

  	long LineNr = -1;

  	// Get the document name

! 	if (FAILED(pDoc->get_FullName(&FileName)))

  		return S_OK;

  	LPDISPATCH pDispSel;

  	// Get a selection object dispatch pointer

! 	if (SUCCEEDED(pDoc->get_Selection(&pDispSel)))

  	{

  		// Get the selection object

! 		CComQIPtr < ITextSelection, &IID_ITextSelection > pSel(pDispSel);

  		if (pSel)

  			// Get the selection line number

! 			pSel->get_CurrentLine(&LineNr);

! 		pDispSel->Release();

  	}

  	// Open the file in Vim and position to the current line

! 	if (VimOpenFile(FileName, LineNr))

  	{

  		if (! g_bDevStudioEditor)

  		{

***************

*** 204,233 ****

  			CComVariant vSaveChanges = dsSaveChangesPrompt;

  			DsSaveStatus Saved;

! 			pDoc->Close (vSaveChanges, &Saved);

  		}

  	}

  	// We're done here

! 	SysFreeString (FileName);

  	return S_OK;

  }

! HRESULT CCommands::XApplicationEvents::BeforeDocumentClose (IDispatch * theDocument)

  {

! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());

  	return S_OK;

  }

! HRESULT CCommands::XApplicationEvents::DocumentSave (IDispatch * theDocument)

  {

! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());

  	return S_OK;

  }

! HRESULT CCommands::XApplicationEvents::NewDocument (IDispatch * theDocument)

  {

! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());

  	if (! g_bEnableVim)

  		// Vim not enabled or empty command line entered

--- 207,236 ----

  			CComVariant vSaveChanges = dsSaveChangesPrompt;

  			DsSaveStatus Saved;

! 			pDoc->Close(vSaveChanges, &Saved);

  		}

  	}

  	// We're done here

! 	SysFreeString(FileName);

  	return S_OK;

  }

! HRESULT CCommands::XApplicationEvents::BeforeDocumentClose(IDispatch * theDocument)

  {

! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());

  	return S_OK;

  }

! HRESULT CCommands::XApplicationEvents::DocumentSave(IDispatch * theDocument)

  {

! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());

  	return S_OK;

  }

! HRESULT CCommands::XApplicationEvents::NewDocument(IDispatch * theDocument)

  {

! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());

  	if (! g_bEnableVim)

  		// Vim not enabled or empty command line entered

***************

*** 235,253 ****

  	// First get the current file name and line number

! 	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc (theDocument);

  	if (! pDoc)

  		return S_OK;

  	BSTR FileName;

  	HRESULT hr;

! 	hr = pDoc->get_FullName (&FileName);

! 	if (FAILED (hr))

  		return S_OK;

  	// Open the file in Vim and position to the current line

! 	if (VimOpenFile (FileName, 0))

  	{

  		if (! g_bDevStudioEditor)

  		{

--- 238,256 ----

  	// First get the current file name and line number

! 	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc(theDocument);

  	if (! pDoc)

  		return S_OK;

  	BSTR FileName;

  	HRESULT hr;

! 	hr = pDoc->get_FullName(&FileName);

! 	if (FAILED(hr))

  		return S_OK;

  	// Open the file in Vim and position to the current line

! 	if (VimOpenFile(FileName, 0))

  	{

  		if (! g_bDevStudioEditor)

  		{

***************

*** 255,303 ****

  			CComVariant vSaveChanges = dsSaveChangesPrompt;

  			DsSaveStatus Saved;

! 			pDoc->Close (vSaveChanges, &Saved);

  		}

  	}

! 	SysFreeString (FileName);

  	return S_OK;

  }

! HRESULT CCommands::XApplicationEvents::WindowActivate (IDispatch * theWindow)

  {

! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());

  	return S_OK;

  }

! HRESULT CCommands::XApplicationEvents::WindowDeactivate (IDispatch * theWindow)

  {

! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());

  	return S_OK;

  }

! HRESULT CCommands::XApplicationEvents::WorkspaceOpen ()

  {

! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());

  	return S_OK;

  }

! HRESULT CCommands::XApplicationEvents::WorkspaceClose ()

  {

! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());

  	return S_OK;

  }

! HRESULT CCommands::XApplicationEvents::NewWorkspace ()

  {

! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());

  	return S_OK;

  }

  // Debugger event

! HRESULT CCommands::XDebuggerEvents::BreakpointHit (IDispatch * pBreakpoint)

  {

! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());

  	return S_OK;

  }

--- 258,306 ----

  			CComVariant vSaveChanges = dsSaveChangesPrompt;

  			DsSaveStatus Saved;

! 			pDoc->Close(vSaveChanges, &Saved);

  		}

  	}

! 	SysFreeString(FileName);

  	return S_OK;

  }

! HRESULT CCommands::XApplicationEvents::WindowActivate(IDispatch * theWindow)

  {

! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());

  	return S_OK;

  }

! HRESULT CCommands::XApplicationEvents::WindowDeactivate(IDispatch * theWindow)

  {

! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());

  	return S_OK;

  }

! HRESULT CCommands::XApplicationEvents::WorkspaceOpen()

  {

! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());

  	return S_OK;

  }

! HRESULT CCommands::XApplicationEvents::WorkspaceClose()

  {

! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());

  	return S_OK;

  }

! HRESULT CCommands::XApplicationEvents::NewWorkspace()

  {

! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());

  	return S_OK;

  }

  // Debugger event

! HRESULT CCommands::XDebuggerEvents::BreakpointHit(IDispatch * pBreakpoint)

  {

! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());

  	return S_OK;

  }

***************

*** 308,324 ****

  class CMainDialog : public CDialog

  {

      public:

! 	CMainDialog (CWnd * pParent = NULL);	// Standard constructor

  	//{{AFX_DATA(CMainDialog)

  	enum { IDD = IDD_ADDINMAIN };

  	int	m_ChangeDir;

  	BOOL	m_bDevStudioEditor;

  	//}}AFX_DATA

  	//{{AFX_VIRTUAL(CMainDialog)

      protected:

! 	virtual void DoDataExchange (CDataExchange * pDX);	// DDX/DDV support

  	//}}AFX_VIRTUAL

      protected:

--- 311,328 ----

  class CMainDialog : public CDialog

  {

      public:

! 	CMainDialog(CWnd * pParent = NULL);	// Standard constructor

  	//{{AFX_DATA(CMainDialog)

  	enum { IDD = IDD_ADDINMAIN };

  	int	m_ChangeDir;

  	BOOL	m_bDevStudioEditor;

+ 	BOOL	m_bNewTabs;

  	//}}AFX_DATA

  	//{{AFX_VIRTUAL(CMainDialog)

      protected:

! 	virtual void DoDataExchange(CDataExchange * pDX);	// DDX/DDV support

  	//}}AFX_VIRTUAL

      protected:

***************

*** 326,425 ****

  	afx_msg void OnEnable();

  	afx_msg void OnDisable();

  	//}}AFX_MSG

! 	DECLARE_MESSAGE_MAP ()

  };

! CMainDialog::CMainDialog (CWnd * pParent /* =NULL */ )

! 	: CDialog (CMainDialog::IDD, pParent)

  {

  	//{{AFX_DATA_INIT(CMainDialog)

  	m_ChangeDir = -1;

  	m_bDevStudioEditor = FALSE;

  	//}}AFX_DATA_INIT

  }

! void CMainDialog::DoDataExchange (CDataExchange * pDX)

  {

! 	CDialog::DoDataExchange (pDX);

  	//{{AFX_DATA_MAP(CMainDialog)

  	DDX_Radio(pDX, IDC_CD_SOURCE_PATH, m_ChangeDir);

! 	DDX_Check (pDX, IDC_DEVSTUDIO_EDITOR, m_bDevStudioEditor);

  	//}}AFX_DATA_MAP

  }

! BEGIN_MESSAGE_MAP (CMainDialog, CDialog)

  	//{{AFX_MSG_MAP(CMainDialog)

  	//}}AFX_MSG_MAP

! END_MESSAGE_MAP ()

  /////////////////////////////////////////////////////////////////////////////

  // CCommands methods

! STDMETHODIMP CCommands::VisVimDialog ()

  {

! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());

  	// Use m_pApplication to access the Developer Studio Application

  	// object,

  	// and VERIFY_OK to see error strings in DEBUG builds of your add-in

  	// (see stdafx.h)

! 	VERIFY_OK (m_pApplication->EnableModeless (VARIANT_FALSE));

  	CMainDialog Dlg;

  	Dlg.m_bDevStudioEditor = g_bDevStudioEditor;

  	Dlg.m_ChangeDir = g_ChangeDir;

! 	if (Dlg.DoModal () == IDOK)

  	{

  		g_bDevStudioEditor = Dlg.m_bDevStudioEditor;

  		g_ChangeDir = Dlg.m_ChangeDir;

  		// Save settings to registry HKEY_CURRENT_USER\Software\Vim\VisVim

! 		HKEY hAppKey = GetAppKey ("Vim");

  		if (hAppKey)

  		{

! 			HKEY hSectionKey = GetSectionKey (hAppKey, "VisVim");

  			if (hSectionKey)

  			{

! 				WriteRegistryInt (hSectionKey, "DevStudioEditor",

  						  g_bDevStudioEditor);

! 				WriteRegistryInt (hSectionKey, "ChangeDir", g_ChangeDir);

! 				RegCloseKey (hSectionKey);

  			}

! 			RegCloseKey (hAppKey);

  		}

  	}

! 	VERIFY_OK (m_pApplication->EnableModeless (VARIANT_TRUE));

  	return S_OK;

  }

! STDMETHODIMP CCommands::VisVimEnable ()

  {

! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());

! 	VimSetEnableState (true);

  	return S_OK;

  }

! STDMETHODIMP CCommands::VisVimDisable ()

  {

! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());

! 	VimSetEnableState (false);

  	return S_OK;

  }

! STDMETHODIMP CCommands::VisVimToggle ()

  {

! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());

! 	VimSetEnableState (! g_bEnableVim);

  	return S_OK;

  }