a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed mouse trap bug in fullscreen

Browse Source
This commit is contained in:
pagefault
2001-07-26 03:39:24 +00:00
parent 4aed468e9f
commit bac33db545
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
zsnes/src/win/winlink.cpp
View File

@@ -2539,15 +2539,15 @@ int GetMouseX(void)
{ {
MouseX = MouseMaxX; MouseX = MouseMaxX;
if (TrapMouseCursor == 1 && FullScreen == 0) if (TrapMouseCursor == 1)
{ {
if (abs(MouseMoveX) > 10 && T36HZEnabled) if (abs(MouseMoveX) > 10 && T36HZEnabled && FullScreen == 0)
{ {
MouseInput->Unacquire(); MouseInput->Unacquire();
SetCursorPos(X + WindowWidth + 32, Y + (MouseY * WindowHeight / 224)); SetCursorPos(X + WindowWidth + 32, Y + (MouseY * WindowHeight / 224));
} }
} }
else else if (FullScreen == 0)
{ {
MouseInput->Unacquire(); MouseInput->Unacquire();
SetCursorPos(X + WindowWidth + 1, Y + (MouseY * WindowHeight / 224)); SetCursorPos(X + WindowWidth + 1, Y + (MouseY * WindowHeight / 224));
@@ -2558,15 +2558,15 @@ int GetMouseX(void)
{ {
MouseX = MouseMinX; MouseX = MouseMinX;
if (TrapMouseCursor == 1 && FullScreen == 0) if (TrapMouseCursor == 1)
{ {
if (abs(MouseMoveX) > 10 && T36HZEnabled) if (abs(MouseMoveX) > 10 && T36HZEnabled && FullScreen == 0)
{ {
MouseInput->Unacquire(); MouseInput->Unacquire();
SetCursorPos(X - 32, Y + (MouseY * WindowHeight / 224)); SetCursorPos(X - 32, Y + (MouseY * WindowHeight / 224));
} }
} }
else else if (FullScreen == 0)
{ {
MouseInput->Unacquire(); MouseInput->Unacquire();
SetCursorPos(X - 1, Y + (MouseY * WindowHeight / 224)); SetCursorPos(X - 1, Y + (MouseY * WindowHeight / 224));
@@ -2583,15 +2583,15 @@ int GetMouseY(void)
{ {
MouseY = MouseMaxY; MouseY = MouseMaxY;
if (TrapMouseCursor == 1 && FullScreen == 0) if (TrapMouseCursor == 1)
{ {
if (abs(MouseMoveY) > 10 && T36HZEnabled) if (abs(MouseMoveY) > 10 && T36HZEnabled && FullScreen == 0)
{ {
MouseInput->Unacquire(); MouseInput->Unacquire();
SetCursorPos(X+(MouseX * WindowWidth / 256), Y + WindowHeight + 32); SetCursorPos(X+(MouseX * WindowWidth / 256), Y + WindowHeight + 32);
} }
} }
else else if (FullScreen == 0)
{ {
MouseInput->Unacquire(); MouseInput->Unacquire();
SetCursorPos(X+(MouseX * WindowWidth / 256), Y + WindowHeight + 1); SetCursorPos(X+(MouseX * WindowWidth / 256), Y + WindowHeight + 1);
@@ -2602,15 +2602,15 @@ int GetMouseY(void)
{ {
MouseY = MouseMinY; MouseY = MouseMinY;
if (TrapMouseCursor == 1 && FullScreen == 0) if (TrapMouseCursor == 1)
{ {
if (abs(MouseMoveY) > 10 && T36HZEnabled) if (abs(MouseMoveY) > 10 && T36HZEnabled && FullScreen == 0)
{ {
MouseInput->Unacquire(); MouseInput->Unacquire();
SetCursorPos(X + (MouseX * WindowWidth / 256), Y - 32); SetCursorPos(X + (MouseX * WindowWidth / 256), Y - 32);
} }
} }
else else if (FullScreen == 0)
{ {
MouseInput->Unacquire(); MouseInput->Unacquire();
SetCursorPos(X + (MouseX * WindowWidth / 256), Y - 1); SetCursorPos(X + (MouseX * WindowWidth / 256), Y - 1);
@@ -2637,25 +2637,25 @@ int GetMouseButton(void)
RECT rc1; RECT rc1;
if (MouseButton&2) if (MouseButton&2)
{ {
while ((MouseButton!=0)&&T36HZEnabled&&(FullScreen==0)) while (MouseButton != 0 && T36HZEnabled && FullScreen == 0)
{ {
Moving=1; Moving = 1;
X+=MouseMoveX; X += MouseMoveX;
Y+=MouseMoveY; Y += MouseMoveY;
if (X<0)X=0; if (X < 0)X = 0;
if (X>(GetSystemMetrics( SM_CXSCREEN )-WindowWidth)) X=(GetSystemMetrics( SM_CXSCREEN )-WindowWidth); if (X > (GetSystemMetrics(SM_CXSCREEN) - WindowWidth)) X = (GetSystemMetrics(SM_CXSCREEN) - WindowWidth);
if (Y<0)Y=0; if (Y < 0)Y=0;
if (Y>(GetSystemMetrics( SM_CYSCREEN )-WindowHeight)) Y=(GetSystemMetrics( SM_CYSCREEN )-WindowHeight); if (Y > (GetSystemMetrics(SM_CYSCREEN) - WindowHeight)) Y = (GetSystemMetrics(SM_CYSCREEN) - WindowHeight);
InputRead(); InputRead();
initwinvideo(); initwinvideo();
} }
} }
if (Moving==1) if (Moving == 1)
{ {
Moving=0; Moving = 0;
initwinvideo(); initwinvideo();
} }
return((int)MouseButton); return((int) MouseButton);
} }
void SetMouseMinX(int MinX) void SetMouseMinX(int MinX)