PythonInterpreter: Add a simple notebook tab as a button for adding new interpreters and correctly handle the process termination event

spillz · spillz · commit 555eb6f78e01 · 2013-12-24T06:53:34.000Z
diff --git a/PythonInterpreter/PythonInterpCtrl.cpp b/PythonInterpreter/PythonInterpCtrl.cpp
@@ -179,7 +179,7 @@ BEGIN_EVENT_TABLE(PythonInterpCtrl, wxPanel)
     EVT_XMLRPC_RESPONSE(wxID_ANY, PythonInterpCtrl::OnPyNotify)
 //    EVT_COMMAND(0, wxEVT_PY_NOTIFY_UI_CODEOK, PythonInterpCtrl::OnPyCode)
 //    EVT_COMMAND(0, wxEVT_PY_NOTIFY_UI_INPUT, PythonInterpCtrl::OnLineInputRequest)
-    EVT_COMMAND(0, wxEVT_PY_PROC_END, PythonInterpCtrl::OnEndProcess)
+    EVT_COMMAND(0, wxEVT_XMLRPC_PROC_END, PythonInterpCtrl::OnEndProcess)
 
     EVT_SIZE    (PythonInterpCtrl::OnSize)
 END_EVENT_TABLE()
@@ -211,10 +211,10 @@ long PythonInterpCtrl::LaunchProcess(const wxString &processcmd, const wxArraySt
 {
     if(!IsDead())
         return -1;
+//TODO: Option to use XMLRPC over localhost or pipe, currently always use localhost
     m_port=m_portalloc.RequestPort();
     if(m_port<0)
         return -1;
-//TODO: XmlRpc over pipe doesn't work because of the way interp.py is implemented
 //    m_port = -1; //Use XmlRpc over pipe
     //TODO: get the command and working dir from config
 #ifdef __WXMSW__
@@ -243,7 +243,7 @@ long PythonInterpCtrl::LaunchProcess(const wxString &processcmd, const wxArraySt
     if(!global&&!local) //No interpreter script found, return failure.
         return -2; //TODO: Return meaningful messages (or at least use the codeblocks logger)
 
-    m_pyinterp = new XmlRpcInstance(cmd,m_port);
+    m_pyinterp = new XmlRpcInstance(cmd,m_port,_T("localhost"),this);
     if(m_pyinterp->IsDead())
     {
         Manager::Get()->GetLogManager()->Log(_("Error Starting Interpreter"));
@@ -373,7 +373,7 @@ void PythonInterpCtrl::OnPyJobAbort(wxCommandEvent& event)
     m_code=_T("");
 }
 
-void PythonInterpCtrl::OnEndProcess(wxCommandEvent &ce)
+void PythonInterpCtrl::OnEndProcess(wxCommandEvent& event)
 {
     m_portalloc.ReleasePort(m_port);
     if(m_shellmgr)
diff --git a/PythonInterpreter/PythonInterpCtrl.h b/PythonInterpreter/PythonInterpCtrl.h
@@ -136,7 +136,7 @@ class PythonInterpCtrl : public ShellCtrlBase
         void OnPyCode(wxCommandEvent& event);
         void OnPyJobDone(wxCommandEvent& event);
         void OnPyJobAbort(wxCommandEvent& event);
-        void OnEndProcess(wxCommandEvent &ce);
+        void OnEndProcess(wxCommandEvent& event);
 
         bool DispatchCode(const wxString &code);
 
diff --git a/PythonInterpreter/PythonInterpreter.cpp b/PythonInterpreter/PythonInterpreter.cpp
@@ -40,6 +40,7 @@ BEGIN_EVENT_TABLE(PythonInterpreter, cbPlugin)
 	// add any events you want to handle here
     EVT_MENU(ID_INTERP_WINDOW_TOGGLE,PythonInterpreter::OnToggleInterpreterWindow)
     EVT_UPDATE_UI(ID_INTERP_WINDOW_TOGGLE, PythonInterpreter::OnUpdateUI)
+    EVT_COMMAND(0,wxEVT_SHELL_ADD_CLICKED, PythonInterpreter::AddNewInterpreter)
 END_EVENT_TABLE()
 
 
@@ -100,11 +101,18 @@ void PythonInterpreter::OnAttach()
     Manager::Get()->ProcessEvent(evt);
 
     //TODO: Add UI to open a terminal instead of opening on attach
+//    wxArrayString as;
+//    m_shellmgr->LaunchProcess(_T(""),_T("Python"),_("Python Interpreter"),as);
+#endif
+}
+
+void PythonInterpreter::AddNewInterpreter(wxCommandEvent &event)
+{
     wxArrayString as;
     m_shellmgr->LaunchProcess(_T(""),_T("Python"),_("Python Interpreter"),as);
-#endif
 }
 
+
 void PythonInterpreter::OnRelease(bool appShutDown)
 {
 #ifndef TOOLSPLUSLINK
diff --git a/PythonInterpreter/PythonInterpreter.h b/PythonInterpreter/PythonInterpreter.h
@@ -48,6 +48,7 @@ class PythonInterpreter : public cbPlugin
     public:
 
     private:
+        void AddNewInterpreter(wxCommandEvent &event);
         void OnToggleInterpreterWindow(wxCommandEvent &event);
         void OnUpdateUI(wxUpdateUIEvent& event);
         wxMenu *m_ViewMenu;
diff --git a/PythonInterpreter/ShellCtrlBase.cpp b/PythonInterpreter/ShellCtrlBase.cpp
@@ -72,12 +72,15 @@ ShellCtrlBase::ShellCtrlBase(wxWindow* parent, int id, const wxString &name, She
 }
 
 
+DEFINE_EVENT_TYPE(wxEVT_SHELL_ADD_CLICKED)
+
 ////////////////////////////////////// ShellManager /////////////////////////////////////////////
 
 BEGIN_EVENT_TABLE(ShellManager, wxPanel)
     EVT_CHAR(ShellManager::OnUserInput)
     EVT_TIMER(ID_SHELLPOLLTIMER, ShellManager::OnPollandSyncOutput)
     EVT_AUINOTEBOOK_PAGE_CLOSE(ID_SHELLMGR, ShellManager::OnPageClosing)
+    EVT_AUINOTEBOOK_PAGE_CHANGING(ID_SHELLMGR, ShellManager::OnPageChanging)
 END_EVENT_TABLE()
 
 
@@ -87,10 +90,25 @@ void ShellManager::OnPageClosing(wxAuiNotebookEvent& event)
     //    LOGSTREAM << wxString::Format(_T("OnPageClosing(): ed=%p, title=%s\n"), eb, eb ? eb->GetTitle().c_str() : _T(""));
     if (!QueryClose(sh))
         event.Veto();
+    m_nb->SetSelection(0);
 //    event.Skip(); // allow others to process it too
 }
 
 
+void ShellManager::OnPageChanging(wxAuiNotebookEvent& event)
+{
+    if(event.GetSelection() == int(m_nb->GetPageCount()-1))
+    {
+        wxCommandEvent pe(wxEVT_SHELL_ADD_CLICKED,0);
+        AddPendingEvent(pe);
+        event.Veto();
+        return;
+    }
+    event.Skip();
+}
+
+
+
 bool ShellManager::QueryClose(ShellCtrlBase* sh)
 {
     if(!sh)
@@ -134,10 +152,11 @@ long ShellManager::LaunchProcess(const wxString &processcmd, const wxString &nam
         delete shell; //TODO: GlobalShellRegistry.FreeControl() ???
         return -1;
     }
-    m_nb->AddPage(shell,name);
-    m_nb->SetSelection(m_nb->GetPageCount()-1);
+    m_nb->InsertPage(m_nb->GetPageCount()-1,shell,name);
+    m_nb->SetSelection(m_nb->GetPageCount()-2);
 //    shell->Show();
     return procid;
+
 }
 
 ShellCtrlBase *ShellManager::GetPage(size_t i)
@@ -147,7 +166,7 @@ ShellCtrlBase *ShellManager::GetPage(size_t i)
 
 ShellCtrlBase *ShellManager::GetPage(const wxString &name)
 {
-    for(unsigned int i=0;i<m_nb->GetPageCount();i++)
+    for(unsigned int i=0;i<m_nb->GetPageCount()-1;i++)
     {
         ShellCtrlBase *sh=GetPage(i);
         if(name==sh->GetName())
@@ -169,7 +188,7 @@ void ShellManager::KillWindow(int /*id*/)
 void ShellManager::RemoveDeadPages()
 {
     unsigned int i=0;
-    while(i<m_nb->GetPageCount())
+    while(i<m_nb->GetPageCount()-1)
     {
         ShellCtrlBase *shell=GetPage(i);
         if(shell->IsDead())
@@ -182,7 +201,7 @@ void ShellManager::RemoveDeadPages()
 
 size_t ShellManager::GetTermNum(ShellCtrlBase *term)
 {
-    for(unsigned int i=0;i<m_nb->GetPageCount();i++)
+    for(unsigned int i=0;i<m_nb->GetPageCount()-1;i++)
     {
         ShellCtrlBase *shell=GetPage(i);
         if(shell==term)
@@ -194,7 +213,7 @@ size_t ShellManager::GetTermNum(ShellCtrlBase *term)
 int ShellManager::NumAlive()
 {
     int count=0;
-    for(unsigned int i=0;i<m_nb->GetPageCount();i++)
+    for(unsigned int i=0;i<m_nb->GetPageCount()-1;i++)
         count+=!GetPage(i)->IsDead();
     return count;
 }
@@ -203,15 +222,16 @@ int ShellManager::NumAlive()
 void ShellManager::OnShellTerminate(ShellCtrlBase *term)
 {
     size_t i=GetTermNum(term);
-    m_nb->SetPageText(i,_("[DONE]")+m_nb->GetPageText(i));
+    if(i<m_nb->GetPageCount()-1)
+        m_nb->SetPageText(i,_("[DONE]")+m_nb->GetPageText(i));
     if(NumAlive()==0)
         m_synctimer.Stop();
 }
 
 
 void ShellManager::OnPollandSyncOutput(wxTimerEvent& /*te*/)
 {
-    for(unsigned int i=0;i<m_nb->GetPageCount();i++)
+    for(unsigned int i=0;i<m_nb->GetPageCount()-1;i++)
     {
         GetPage(i)->SyncOutput();
     }
@@ -230,6 +250,9 @@ ShellManager::ShellManager(wxWindow* parent)
     wxBoxSizer* bs = new wxBoxSizer(wxVERTICAL);
     m_nb = new wxAuiNotebook(this, ID_SHELLMGR, wxDefaultPosition, wxDefaultSize, wxAUI_NB_SCROLL_BUTTONS|wxAUI_NB_CLOSE_ON_ACTIVE_TAB);
     bs->Add(m_nb, 1, wxEXPAND | wxALL);
+    wxBitmap bm = wxArtProvider::GetBitmap(wxART_NEW);
+    wxButton *wnd = new wxButton(this, wxID_ANY);
+    m_nb->AddPage(wnd,_(""),false,bm);
     SetAutoLayout(TRUE);
     SetSizer(bs);
 }
diff --git a/PythonInterpreter/ShellCtrlBase.h b/PythonInterpreter/ShellCtrlBase.h
@@ -114,6 +114,11 @@ class ShellCtrlBase : public wxPanel //TODO: make wxPanel a member, not a base??
 };
 
 
+BEGIN_DECLARE_EVENT_TYPES()
+DECLARE_LOCAL_EVENT_TYPE(wxEVT_SHELL_ADD_CLICKED, -1)
+END_DECLARE_EVENT_TYPES()
+
+
 class ShellManager : public wxPanel
 {
     friend class ShellCtrlBase;
@@ -133,6 +138,7 @@ class ShellManager : public wxPanel
         void OnUserInput(wxKeyEvent& ke);
         void OnPollandSyncOutput(wxTimerEvent& te);
         void OnPageClosing(wxAuiNotebookEvent& event);
+        void OnPageChanging(wxAuiNotebookEvent& event);
         bool QueryClose(ShellCtrlBase* sh);
         //Responders to friend class ShellCtrlBase
         size_t GetTermNum(ShellCtrlBase *term);
