X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fmswin%2Ffg_main_mswin.c;h=28e1b64e0a96595f68040318f782f0b4fb0e962b;hb=3a423ad871d823ee0707057c22b4ef90fd66e1aa;hp=a992b2ba5d8c8189f6472f4688cc3fa325d02c3d;hpb=49e61d9b74ae8520b5b7fddbcfc727081ac54391;p=freeglut

diff --git a/src/mswin/fg_main_mswin.c b/src/mswin/fg_main_mswin.c
index a992b2b..28e1b64 100644
--- a/src/mswin/fg_main_mswin.c
+++ b/src/mswin/fg_main_mswin.c
@@ -228,6 +228,7 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
     SFG_Window* window;
     PAINTSTRUCT ps;
     LRESULT lRet = 1;
+    GLboolean gotChild = GL_FALSE;
 
     FREEGLUT_INTERNAL_ERROR_EXIT_IF_NOT_INITIALISED ( "Event Handler" ) ;
 
@@ -252,7 +253,11 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
         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 */
+        {
             window = fgWindowByHandle(hwnd);
+            if (window->Parent)
+                gotChild = GL_TRUE;
+        }
     }
 
     if ( window )
@@ -486,42 +491,45 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
 
     case WM_SETFOCUS:
 /*        printf("WM_SETFOCUS: %p\n", window ); */
+        if (gotChild)
+            /* If child should have focus instead, set it here. */
+            SetFocus(window->Window.Handle);
+
         lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
         INVOKE_WCB( *window, Entry, ( GLUT_ENTERED ) );
 
-		UpdateWindow ( hWnd );
+        UpdateWindow ( hWnd );
+        if (gotChild)
+            UpdateWindow ( window->Window.Handle );
         break;
 
     case WM_KILLFOCUS:
         {
             SFG_Menu* menu = NULL;
-/*            printf("WM_KILLFOCUS (ismenu: %i): %p\n", window->IsMenu, window ); */
+/*            printf("WM_KILLFOCUS: %p\n", window ); */
             lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
             INVOKE_WCB( *window, Entry, ( GLUT_LEFT ) );
 
             /* If we have an open menu, see if the open menu should be closed
-               when focus was lost because user either switched
-               application or FreeGLUT window (if one is running multiple
-               windows). If so, close menu the active menu.
+             * when focus was lost because user either switched
+             * application or FreeGLUT window (if one is running multiple
+             * windows). If so, close menu the active menu.
              */
-            if ( fgStructure.CurrentMenu )
+            if ( fgStructure.Menus.First )
                 menu = fgGetActiveMenu();
-            
+
             if ( menu )
             {
                 SFG_Window* wnd = NULL;
-                HWND hwnd = GetForegroundWindow();  /* Get window with current focus */
+                HWND hwnd = GetFocus();  /* Get window with current focus - NULL for non freeglut windows */
                 if (hwnd)
-                    /* See if its one of our windows */
+                    /* See which of our windows it is */
                     wnd = fgWindowByHandle(hwnd);
 
                 if (!hwnd || !wnd)
                     /* User switched to another application*/
                     fgDeactivateMenu(menu->ParentWindow);
-                else if (
-                    ( wnd->IsMenu && wnd->ActiveMenu && wnd->ActiveMenu->ParentWindow!=menu->ParentWindow) ||    /* Make sure we don't kill the menu when trying to enter a submenu */
-                    (!wnd->IsMenu && wnd!=menu->ParentWindow)
-                    )
+                else if (!wnd->IsMenu && wnd!=menu->ParentWindow)   /* Make sure we don't kill the menu when trying to enter a submenu */
                     /* User switched to another FreeGLUT window */
                     fgDeactivateMenu(menu->ParentWindow);
             }