ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed zapper and mouse positioning in fullscreen and bestfit mode

This commit is contained in:
ansstuff 2012-12-05 18:10:07 +00:00
parent 72319e90d7
commit 9cc3a0d29c
2 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -1,3 +1,4 @@
05-Dec-2012 - AnS - fixed zapper and mouse positioning in fullscreen and bestfit mode
04-Dec-2012 - AnS - speed up HUD text drawing
04-Dec-2012 - AnS - Taseditor: speed up consecutive Recordings (when combining)
03-Dec-2012 - AnS - Taseditor: fixed accelerators when editing Notes

59
src/drivers/win/window.cpp
View File

@ -1111,27 +1111,56 @@ void LoadNewGamey(HWND hParent, const char *initialdir)
void GetMouseData(uint32 (&md)[3])
{
md[0] = mousex;
md[1] = mousey;
extern RECT resizable_surface_rect;
if(!fullscreen)
if (eoptions & EO_BESTFIT && (resizable_surface_rect.top || resizable_surface_rect.left))
{
if(ismaximized)
if (mousex <= resizable_surface_rect.left)
{
RECT t;
GetClientRect(hAppWnd, &t);
md[0] = md[0] * VNSWID / (t.right ? t.right : 1);
md[1] = md[1] * FSettings.TotalScanlines() / (t.bottom ? t.bottom : 1);
}
else
md[0] = 0;
} else if (mousex >= resizable_surface_rect.right)
{
md[0] /= winsizemulx;
md[1] /= winsizemuly;
md[0] = VNSWID;
} else
{
md[0] = VNSWID * (mousex - resizable_surface_rect.left) / (resizable_surface_rect.right - resizable_surface_rect.left);
}
if (mousey <= resizable_surface_rect.top)
{
md[1] = 0;
} else if (mousey >= resizable_surface_rect.bottom)
{
md[1] = FSettings.TotalScanlines();
} else
{
md[1] = FSettings.TotalScanlines() * (mousey - resizable_surface_rect.top) / (resizable_surface_rect.bottom - resizable_surface_rect.top);
}
} else
{
RECT client_rect;
GetClientRect(hAppWnd, &client_rect);
if (mousex <= client_rect.left)
{
md[0] = 0;
} else if (mousex >= client_rect.right)
{
md[0] = VNSWID;
} else
{
md[0] = VNSWID * (mousex - client_rect.left) / (client_rect.right - client_rect.left);
}
if (mousey <= client_rect.top)
{
md[1] = 0;
} else if (mousey >= client_rect.bottom)
{
md[1] = FSettings.TotalScanlines();
} else
{
md[1] = FSettings.TotalScanlines() * (mousey - client_rect.top) / (client_rect.bottom - client_rect.top);
}
md[0] += VNSCLIP;
}
md[0] += VNSCLIP;
md[1] += FSettings.FirstSLine;
md[2] = ((mouseb == MK_LBUTTON) ? 1 : 0) | (( mouseb == MK_RBUTTON ) ? 2 : 0);
}