projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix object/function pointer inconsistencies which are a problem for gcc 3.4.2.
[freeglut]
/
src
/
freeglut_structure.c
diff --git
a/src/freeglut_structure.c
b/src/freeglut_structure.c
index
3b3032d
..
07bf892
100644
(file)
--- a/
src/freeglut_structure.c
+++ b/
src/freeglut_structure.c
@@
-25,14
+25,9
@@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#include <GL/freeglut.h>
#include "freeglut_internal.h"
#include <GL/freeglut.h>
#include "freeglut_internal.h"
-
/* -- GLOBAL EXPORTS ------------------------------------------------------- */
/*
/* -- GLOBAL EXPORTS ------------------------------------------------------- */
/*
@@
-53,7
+48,7
@@
SFG_Structure fgStructure = { { NULL, NULL }, /* The list of windows */
/* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
/* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
-void fgClearCallBacks( SFG_Window *window )
+static void fghClearCallBacks( SFG_Window *window )
{
if( window )
{
{
if( window )
{
@@
-73,24
+68,12
@@
SFG_Window* fgCreateWindow( SFG_Window* parent, const char* title,
int x, int y, int w, int h,
GLboolean gameMode, GLboolean isMenu )
{
int x, int y, int w, int h,
GLboolean gameMode, GLboolean isMenu )
{
- /*
- * Have the window object created
- */
+ /* Have the window object created */
SFG_Window *window = (SFG_Window *)calloc( sizeof(SFG_Window), 1 );
SFG_Window *window = (SFG_Window *)calloc( sizeof(SFG_Window), 1 );
- int fakeArgc = 0;
- fgClearCallBacks( window );
-
- /*
- * If the freeglut internals haven't been initialized yet,
- * do it now. Hack's idea courtesy of Chris Purnell...
- */
- if( !fgState.Initialised )
- glutInit( &fakeArgc, NULL );
+ fghClearCallBacks( window );
- /*
- * Initialize the object properties
- */
+ /* Initialize the object properties */
window->ID = ++fgStructure.WindowID;
window->State.OldHeight = window->State.OldWidth = -1;
window->ID = ++fgStructure.WindowID;
window->State.OldHeight = window->State.OldWidth = -1;
@@
-103,9
+86,7
@@
SFG_Window* fgCreateWindow( SFG_Window* parent, const char* title,
else
fgListAppend( &fgStructure.Windows, &window->Node );
else
fgListAppend( &fgStructure.Windows, &window->Node );
- /*
- * Set the default mouse cursor and reset the modifiers value
- */
+ /* Set the default mouse cursor and reset the modifiers value */
window->State.Cursor = GLUT_CURSOR_INHERIT;
window->IsMenu = isMenu;
window->State.Cursor = GLUT_CURSOR_INHERIT;
window->IsMenu = isMenu;
@@
-131,24
+112,12
@@
SFG_Menu* fgCreateMenu( FGCBMenu menuCallback )
int x = 100, y = 100, w = 100, h = 100;
SFG_Window *current_window = fgStructure.Window;
int x = 100, y = 100, w = 100, h = 100;
SFG_Window *current_window = fgStructure.Window;
- /*
- * Have the menu object created
- */
+ /* Have the menu object created */
SFG_Menu* menu = (SFG_Menu *)calloc( sizeof(SFG_Menu), 1 );
SFG_Menu* menu = (SFG_Menu *)calloc( sizeof(SFG_Menu), 1 );
- int fakeArgc = 0;
-
- /*
- * If the freeglut internals haven't been initialized yet,
- * do it now. Hack's idea courtesy of Chris Purnell...
- */
- if( !fgState.Initialised )
- glutInit( &fakeArgc, NULL );
menu->ParentWindow = fgStructure.Window;
menu->ParentWindow = fgStructure.Window;
- /*
- * Create a window for the menu to reside in.
- */
+ /* Create a window for the menu to reside in. */
fgCreateWindow( NULL, "freeglut menu", x, y, w, h, GL_FALSE, GL_TRUE );
menu->Window = fgStructure.Window;
fgCreateWindow( NULL, "freeglut menu", x, y, w, h, GL_FALSE, GL_TRUE );
menu->Window = fgStructure.Window;
@@
-157,9
+126,7
@@
SFG_Menu* fgCreateMenu( FGCBMenu menuCallback )
glutHideWindow( ); /* Hide the window for now */
fgSetWindow( current_window );
glutHideWindow( ); /* Hide the window for now */
fgSetWindow( current_window );
- /*
- * Initialize the object properties:
- */
+ /* Initialize the object properties: */
menu->ID = ++fgStructure.MenuID;
menu->Callback = menuCallback;
menu->ActiveEntry = NULL;
menu->ID = ++fgStructure.MenuID;
menu->Callback = menuCallback;
menu->ActiveEntry = NULL;
@@
-167,9
+134,7
@@
SFG_Menu* fgCreateMenu( FGCBMenu menuCallback )
fgListInit( &menu->Entries );
fgListAppend( &fgStructure.Menus, &menu->Node );
fgListInit( &menu->Entries );
fgListAppend( &fgStructure.Menus, &menu->Node );
- /*
- * Newly created menus implicitly become current ones
- */
+ /* Newly created menus implicitly become current ones */
fgStructure.Menu = menu;
return menu;
fgStructure.Menu = menu;
return menu;
@@
-187,9
+152,7
@@
void fgAddToWindowDestroyList( SFG_Window* window )
new_list_entry->window = window;
fgListAppend( &fgStructure.WindowsToDestroy, &new_list_entry->node );
new_list_entry->window = window;
fgListAppend( &fgStructure.WindowsToDestroy, &new_list_entry->node );
- /*
- * Check if the window is the current one...
- */
+ /* Check if the window is the current one... */
if( fgStructure.Window == window )
fgStructure.Window = NULL;
if( fgStructure.Window == window )
fgStructure.Window = NULL;
@@
-203,7
+166,7
@@
void fgAddToWindowDestroyList( SFG_Window* window )
*/
{
FGCBDestroy destroy = FETCH_WCB( *window, Destroy );
*/
{
FGCBDestroy destroy = FETCH_WCB( *window, Destroy );
- fgClearCallBacks( window );
+ fghClearCallBacks( window );
SET_WCB( *window, Destroy, destroy );
}
}
SET_WCB( *window, Destroy, destroy );
}
}
@@
-231,8
+194,8
@@
void fgDestroyWindow( SFG_Window* window )
{
int menu_index;
{
int menu_index;
- assert( window );
- freeglut_assert_ready;
+ FREEGLUT_INTERNAL_ERROR_EXIT ( window, "Window destroy function called with null window",
+ "fgDestroyWindow" );
while( window->Children.First )
fgDestroyWindow( ( SFG_Window * )window->Children.First );
while( window->Children.First )
fgDestroyWindow( ( SFG_Window * )window->Children.First );
@@
-255,7
+218,7
@@
void fgDestroyWindow( SFG_Window* window )
if( window->Menu[ menu_index ] )
window->Menu[ menu_index ]->ParentWindow = NULL;
if( window->Menu[ menu_index ] )
window->Menu[ menu_index ]->ParentWindow = NULL;
- fgClearCallBacks( window );
+ fghClearCallBacks( window );
fgCloseWindow( window );
free( window );
if( fgStructure.Window == window )
fgCloseWindow( window );
free( window );
if( fgStructure.Window == window )
@@
-279,9
+242,7
@@
static void fghRemoveMenuFromWindow( SFG_Window* window, SFG_Menu* menu )
if( window->Menu[ i ] == menu )
window->Menu[ i ] = NULL;
if( window->Menu[ i ] == menu )
window->Menu[ i ] = NULL;
- /*
- * Call this function for all of the window's children recursively:
- */
+ /* Call this function for all of the window's children recursively: */
for( subWindow = (SFG_Window *)window->Children.First;
subWindow;
subWindow = (SFG_Window *)subWindow->Node.Next)
for( subWindow = (SFG_Window *)window->Children.First;
subWindow;
subWindow = (SFG_Window *)subWindow->Node.Next)
@@
-312,20
+273,16
@@
void fgDestroyMenu( SFG_Menu* menu )
SFG_Window *window;
SFG_Menu *from;
SFG_Window *window;
SFG_Menu *from;
- assert( menu );
- freeglut_assert_ready;
+ FREEGLUT_INTERNAL_ERROR_EXIT ( menu, "Menu destroy function called with null menu",
+ "fgDestroyMenu" );
- /*
- * First of all, have all references to this menu removed from all windows:
- */
+ /* First of all, have all references to this menu removed from all windows: */
for( window = (SFG_Window *)fgStructure.Windows.First;
window;
window = (SFG_Window *)window->Node.Next )
fghRemoveMenuFromWindow( window, menu );
for( window = (SFG_Window *)fgStructure.Windows.First;
window;
window = (SFG_Window *)window->Node.Next )
fghRemoveMenuFromWindow( window, menu );
- /*
- * Now proceed with removing menu entries that lead to this menu
- */
+ /* Now proceed with removing menu entries that lead to this menu */
for( from = ( SFG_Menu * )fgStructure.Menus.First;
from;
from = ( SFG_Menu * )from->Node.Next )
for( from = ( SFG_Menu * )fgStructure.Menus.First;
from;
from = ( SFG_Menu * )from->Node.Next )
@@
-396,16
+353,10
@@
void fgCreateStructure( void )
*/
void fgDestroyStructure( void )
{
*/
void fgDestroyStructure( void )
{
- freeglut_assert_ready;
-
- /*
- * Clean up the WindowsToDestroy list.
- */
+ /* Clean up the WindowsToDestroy list. */
fgCloseWindows( );
fgCloseWindows( );
- /*
- * Make sure all windows and menus have been deallocated
- */
+ /* Make sure all windows and menus have been deallocated */
while( fgStructure.Menus.First )
fgDestroyMenu( ( SFG_Menu * )fgStructure.Menus.First );
while( fgStructure.Menus.First )
fgDestroyMenu( ( SFG_Menu * )fgStructure.Menus.First );
@@
-420,12
+371,11
@@
void fgEnumWindows( FGCBenumerator enumCallback, SFG_Enumerator* enumerator )
{
SFG_Window *window;
{
SFG_Window *window;
- assert( enumCallback && enumerator );
- freeglut_assert_ready;
+ FREEGLUT_INTERNAL_ERROR_EXIT ( enumCallback && enumerator,
+ "Enumerator or callback missing from window enumerator call",
+ "fgEnumWindows" );
- /*
- * Check every of the top-level windows
- */
+ /* Check every of the top-level windows */
for( window = ( SFG_Window * )fgStructure.Windows.First;
window;
window = ( SFG_Window * )window->Node.Next )
for( window = ( SFG_Window * )fgStructure.Windows.First;
window;
window = ( SFG_Window * )window->Node.Next )
@@
-445,8
+395,10
@@
void fgEnumSubWindows( SFG_Window* window, FGCBenumerator enumCallback,
{
SFG_Window *child;
{
SFG_Window *child;
- assert( enumCallback && enumerator );
- freeglut_assert_ready;
+ FREEGLUT_INTERNAL_ERROR_EXIT ( enumCallback && enumerator,
+ "Enumerator or callback missing from subwindow enumerator call",
+ "fgEnumSubWindows" );
+ FREEGLUT_INTERNAL_ERROR_EXIT_IF_NOT_INITIALISED ( "Window Enumeration" );
for( child = ( SFG_Window * )window->Children.First;
child;
for( child = ( SFG_Window * )window->Children.First;
child;
@@
-467,9
+419,7
@@
static void fghcbWindowByHandle( SFG_Window *window,
if ( enumerator->found )
return;
if ( enumerator->found )
return;
- /*
- * Check the window's handle. Hope this works. Looks ugly. That's for sure.
- */
+ /* Check the window's handle. Hope this works. Looks ugly. That's for sure. */
if( window->Window.Handle == (SFG_WindowHandleType) (enumerator->data) )
{
enumerator->found = GL_TRUE;
if( window->Window.Handle == (SFG_WindowHandleType) (enumerator->data) )
{
enumerator->found = GL_TRUE;
@@
-478,9
+428,7
@@
static void fghcbWindowByHandle( SFG_Window *window,
return;
}
return;
}
- /*
- * Otherwise, check this window's children
- */
+ /* Otherwise, check this window's children */
fgEnumSubWindows( window, fghcbWindowByHandle, enumerator );
}
fgEnumSubWindows( window, fghcbWindowByHandle, enumerator );
}
@@
-493,9
+441,7
@@
SFG_Window* fgWindowByHandle ( SFG_WindowHandleType hWindow )
{
SFG_Enumerator enumerator;
{
SFG_Enumerator enumerator;
- /*
- * This is easy and makes use of the windows enumeration defined above
- */
+ /* This is easy and makes use of the windows enumeration defined above */
enumerator.found = GL_FALSE;
enumerator.data = (void *)hWindow;
fgEnumWindows( fghcbWindowByHandle, &enumerator );
enumerator.found = GL_FALSE;
enumerator.data = (void *)hWindow;
fgEnumWindows( fghcbWindowByHandle, &enumerator );
@@
-510,15
+456,11
@@
SFG_Window* fgWindowByHandle ( SFG_WindowHandleType hWindow )
*/
static void fghcbWindowByID( SFG_Window *window, SFG_Enumerator *enumerator )
{
*/
static void fghcbWindowByID( SFG_Window *window, SFG_Enumerator *enumerator )
{
- /*
- * Make sure we do not overwrite our precious results...
- */
+ /* Make sure we do not overwrite our precious results... */
if( enumerator->found )
return;
if( enumerator->found )
return;
- /*
- * Check the window's handle. Hope this works. Looks ugly. That's for sure.
- */
+ /* Check the window's handle. Hope this works. Looks ugly. That's for sure. */
if( window->ID == *( int *)(enumerator->data) )
{
enumerator->found = GL_TRUE;
if( window->ID == *( int *)(enumerator->data) )
{
enumerator->found = GL_TRUE;
@@
-527,9
+469,7
@@
static void fghcbWindowByID( SFG_Window *window, SFG_Enumerator *enumerator )
return;
}
return;
}
- /*
- * Otherwise, check this window's children
- */
+ /* Otherwise, check this window's children */
fgEnumSubWindows( window, fghcbWindowByID, enumerator );
}
fgEnumSubWindows( window, fghcbWindowByID, enumerator );
}
@@
-542,9
+482,7
@@
SFG_Window* fgWindowByID( int windowID )
{
SFG_Enumerator enumerator;
{
SFG_Enumerator enumerator;
- /*
- * Uses a method very similiar for fgWindowByHandle...
- */
+ /* Uses a method very similiar for fgWindowByHandle... */
enumerator.found = GL_FALSE;
enumerator.data = ( void * )&windowID;
fgEnumWindows( fghcbWindowByID, &enumerator );
enumerator.found = GL_FALSE;
enumerator.data = ( void * )&windowID;
fgEnumWindows( fghcbWindowByID, &enumerator );
@@
-555,17
+493,13
@@
SFG_Window* fgWindowByID( int windowID )
/*
* Looks up a menu given its ID. This is easier that fgWindowByXXX
/*
* Looks up a menu given its ID. This is easier that fgWindowByXXX
- * as all menus are placed in a single doubly linked list...
+ * as all menus are placed in one doubly linked list...
*/
SFG_Menu* fgMenuByID( int menuID )
{
SFG_Menu *menu = NULL;
*/
SFG_Menu* fgMenuByID( int menuID )
{
SFG_Menu *menu = NULL;
- freeglut_assert_ready;
-
- /*
- * It's enough to check all entries in fgStructure.Menus...
- */
+ /* It's enough to check all entries in fgStructure.Menus... */
for( menu = (SFG_Menu *)fgStructure.Menus.First;
menu;
menu = (SFG_Menu *)menu->Node.Next )
for( menu = (SFG_Menu *)fgStructure.Menus.First;
menu;
menu = (SFG_Menu *)menu->Node.Next )