Update Terminal Input Handling And Process Execution

Improve the built-in terminal experience by routing key events through the active terminal control when it has focus, so input handling works more reliably for embedded terminals. The default Windows terminal choice is also updated to PowerShell, reflecting the preferred shell on that platform.

This change additionally modernizes Windows process execution in the safe command runner by delegating process launch and output collection to the assistant process helper, while preserving shutdown-aware output handling. At the application level, startup now detaches from the console when possible, and the global event filter is extended so registered callbacks can consume events instead of only observing them.

* Terminal
* Process Execution
* Event Filtering

**Generated by CodeLite**

Signed-off-by: Eran Ifrah <eran@codelite.org>

Author: eranif

CodeLite/AsyncProcess/winprocess_impl.cpp

@@ -71,30 +71,6 @@ thread_local ClosePseudoConsole_T ClosePseudoConsoleFunc = nullptr;
 
 using HPCON = HANDLE;
 
-/**
- * @class ConsoleAttacher
- * @date 11/03/10
- * @brief a helper class to attach this process to a process' console
- * this allows us to write directly into that process console-input-buffer
- * One should check isAttached once this object is constructed
- */
-class ConsoleAttacher
-{
-public:
-    bool isAttached;
-
-public:
-    ConsoleAttacher(long pid) { isAttached = AttachConsole(pid); }
-
-    ~ConsoleAttacher()
-    {
-        if (isAttached) {
-            FreeConsole();
-        }
-        isAttached = false;
-    }
-};
-
 static bool CheckIsAlive(HANDLE hProcess)
 {
     DWORD dwExitCode;
@@ -418,7 +394,6 @@ IProcess* WinProcessImpl::Execute(
     LOG_IF_TRACE { clDEBUG1() << "Running process:" << cmd << endl; }
     BOOL ret = FALSE;
     {
-        ConsoleAttacher ca(prc->GetPid());
         ret = CreateProcess(NULL,
                             cmd.wchar_str(),   // shell line execution command
                             NULL,              // process security attributes

CodeLite/event_notifier.cpp

@@ -139,5 +139,10 @@ int EventNotifier::FilterEvent(wxEvent& event)
         return wxEventFilter::Event_Skip;
     }
 
+    for (auto& cb : iter->second) {
+        if (cb.callback(event)) {
+            return wxEventFilter::Event_Processed;
+        }
+    }
     return wxEventFilter::Event_Skip;
 }

CodeLite/procutils.cpp

@@ -26,6 +26,7 @@
 
 #include "AsyncProcess/asyncprocess.h"
 #include "StringUtils.h"
+#include "assistant/Process.hpp"
 #include "cl_command_event.h"
 #include "file_logger.h"
 #include "fileutils.h"
@@ -500,56 +501,29 @@ int ProcUtils::SafeExecuteCommand(const wxString& command,
                                   std::shared_ptr<std::atomic_bool> shutdown_flag)
 {
 #ifdef __WXMSW__
-    wxString errMsg;
-    LOG_IF_TRACE { clDEBUG1() << "executing process:" << command << endl; }
-    std::unique_ptr<WinProcess> proc{WinProcess::Execute(command, errMsg)};
-    if (!proc) {
-        return wxNOT_FOUND;
-    }
-
-    // wait for the process to terminate
-    wxString tmpbuf;
-    wxString buff;
-
-    LOG_IF_TRACE { clDEBUG1() << "reading process output..." << endl; }
-    bool shutdown_cleanly{true};
-    while (proc->IsAlive()) {
-        if (shutdown_flag && shutdown_flag->load()) {
-            // Check for termination flag state
-            shutdown_cleanly = false;
-            break;
+    auto argv = StringUtils::BuildArgv(command);
+    auto argv_std = StringUtils::ToStdStrings(argv);
+    std::string accumlated_output;
+    auto output_cb = [shutdown_flag, &accumlated_output](const std::string& out, const std::string& err) -> bool {
+        if (!out.empty()) {
+            accumlated_output += out;
         }
-
-        tmpbuf.Clear();
-        if (proc->Read(tmpbuf)) {
-            // as long as we read something, don't sleep...
-            buff << tmpbuf;
-        } else {
-            wxThread::Sleep(1);
+        if (!err.empty()) {
+            accumlated_output += err;
         }
-    }
+        return !shutdown_flag->load();
+    };
 
-    int exit_code{-1};
-    if (shutdown_cleanly) {
-        tmpbuf.Clear();
-        exit_code = proc->GetExitCode();
-        LOG_IF_TRACE
-        {
-            clDEBUG1() << "process terminated with exit code:" << exit_code << endl;
-            // Read any unread output
-            clDEBUG1() << "reading process output remainder..." << endl;
-        }
-        proc->Read(tmpbuf);
-        while (!tmpbuf.IsEmpty()) {
-            buff << tmpbuf;
-            tmpbuf.Clear();
-            proc->Read(tmpbuf);
-        }
-        proc->Cleanup();
-        LOG_IF_TRACE { clDEBUG1() << "reading process output remainder...done" << endl; }
+    int exit_code = assistant::Process::RunProcessAndWait(argv_std, output_cb);
+    wxString out_str = wxString::FromUTF8(accumlated_output);
+    LOG_IF_TRACE
+    {
+        clDEBUG1() << "process terminated with exit code:" << exit_code << endl;
+        // Read any unread output
+        clDEBUG1() << "reading process output remainder..." << endl;
     }
     // Convert buff into wxArrayString
-    output = ::wxStringTokenize(buff, "\n", wxTOKEN_STRTOK);
+    output = ::wxStringTokenize(out_str, "\n", wxTOKEN_STRTOK);
     return exit_code;
 #else
     return Popen(command, output, shutdown_flag);

LiteEditor/app.cpp

@@ -517,6 +517,9 @@ bool CodeLiteApp::OnInit()
     // CodeLite itself :/
     FileLogger::OpenLog("codelite.log", clConfig::Get().Read(kConfigLogVerbosity, FileLogger::Error));
     clDEBUG() << "Starting codelite..." << endl;
+    if (FreeConsole()) {
+        clSYSTEM() << "Successfully detached from console" << endl;
+    }
 
     // Copy gdb pretty printers from the installation folder to a writeable location
     // this is  needed because python complies the files and in most cases the user
@@ -1185,6 +1188,4 @@ void CodeLiteApp::FinalizeShutdown()
     clDEBUG() << "Finalizing shutdown...success" << endl;
 }
 
-int CodeLiteApp::FilterEvent(wxEvent& event) {
-    return EventNotifier::Get()->FilterEvent(event);
-}
+int CodeLiteApp::FilterEvent(wxEvent& event) { return EventNotifier::Get()->FilterEvent(event); }

Plugin/wxTerminalCtrl/clBuiltinTerminalPane.cpp

@@ -28,7 +28,7 @@ std::map<wxString, wxString> LocateDefaultTerminals()
 {
     std::map<wxString, wxString> terminals;
     auto bash = ThePlatform->Which("bash");
-    auto cmd = ThePlatform->Which("cmd");
+    auto cmd = ThePlatform->Which("powershell");
     if (bash.has_value()) {
         terminals.insert(
             {wxString::Format("%s --login -i", bash.value()), wxString::Format("%s --login -i", bash.value())});
@@ -77,10 +77,39 @@ clBuiltinTerminalPane::clBuiltinTerminalPane(wxWindow* parent, wxWindowID id)
     GetSizer()->Fit(this);
     m_book->Bind(wxEVT_BOOK_PAGE_CHANGED, &clBuiltinTerminalPane::OnPageChanged, this);
     EventNotifier::Get()->Bind(wxEVT_WORKSPACE_LOADED, &clBuiltinTerminalPane::OnWorkspaceLoaded, this);
+
+    auto on_key_down = [this](wxEvent& event) -> bool {
+        auto terminal = GetActiveTerminal();
+        CHECK_PTR_RET_FALSE(terminal);
+        CHECK_COND_RET_FALSE(terminal->HasFocus());
+        wxKeyEvent* key_event = dynamic_cast<wxKeyEvent*>(&event);
+        if (!key_event) {
+            return false;
+        }
+        return terminal->GetEventHandler()->ProcessEvent(*key_event);
+    };
+    auto on_char_hook = [this](wxEvent& event) -> bool {
+        auto terminal = GetActiveTerminal();
+        CHECK_PTR_RET_FALSE(terminal);
+        CHECK_COND_RET_FALSE(terminal->HasFocus());
+        wxKeyEvent* key_event = dynamic_cast<wxKeyEvent*>(&event);
+        if (!key_event) {
+            return false;
+        }
+        return terminal->GetEventHandler()->ProcessEvent(*key_event);
+    };
+    m_tokens.push_back(
+        {EventNotifier::Get()->AddEventTypeFilter(wxEVT_KEY_DOWN, std::move(on_key_down)), wxEVT_KEY_DOWN});
+    m_tokens.push_back(
+        {EventNotifier::Get()->AddEventTypeFilter(wxEVT_CHAR_HOOK, std::move(on_char_hook)), wxEVT_CHAR_HOOK});
 }
 
 clBuiltinTerminalPane::~clBuiltinTerminalPane()
 {
+    for (const auto& [token, evt_type] : m_tokens) {
+        EventNotifier::Get()->RemoveEventTypeFilter(evt_type, token);
+    }
+
     m_book->Unbind(wxEVT_BOOK_PAGE_CHANGED, &clBuiltinTerminalPane::OnPageChanged, this);
     EventNotifier::Get()->Unbind(wxEVT_WORKSPACE_LOADED, &clBuiltinTerminalPane::OnWorkspaceLoaded, this);
     clConfig::Get().Write("terminal/last_used_terminal", m_terminal_types->GetStringSelection());
@@ -115,7 +144,6 @@ void clBuiltinTerminalPane::OnNew(wxCommandEvent& event)
     // By default, inherit parent's env.
     EnvSetter env_setter{};
     std::optional<TerminalView::EnvironmentList> env{std::nullopt};
-
     TerminalView* ctrl = new TerminalView(m_book, cmd, env);
     m_book->AddPage(ctrl, cmd, true);
     m_book->SetPageToolTip(m_book->GetPageCount() - 1, cmd);

Plugin/wxTerminalCtrl/clBuiltinTerminalPane.hpp

@@ -3,8 +3,10 @@
 
 #include "Notebook.h"
 #include "clWorkspaceEvent.hpp"
+#include "event_notifier.h"
 #include "terminal_event.h"
 
+#include <vector>
 #include <wx/aui/auibar.h>
 #include <wx/choice.h>
 #include <wx/panel.h>
@@ -34,6 +36,7 @@ class WXDLLIMPEXP_SDK clBuiltinTerminalPane : public wxPanel
     wxAuiToolBar* m_toolbar = nullptr;
     Notebook* m_book = nullptr;
     wxChoice* m_terminal_types = nullptr;
+    std::vector<std::pair<EventFilterCallbackToken, wxEventType>> m_tokens;
 };
 
 #endif // CLBUILTINTERMINALPANE_HPP