wip

src/cascadia/TerminalApp/AppLogic.cpp

@@ -13,15 +13,52 @@
 
 using namespace winrt::Windows::ApplicationModel;
 using namespace winrt::Windows::ApplicationModel::DataTransfer;
+using namespace winrt::Windows::System;
+using namespace winrt::Windows::UI::Core;
+using namespace winrt::Windows::UI::Text::Core;
 using namespace winrt::Windows::UI::Xaml;
 using namespace winrt::Windows::UI::Xaml::Controls;
-using namespace winrt::Windows::UI::Core;
-using namespace winrt::Windows::System;
 using namespace winrt::Microsoft::Terminal;
 using namespace winrt::Microsoft::Terminal::Control;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace ::TerminalApp;
 
+class LanguageProfileNotifier : public winrt::implements<LanguageProfileNotifier, ITfActiveLanguageProfileNotifySink>
+{
+public:
+    explicit LanguageProfileNotifier(std::function<void()> callback) :
+        _callback{ std::move(callback) }
+    {
+        _manager = wil::CoCreateInstance<ITfThreadMgr>(CLSID_TF_ThreadMgr);
+        _source = _manager.query<ITfSource>();
+        if (FAILED(_source->AdviseSink(IID_ITfActiveLanguageProfileNotifySink, static_cast<ITfActiveLanguageProfileNotifySink*>(this), &_cookie)))
+        {
+            _cookie = TF_INVALID_COOKIE;
+            THROW_LAST_ERROR();
+        }
+    }
+
+    ~LanguageProfileNotifier()
+    {
+        if (_cookie != TF_INVALID_COOKIE)
+        {
+            _source->UnadviseSink(_cookie);
+        }
+    }
+
+    HRESULT OnActivated(const IID&, const GUID&, BOOL)
+    {
+        _callback();
+        return S_OK;
+    }
+
+private:
+    std::function<void()> _callback;
+    wil::com_ptr<ITfThreadMgr> _manager;
+    wil::com_ptr<ITfSource> _source;
+    DWORD _cookie = TF_INVALID_COOKIE;
+};
+
 namespace winrt
 {
     namespace MUX = Microsoft::UI::Xaml;
@@ -191,24 +228,42 @@ namespace winrt::TerminalApp::implementation
     AppLogic::AppLogic() :
         _reloadState{ std::chrono::milliseconds(100), []() { ApplicationState::SharedInstance().Reload(); } }
     {
-        // For your own sanity, it's better to do setup outside the ctor.
-        // If you do any setup in the ctor that ends up throwing an exception,
-        // then it might look like App just failed to activate, which will
-        // cause you to chase down the rabbit hole of "why is App not
-        // registered?" when it definitely is.
+        try
+        {
+            // For your own sanity, it's better to do setup outside the ctor.
+            // If you do any setup in the ctor that ends up throwing an exception,
+            // then it might look like App just failed to activate, which will
+            // cause you to chase down the rabbit hole of "why is App not
+            // registered?" when it definitely is.
 
-        // The TerminalPage has to be constructed during our construction, to
-        // make sure that there's a terminal page for callers of
-        // SetTitleBarContent
-        _isElevated = _isUserAdmin();
-        _root = winrt::make_self<TerminalPage>();
+            // The TerminalPage has to be constructed during our construction, to
+            // make sure that there's a terminal page for callers of
+            // SetTitleBarContent
+            _isElevated = _isUserAdmin();
+            _root = winrt::make_self<TerminalPage>();
 
-        _reloadSettings = std::make_shared<ThrottledFuncTrailing<>>(_root->Dispatcher(), std::chrono::milliseconds(100), [weakSelf = get_weak()]() {
-            if (auto self{ weakSelf.get() })
-            {
-                self->_ReloadSettings();
-            }
-        });
+            _reloadSettings = std::make_shared<ThrottledFuncTrailing<>>(_root->Dispatcher(), std::chrono::milliseconds(100), [weakSelf = get_weak()]() {
+                if (auto self{ weakSelf.get() })
+                {
+                    self->_ReloadSettings();
+                }
+            });
+
+            static auto f = winrt::make<LanguageProfileNotifier>([]() {
+                printf("");
+            });
+            /*auto resourceContext = winrt::Windows::ApplicationModel::Resources::Core::ResourceContext::GetForViewIndependentUse();
+            auto qualifierValues = resourceContext.QualifierValues();
+            _qualifierValuesChangedRevoker = qualifierValues.MapChanged(winrt::auto_revoke, [this](const auto& sender, const auto& change) {
+                _reloadSettings->Run();
+                _InputLanguageChangedHandlers(sender, change);
+            });*/
+        }
+        catch (...)
+        {
+            LOG_CAUGHT_EXCEPTION();
+            throw;
+        }
     }
 
     // Method Description:

src/cascadia/TerminalApp/AppLogic.h

@@ -99,6 +99,7 @@ namespace winrt::TerminalApp::implementation
         // -------------------------------- WinRT Events ---------------------------------
         TYPED_EVENT(RequestedThemeChanged, winrt::Windows::Foundation::IInspectable, winrt::Windows::UI::Xaml::ElementTheme);
         TYPED_EVENT(SettingsChanged, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
+        TYPED_EVENT(InputLanguageChanged, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
 
     private:
         bool _isUwp{ false };
@@ -110,8 +111,8 @@ namespace winrt::TerminalApp::implementation
         // ALSO: If you add any UIElements as roots here, make sure they're
         // updated in _ApplyTheme. The root currently is _root.
         winrt::com_ptr<TerminalPage> _root{ nullptr };
-
         Microsoft::Terminal::Settings::Model::CascadiaSettings _settings{ nullptr };
+        winrt::Windows::Foundation::Collections::IObservableMap<winrt::hstring,winrt::hstring>::MapChanged_revoker _qualifierValuesChangedRevoker;
 
         wil::unique_folder_change_reader_nothrow _reader;
         std::shared_ptr<ThrottledFuncTrailing<>> _reloadSettings;

src/cascadia/TerminalApp/AppLogic.idl

@@ -91,6 +91,7 @@ namespace TerminalApp
         event Windows.Foundation.TypedEventHandler<Object, Object> IdentifyWindowsRequested;
         event Windows.Foundation.TypedEventHandler<Object, RenameWindowRequestedArgs> RenameWindowRequested;
         event Windows.Foundation.TypedEventHandler<Object, Object> SettingsChanged;
+        event Windows.Foundation.TypedEventHandler<Object, Object> InputLanguageChanged;
         event Windows.Foundation.TypedEventHandler<Object, Object> IsQuakeWindowChanged;
         event Windows.Foundation.TypedEventHandler<Object, Object> SummonWindowRequested;
     }

src/cascadia/TerminalApp/pch.h

@@ -26,6 +26,7 @@
 #include <wil/cppwinrt.h>
 
 #include <winrt/Windows.ApplicationModel.h>
+#include <winrt/Windows.ApplicationModel.Resources.Core.h>
 #include <winrt/Windows.ApplicationModel.DataTransfer.h>
 #include <winrt/Windows.Foundation.h>
 #include <winrt/Windows.Foundation.Collections.h>
@@ -36,6 +37,7 @@
 #include <winrt/Windows.UI.Core.h>
 #include <winrt/Windows.UI.Input.h>
 #include <winrt/Windows.UI.Text.h>
+#include <winrt/Windows.UI.Text.Core.h>
 #include <winrt/Windows.UI.ViewManagement.h>
 #include <winrt/Windows.UI.Xaml.Automation.Peers.h>
 #include <winrt/Windows.UI.Xaml.Controls.h>
@@ -66,6 +68,7 @@ TRACELOGGING_DECLARE_PROVIDER(g_hTerminalAppProvider);
 #include <telemetry/ProjectTelemetry.h>
 #include <TraceLoggingActivity.h>
 
+#include <msctf.h>
 #include <shellapi.h>
 #include <shobjidl_core.h>
 

src/cascadia/WindowsTerminal/AppHost.cpp

@@ -13,11 +13,12 @@
 
 #include <ScopedResourceLoader.h>
 
+using namespace winrt::Windows::Foundation::Numerics;
 using namespace winrt::Windows::UI;
 using namespace winrt::Windows::UI::Composition;
+using namespace winrt::Windows::UI::Text::Core;
 using namespace winrt::Windows::UI::Xaml;
 using namespace winrt::Windows::UI::Xaml::Hosting;
-using namespace winrt::Windows::Foundation::Numerics;
 using namespace winrt::Microsoft::Terminal;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace ::Microsoft::Console;

src/cascadia/WindowsTerminal/AppHost.h

@@ -24,6 +24,7 @@ private:
     winrt::TerminalApp::App _app;
     winrt::TerminalApp::AppLogic _logic;
     winrt::Microsoft::Terminal::Remoting::WindowManager _windowManager{ nullptr };
+    winrt::Windows::UI::Text::Core::CoreTextServicesManager::InputLanguageChanged_revoker _inputLanguageChangedRevoker;
 
     std::vector<winrt::Microsoft::Terminal::Settings::Model::GlobalSummonArgs> _hotkeys;
     winrt::com_ptr<IVirtualDesktopManager> _desktopManager{ nullptr };

src/cascadia/WindowsTerminal/pch.h

@@ -29,8 +29,6 @@ Abstract:
 
 #include <windows.h>
 #include <UIAutomation.h>
-#include <cstdlib>
-#include <cstring>
 #include <shellscalingapi.h>
 #include <windowsx.h>
 #include <ShObjIdl.h>
@@ -50,26 +48,28 @@ Abstract:
 #include <wil/cppwinrt.h>
 
 // Needed just for XamlIslands to work at all:
-#include <winrt/Windows.system.h>
 #include <winrt/Windows.Foundation.Collections.h>
+#include <winrt/Windows.system.h>
+#include <winrt/Windows.UI.Text.Core.h>
 #include <winrt/Windows.UI.Xaml.Hosting.h>
-#include <windows.ui.xaml.hosting.desktopwindowxamlsource.h>
 
 // Additional headers for various xaml features. We need:
 //  * Core so we can resume_foreground with CoreDispatcher
 //  * Controls for grid
 //  * Media for ScaleTransform
 //  * ApplicationModel for finding the path to wt.exe
+#include <winrt/Windows.ApplicationModel.h>
+#include <winrt/Windows.ApplicationModel.Resources.Core.h>
 #include <winrt/Windows.UI.Core.h>
 #include <winrt/Windows.UI.Xaml.Controls.h>
 #include <winrt/Windows.ui.xaml.media.h>
-#include <winrt/Windows.ApplicationModel.h>
-#include <winrt/Windows.ApplicationModel.Resources.Core.h>
+
+#include <windows.ui.xaml.hosting.desktopwindowxamlsource.h>
 
 #include <winrt/TerminalApp.h>
-#include <winrt/Microsoft.Terminal.Settings.Model.h>
-#include <winrt/Microsoft.Terminal.Remoting.h>
 #include <winrt/Microsoft.Terminal.Control.h>
+#include <winrt/Microsoft.Terminal.Remoting.h>
+#include <winrt/Microsoft.Terminal.Settings.Model.h>
 
 #include <wil/resource.h>
 #include <wil/win32_helpers.h>
@@ -85,4 +85,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hWindowsTerminalProvider);
 #include <shellapi.h>
 #include <processenv.h>
 #include <WinUser.h>
+
 #include "til.h"