ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dinput: Get rid of some redundant coordinate mappings.

This commit is contained in:
Alexandre Julliard 2011-04-26 12:26:16 +02:00
parent 897fdfd423
commit 8578f9c375
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/dinput/mouse.c
View File

@ -66,7 +66,6 @@ struct SysMouseImpl
/* These are used in case of relative -> absolute transitions */ /* These are used in case of relative -> absolute transitions */
POINT org_coords; POINT org_coords;
POINT mapped_center; POINT mapped_center;
DWORD win_centerX, win_centerY;
/* warping: whether we need to move mouse back to middle once we /* warping: whether we need to move mouse back to middle once we
* reach window borders (for e.g. shooters, "surface movement" games) */ * reach window borders (for e.g. shooters, "surface movement" games) */
BOOL need_warp; BOOL need_warp;
@ -419,20 +418,12 @@ static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM
static BOOL dinput_window_check(SysMouseImpl* This) { static BOOL dinput_window_check(SysMouseImpl* This) {
RECT rect; RECT rect;
DWORD centerX, centerY;
/* make sure the window hasn't moved */ /* make sure the window hasn't moved */
if(!GetWindowRect(This->base.win, &rect)) if(!GetWindowRect(This->base.win, &rect))
return FALSE; return FALSE;
centerX = (rect.right - rect.left) / 2; This->mapped_center.x = (rect.left + rect.right) / 2;
centerY = (rect.bottom - rect.top ) / 2; This->mapped_center.y = (rect.top + rect.bottom) / 2;
if (This->win_centerX != centerX || This->win_centerY != centerY) {
This->win_centerX = centerX;
This->win_centerY = centerY;
}
This->mapped_center.x = This->win_centerX;
This->mapped_center.y = This->win_centerY;
MapWindowPoints(This->base.win, HWND_DESKTOP, &This->mapped_center, 1);
return TRUE; return TRUE;
} }
@ -488,15 +479,12 @@ static HRESULT WINAPI SysMouseWImpl_Acquire(LPDIRECTINPUTDEVICE8W iface)
/* Get the window dimension and find the center */ /* Get the window dimension and find the center */
GetWindowRect(This->base.win, &rect); GetWindowRect(This->base.win, &rect);
This->win_centerX = (rect.right - rect.left) / 2; This->mapped_center.x = (rect.left + rect.right) / 2;
This->win_centerY = (rect.bottom - rect.top ) / 2; This->mapped_center.y = (rect.top + rect.bottom) / 2;
/* Warp the mouse to the center of the window */ /* Warp the mouse to the center of the window */
if (This->base.dwCoopLevel & DISCL_EXCLUSIVE || This->warp_override == WARP_FORCE_ON) if (This->base.dwCoopLevel & DISCL_EXCLUSIVE || This->warp_override == WARP_FORCE_ON)
{ {
This->mapped_center.x = This->win_centerX;
This->mapped_center.y = This->win_centerY;
MapWindowPoints(This->base.win, HWND_DESKTOP, &This->mapped_center, 1);
TRACE("Warping mouse to %d - %d\n", This->mapped_center.x, This->mapped_center.y); TRACE("Warping mouse to %d - %d\n", This->mapped_center.x, This->mapped_center.y);
SetCursorPos( This->mapped_center.x, This->mapped_center.y ); SetCursorPos( This->mapped_center.x, This->mapped_center.y );
This->last_warped = GetCurrentTime(); This->last_warped = GetCurrentTime();