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

Exclude copied window regions from further preserved regions

Browse Source
This commit is contained in:
narzoul 2021-01-21 20:52:57 +01:00
parent c5a867bac5
commit 259f2bef20
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
DDrawCompat/Gdi/Window.cpp
View File

@ -72,11 +72,11 @@ namespace
return g_windows.emplace(hwnd, Window(hwnd)).first; return g_windows.emplace(hwnd, Window(hwnd)).first;
} }
void bltWindow(const RECT& dst, const RECT& src, const Gdi::Region& clipRegion) bool bltWindow(const RECT& dst, const RECT& src, const Gdi::Region& clipRegion)
{ {
if (dst.left == src.left && dst.top == src.top || clipRegion.isEmpty()) if (dst.left == src.left && dst.top == src.top || clipRegion.isEmpty())
{ {
return; return false;
} }
HDC screenDc = GetDC(nullptr); HDC screenDc = GetDC(nullptr);
@ -84,6 +84,7 @@ namespace
BitBlt(screenDc, dst.left, dst.top, src.right - src.left, src.bottom - src.top, screenDc, src.left, src.top, SRCCOPY); BitBlt(screenDc, dst.left, dst.top, src.right - src.left, src.bottom - src.top, screenDc, src.left, src.top, SRCCOPY);
SelectClipRgn(screenDc, nullptr); SelectClipRgn(screenDc, nullptr);
CALL_ORIG_FUNC(ReleaseDC)(nullptr, screenDc); CALL_ORIG_FUNC(ReleaseDC)(nullptr, screenDc);
return true;
} }
Gdi::Region getWindowRegion(HWND hwnd) Gdi::Region getWindowRegion(HWND hwnd)
@ -97,7 +98,7 @@ namespace
} }
void updatePosition(Window& window, const RECT& oldWindowRect, const RECT& oldClientRect, void updatePosition(Window& window, const RECT& oldWindowRect, const RECT& oldClientRect,
const Gdi::Region& oldVisibleRegion, const Gdi::Region& invalidatedRegion) const Gdi::Region& oldVisibleRegion, Gdi::Region& invalidatedRegion)
{ {
const bool isClientOriginChanged = const bool isClientOriginChanged =
window.clientRect.left - window.windowRect.left != oldClientRect.left - oldWindowRect.left || window.clientRect.left - window.windowRect.left != oldClientRect.left - oldWindowRect.left ||
@ -116,7 +117,7 @@ namespace
Gdi::Region preservedRegion; Gdi::Region preservedRegion;
if (!isClientInvalidated || !isFrameInvalidated) if (!isClientInvalidated || !isFrameInvalidated)
{ {
preservedRegion = oldVisibleRegion; preservedRegion = oldVisibleRegion - invalidatedRegion;
preservedRegion.offset(window.windowRect.left - oldWindowRect.left, window.windowRect.top - oldWindowRect.top); preservedRegion.offset(window.windowRect.left - oldWindowRect.left, window.windowRect.top - oldWindowRect.top);
preservedRegion &= window.visibleRegion; preservedRegion &= window.visibleRegion;
@ -156,15 +157,19 @@ namespace
preservedRegion -= updateRegion; preservedRegion -= updateRegion;
} }
preservedRegion -= invalidatedRegion; bool isCopied = false;
if (!isFrameInvalidated) if (!isFrameInvalidated)
{ {
bltWindow(window.windowRect, oldWindowRect, preservedRegion); isCopied = bltWindow(window.windowRect, oldWindowRect, preservedRegion);
} }
else else
{ {
bltWindow(window.clientRect, oldClientRect, preservedRegion); isCopied = bltWindow(window.clientRect, oldClientRect, preservedRegion);
}
if (isCopied)
{
invalidatedRegion |= preservedRegion;
} }
} }