X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_menu.c;h=f49ca5259a562150ddf8e7081a1a0d5f8950a6e1;hb=d27fd0aebaecfa09560f296df23829757c42fb65;hp=c7760d9393e2ac55d999fb9e1b67de22512c6590;hpb=c0b24ae9f197885c2bfde8ca2fc4883858b7fc33;p=freeglut diff --git a/src/freeglut_menu.c b/src/freeglut_menu.c index c7760d9..f49ca52 100644 --- a/src/freeglut_menu.c +++ b/src/freeglut_menu.c @@ -79,14 +79,13 @@ /* - * These variables should be moved into the freeglut global state, but for now, - * we'll put them here. They are for rendering the freeglut menu items. + * These variables are for rendering the freeglut menu items. + * * The choices are fore- and background, with and without h for Highlighting. * Old GLUT appeared to be system-dependant for its colors (sigh) so we are * too. These variables should be stuffed into global state and initialized * via the glutInit*() system. */ - #if TARGET_HOST_WIN32 static float menu_pen_fore [4] = {0.0f, 0.0f, 0.0f, 1.0f}; static float menu_pen_back [4] = {0.85f, 0.85f, 0.85f, 1.0f}; @@ -768,21 +767,8 @@ void FGAPIENTRY glutDestroyMenu( int menuID ) int FGAPIENTRY glutGetMenu( void ) { freeglut_assert_ready; - - /* - * Is there a current menu set? - */ if( fgStructure.Menu != NULL ) - { - /* - * Yes, there is indeed... - */ return( fgStructure.Menu->ID ); - } - - /* - * No, there is no current menu at all - */ return( 0 ); } @@ -793,11 +779,8 @@ void FGAPIENTRY glutSetMenu( int menuID ) { SFG_Menu* menu = fgMenuByID( menuID ); - freeglut_assert_ready; freeglut_return_if_fail( menu != NULL ); - - /* - * The current menu pointer is stored in fgStructure.Menu - */ + freeglut_assert_ready; + freeglut_return_if_fail( menu != NULL ); fgStructure.Menu = menu; } @@ -808,14 +791,8 @@ void FGAPIENTRY glutAddMenuEntry( const char* label, int value ) { SFG_MenuEntry* menuEntry = (SFG_MenuEntry *)calloc( sizeof(SFG_MenuEntry), 1 ); - /* - * Make sure there is a current menu set - */ - freeglut_assert_ready; freeglut_return_if_fail( fgStructure.Menu != NULL ); - - /* - * Fill in the appropriate values... - */ + freeglut_assert_ready; + freeglut_return_if_fail( fgStructure.Menu != NULL ); menuEntry->Text = strdup( label ); menuEntry->ID = value; @@ -823,10 +800,6 @@ void FGAPIENTRY glutAddMenuEntry( const char* label, int value ) * Have the new menu entry attached to the current menu */ fgListAppend( &fgStructure.Menu->Entries, &menuEntry->Node ); - - /* - * Update the menu's dimensions now - */ fghCalculateMenuBoxSize(); } @@ -838,16 +811,10 @@ void FGAPIENTRY glutAddSubMenu( const char* label, int subMenuID ) SFG_MenuEntry* menuEntry = (SFG_MenuEntry *)calloc( sizeof(SFG_MenuEntry), 1 ); SFG_Menu* subMenu = fgMenuByID( subMenuID ); - /* - * Make sure there is a current menu and the sub menu - * we want to attach actually exists... - */ - freeglut_assert_ready; freeglut_return_if_fail( fgStructure.Menu != NULL ); + freeglut_assert_ready; + freeglut_return_if_fail( fgStructure.Menu != NULL ); freeglut_return_if_fail( subMenu != NULL ); - /* - * Fill in the appropriate values - */ menuEntry->Text = strdup( label ); menuEntry->SubMenu = subMenu; menuEntry->ID = -1; @@ -856,15 +823,7 @@ void FGAPIENTRY glutAddSubMenu( const char* label, int subMenuID ) * Make the submenu's parent window be the menu's parent window */ fghSetSubmenuParentWindow ( fgStructure.Menu->ParentWindow, subMenu ) ; - - /* - * Have the new menu entry attached to the current menu - */ fgListAppend( &fgStructure.Menu->Entries, &menuEntry->Node ); - - /* - * Update the menu's dimensions now - */ fghCalculateMenuBoxSize(); } @@ -875,19 +834,9 @@ void FGAPIENTRY glutChangeToMenuEntry( int item, const char* label, int value ) { SFG_MenuEntry* menuEntry = NULL; - /* - * Make sure there is a current menu set... - */ - freeglut_assert_ready; freeglut_return_if_fail( fgStructure.Menu != NULL ); - - /* - * Get n-th menu entry in the current menu, starting from one: - */ + freeglut_assert_ready; + freeglut_return_if_fail( fgStructure.Menu != NULL ); menuEntry = fghFindMenuEntry( fgStructure.Menu, item ); - - /* - * Make sure the menu entry exists - */ freeglut_return_if_fail( menuEntry != NULL ); /* @@ -900,9 +849,6 @@ void FGAPIENTRY glutChangeToMenuEntry( int item, const char* label, int value ) menuEntry->ID = value; menuEntry->SubMenu = NULL; - /* - * Update the menu's dimensions now - */ fghCalculateMenuBoxSize(); } @@ -914,35 +860,22 @@ void FGAPIENTRY glutChangeToSubMenu( int item, const char* label, int subMenuID SFG_Menu* subMenu = fgMenuByID( subMenuID ); SFG_MenuEntry* menuEntry = NULL; - /* - * Make sure there is a current menu set and the sub menu exists... - */ - freeglut_assert_ready; freeglut_return_if_fail( fgStructure.Menu != NULL ); - freeglut_return_if_fail( subMenu != NULL ); - - /* - * Get n-th menu entry in the current menu, starting from one: - */ + freeglut_assert_ready; + freeglut_return_if_fail( fgStructure.Menu ); + freeglut_return_if_fail( subMenu ); menuEntry = fghFindMenuEntry( fgStructure.Menu, item ); - - /* - * Make sure the menu entry exists - */ - freeglut_return_if_fail( menuEntry != NULL ); + freeglut_return_if_fail( menuEntry ); /* * We want it to become a sub menu entry, so: */ - if( menuEntry->Text != NULL ) + if( menuEntry->Text ) free( menuEntry->Text ); menuEntry->Text = strdup( label ); menuEntry->SubMenu = subMenu; menuEntry->ID = -1; - /* - * Update the menu's dimensions now - */ fghCalculateMenuBoxSize(); } @@ -953,36 +886,13 @@ void FGAPIENTRY glutRemoveMenuItem( int item ) { SFG_MenuEntry* menuEntry; - /* - * Make sure there is a current menu set - */ - freeglut_assert_ready; freeglut_return_if_fail( fgStructure.Menu != NULL ); - - /* - * Get n-th menu entry in the current menu, starting from one: - */ + freeglut_assert_ready; + freeglut_return_if_fail( fgStructure.Menu ); menuEntry = fghFindMenuEntry( fgStructure.Menu, item ); - - /* - * Make sure the menu entry exists - */ - freeglut_return_if_fail( menuEntry != NULL ); - - /* - * Removing a menu entry is quite simple... - */ + freeglut_return_if_fail( menuEntry ); fgListRemove( &fgStructure.Menu->Entries, &menuEntry->Node ); - - /* - * Free the entry label string, too - */ free( menuEntry->Text ); - free( menuEntry ); - - /* - * Update the menu's dimensions now - */ fghCalculateMenuBoxSize(); } @@ -1010,7 +920,7 @@ void FGAPIENTRY glutAttachMenu( int button ) void FGAPIENTRY glutDetachMenu( int button ) { freeglut_assert_ready; - freeglut_return_if_fail( fgStructure.Window != NULL ); + freeglut_return_if_fail( fgStructure.Window ); freeglut_return_if_fail( fgStructure.Menu ); freeglut_return_if_fail( button >= 0 ); freeglut_return_if_fail( button < FREEGLUT_MAX_MENUS );