From 99532b98a9b24cbf41fdf83789f74fef2dbc8b6c Mon Sep 17 00:00:00 2001 From: Christopher John Purnell Date: Mon, 17 Nov 2003 21:11:33 +0000 Subject: [PATCH 1/1] Fix spelling mistake in a variable name. Added a comment for John Fay. Added the copyright notice for XParseGeometry source. git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@358 7f0cb862-5218-0410-a997-914c9d46530a --- src/freeglut_init.c | 42 +++++++++++++++++++++++++++++++++++------- src/freeglut_internal.h | 4 ++-- src/freeglut_main.c | 2 +- src/freeglut_state.c | 2 +- src/freeglut_structure.c | 4 ++-- 5 files changed, 41 insertions(+), 13 deletions(-) diff --git a/src/freeglut_init.c b/src/freeglut_init.c index d271523..58388f8 100644 --- a/src/freeglut_init.c +++ b/src/freeglut_init.c @@ -58,7 +58,7 @@ SFG_Display fgDisplay; SFG_State fgState = { { -1, -1, GL_FALSE }, /* Position */ { 300, 300, GL_TRUE }, /* Size */ GLUT_RGBA | GLUT_SINGLE | GLUT_DEPTH, /* DisplayMode */ - GL_FALSE, /* Initalized */ + GL_FALSE, /* Initialised */ GL_FALSE, /* ForceDirectContext */ GL_TRUE, /* TryDirectContext */ GL_FALSE, /* ForceIconic */ @@ -159,7 +159,7 @@ void fgInitialize( const char* displayName ) /* * Each of the windows should have its own device context... */ - wc.style = CS_OWNDC; + wc.style = CS_OWNDC /* | CS_DBLCLKS */; wc.lpfnWndProc = fgWindowProc; wc.cbClsExtra = 0; wc.cbWndExtra = 0; @@ -200,7 +200,7 @@ void fgInitialize( const char* displayName ) fgJoystickInit( 0 ); - fgState.Initalized = GL_TRUE; + fgState.Initialised = GL_TRUE; } /* @@ -210,14 +210,14 @@ void fgDeinitialize( void ) { SFG_Timer *timer; - if( !fgState.Initalized ) + if( !fgState.Initialised ) { fgWarning( "fgDeinitialize(): " "no valid initialization has been performed" ); return; } - /* fgState.Initalized = GL_FALSE; */ + /* fgState.Initialised = GL_FALSE; */ /* * If there was a menu created, destroy the rendering context @@ -238,7 +238,7 @@ void fgDeinitialize( void ) fgJoystickClose( ); - fgState.Initalized = GL_FALSE; + fgState.Initialised = GL_FALSE; fgState.Position.X = -1; fgState.Position.Y = -1; @@ -308,6 +308,34 @@ void fgDeinitialize( void ) #ifndef TARGET_HOST_UNIX_X11 +/* + +Copyright 1985, 1986, 1987,1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Software without prior written authorization +from The Open Group. + +*/ + #define NoValue 0x0000 #define XValue 0x0001 #define YValue 0x0002 @@ -456,7 +484,7 @@ void FGAPIENTRY glutInit( int* pargc, char** argv ) char* geometry = NULL; int i, j, argc = *pargc; - if( fgState.Initalized ) + if( fgState.Initialised ) fgError( "illegal glutInit() reinitialization attemp" ); if (pargc && *pargc && argv && *argv && **argv) diff --git a/src/freeglut_internal.h b/src/freeglut_internal.h index 5da2140..31e7681 100644 --- a/src/freeglut_internal.h +++ b/src/freeglut_internal.h @@ -218,7 +218,7 @@ struct tagSFG_State SFG_XYUse Size; /* The default windows' size */ unsigned int DisplayMode; /* Display mode for new windows */ - GLboolean Initalized; /* Freeglut has been initalized */ + GLboolean Initialised; /* Freeglut has been initialised */ GLboolean ForceDirectContext; /* Force direct rendering? */ GLboolean TryDirectContext; /* What about giving a try to? */ @@ -644,7 +644,7 @@ extern SFG_State fgState; * A call to this function makes us sure that the Display and Structure * subsystems have been properly initialized and are ready to be used */ -#define freeglut_assert_ready assert( fgState.Initalized ); +#define freeglut_assert_ready assert( fgState.Initialised ); /* * Following definitions are somewhat similiar to GLib's, diff --git a/src/freeglut_main.c b/src/freeglut_main.c index f976446..85bab79 100644 --- a/src/freeglut_main.c +++ b/src/freeglut_main.c @@ -340,7 +340,7 @@ void fgError( const char *fmt, ... ) va_end( ap ); - if ( fgState.Initalized ) + if ( fgState.Initialised ) fgDeinitialize( ); exit( 1 ); diff --git a/src/freeglut_state.c b/src/freeglut_state.c index 9420de9..8319b5f 100644 --- a/src/freeglut_state.c +++ b/src/freeglut_state.c @@ -130,7 +130,7 @@ int FGAPIENTRY glutGet( GLenum eWhat ) switch (eWhat) { case GLUT_INIT_STATE: - return ( fgState.Initalized ) ; + return ( fgState.Initialised ) ; case GLUT_ELAPSED_TIME: return( fgElapsedTime() ); diff --git a/src/freeglut_structure.c b/src/freeglut_structure.c index 0824a34..b5b737c 100644 --- a/src/freeglut_structure.c +++ b/src/freeglut_structure.c @@ -84,7 +84,7 @@ SFG_Window* fgCreateWindow( SFG_Window* parent, const char* title, * If the freeglut internals haven't been initialized yet, * do it now. Hack's idea courtesy of Chris Purnell... */ - if( !fgState.Initalized ) + if( !fgState.Initialised ) glutInit( &fakeArgc, NULL ); /* @@ -136,7 +136,7 @@ SFG_Menu* fgCreateMenu( FGCBMenu menuCallback ) * If the freeglut internals haven't been initialized yet, * do it now. Hack's idea courtesy of Chris Purnell... */ - if( !fgState.Initalized ) + if( !fgState.Initialised ) glutInit( &fakeArgc, NULL ); menu->ParentWindow = fgStructure.Window; -- 1.7.10.4