maxmustermann/terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

This obviously works but is somehow just as dumb as a Sleep(1)

Browse source
This commit is contained in:
Mike Griese 2021-04-27 09:23:18 -05:00
parent 530903219e
commit f3c7d9c471
1 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/cascadia/WindowsTerminal/AppHost.cpp
View file

@ -755,30 +755,30 @@ bool AppHost::_LazyLoadDesktopManager()
return _desktopManager != nullptr;
}
static wil::unique_event windowCreated;
// static wil::unique_event windowCreated;
GUID AppHost::_fakeGetCurrentDesktop()
{
GUID currentlyActiveDesktop;
static bool createEvent{ []() {
windowCreated.create();
return true;
}() };
static auto fakeWndProc = [](HWND const window, UINT const message, WPARAM const wparam, LPARAM const lparam) -> LRESULT {
if (message == WM_SHOWWINDOW && wparam)
{
windowCreated.SetEvent();
}
return DefWindowProc(window, message, wparam, lparam);
};
// static bool createEvent{ []() {
// windowCreated.create();
// return true;
// }() };
// static auto fakeWndProc = [](HWND const window, UINT const message, WPARAM const wparam, LPARAM const lparam) -> LRESULT {
// if (message == WM_SHOWWINDOW && wparam)
// {
// windowCreated.SetEvent();
// }
// return DefWindowProc(window, message, wparam, lparam);
// };
// *** magic static ***
// Only initialize the psuedo class once over the lifetime of the process
static ATOM pseudoClassAtom{ []() {
WNDCLASS pseudoClass{ 0 };
pseudoClass.lpszClassName = PSEUDO_WINDOW_CLASS;
// pseudoClass.lpfnWndProc = DefWindowProc;
pseudoClass.lpfnWndProc = fakeWndProc;
pseudoClass.lpfnWndProc = DefWindowProc;
// pseudoClass.lpfnWndProc = fakeWndProc;
return RegisterClass(&pseudoClass);
}() };
@ -794,11 +794,20 @@ GUID AppHost::_fakeGetCurrentDesktop()
nullptr,
nullptr,
nullptr) };
windowCreated.ResetEvent();
ShowWindow(hwnd.get(), SW_SHOWNORMAL);
// windowCreated.ResetEvent();
// ShowWindow(hwnd.get(), SW_SHOWNORMAL);
// Sleep(1); // !! LOAD BEARING !!
WaitForSingleObject(windowCreated.get(), INFINITE);
BOOL onCurrent = false;
while (!onCurrent)
{
ShowWindow(hwnd.get(), SW_HIDE);
ShowWindow(hwnd.get(), SW_RESTORE);
_desktopManager->IsWindowOnCurrentVirtualDesktop(hwnd.get(), &onCurrent);
}
// WaitForSingleObject(windowCreated.get(), INFINITE);
LOG_IF_FAILED(_desktopManager->GetWindowDesktopId(hwnd.get(), &currentlyActiveDesktop));