Revert "we do not want this"

This reverts commit 4ab628d.

Author: zadjii-msft

src/cascadia/Remoting/WindowManager.cpp

@@ -75,26 +75,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         //
         // * If we're running unpackaged: the .winmd must be a sibling of the .exe
         // * If we're running packaged: the .winmd must be in the package root
-        // const winrt::com_ptr<::IUnknown> monarch = try_create_instance<::IUnknown>(MonarchCLSID(),
-        //                                                                            CLSCTX_LOCAL_SERVER);
-        // // const auto monarch = try_create_instance<Remoting::IMonarch>(MonarchCLSID(),
-        // //                                                              CLSCTX_LOCAL_SERVER);
-
-        // if (monarch)
-        // {
-        //     const auto hr = (CoAllowSetForegroundWindow(monarch.get(), nullptr));
-        //     if (FAILED(hr))
-        //     {
-        //         DebugBreak();
-        //     }
-        // }
-
-        // _monarch = monarch.try_as<Remoting::IMonarch>();
-        _monarch = try_create_instance<Remoting::IMonarch>(MonarchCLSID(), CLSCTX_LOCAL_SERVER);
-        if (_monarch)
-        {
-            LOG_LAST_ERROR_IF(!AllowSetForegroundWindow((DWORD)_monarch.GetPID()));
-        }
+        _monarch = try_create_instance<Remoting::IMonarch>(MonarchCLSID(),
+                                                           CLSCTX_LOCAL_SERVER);
     }
 
     // Check if we became the king, and if we are, wire up callbacks.
@@ -507,9 +489,6 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         summonArgs.ToggleVisibility(false);
 
         args.SummonBehavior(summonArgs);
-
-        LOG_LAST_ERROR_IF(!AllowSetForegroundWindow((DWORD)monarch.GetPID()));
-
         monarch.SummonWindow(args);
         return true;
     }

src/cascadia/WindowsTerminal/IslandWindow.cpp

@@ -27,16 +27,6 @@ using VirtualKeyModifiers = winrt::Windows::System::VirtualKeyModifiers;
 #define XAML_HOSTING_WINDOW_CLASS_NAME L"CASCADIA_HOSTING_WINDOW_CLASS"
 #define IDM_SYSTEM_MENU_BEGIN 0x1000
 
-void _trace(const wchar_t* const pwsz)
-{
-    TraceLoggingWrite(g_hWindowsTerminalProvider,
-                      "TraceMessage",
-                      TraceLoggingDescription("debug print messages"),
-                      TraceLoggingWideString(pwsz, "message", "the message"),
-                      TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
-                      TraceLoggingKeyword(TIL_KEYWORD_TRACE));
-}
-
 IslandWindow::IslandWindow() noexcept :
     _interopWindowHandle{ nullptr },
     _rootGrid{ nullptr },
@@ -1532,7 +1522,6 @@ void IslandWindow::_globalActivateWindow(const uint32_t dropdownDuration,
     // restore-down the window.
     if (IsIconic(_window.get()))
     {
-        _trace(L"window was iconic");
         if (dropdownDuration > 0)
         {
             _dropdownWindow(dropdownDuration, toMonitor);
@@ -1545,47 +1534,16 @@ void IslandWindow::_globalActivateWindow(const uint32_t dropdownDuration,
             // able to properly set this as the foreground window.
             if (!IsWindowVisible(GetHandle()))
             {
-                _trace(L"window wasn't visible");
                 ShowWindow(_window.get(), SW_SHOW);
             }
             ShowWindow(_window.get(), SW_RESTORE);
-            if (!SetForegroundWindow(_window.get()))
-            {
-                const auto gle = GetLastError();
-                _trace(fmt::format(L"SetForegroundWindow failed: {}", gle).c_str());
-
-                const auto fg = GetForegroundWindow();
-                std::wstring title(GetWindowTextLength(fg) + 1, L'\0');
-                GetWindowTextW(fg, &title[0], (DWORD)title.size());
-                DWORD fgPid = 0;
-                GetWindowThreadProcessId(fg, &fgPid);
-                _trace(fmt::format(L"Foreground Window is: [{}]={}", (uint64_t)fgPid, title).c_str());
-
-                SwitchToThisWindow(_window.get(), false);
-            }
-            else
-            {
-                _trace(L"got fg?");
-            }
-
-            // LOG_IF_WIN32_BOOL_FALSE(BringWindowToTop(_window.get()));
-            if (!BringWindowToTop(_window.get()))
-            {
-                const auto gle = GetLastError();
-                _trace(fmt::format(L"BringWindowToTop failed: {}", gle).c_str());
-            }
-            else
-            {
-                _trace(L"brought to top?");
-            }
 
             // Once we've been restored, throw us on the active monitor.
             _moveToMonitor(oldForegroundWindow, toMonitor);
         }
     }
     else
     {
-        _trace(L"window wasn't iconic");
         // Try first to send a message to the current foreground window. If it's not responding, it may
         // be waiting on us to finish launching. Passing SMTO_NOTIMEOUTIFNOTHUNG means that we get the same
         // behavior as before--that is, waiting for the message loop--but we've done an early return if
@@ -1611,10 +1569,6 @@ void IslandWindow::_globalActivateWindow(const uint32_t dropdownDuration,
             // Throw us on the active monitor.
             _moveToMonitor(oldForegroundWindow, toMonitor);
         }
-        else
-        {
-            _trace(L"huh");
-        }
     }
 }
 

src/cascadia/WindowsTerminal/WindowEmperor.cpp

@@ -59,32 +59,6 @@ void _buildArgsFromCommandline(std::vector<winrt::hstring>& args)
         args.emplace_back(L"wt.exe");
     }
 }
-
-HWND _createToolWindow()
-{
-    WNDCLASS wc{};
-    wc.hCursor = LoadCursor(nullptr, IDC_ARROW);
-    wc.hInstance = reinterpret_cast<HINSTANCE>(&__ImageBase);
-    wc.lpszClassName = TERMINAL_MESSAGE_CLASS_NAME;
-    wc.style = CS_HREDRAW | CS_VREDRAW;
-    wc.lpfnWndProc = DefWindowProc; //WindowEmperor::_wndProc;
-    wc.hIcon = LoadIconW(wc.hInstance, MAKEINTRESOURCEW(IDI_APPICON));
-    RegisterClass(&wc);
-    // WINRT_ASSERT(!_window);
-
-    return CreateWindow(wc.lpszClassName,
-                        L"Windows Terminal Notification Handoff",
-                        0,
-                        CW_USEDEFAULT,
-                        CW_USEDEFAULT,
-                        CW_USEDEFAULT,
-                        CW_USEDEFAULT,
-                        HWND_MESSAGE,
-                        nullptr,
-                        wc.hInstance,
-                        nullptr);
-}
-
 bool WindowEmperor::_handleLaunchArgs()
 try
 {
@@ -140,8 +114,6 @@ try
                     // }
                 }
             }
-            auto fake = _createToolWindow();
-            fake;
             return winrt::Microsoft::Terminal::Remoting::WindowManager::SummonForNotification(window);
         }
     }