FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A first pass over freeglut_menu.c to bring it in line with the rest of

Browse Source 
freeglut's style.  Mostly re-indenting and splitting long lines.
For those that may be concerned: No, I didn't do any more arrangments
of the form (CONST == a) rather than (a == CONST).  (^&


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@325 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
rkrolib 2003-11-08 11:28:34 +00:00
parent 9c070e4f9b
commit 6bf9d27035
1 changed files with 445 additions and 401 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

212
freeglut/freeglut/src/freeglut_menu.c
View File

@ -62,7 +62,8 @@
#define FREEGLUT_MENU_FONT GLUT_BITMAP_HELVETICA_18 #define FREEGLUT_MENU_FONT GLUT_BITMAP_HELVETICA_18
#endif #endif
#define FREEGLUT_MENU_HEIGHT (glutBitmapHeight(FREEGLUT_MENU_FONT) + FREEGLUT_MENU_BORDER) #define FREEGLUT_MENU_HEIGHT (glutBitmapHeight(FREEGLUT_MENU_FONT) + \
FREEGLUT_MENU_BORDER)
#define FREEGLUT_MENU_BORDER 2 #define FREEGLUT_MENU_BORDER 2
@ -96,7 +97,9 @@ static SFG_MenuEntry *fghFindMenuEntry( SFG_Menu* menu, int index )
SFG_MenuEntry *entry; SFG_MenuEntry *entry;
int i = 1; int i = 1;
for( entry = (SFG_MenuEntry *)menu->Entries.First; entry; entry = (SFG_MenuEntry *)entry->Node.Next) for( entry = (SFG_MenuEntry *)menu->Entries.First;
entry;
entry = (SFG_MenuEntry *)entry->Node.Next )
{ {
if( i == index ) if( i == index )
break; break;
@ -117,25 +120,27 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu )
/* /*
* First of all check any of the active sub menus... * First of all check any of the active sub menus...
*/ */
for( menuEntry = (SFG_MenuEntry *)menu->Entries.First; menuEntry; for( menuEntry = (SFG_MenuEntry *)menu->Entries.First;
menuEntry;
menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next ) menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next )
{ {
if( menuEntry->SubMenu != NULL && menuEntry->IsActive == TRUE ) if( menuEntry->SubMenu && ( menuEntry->IsActive == TRUE ) )
{ {
/* /*
* OK, have the sub-menu checked, too. If it returns TRUE, it will mean * OK, have the sub-menu checked, too. If it returns TRUE, it
* that it caught the mouse cursor and we do not need to regenerate * will mean that it caught the mouse cursor and we do not need
* the activity list, and so our parents do... * to regenerate the activity list, and so our parents do...
*/ */
GLboolean return_status = fghCheckMenuStatus( window, menuEntry->SubMenu ) ; GLboolean return_status = fghCheckMenuStatus( window,
menuEntry->SubMenu );
/* /*
* Reactivate the submenu as the checkMenuStatus may have turned it off * Reactivate the submenu as the checkMenuStatus may have turned
* if the mouse is in its parent menu entry. * it off if the mouse is in its parent menu entry.
*/ */
menuEntry->SubMenu->IsActive = TRUE; menuEntry->SubMenu->IsActive = TRUE;
if ( return_status == TRUE ) if ( return_status == TRUE )
return( TRUE ); return TRUE;
} }
} }
@ -145,12 +150,10 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu )
x = window->State.MouseX; x = window->State.MouseX;
y = window->State.MouseY; y = window->State.MouseY;
for( menuEntry = (SFG_MenuEntry *)menu->Entries.First; menuEntry; for( menuEntry = (SFG_MenuEntry *)menu->Entries.First;
menuEntry;
menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next ) menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next )
{
menuEntry->IsActive = FALSE; menuEntry->IsActive = FALSE;
}
menu->IsActive = FALSE; menu->IsActive = FALSE;
@ -169,19 +172,19 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu )
* The mouse cursor is somewhere over our box, check it out. * The mouse cursor is somewhere over our box, check it out.
*/ */
menuEntry = fghFindMenuEntry( menu, menuID + 1 ); menuEntry = fghFindMenuEntry( menu, menuID + 1 );
assert( menuEntry != NULL ); assert( menuEntry );
menuEntry->IsActive = TRUE; menuEntry->IsActive = TRUE;
menuEntry->Ordinal = menuID; menuEntry->Ordinal = menuID;
/* /*
* If this is not the same as the last active menu entry, deactivate the * If this is not the same as the last active menu entry, deactivate
* previous entry. Specifically, if the previous active entry was a * the previous entry. Specifically, if the previous active entry
* submenu then deactivate it. * was a submenu then deactivate it.
*/ */
if( menu->ActiveEntry && ( menuEntry != menu->ActiveEntry ) ) if( menu->ActiveEntry && ( menuEntry != menu->ActiveEntry ) )
{ {
if ( menu->ActiveEntry->SubMenu != NULL ) if( menu->ActiveEntry->SubMenu )
fgDeactivateSubMenu( menu->ActiveEntry ); fgDeactivateSubMenu( menu->ActiveEntry );
} }
@ -193,7 +196,7 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu )
* nice to have its contents updated, in case it's a sub menu. * nice to have its contents updated, in case it's a sub menu.
* Also, ignore the return value of the check function: * Also, ignore the return value of the check function:
*/ */
if( menuEntry->SubMenu != NULL ) if( menuEntry->SubMenu )
{ {
if ( ! menuEntry->SubMenu->IsActive ) if ( ! menuEntry->SubMenu->IsActive )
{ {
@ -202,25 +205,31 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu )
/* /*
* Set up the initial menu position now... * Set up the initial menu position now...
*/ */
menuEntry->SubMenu->IsActive = TRUE; menuEntry->SubMenu->IsActive = TRUE;
/* /*
* Set up the initial submenu position now: * Set up the initial submenu position now:
*/ */
menuEntry->SubMenu->X = menu->X + menu->Width; menuEntry->SubMenu->X = menu->X + menu->Width;
menuEntry->SubMenu->Y = menu->Y + menuEntry->Ordinal * FREEGLUT_MENU_HEIGHT ; menuEntry->SubMenu->Y = menu->Y +
menuEntry->Ordinal * FREEGLUT_MENU_HEIGHT;
if ( menuEntry->SubMenu->X + menuEntry->SubMenu->Width > glutGet ( GLUT_SCREEN_WIDTH ) ) if( menuEntry->SubMenu->X + menuEntry->SubMenu->Width >
menuEntry->SubMenu->X = menu->X - menuEntry->SubMenu->Width ; glutGet( GLUT_SCREEN_WIDTH ) )
menuEntry->SubMenu->X = menu->X -
menuEntry->SubMenu->Width;
if ( menuEntry->SubMenu->Y + menuEntry->SubMenu->Height > glutGet ( GLUT_SCREEN_HEIGHT ) ) if( menuEntry->SubMenu->Y + menuEntry->SubMenu->Height >
glutGet( GLUT_SCREEN_HEIGHT ) )
menuEntry->SubMenu->Y -= ( menuEntry->SubMenu->Height - menuEntry->SubMenu->Y -= ( menuEntry->SubMenu->Height -
FREEGLUT_MENU_HEIGHT - 2 * FREEGLUT_MENU_BORDER ) ; FREEGLUT_MENU_HEIGHT -
2 * FREEGLUT_MENU_BORDER );
fgSetWindow( menuEntry->SubMenu->Window ); fgSetWindow( menuEntry->SubMenu->Window );
glutPositionWindow ( menuEntry->SubMenu->X, menuEntry->SubMenu->Y ) ; glutPositionWindow( menuEntry->SubMenu->X,
glutReshapeWindow ( menuEntry->SubMenu->Width, menuEntry->SubMenu->Height ) ; menuEntry->SubMenu->Y );
glutReshapeWindow( menuEntry->SubMenu->Width,
menuEntry->SubMenu->Height );
glutPopWindow( ); glutPopWindow( );
glutShowWindow( ); glutShowWindow( );
menuEntry->SubMenu->Window->ActiveMenu = menuEntry->SubMenu; menuEntry->SubMenu->Window->ActiveMenu = menuEntry->SubMenu;
@ -238,13 +247,13 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu )
/* /*
* Report back that we have caught the menu cursor * Report back that we have caught the menu cursor
*/ */
return( TRUE ); return TRUE;
} }
/* /*
* Looks like the menu cursor is somewhere else... * Looks like the menu cursor is somewhere else...
*/ */
return( FALSE ); return FALSE;
} }
/* /*
@ -260,7 +269,8 @@ static void fghDisplayMenuBox( SFG_Menu* menu )
* Have the menu box drawn first. The +- values are * Have the menu box drawn first. The +- values are
* here just to make it more nice-looking... * here just to make it more nice-looking...
*/ */
glColor4f( 1.0f, 1.0f, 1.0f, 1.0f ); /* a non-black dark version of the below. */ /* a non-black dark version of the below. */
glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
glBegin( GL_QUAD_STRIP ); glBegin( GL_QUAD_STRIP );
glVertex2i( menu->Width , 0 ); glVertex2i( menu->Width , 0 );
glVertex2i( menu->Width-border, border); glVertex2i( menu->Width-border, border);
@ -270,7 +280,8 @@ static void fghDisplayMenuBox( SFG_Menu* menu )
glVertex2i( border, menu->Height-border); glVertex2i( border, menu->Height-border);
glEnd( ); glEnd( );
glColor4f( 0.5f, 0.5f, 0.5f, 1.0f ); /* a non-black dark version of the below. */ /* a non-black dark version of the below. */
glColor4f( 0.5f, 0.5f, 0.5f, 1.0f );
glBegin( GL_QUAD_STRIP ); glBegin( GL_QUAD_STRIP );
glVertex2i( 0 , menu->Height ); glVertex2i( 0 , menu->Height );
glVertex2i( border, menu->Height-border); glVertex2i( border, menu->Height-border);
@ -291,7 +302,8 @@ static void fghDisplayMenuBox( SFG_Menu* menu )
/* /*
* Check if any of the submenus is currently active... * Check if any of the submenus is currently active...
*/ */
for( menuEntry = (SFG_MenuEntry *)menu->Entries.First; menuEntry; for( menuEntry = (SFG_MenuEntry *)menu->Entries.First;
menuEntry;
menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next ) menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next )
{ {
/* /*
@ -311,10 +323,18 @@ static void fghDisplayMenuBox( SFG_Menu* menu )
*/ */
glColor4fv( menu_pen_hback ); glColor4fv( menu_pen_hback );
glBegin( GL_QUADS ); glBegin( GL_QUADS );
glVertex2i( FREEGLUT_MENU_BORDER, (menuID + 0)*FREEGLUT_MENU_HEIGHT + FREEGLUT_MENU_BORDER ); glVertex2i( FREEGLUT_MENU_BORDER,
glVertex2i( menu->Width-FREEGLUT_MENU_BORDER, (menuID + 0)*FREEGLUT_MENU_HEIGHT + FREEGLUT_MENU_BORDER ); (menuID + 0)*FREEGLUT_MENU_HEIGHT +
glVertex2i( menu->Width-FREEGLUT_MENU_BORDER, (menuID + 1)*FREEGLUT_MENU_HEIGHT + FREEGLUT_MENU_BORDER ); FREEGLUT_MENU_BORDER );
glVertex2i( FREEGLUT_MENU_BORDER, (menuID + 1)*FREEGLUT_MENU_HEIGHT + FREEGLUT_MENU_BORDER ); glVertex2i( menu->Width-FREEGLUT_MENU_BORDER,
(menuID + 0)*FREEGLUT_MENU_HEIGHT +
FREEGLUT_MENU_BORDER );
glVertex2i( menu->Width-FREEGLUT_MENU_BORDER,
(menuID + 1)*FREEGLUT_MENU_HEIGHT +
FREEGLUT_MENU_BORDER );
glVertex2i( FREEGLUT_MENU_BORDER,
(menuID + 1)*FREEGLUT_MENU_HEIGHT +
FREEGLUT_MENU_BORDER );
glEnd( ); glEnd( );
} }
} }
@ -325,7 +345,8 @@ static void fghDisplayMenuBox( SFG_Menu* menu )
glColor4fv( menu_pen_fore ); glColor4fv( menu_pen_fore );
for( menuEntry = (SFG_MenuEntry *)menu->Entries.First, i=0; menuEntry; for( menuEntry = (SFG_MenuEntry *)menu->Entries.First, i=0;
menuEntry;
menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next, ++i ) menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next, ++i )
{ {
/* /*
@ -337,9 +358,11 @@ static void fghDisplayMenuBox( SFG_Menu* menu )
/* /*
* Move the raster into position... * Move the raster into position...
*/ */
/* Try to center the text - JCJ 31 July 2003*/
glRasterPos2i( glRasterPos2i(
2 * FREEGLUT_MENU_BORDER, 2 * FREEGLUT_MENU_BORDER,
(i + 1)*FREEGLUT_MENU_HEIGHT-(int)(FREEGLUT_MENU_HEIGHT*0.3 - FREEGLUT_MENU_BORDER ) /* Try to center the text - JCJ 31 July 2003*/ (i + 1)*FREEGLUT_MENU_HEIGHT-(int)( FREEGLUT_MENU_HEIGHT*0.3 -
FREEGLUT_MENU_BORDER )
); );
/* /*
@ -350,15 +373,18 @@ static void fghDisplayMenuBox( SFG_Menu* menu )
/* /*
* If it's a submenu, draw a right arrow * If it's a submenu, draw a right arrow
*/ */
if ( menuEntry->SubMenu != NULL ) if( menuEntry->SubMenu )
{ {
int width = glutBitmapWidth( FREEGLUT_MENU_FONT, '_' ); int width = glutBitmapWidth( FREEGLUT_MENU_FONT, '_' );
int x_base = menu->Width - 2 - width; int x_base = menu->Width - 2 - width;
int y_base = i*FREEGLUT_MENU_HEIGHT + FREEGLUT_MENU_BORDER; int y_base = i*FREEGLUT_MENU_HEIGHT + FREEGLUT_MENU_BORDER;
glBegin( GL_TRIANGLES ); glBegin( GL_TRIANGLES );
glVertex2i( x_base, y_base + 2*FREEGLUT_MENU_BORDER); glVertex2i( x_base, y_base + 2*FREEGLUT_MENU_BORDER);
glVertex2i( menu->Width - 2, y_base + (FREEGLUT_MENU_HEIGHT + FREEGLUT_MENU_BORDER) / 2 ); glVertex2i( menu->Width - 2, y_base +
glVertex2i( x_base, y_base + FREEGLUT_MENU_HEIGHT - FREEGLUT_MENU_BORDER); ( FREEGLUT_MENU_HEIGHT +
FREEGLUT_MENU_BORDER) / 2 );
glVertex2i( x_base, y_base + FREEGLUT_MENU_HEIGHT -
FREEGLUT_MENU_BORDER);
glEnd( ); glEnd( );
} }
@ -372,13 +398,14 @@ static void fghDisplayMenuBox( SFG_Menu* menu )
/* /*
* Now we are ready to check if any of our children needs to be redrawn: * Now we are ready to check if any of our children needs to be redrawn:
*/ */
for( menuEntry = (SFG_MenuEntry *)menu->Entries.First; menuEntry; for( menuEntry = (SFG_MenuEntry *)menu->Entries.First;
menuEntry;
menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next ) menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next )
{ {
/* /*
* Is that an active sub menu by any case? * Is that an active sub menu by any case?
*/ */
if( menuEntry->SubMenu != NULL && menuEntry->IsActive == TRUE ) if( menuEntry->SubMenu && ( menuEntry->IsActive == TRUE ) )
{ {
/* /*
* Yeah, indeed. Have it redrawn now: * Yeah, indeed. Have it redrawn now:
@ -391,7 +418,8 @@ static void fghDisplayMenuBox( SFG_Menu* menu )
} }
/* /*
* Private static function to set the parent window of a submenu and all of its submenus * Private static function to set the parent window of a submenu and all
* of its submenus
*/ */
static void fghSetSubmenuParentWindow ( SFG_Window *window, SFG_Menu *menu ) static void fghSetSubmenuParentWindow ( SFG_Window *window, SFG_Menu *menu )
{ {
@ -399,12 +427,12 @@ static void fghSetSubmenuParentWindow ( SFG_Window *window, SFG_Menu *menu )
menu->ParentWindow = window; menu->ParentWindow = window;
for ( menuEntry = (SFG_MenuEntry *)menu->Entries.First; menuEntry; menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next ) for( menuEntry = (SFG_MenuEntry *)menu->Entries.First;
{ menuEntry;
if ( menuEntry->SubMenu != NULL ) menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next )
if ( menuEntry->SubMenu )
fghSetSubmenuParentWindow ( window, menuEntry->SubMenu ) ; fghSetSubmenuParentWindow ( window, menuEntry->SubMenu ) ;
} }
}
/* /*
@ -428,14 +456,15 @@ void fgDisplayMenu( void )
/* /*
* Did we find an active menu? * Did we find an active menu?
*/ */
freeglut_return_if_fail( menu != NULL ); freeglut_return_if_fail( menu );
fgSetWindow ( menu->Window ); fgSetWindow ( menu->Window );
/* /*
* Prepare the OpenGL state to do the rendering first: * Prepare the OpenGL state to do the rendering first:
*/ */
glPushAttrib( GL_DEPTH_BUFFER_BIT | GL_TEXTURE_BIT | GL_LIGHTING_BIT | GL_POLYGON_BIT ); glPushAttrib( GL_DEPTH_BUFFER_BIT | GL_TEXTURE_BIT | GL_LIGHTING_BIT |
GL_POLYGON_BIT );
glDisable( GL_DEPTH_TEST ); glDisable( GL_DEPTH_TEST );
glDisable( GL_TEXTURE_2D ); glDisable( GL_TEXTURE_2D );
@ -534,10 +563,14 @@ GLboolean fgCheckActiveMenu ( SFG_Window *window, SFG_Menu *menu )
{ {
/* /*
* Near as I can tell, this is the active menu behaviour: * Near as I can tell, this is the active menu behaviour:
* - Down-click any button outside the menu, menu active: deactivate the menu * - Down-click any button outside the menu, menu active:
* - Down-click any button inside the menu, menu active: select the menu entry and deactivate the menu * deactivate the menu
* - Up-click the menu button outside the menu, menu active: nothing happens * - Down-click any button inside the menu, menu active:
* - Up-click the menu button inside the menu, menu active: select the menu entry and deactivate the menu * select the menu entry and deactivate the menu
* - Up-click the menu button outside the menu, menu active:
* nothing happens
* - Up-click the menu button inside the menu, menu active:
* select the menu entry and deactivate the menu
* Since menus can have submenus, we need to check this recursively. * Since menus can have submenus, we need to check this recursively.
*/ */
return fghCheckMenuStatus( window, menu ); return fghCheckMenuStatus( window, menu );
@ -553,7 +586,9 @@ void fgExecuteMenuCallback( SFG_Menu* menu )
/* /*
* First of all check any of the active sub menus... * First of all check any of the active sub menus...
*/ */
for( menuEntry = (SFG_MenuEntry *)menu->Entries.First; menuEntry; menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next) for( menuEntry = (SFG_MenuEntry *)menu->Entries.First;
menuEntry;
menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next)
{ {
/* /*
* Is this menu entry active? * Is this menu entry active?
@ -561,14 +596,15 @@ void fgExecuteMenuCallback( SFG_Menu* menu )
if( menuEntry->IsActive == TRUE ) if( menuEntry->IsActive == TRUE )
{ {
/* /*
* If there is not a sub menu, execute the menu callback and return... * If there is not a sub menu, execute the menu callback and
* return...
*/ */
if( menuEntry->SubMenu == NULL ) if( !( menuEntry->SubMenu ) )
{ {
/* /*
* ...certainly given that there is one... * ...certainly given that there is one...
*/ */
if( menu->Callback != NULL ) if( menu->Callback )
menu->Callback( menuEntry->ID ); menu->Callback( menuEntry->ID );
return; return;
@ -603,7 +639,7 @@ void fgDeactivateMenu( SFG_Window *window )
/* /*
* Did we find an active window? * Did we find an active window?
*/ */
freeglut_return_if_fail( menu != NULL ); freeglut_return_if_fail( menu );
/* /*
* Hide the present menu's window * Hide the present menu's window
@ -623,13 +659,14 @@ void fgDeactivateMenu( SFG_Window *window )
/* /*
* Hide all submenu windows, and the root menu's window. * Hide all submenu windows, and the root menu's window.
*/ */
for ( menuEntry = (SFG_MenuEntry *)menu->Entries.First; menuEntry; for ( menuEntry = (SFG_MenuEntry *)menu->Entries.First;
menuEntry;
menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next ) menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next )
{ {
/* /*
* Is that an active submenu by any case? * Is that an active submenu by any case?
*/ */
if ( menuEntry->SubMenu != NULL ) if( menuEntry->SubMenu )
fgDeactivateSubMenu( menuEntry ); fgDeactivateSubMenu( menuEntry );
} }
@ -658,13 +695,14 @@ void fgDeactivateSubMenu( SFG_MenuEntry *menuEntry )
/* /*
* Hide all submenu windows, and the root menu's window. * Hide all submenu windows, and the root menu's window.
*/ */
for ( subMenuIter = (SFG_MenuEntry *)menuEntry->SubMenu->Entries.First; subMenuIter; for ( subMenuIter = (SFG_MenuEntry *)menuEntry->SubMenu->Entries.First;
subMenuIter;
subMenuIter = (SFG_MenuEntry *)subMenuIter->Node.Next ) subMenuIter = (SFG_MenuEntry *)subMenuIter->Node.Next )
{ {
/* /*
* Is that an active submenu by any case? * Is that an active submenu by any case?
*/ */
if ( subMenuIter->SubMenu != NULL ) if( subMenuIter->SubMenu )
fgDeactivateSubMenu( subMenuIter ); fgDeactivateSubMenu( subMenuIter );
} }
@ -682,24 +720,27 @@ void fghCalculateMenuBoxSize( void )
/* /*
* Make sure there is a current menu set * Make sure there is a current menu set
*/ */
freeglut_assert_ready; freeglut_return_if_fail( fgStructure.Menu != NULL ); freeglut_assert_ready;
freeglut_return_if_fail( fgStructure.Menu );
/* /*
* The menu's box size depends on the menu entries: * The menu's box size depends on the menu entries:
*/ */
for( menuEntry = (SFG_MenuEntry *)fgStructure.Menu->Entries.First; menuEntry; for( menuEntry = (SFG_MenuEntry *)fgStructure.Menu->Entries.First;
menuEntry;
menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next) menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next)
{ {
/* /*
* Update the menu entry's width value * Update the menu entry's width value
*/ */
menuEntry->Width = glutBitmapLength( FREEGLUT_MENU_FONT, menuEntry->Text ); menuEntry->Width = glutBitmapLength( FREEGLUT_MENU_FONT,
menuEntry->Text );
/* /*
* If the entry is a submenu, then it needs to be wider to accomodate the arrow. JCJ 31 July 2003 * If the entry is a submenu, then it needs to be wider to
* accomodate the arrow. JCJ 31 July 2003
*/ */
if (menuEntry->SubMenu )
if (menuEntry->SubMenu != NULL)
menuEntry->Width += glutBitmapLength( FREEGLUT_MENU_FONT, "_" ); menuEntry->Width += glutBitmapLength( FREEGLUT_MENU_FONT, "_" );
/* /*
@ -729,7 +770,7 @@ int FGAPIENTRY glutCreateMenu( void (* callback)( int ) )
/* /*
* The menu object creation code resides in freeglut_structure.c * The menu object creation code resides in freeglut_structure.c
*/ */
return( fgCreateMenu( callback )->ID ); return fgCreateMenu( callback )->ID;
} }
/* /*
@ -739,7 +780,8 @@ void FGAPIENTRY glutDestroyMenu( int menuID )
{ {
SFG_Menu* menu = fgMenuByID( menuID ); SFG_Menu* menu = fgMenuByID( menuID );
freeglut_assert_ready; freeglut_return_if_fail( menu != NULL ); freeglut_assert_ready;
freeglut_return_if_fail( menu );
/* /*
* The menu object destruction code resides in freeglut_structure.c * The menu object destruction code resides in freeglut_structure.c
@ -754,10 +796,10 @@ int FGAPIENTRY glutGetMenu( void )
{ {
freeglut_assert_ready; freeglut_assert_ready;
if( fgStructure.Menu != NULL ) if( fgStructure.Menu )
return( fgStructure.Menu->ID ); return fgStructure.Menu->ID;
return( 0 ); return 0;
} }
/* /*
@ -768,7 +810,7 @@ void FGAPIENTRY glutSetMenu( int menuID )
SFG_Menu* menu = fgMenuByID( menuID ); SFG_Menu* menu = fgMenuByID( menuID );
freeglut_assert_ready; freeglut_assert_ready;
freeglut_return_if_fail( menu != NULL ); freeglut_return_if_fail( menu );
fgStructure.Menu = menu; fgStructure.Menu = menu;
} }
@ -778,10 +820,11 @@ void FGAPIENTRY glutSetMenu( int menuID )
*/ */
void FGAPIENTRY glutAddMenuEntry( const char* label, int value ) void FGAPIENTRY glutAddMenuEntry( const char* label, int value )
{ {
SFG_MenuEntry* menuEntry = (SFG_MenuEntry *)calloc( sizeof(SFG_MenuEntry), 1 ); SFG_MenuEntry* menuEntry =
(SFG_MenuEntry *)calloc( sizeof(SFG_MenuEntry), 1 );
freeglut_assert_ready; freeglut_assert_ready;
freeglut_return_if_fail( fgStructure.Menu != NULL ); freeglut_return_if_fail( fgStructure.Menu );
menuEntry->Text = strdup( label ); menuEntry->Text = strdup( label );
menuEntry->ID = value; menuEntry->ID = value;
@ -799,12 +842,13 @@ void FGAPIENTRY glutAddMenuEntry( const char* label, int value )
*/ */
void FGAPIENTRY glutAddSubMenu( const char* label, int subMenuID ) void FGAPIENTRY glutAddSubMenu( const char* label, int subMenuID )
{ {
SFG_MenuEntry* menuEntry = (SFG_MenuEntry *)calloc( sizeof(SFG_MenuEntry), 1 ); SFG_MenuEntry* menuEntry =
(SFG_MenuEntry *)calloc( sizeof(SFG_MenuEntry), 1 );
SFG_Menu* subMenu = fgMenuByID( subMenuID ); SFG_Menu* subMenu = fgMenuByID( subMenuID );
freeglut_assert_ready; freeglut_assert_ready;
freeglut_return_if_fail( fgStructure.Menu != NULL ); freeglut_return_if_fail( fgStructure.Menu );
freeglut_return_if_fail( subMenu != NULL ); freeglut_return_if_fail( subMenu );
menuEntry->Text = strdup( label ); menuEntry->Text = strdup( label );
menuEntry->SubMenu = subMenu; menuEntry->SubMenu = subMenu;
@ -839,7 +883,7 @@ void FGAPIENTRY glutChangeToMenuEntry( int item, const char* label, int value )
/* /*
* We want it to become a normal menu entry, so: * We want it to become a normal menu entry, so:
*/ */
if( menuEntry->Text != NULL ) if( menuEntry->Text )
free( menuEntry->Text ); free( menuEntry->Text );
menuEntry->Text = strdup( label ); menuEntry->Text = strdup( label );
@ -946,7 +990,7 @@ void FGAPIENTRY glutDetachMenu( int button )
*/ */
void* FGAPIENTRY glutGetMenuData( void ) void* FGAPIENTRY glutGetMenuData( void )
{ {
return(fgStructure.Menu->UserData); return fgStructure.Menu->UserData;
} }
void FGAPIENTRY glutSetMenuData(void* data) void FGAPIENTRY glutSetMenuData(void* data)