backup/DDrawCompat
1
0
Fork 0
mirror of https://github.com/narzoul/DDrawCompat synced 2024-12-30 08:55:36 +01:00
Code Issues Projects Releases Activity

Added AltTabFix=noactivateapp setting

Browse Source 
Fixes alt-tabbing in Tonic Trouble (issue #286).
This commit is contained in:
narzoul 2024-04-14 15:40:54 +02:00
parent 8e84130378
commit 5b35b3b261
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
DDrawCompat/Config/Settings/AltTabFix.h
View File

@ -9,16 +9,23 @@ namespace Config
class AltTabFix : public EnumSetting class AltTabFix : public EnumSetting
{ {
public: public:
enum Values { OFF, KEEPVIDMEM }; enum Values { OFF, KEEPVIDMEM, NOACTIVATEAPP };
AltTabFix() AltTabFix()
: EnumSetting("AltTabFix", "off", { "off", "keepvidmem" }) : EnumSetting("AltTabFix", "off", { "off", "keepvidmem", "noactivateapp" })
{ {
} }
virtual ParamInfo getParamInfo() const override virtual ParamInfo getParamInfo() const override
{ {
return KEEPVIDMEM == m_value ? ParamInfo{ "KeepPrimary", 0, 1, 1 } : ParamInfo{}; switch (m_value)
{
case KEEPVIDMEM:
return { "KeepPrimary", 0, 1, 1 };
case NOACTIVATEAPP:
return { "PassToApp", 0, 1, 1 };
}
return {};
} }
}; };
} }

8
DDrawCompat/DDraw/DirectDraw.cpp
View File

@ -183,12 +183,18 @@ namespace
if (origWndProc) if (origWndProc)
{ {
auto tagSurface = DDraw::TagSurface::findFullscreenWindow(); auto tagSurface = DDraw::TagSurface::findFullscreenWindow();
if (tagSurface && tagSurface->getExclusiveOwnerThreadId() != GetCurrentThreadId()) if (tagSurface && tagSurface->getExclusiveOwnerThreadId() != GetCurrentThreadId() ||
Config::Settings::AltTabFix::NOACTIVATEAPP == Config::altTabFix.get())
{ {
if (!wParam) if (!wParam)
{ {
ShowWindow(hwnd, SW_SHOWMINNOACTIVE); ShowWindow(hwnd, SW_SHOWMINNOACTIVE);
} }
if (Config::Settings::AltTabFix::NOACTIVATEAPP == Config::altTabFix.get() &&
0 == Config::altTabFix.getParam())
{
return LOG_RESULT(0);
}
return LOG_RESULT(CallWindowProcA(origWndProc, hwnd, WM_ACTIVATEAPP, wParam, lParam)); return LOG_RESULT(CallWindowProcA(origWndProc, hwnd, WM_ACTIVATEAPP, wParam, lParam));
} }
} }