snxrzx
/
mkxp-sunshine
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed crashes/weirdness with obscured window code

This commit is contained in:
Mathew Velasquez 2016-02-27 22:22:52 -05:00
parent df2a32d4f0
commit 71867727ab
1 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/oneshot.cpp
View File

@ -82,6 +82,7 @@ struct OneshotPrivate
//Alpha texture data for portions of window obscured by screen edges //Alpha texture data for portions of window obscured by screen edges
int winX, winY; int winX, winY;
SDL_mutex *winMutex;
bool winPosChanged; bool winPosChanged;
std::vector<uint8_t> obscuredMap; std::vector<uint8_t> obscuredMap;
bool obscuredCleared; bool obscuredCleared;
@ -100,7 +101,8 @@ struct OneshotPrivate
#endif #endif
OneshotPrivate() OneshotPrivate()
: window(0) : window(0),
winMutex(SDL_CreateMutex())
#if defined OS_LINUX #if defined OS_LINUX
,libgtk(0) ,libgtk(0)
#endif #endif
@ -109,6 +111,7 @@ struct OneshotPrivate
~OneshotPrivate() ~OneshotPrivate()
{ {
SDL_DestroyMutex(winMutex);
#ifdef OS_LINUX #ifdef OS_LINUX
if (libgtk) if (libgtk)
dlclose(libgtk); dlclose(libgtk);
@ -355,12 +358,17 @@ void Oneshot::update()
p->winPosChanged = false; p->winPosChanged = false;
//Map of unobscured pixels in this frame //Map of unobscured pixels in this frame
static std::vector<bool> obscuredFrame(p->obscuredMap.size()); static std::vector<bool> obscuredFrame;
obscuredFrame.resize(p->obscuredMap.size());
if (p->obscuredMap.size() != 640 * 480)
Debug() << p->obscuredMap.size();
std::fill(obscuredFrame.begin(), obscuredFrame.end(), true); std::fill(obscuredFrame.begin(), obscuredFrame.end(), true);
SDL_Rect screenRect; SDL_Rect screenRect;
SDL_LockMutex(p->winMutex);
screenRect.x = p->winX; screenRect.x = p->winX;
screenRect.y = p->winY; screenRect.y = p->winY;
SDL_UnlockMutex(p->winMutex);
screenRect.w = 640; screenRect.w = 640;
screenRect.h = 480; screenRect.h = 480;
@ -370,17 +378,24 @@ void Oneshot::update()
SDL_Rect bounds; SDL_Rect bounds;
SDL_GetDisplayBounds(i, &bounds); SDL_GetDisplayBounds(i, &bounds);
//If it's fully within the monitor, it's completely unobscured //Get intersection of window and the screen
//and no texture update is necessary
if (p->winX >= bounds.x && p->winY >= bounds.y && p->winX + 640 <= bounds.x + bounds.w && p->winY + 480 <= bounds.y + bounds.h)
return;
//Update obscuredFrame otherwise
SDL_Rect intersect; SDL_Rect intersect;
if (!SDL_IntersectRect(&screenRect, &bounds, &intersect)) if (!SDL_IntersectRect(&screenRect, &bounds, &intersect))
continue; continue;
intersect.x -= p->winX; intersect.x -= screenRect.x;
intersect.y -= p->winY; intersect.y -= screenRect.y;
//If it's entirely within the bounds of the screen, we don't need to check out
//any other monitors
if (intersect.x == 0 && intersect.y == 0 && intersect.w == 640 && intersect.h == 480)
return;
if (intersect.x < 0 || intersect.y < 0)
{
Debug() << i;
Debug() << intersect.x << intersect.y << intersect.w << intersect.h;
Debug() << p->winX << p->winY;
}
for (int y = intersect.y; y < intersect.y + intersect.h; ++y) for (int y = intersect.y; y < intersect.y + intersect.h; ++y)
{ {
int start = y * 640 + intersect.x; int start = y * 640 + intersect.x;
@ -545,13 +560,16 @@ bool Oneshot::msgbox(int type, const char *body, const char *title)
void Oneshot::setWindowPos(int x, int y) void Oneshot::setWindowPos(int x, int y)
{ {
SDL_LockMutex(p->winMutex);
p->winX = x; p->winX = x;
p->winY = y; p->winY = y;
p->winPosChanged = true; p->winPosChanged = true;
SDL_UnlockMutex(p->winMutex);
} }
void Oneshot::resetObscured() void Oneshot::resetObscured()
{ {
std::fill(p->obscuredMap.begin(), p->obscuredMap.end(), 255); std::fill(p->obscuredMap.begin(), p->obscuredMap.end(), 255);
obscuredDirty = true; obscuredDirty = true;
p->obscuredCleared = false;
} }