From 12b5b4f2497902c06c175b88d90cab8a91457739 Mon Sep 17 00:00:00 2001 From: Diederick Niehorster Date: Fri, 20 Jul 2012 06:35:38 +0000 Subject: [PATCH] removed SetFocus that was added to WM_MOUSEMOVE to handle keyboard focus with subwindows Now using a solution similar to GLUT's, when receiving input, check if mouse is actually on a child of the window passed in by the event, and process as if event was on that window instead git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1348 7f0cb862-5218-0410-a997-914c9d46530a --- src/mswin/fg_main_mswin.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/mswin/fg_main_mswin.c b/src/mswin/fg_main_mswin.c index c631a9c..4fe5538 100644 --- a/src/mswin/fg_main_mswin.c +++ b/src/mswin/fg_main_mswin.c @@ -239,6 +239,21 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, /* printf ( "Window %3d message <%04x> %12d %12d\n", window?window->ID:0, uMsg, wParam, lParam ); */ + /* events only sent to main window. Check if the current window that the mouse + is over is a child window and if so, make sure we call the callback on that + child instead. + */ + if (window && window->Children.First) + { + POINT mouse_pos; + SFG_WindowHandleType hwnd; + + GetCursorPos( &mouse_pos ); + ScreenToClient( window->Window.Handle, &mouse_pos ); + hwnd = ChildWindowFromPoint(window->Window.Handle, mouse_pos); + window = fgWindowByHandle(hwnd); + } + if ( window ) { fgState.Modifiers = fgPlatformGetModifiers( ); @@ -552,7 +567,6 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, fgUpdateMenuHighlight( window->ActiveMenu ); break; } - SetFocus(window->Window.Handle); fgState.Modifiers = fgPlatformGetModifiers( ); @@ -751,6 +765,7 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, int keypress = -1; POINT mouse_pos ; + if( ( fgState.KeyRepeat==GLUT_KEY_REPEAT_OFF || window->State.IgnoreKeyRepeat==GL_TRUE ) && (HIWORD(lParam) & KF_REPEAT) ) break; -- 1.7.10.4