cleaning up mixed tabs and spaces

[freeglut] / src / mswin / fg_state_mswin.c

diff --git a/src/mswin/fg_state_mswin.c b/src/mswin/fg_state_mswin.c
index 4c0ca30..b8f3e00 100644 (file)
--- a/src/mswin/fg_state_mswin.c
+++ b/src/mswin/fg_state_mswin.c
@@ -1,5 +1,5 @@
 /*
- * freeglut_state_mswin.c
+ * fg_state_mswin.c
  *
  * The Windows-specific state query methods.
  *
@@ -32,7 +32,7 @@
 extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
                                      unsigned char layer_type );
 
-/* 
+/*
  * Helper functions for getting client area from the window rect
  * 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).
@@ -146,7 +146,7 @@ int fgPlatformGlutGet ( GLenum eWhat )
         HDC hdc = fgStructure.CurrentWindow->Window.pContext.Device;
         int iPixelFormat = GetPixelFormat( hdc );
         DescribePixelFormat(hdc, iPixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &pfd);
-        
+
         returnValue = pfd.cColorBits;
         if (pfd.iPixelType==PFD_TYPE_RGBA)
             returnValue += pfd.cAlphaBits;
@@ -183,7 +183,7 @@ int fgPlatformGlutGet ( GLenum eWhat )
         GetWindowRect( fgStructure.CurrentWindow->Window.Handle, &winRect);
 #else
         ClientToScreen(fgStructure.CurrentWindow->Window.Handle, &topLeft);
-        
+
         if (fgStructure.CurrentWindow->Parent)
             /* For child window, we should return relative to upper-left
              * of parent's client area.
@@ -256,8 +256,8 @@ int fgPlatformGlutGet ( GLenum eWhat )
              * all other extra pixels are assumed to be atop the window, forming the caption.
              */
             borderWidth   = ((winRect.right-winRect.left)-(clientRect.right-clientRect.left))/2;
-            captionHeight = (winRect.bottom-winRect.top)-(clientRect.bottom-clientRect.top)-borderWidth*2;
-            
+            captionHeight = (winRect.bottom-winRect.top)-(clientRect.bottom-clientRect.top)-borderWidth; /* include top border in caption height */
+
             switch( eWhat )
             {
             case GLUT_WINDOW_BORDER_WIDTH:
@@ -289,7 +289,7 @@ int fgPlatformGlutGet ( GLenum eWhat )
         break;
     }
 
-       return -1;
+    return -1;
 }
 
 
@@ -327,11 +327,9 @@ int fgPlatformGlutDeviceGet ( GLenum eWhat )
 
     default:
         fgWarning( "glutDeviceGet(): missing enum handle %d", eWhat );
+        return -1;
         break;
     }
-
-    /* And now -- the failure. */
-    return -1;
 }
 
 /*
@@ -347,4 +345,4 @@ int *fgPlatformGlutGetModeValues(GLenum eWhat, int *size)
 {
   *size = 0;
   return NULL;
-}
\ No newline at end of file
+}