X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fmswin%2Ffg_main_mswin.c;h=a9f85528cba616ddc73b46a2ae671996075315e2;hb=637e1260edb9068591665330c32407549ca36535;hp=7250b3a3cdcfb895a6c7f3270ade8d3e235d3d70;hpb=d398aeed300f951a5972d93e231f50ea2bab27c5;p=freeglut

diff --git a/src/mswin/fg_main_mswin.c b/src/mswin/fg_main_mswin.c
index 7250b3a..a9f8552 100644
--- a/src/mswin/fg_main_mswin.c
+++ b/src/mswin/fg_main_mswin.c
@@ -35,6 +35,8 @@ extern void fgNewWGLCreateContext( SFG_Window* window );
 extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
                                      unsigned char layer_type );
 
+extern void fgPlatformCheckMenuDeactivate();
+
 #ifdef WM_TOUCH
 typedef BOOL (WINAPI *pGetTouchInputInfo)(HTOUCHINPUT,UINT,PTOUCHINPUT,int);
 typedef BOOL (WINAPI *pCloseTouchInputHandle)(HTOUCHINPUT);
@@ -61,8 +63,8 @@ struct GXKeyList gxKeyList;
  * and the window rect from the client area given the style of the window
  * (or a valid window pointer from which the style can be queried).
  */
-extern void fghComputeWindowRectFromClientArea_QueryWindow( const SFG_Window *window, RECT *clientRect, BOOL posIsOutside );
-extern RECT fghGetClientArea                              ( const SFG_Window *window,                   BOOL wantPosOutside );
+extern void fghComputeWindowRectFromClientArea_QueryWindow( RECT *clientRect, const SFG_Window *window, BOOL posIsOutside );
+extern void fghGetClientArea                              ( RECT *clientRect, const SFG_Window *window, BOOL wantPosOutside );
 
 
 void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height )
@@ -84,7 +86,7 @@ void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height )
 
     if (window->Parent == NULL)
         /* get the window rect from this to feed to SetWindowPos, correct for window decorations */
-        fghComputeWindowRectFromClientArea_QueryWindow(window,&windowRect,TRUE);
+        fghComputeWindowRectFromClientArea_QueryWindow(&windowRect,window,TRUE);
     else
     {
         /* correct rect for position client area of parent window
@@ -94,11 +96,8 @@ void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height )
          * for them.
          */
         RECT parentRect;
-        parentRect = fghGetClientArea( window->Parent, FALSE );
-        windowRect.left   -= parentRect.left;
-        windowRect.right  -= parentRect.left;
-        windowRect.top    -= parentRect.top;
-        windowRect.bottom -= parentRect.top;
+        fghGetClientArea( &parentRect, window->Parent, FALSE );
+        OffsetRect(&windowRect,-parentRect.left,-parentRect.top);
     }
     
     /* Do the actual resizing */
@@ -240,7 +239,7 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
              uMsg, wParam, lParam ); */
 
     /* Some events only sent to main window. Check if the current window that
-     * the mouse is over is a child window. Below whn handling some messages,
+     * the mouse is over is a child window. Below when handling some messages,
      * we make sure that we process callbacks on the child window instead.
      * This mirrors how GLUT does things.
      */
@@ -517,51 +516,14 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
 
     case WM_KILLFOCUS:
         {
-            SFG_Menu* menu = NULL;
             SFG_Window* saved_window = fgStructure.CurrentWindow;
 /*            printf("WM_KILLFOCUS: %p\n", window ); */
             lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
             INVOKE_WCB( *window, Entry, ( GLUT_LEFT ) );
             fgSetWindow(saved_window);
 
-            /* 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.
-             */
-            if ( fgStructure.Menus.First )
-                menu = fgGetActiveMenu();
-
-            if ( menu )
-            {
-                SFG_Window* wnd = NULL;
-                HWND hwnd = GetFocus();  /* Get window with current focus - NULL for non freeglut windows */
-                if (hwnd)
-                    /* 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)      /* Make sure we don't kill the menu when trying to enter a submenu */
-                {
-                    if (wnd!=menu->ParentWindow)
-                        /* User switched to another FreeGLUT window */
-                        fgDeactivateMenu(menu->ParentWindow);
-                    else
-                    {
-                        /* Check if focus lost because non-client area of
-                         * window was pressed (pressing on client area is
-                         * handled in fgCheckActiveMenu)
-                         */
-                        POINT mouse_pos;
-                        RECT clientArea = fghGetClientArea(menu->ParentWindow, GL_FALSE);
-                        GetCursorPos(&mouse_pos);
-                        if ( !PtInRect( &clientArea, mouse_pos ) )
-                            fgDeactivateMenu(menu->ParentWindow);
-                    }
-                }
-            }
+            /* Check if there are any open menus that need to be closed */
+            fgPlatformCheckMenuDeactivate();
         }
         break;
 
@@ -594,6 +556,7 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
     case WM_PAINT:
         /* Turn on the visibility in case it was turned off somehow */
         window->State.Visible = GL_TRUE;
+        InvalidateRect( hWnd, NULL, GL_FALSE ); /* Make sure whole window is repainted. Bit of a hack, but a safe on from what google turns up... */
         BeginPaint( hWnd, &ps );
         fghRedrawWindow( window );
         EndPaint( hWnd, &ps );