FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some msgs only sent to parent window, find child under cursor. This before only search for childs of the parent, not grandchilds or more derived. Fixed

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1508 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
dcnieho 2013-02-26 16:13:09 +00:00
parent fdbb8086ed
commit 3b5f3573a1
1 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
freeglut/freeglut/src/mswin/fg_main_mswin.c
View File

@ -323,6 +323,33 @@ static LRESULT fghWindowProcKeyPress(SFG_Window *window, UINT uMsg, GLboolean ke
return 1; return 1;
} }
void fghWindowUnderCursor(SFG_Window *window, SFG_Window **child_window)
{
/* Check if the current window that the mouse is over is a child window
* of the window the message was sent to.
*/
if (window && window->Children.First)
{
POINT mouse_pos;
SFG_WindowHandleType hwnd;
SFG_Window* temp_window;
GetCursorPos( &mouse_pos );
ScreenToClient( window->Window.Handle, &mouse_pos );
hwnd = ChildWindowFromPoint(window->Window.Handle, mouse_pos);
if (hwnd && hwnd!=window->Window.Handle) /* can be NULL if mouse outside parent by the time we get here, or can be same as parent if we didn't find a child */
{
temp_window = fgWindowByHandle(hwnd);
if (temp_window) /* Verify we got a FreeGLUT window */
{
*child_window = temp_window;
/* ChildWindowFromPoint only searches immediate children, so search again to see if actually in grandchild or further descendant */
fghWindowUnderCursor(temp_window,child_window);
}
}
}
}
/* /*
* The window procedure for handling Win32 events * The window procedure for handling Win32 events
*/ */
@ -347,22 +374,7 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
* we make sure that we process callbacks on the child window instead. * we make sure that we process callbacks on the child window instead.
* This mirrors how GLUT does things. * This mirrors how GLUT does things.
*/ */
if (window && window->Children.First) fghWindowUnderCursor(window, &child_window);
{
POINT mouse_pos;
SFG_WindowHandleType hwnd;
SFG_Window* temp_window;
GetCursorPos( &mouse_pos );
ScreenToClient( window->Window.Handle, &mouse_pos );
hwnd = ChildWindowFromPoint(window->Window.Handle, mouse_pos);
if (hwnd) /* can be NULL if mouse outside parent by the time we get here */
{
temp_window = fgWindowByHandle(hwnd);
if (temp_window && temp_window->Parent) /* Verify we got a child window */
child_window = temp_window;
}
}
switch( uMsg ) switch( uMsg )
{ {