cherry-pick 479c6c9

src/cascadia/TerminalControl/ControlCore.cpp

@@ -1683,6 +1683,16 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         }
     }
 
+    void ControlCore::GotFocus()
+    {
+        _connection.WriteInput(L"\x1b[I");
+    }
+
+    void ControlCore::LostFocus()
+    {
+        _connection.WriteInput(L"\x1b[O");
+    }
+
     bool ControlCore::_isBackgroundTransparent()
     {
         // If we're:

src/cascadia/TerminalControl/ControlCore.h

@@ -81,6 +81,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         void PasteText(const winrt::hstring& hstr);
         bool CopySelectionToClipboard(bool singleLine, const Windows::Foundation::IReference<CopyFormat>& formats);
 
+        void GotFocus();
+        void LostFocus();
+
         void ToggleShaderEffects();
         void AdjustOpacity(const double adjustment);
         void ResumeRendering();

src/cascadia/TerminalControl/ControlInteractivity.cpp

@@ -111,6 +111,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             THROW_IF_FAILED(_uiaEngine->Enable());
         }
 
+        _core->GotFocus();
+
         _updateSystemParameterSettings();
     }
 
@@ -120,6 +122,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         {
             THROW_IF_FAILED(_uiaEngine->Disable());
         }
+
+        _core->LostFocus();
     }
 
     // Method Description

src/host/outputStream.cpp

@@ -892,3 +892,10 @@ void ConhostInternalGetSet::UpdateSoftFont(const gsl::span<const uint16_t> bitPa
         pRender->UpdateSoftFont(bitPattern, cellSize, centeringHint);
     }
 }
+
+void ConhostInternalGetSet::FocusChanged(const bool focused)
+{
+    auto& g = ServiceLocator::LocateGlobals();
+    auto& gci = g.getConsoleInformation();
+    gci.ProcessHandleList.ModifyConsoleProcessFocus(focused);
+}

src/host/outputStream.hpp

@@ -116,6 +116,8 @@ class ConhostInternalGetSet final : public Microsoft::Console::VirtualTerminal::
                         const SIZE cellSize,
                         const size_t centeringHint) override;
 
+    void FocusChanged(const bool focused) override;
+
 private:
     void _modifyLines(const size_t count, const bool insert);
 

src/server/IoDispatchers.cpp

@@ -456,7 +456,9 @@ PCONSOLE_API_MSG IoDispatchers::ConsoleHandleConnectionRequest(_In_ PCONSOLE_API
         return pReceiveMsg;
     }
 
-    gci.ProcessHandleList.ModifyConsoleProcessFocus(WI_IsFlagSet(gci.Flags, CONSOLE_HAS_FOCUS));
+    const bool hasFocus{ WI_IsFlagSet(gci.Flags, CONSOLE_HAS_FOCUS) };
+    const auto grantFG{ hasFocus };
+    gci.ProcessHandleList.ModifyConsoleProcessFocus(grantFG);
 
     // Create the handles.
 

src/terminal/adapter/InteractDispatch.cpp

@@ -171,9 +171,10 @@ bool InteractDispatch::IsVtInputEnabled() const
 
 bool InteractDispatch::FocusChanged(const bool focused) const
 {
-    // * TODO!: plumb through to conapi and then gci.ProcessHandleList.ModifyConsoleProcessFocus(focused);
     // * We should assume this is false by default?
     // * TODO!: ConPTY should ask for this mode? Yea? Lets make sure that VTE will send that sequence even without other mouse sequences enabled.
     //   - in the past, this is something we've made opt-in (request cursor, for example. Maybe also the other mouse modes, can't recall)
     // * gotta make sure that we can always handle the focus events, even if the client hasn't requested them.
+    _pConApi->FocusChanged(focused);
+    return true;
 }

src/terminal/adapter/conGetSet.hpp

@@ -111,5 +111,7 @@ namespace Microsoft::Console::VirtualTerminal
         virtual void UpdateSoftFont(const gsl::span<const uint16_t> bitPattern,
                                     const SIZE cellSize,
                                     const size_t centeringHint) = 0;
+
+        virtual void FocusChanged(const bool focused) = 0;
     };
 }