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

Merge pull request #3387 from skidau/Mouse-In-Separate-Window-By-ProcessId 

Ignored the mouse position unless the cursor is over the Dolphin window.
This commit is contained in:
skidau 2015-12-29 10:21:28 +11:00
parent d3d0aa69ce f96f90b334
commit fc86a9e626
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
View File

@ -126,18 +126,28 @@ void GetMousePos(ControlState* const x, ControlState* const y)
GetCursorPos(&point); GetCursorPos(&point);
// Get the cursor position relative to the upper left corner of the current window (separate or render to main) // Get the cursor position relative to the upper left corner of the current window (separate or render to main)
HWND hwnd = WindowFromPoint(point); HWND hwnd = WindowFromPoint(point);
ScreenToClient(hwnd, &point); DWORD processId;
GetWindowThreadProcessId(hwnd, &processId);
if (processId == GetCurrentProcessId())
{
ScreenToClient(hwnd, &point);
// Get the size of the current window. (In my case Rect.top and Rect.left was zero.) // Get the size of the current window. (In my case Rect.top and Rect.left was zero.)
RECT rect; RECT rect;
GetClientRect(hwnd, &rect); GetClientRect(hwnd, &rect);
// Width and height is the size of the rendering window // Width and height is the size of the rendering window
unsigned int win_width = rect.right - rect.left; unsigned int win_width = rect.right - rect.left;
unsigned int win_height = rect.bottom - rect.top; unsigned int win_height = rect.bottom - rect.top;
// Return the mouse position as a range from -1 to 1 // Return the mouse position as a range from -1 to 1
*x = (ControlState)point.x / (ControlState)win_width * 2 - 1; *x = (ControlState)point.x / (ControlState)win_width * 2 - 1;
*y = (ControlState)point.y / (ControlState)win_height * 2 - 1; *y = (ControlState)point.y / (ControlState)win_height * 2 - 1;
}
else
{
*x = (ControlState)1;
*y = (ControlState)1;
}
} }
void KeyboardMouse::UpdateInput() void KeyboardMouse::UpdateInput()