avoid crash on null temp_window, thanks Phillip Kutin!

[freeglut] / src / mswin / fg_main_mswin.c

diff --git a/src/mswin/fg_main_mswin.c b/src/mswin/fg_main_mswin.c
index 22a1d44..4588ef6 100644 (file)
--- a/src/mswin/fg_main_mswin.c
+++ b/src/mswin/fg_main_mswin.c
@@ -119,6 +119,10 @@ void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height )
                   SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSENDCHANGING |
                   SWP_NOZORDER
     );
+
+    /* Set new width and height so we can test for that in WM_SIZE message handler and don't do anything if not needed */
+    window->State.Width  = width;
+    window->State.Height = height;
 }
 
 
@@ -265,7 +269,7 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
         if (hwnd)   /* can be NULL if mouse outside parent by the time we get here */
         {
             temp_window = fgWindowByHandle(hwnd);
-            if (temp_window->Parent)    /* Verify we got a child window */
+            if (temp_window && temp_window->Parent)    /* Verify we got a child window */
                 child_window = temp_window;
         }
     }
@@ -415,7 +419,8 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
          */
         if( window->State.Visible )
         {
-            window->State.NeedToResize = GL_TRUE;
+            /* get old values first to compare to below */
+            int width = window->State.Width, height=window->State.Height;
 #if defined(_WIN32_WCE)
             window->State.Width  = HIWORD(lParam);
             window->State.Height = LOWORD(lParam);
@@ -423,10 +428,37 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
             window->State.Width  = LOWORD(lParam);
             window->State.Height = HIWORD(lParam);
 #endif /* defined(_WIN32_WCE) */
+            
+            if (width!=window->State.Width || height!=window->State.Height)
+                /* Something changed, need to resize */
+                window->State.NeedToResize = GL_TRUE;
         }
 
         break;
 
+    case WM_MOVE:
+        {
+            SFG_Window* saved_window = fgStructure.CurrentWindow;
+            RECT windowRect;
+            GetWindowRect( window->Window.Handle, &windowRect );
+            
+            if (window->Parent)
+            {
+                /* For child window, we should return relative to upper-left
+                * of parent's client area.
+                */
+                POINT topleft = {windowRect.left,windowRect.top};
+
+                ScreenToClient(window->Parent->Window.Handle,&topleft);
+                windowRect.left = topleft.x;
+                windowRect.top  = topleft.y;
+            }
+
+            INVOKE_WCB( *window, Position, ( windowRect.left, windowRect.top ) );
+            fgSetWindow(saved_window);
+        }
+        break;
+
     case WM_SETFOCUS:
 /*        printf("WM_SETFOCUS: %p\n", window ); */
 
@@ -661,10 +693,7 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
         short ticks = ( short )HIWORD( wParam );
                fgState.MouseWheelTicks += ticks;
 
-        /*
-         * XXX Should use WHEEL_DELTA instead of 120
-         */
-               if ( abs ( fgState.MouseWheelTicks ) >= 120 )
+        if ( abs ( fgState.MouseWheelTicks ) >= WHEEL_DELTA )
                {
                        int direction = ( fgState.MouseWheelTicks > 0 ) ? 1 : -1;
 
@@ -675,10 +704,7 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
             fgSetWindow( window );
             fgState.Modifiers = fgPlatformGetModifiers( );
 
-            /*
-             * XXX Should use WHEEL_DELTA instead of 120
-             */
-            while( abs ( fgState.MouseWheelTicks ) >= 120 )
+            while( abs ( fgState.MouseWheelTicks ) >= WHEEL_DELTA )
                        {
                 if( FETCH_WCB( *window, MouseWheel ) )
                     INVOKE_WCB( *window, MouseWheel,
@@ -710,10 +736,7 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
                     );
                                }
 
-                /*
-                 * XXX Should use WHEEL_DELTA instead of 120
-                 */
-                               fgState.MouseWheelTicks -= 120 * direction;
+                               fgState.MouseWheelTicks -= WHEEL_DELTA * direction;
                        }
 
             fgState.Modifiers = INVALID_MODIFIERS;