From c23c2e827e826b228d41c4f21f70336d46a715bb Mon Sep 17 00:00:00 2001 From: dcnieho Date: Sun, 12 Oct 2014 09:50:19 +0000 Subject: [PATCH 1/3] some cleanup, correctness in naming, correctness in type (those ATOM should be BOOL) git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1712 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/src/fg_state.c | 10 +++------- freeglut/freeglut/src/mswin/fg_gamemode_mswin.c | 6 +++--- freeglut/freeglut/src/mswin/fg_init_mswin.c | 2 +- freeglut/freeglut/src/mswin/fg_state_mswin.c | 4 +--- freeglut/freeglut/src/mswin/fg_window_mswin.c | 4 ++-- 5 files changed, 10 insertions(+), 16 deletions(-) diff --git a/freeglut/freeglut/src/fg_state.c b/freeglut/freeglut/src/fg_state.c index bb2e8f7..8f0b3c9 100644 --- a/freeglut/freeglut/src/fg_state.c +++ b/freeglut/freeglut/src/fg_state.c @@ -110,16 +110,16 @@ void FGAPIENTRY glutSetOption( GLenum eWhat, int value ) break; case GLUT_SKIP_STALE_MOTION_EVENTS: - fgState.SkipStaleMotion = value; + fgState.SkipStaleMotion = !!value; break; case GLUT_GEOMETRY_VISUALIZE_NORMALS: if( fgStructure.CurrentWindow != NULL ) - fgStructure.CurrentWindow->State.VisualizeNormals = value; + fgStructure.CurrentWindow->State.VisualizeNormals = !!value; break; case GLUT_STROKE_FONT_DRAW_JOIN_DOTS: - fgState.StrokeFontDrawJoinDots = value; + fgState.StrokeFontDrawJoinDots = !!value; break; default: @@ -229,7 +229,6 @@ int FGAPIENTRY glutGet( GLenum eWhat ) return fgPlatformGlutGet ( eWhat ); break; } - return -1; } /* @@ -289,9 +288,6 @@ int FGAPIENTRY glutDeviceGet( GLenum eWhat ) default: return fgPlatformGlutDeviceGet ( eWhat ); } - - /* And now -- the failure. */ - return -1; } /* diff --git a/freeglut/freeglut/src/mswin/fg_gamemode_mswin.c b/freeglut/freeglut/src/mswin/fg_gamemode_mswin.c index b36767a..48d9c9e 100644 --- a/freeglut/freeglut/src/mswin/fg_gamemode_mswin.c +++ b/freeglut/freeglut/src/mswin/fg_gamemode_mswin.c @@ -31,7 +31,7 @@ /* * Changes to requested devmode, if it doesn't match current mode */ -GLboolean fghPlatformChangeDisplayMode(GLboolean haveToTest, DEVMODE *devModeRequested) +GLboolean fghChangeDisplayMode(GLboolean haveToTest, DEVMODE *devModeRequested) { GLboolean success = GL_FALSE; DEVMODE devModeCurrent; @@ -138,7 +138,7 @@ void fgPlatformRememberState( void ) void fgPlatformRestoreState( void ) { /* Restore the previously remembered desktop display settings */ - fghPlatformChangeDisplayMode(GL_FALSE,&fgDisplay.pDisplay.DisplayMode); + fghChangeDisplayMode(GL_FALSE,&fgDisplay.pDisplay.DisplayMode); } @@ -176,7 +176,7 @@ GLboolean fgPlatformChangeDisplayMode( GLboolean haveToTest ) devMode.dmFields |= DM_DISPLAYFREQUENCY; } - return fghPlatformChangeDisplayMode(haveToTest, &devMode); + return fghChangeDisplayMode(haveToTest, &devMode); } void fgPlatformEnterGameMode( void ) diff --git a/freeglut/freeglut/src/mswin/fg_init_mswin.c b/freeglut/freeglut/src/mswin/fg_init_mswin.c index 9822f8c..c47116d 100644 --- a/freeglut/freeglut/src/mswin/fg_init_mswin.c +++ b/freeglut/freeglut/src/mswin/fg_init_mswin.c @@ -42,7 +42,7 @@ extern void fgPlatformInitSystemTime(); void fgPlatformInitialize( const char* displayName ) { WNDCLASS wc; - ATOM atom; + BOOL atom; /* What we need to do is to initialize the fgDisplay global structure here. */ fgDisplay.pDisplay.Instance = GetModuleHandle( NULL ); diff --git a/freeglut/freeglut/src/mswin/fg_state_mswin.c b/freeglut/freeglut/src/mswin/fg_state_mswin.c index aada564..7c510c5 100644 --- a/freeglut/freeglut/src/mswin/fg_state_mswin.c +++ b/freeglut/freeglut/src/mswin/fg_state_mswin.c @@ -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; } /* diff --git a/freeglut/freeglut/src/mswin/fg_window_mswin.c b/freeglut/freeglut/src/mswin/fg_window_mswin.c index 42b670d..641ea53 100644 --- a/freeglut/freeglut/src/mswin/fg_window_mswin.c +++ b/freeglut/freeglut/src/mswin/fg_window_mswin.c @@ -233,7 +233,7 @@ static void fghFillPFD( PIXELFORMATDESCRIPTOR *ppfd, HDC hdc, unsigned char laye ppfd->cDepthBits = 24; ppfd->cStencilBits = 8; - ppfd->cAuxBuffers = fghNumberOfAuxBuffersRequested(); + ppfd->cAuxBuffers = (BYTE) fghNumberOfAuxBuffersRequested(); ppfd->iLayerType = layer_type; ppfd->bReserved = 0; ppfd->dwLayerMask = 0; @@ -570,7 +570,7 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title, WNDCLASS wc; DWORD flags = 0; DWORD exFlags = 0; - ATOM atom; + BOOL atom; /* Grab the window class we have registered on glutInit(): */ atom = GetClassInfo( fgDisplay.pDisplay.Instance, _T("FREEGLUT"), &wc ); From ee1de6feda47a18f44ab8e8c2b39ec3ec25a9276 Mon Sep 17 00:00:00 2001 From: dcnieho Date: Mon, 13 Oct 2014 13:54:27 +0000 Subject: [PATCH 2/3] Tidy-up: config.h included via fg_internal.h no deep to duplicate. git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1713 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/src/fg_input_devices.c | 4 ---- freeglut/freeglut/src/x11/fg_input_devices_x11.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/freeglut/freeglut/src/fg_input_devices.c b/freeglut/freeglut/src/fg_input_devices.c index 1c7ba29..becff3d 100644 --- a/freeglut/freeglut/src/fg_input_devices.c +++ b/freeglut/freeglut/src/fg_input_devices.c @@ -28,10 +28,6 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include #include "fg_internal.h" diff --git a/freeglut/freeglut/src/x11/fg_input_devices_x11.c b/freeglut/freeglut/src/x11/fg_input_devices_x11.c index aa5da77..d77e970 100644 --- a/freeglut/freeglut/src/x11/fg_input_devices_x11.c +++ b/freeglut/freeglut/src/x11/fg_input_devices_x11.c @@ -30,10 +30,6 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include #include "../fg_internal.h" From adce03d8ab9d7f4b2dcc5e1ef959da9e6bbf3f05 Mon Sep 17 00:00:00 2001 From: dcnieho Date: Mon, 13 Oct 2014 13:54:44 +0000 Subject: [PATCH 3/3] more cleanup: config.h include never needed in demo git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1714 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/progs/demos/One/one.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/freeglut/freeglut/progs/demos/One/one.c b/freeglut/freeglut/progs/demos/One/one.c index e8b08b3..24ce7a7 100644 --- a/freeglut/freeglut/progs/demos/One/one.c +++ b/freeglut/freeglut/progs/demos/One/one.c @@ -12,10 +12,6 @@ * Creation date: czw gru 2 11:58:41 CET 1999 */ -#ifdef HAVE_CONFIG_H -#include -#endif - #include #include