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

Use SWP_NOCOPYBITS for child window movements

Browse Source
This commit is contained in:
narzoul 2021-01-03 20:25:34 +01:00
parent 13ab654665
commit 337c5a9c5a
1 changed files with 2 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
DDrawCompat/Gdi/WinProc.cpp
View File

@ -19,16 +19,6 @@
namespace namespace
{ {
const char* PROP_DDRAWCOMPAT = "DDrawCompat";
struct ChildWindowInfo
{
RECT rect;
Gdi::Region visibleRegion;
ChildWindowInfo() : rect{} {}
};
struct WindowProc struct WindowProc
{ {
WNDPROC wndProcA; WNDPROC wndProcA;
@ -259,7 +249,6 @@ namespace
return; return;
} }
delete reinterpret_cast<ChildWindowInfo*>(RemoveProp(hwnd, PROP_DDRAWCOMPAT));
Compat::ScopedSrwLockExclusive lock(g_windowProcSrwLock); Compat::ScopedSrwLockExclusive lock(g_windowProcSrwLock);
auto it = g_windowProc.find(hwnd); auto it = g_windowProc.find(hwnd);
if (it != g_windowProc.end()) if (it != g_windowProc.end())
@ -280,38 +269,6 @@ namespace
{ {
Gdi::Window::updateAll(); Gdi::Window::updateAll();
} }
else
{
std::unique_ptr<ChildWindowInfo> cwi(reinterpret_cast<ChildWindowInfo*>(RemoveProp(hwnd, PROP_DDRAWCOMPAT)));
if (cwi && IsWindowVisible(hwnd) && !IsIconic(GetAncestor(hwnd, GA_ROOT)))
{
RECT rect = {};
GetWindowRect(hwnd, &rect);
if (rect.left != cwi->rect.left || rect.top != cwi->rect.top)
{
Gdi::Region clipRegion(hwnd);
cwi->visibleRegion.offset(rect.left - cwi->rect.left, rect.top - cwi->rect.top);
clipRegion &= cwi->visibleRegion;
Gdi::Region updateRegion;
GetUpdateRgn(hwnd, updateRegion, FALSE);
POINT clientPos = {};
ClientToScreen(hwnd, &clientPos);
OffsetRgn(updateRegion, clientPos.x, clientPos.y);
clipRegion -= updateRegion;
if (!clipRegion.isEmpty())
{
HDC screenDc = GetDC(nullptr);
SelectClipRgn(screenDc, clipRegion);
BitBlt(screenDc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top,
screenDc, cwi->rect.left, cwi->rect.top, SRCCOPY);
SelectClipRgn(screenDc, nullptr);
CALL_ORIG_FUNC(ReleaseDC)(nullptr, screenDc);
}
}
}
}
} }
void onWindowPosChanging(HWND hwnd, WINDOWPOS& wp) void onWindowPosChanging(HWND hwnd, WINDOWPOS& wp)
@ -322,17 +279,7 @@ namespace
} }
else else
{ {
std::unique_ptr<ChildWindowInfo> cwi(reinterpret_cast<ChildWindowInfo*>(RemoveProp(hwnd, PROP_DDRAWCOMPAT))); wp.flags |= SWP_NOCOPYBITS;
if (!(wp.flags & SWP_NOMOVE) && IsWindowVisible(hwnd) && !IsIconic(GetAncestor(hwnd, GA_ROOT)))
{
cwi.reset(new ChildWindowInfo());
GetWindowRect(hwnd, &cwi->rect);
cwi->visibleRegion = hwnd;
if (!cwi->visibleRegion.isEmpty())
{
SetProp(hwnd, PROP_DDRAWCOMPAT, cwi.release());
}
}
} }
} }
@ -397,9 +344,7 @@ namespace
onWindowPosChanging(hWnd, wp); onWindowPosChanging(hWnd, wp);
uFlags = wp.flags; uFlags = wp.flags;
} }
BOOL result = CALL_ORIG_FUNC(SetWindowPos)(hWnd, hWndInsertAfter, X, Y, cx, cy, uFlags); return LOG_RESULT(CALL_ORIG_FUNC(SetWindowPos)(hWnd, hWndInsertAfter, X, Y, cx, cy, uFlags));
delete reinterpret_cast<ChildWindowInfo*>(RemoveProp(hWnd, PROP_DDRAWCOMPAT));
return LOG_RESULT(result);
} }
void setWindowProc(HWND hwnd, WNDPROC wndProcA, WNDPROC wndProcW) void setWindowProc(HWND hwnd, WNDPROC wndProcA, WNDPROC wndProcW)