Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed handling of WM_MOUSEWHEEL which are supposed to be sent to the window with the current focus no matter where the mouse cursor is

Browse source 
svn path=/trunk/; revision=6182
This commit is contained in:
Thomas Bluemel 2003-09-28 14:21:26 +00:00
parent 59760bf0d0
commit bbe43cc970
1 changed files with 80 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

144
reactos/subsys/win32k/ntuser/msgqueue.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: msgqueue.c,v 1.23 2003/09/28 00:26:13 weiden Exp $ /* $Id: msgqueue.c,v 1.24 2003/09/28 14:21:26 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -175,86 +175,102 @@ MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh,
USHORT Msg = Message->Msg.message; USHORT Msg = Message->Msg.message;
PWINDOW_OBJECT Window; PWINDOW_OBJECT Window;
POINT Point; POINT Point;
if(Msg != WM_MOUSEWHEEL)
{
/* WM_MOUSEWHEEL messages ignore the position of the mouse cursor */
if ((Window = IntGetCaptureWindow()) == NULL)
{
*HitTest = WinPosWindowFromPoint(ScopeWin, Message->Msg.pt, &Window);
}
else
{
*HitTest = HTCLIENT;
}
if ((Window = IntGetCaptureWindow()) == NULL) if (Window == NULL)
{ {
*HitTest = WinPosWindowFromPoint(ScopeWin, Message->Msg.pt, &Window); ExFreePool(Message);
} return(FALSE);
else }
{ if (Window->MessageQueue != PsGetWin32Thread()->MessageQueue)
*HitTest = HTCLIENT; {
} ExAcquireFastMutex(&Window->MessageQueue->Lock);
InsertTailList(&Window->MessageQueue->HardwareMessagesListHead,
&Message->ListEntry);
ExReleaseFastMutex(&Window->MessageQueue->Lock);
KeSetEvent(&Window->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE);
return(FALSE);
}
if (Window == NULL) if (hWnd != NULL && Window->Self != hWnd &&
{ !IntIsChildWindow(hWnd, Window->Self))
ExFreePool(Message); {
return(FALSE); return(FALSE);
} }
if (Window->MessageQueue != PsGetWin32Thread()->MessageQueue)
{
ExAcquireFastMutex(&Window->MessageQueue->Lock);
InsertTailList(&Window->MessageQueue->HardwareMessagesListHead,
&Message->ListEntry);
ExReleaseFastMutex(&Window->MessageQueue->Lock);
KeSetEvent(&Window->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE);
return(FALSE);
}
if (hWnd != NULL && Window->Self != hWnd && if (Msg == WM_LBUTTONDBLCLK || Msg == WM_RBUTTONDBLCLK || Msg == WM_MBUTTONDBLCLK || Msg == WM_XBUTTONDBLCLK)
!IntIsChildWindow(hWnd, Window->Self)) {
{ if (((*HitTest) != HTCLIENT) || !(IntGetClassLong(Window, GCL_STYLE, FALSE) & CS_DBLCLKS))
return(FALSE); {
} Msg -= (WM_LBUTTONDBLCLK - WM_LBUTTONDOWN);
/* FIXME set WindowStation's system cursor variables:
LastBtnDown to Msg.time
*/
}
else
{
/* FIXME check if the dblclick was made in the same window, if
not, change it to a normal click message */
}
}
if (Msg == WM_LBUTTONDBLCLK || Msg == WM_RBUTTONDBLCLK || Msg == WM_MBUTTONDBLCLK || Msg == WM_XBUTTONDBLCLK) *ScreenPoint = Message->Msg.pt;
{ Point = Message->Msg.pt;
if (((*HitTest) != HTCLIENT) || !(IntGetClassLong(Window, GCL_STYLE, FALSE) & CS_DBLCLKS))
{
Msg -= (WM_LBUTTONDBLCLK - WM_LBUTTONDOWN);
/* FIXME set WindowStation's system cursor variables:
LastBtnDown to Msg.time
*/
}
else
{
/* FIXME check if the dblclick was made in the same window, if
not, change it to a normal click message */
}
}
*ScreenPoint = Message->Msg.pt;
Point = Message->Msg.pt;
if ((*HitTest) != HTCLIENT) if ((*HitTest) != HTCLIENT)
{ {
switch(Msg) switch(Msg)
{ {
case WM_MOUSEWHEEL: case WM_XBUTTONDOWN:
break; case WM_XBUTTONUP:
case WM_XBUTTONDOWN: case WM_XBUTTONDBLCLK:
case WM_XBUTTONUP: return FALSE;
case WM_XBUTTONDBLCLK: default:
return FALSE; Msg += WM_NCMOUSEMOVE - WM_MOUSEMOVE;
default: Message->Msg.wParam = *HitTest;
Msg += WM_NCMOUSEMOVE - WM_MOUSEMOVE; break;
Message->Msg.wParam = *HitTest; }
break;
} }
} else
else
{
if(Msg != WM_MOUSEWHEEL)
{ {
Point.x -= Window->ClientRect.left; Point.x -= Window->ClientRect.left;
Point.y -= Window->ClientRect.top; Point.y -= Window->ClientRect.top;
} }
} }
/* FIXME: Check message filter. */ /* FIXME: Check message filter. */
if (Remove) if (Remove)
{ {
Message->Msg.hwnd = Window->Self; if(Msg == WM_MOUSEWHEEL)
{
/* WM_MOUSEWHEEL messages are sent to the window with the current focus */
Message->Msg.hwnd = IntGetFocusWindow();
if(Message->Msg.hwnd == 0)
{
ExFreePool(Message);
return(FALSE);
}
*ScreenPoint = Message->Msg.pt;
Point = Message->Msg.pt;
}
else
Message->Msg.hwnd = Window->Self;
Message->Msg.message = Msg; Message->Msg.message = Msg;
Message->Msg.lParam = MAKELONG(Point.x, Point.y); Message->Msg.lParam = MAKELONG(Point.x, Point.y);
} }