X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_menu.c;h=3b3a5cb67ae42801f302c54918e01cc62666feab;hb=bc762393b1c3421d1f508c03111643e27a1cc8f9;hp=9054ccea0b0bdacfcf044374826720e41ad5e9fc;hpb=9b5ed2940eac112c894bb43f802fbda5b1c8b27a;p=freeglut diff --git a/src/freeglut_menu.c b/src/freeglut_menu.c index 9054cce..3b3a5cb 100644 --- a/src/freeglut_menu.c +++ b/src/freeglut_menu.c @@ -29,33 +29,67 @@ #include "config.h" #endif -#define G_LOG_DOMAIN "freeglut-menu" - #include "../include/GL/freeglut.h" #include "freeglut_internal.h" +/* -- DEFINITIONS ---------------------------------------------------------- */ + /* - * TODO BEFORE THE STABLE RELEASE: + * FREEGLUT_MENU_FONT can be any freeglut bitmapped font. + * (Stroked fonts would not be out of the question, but we'd need to alter + * code, since GLUT (hence freeglut) does not quite unify stroked and + * bitmapped font handling.) + * Old UNIX/X11 GLUT (BSD, UNIX, IRIX, LINUX, HPUX, ...) used a system + * font best approximated by an 18-pixel HELVETICA, I think. MS-WINDOWS + * GLUT used something closest to the 8x13 fixed-width font. (Old + * GLUT apparently uses host-system menus rather than building its own. + * freeglut is building its own menus from scratch.) + * + * FREEGLUT_MENU_HEIGHT gives the height of ONE menu box. This should be + * the distances between two adjacent menu entries. It should scale + * automatically with the font choice, so you needn't alter it---unless you + * use a stroked font. * - * It would be cool if the submenu entries were somehow marked, for example with a dings - * on the right menu border or something like that. Think about the possibility of doing - * the menu on layers *or* using the native window system instead of OpenGL. + * FREEGLUT_MENU_BORDER says how many pixels to allow around the edge of a + * menu. (It also seems to be the same as the number of pixels used as + * a border around *items* to separate them from neighbors. John says + * that that wasn't the original intent...if not, perhaps we need another + * symbolic constant, FREEGLUT_MENU_ITEM_BORDER, or such.) */ +#if TARGET_HOST_WIN32 +#define FREEGLUT_MENU_FONT GLUT_BITMAP_8_BY_13 +#else +#define FREEGLUT_MENU_FONT GLUT_BITMAP_HELVETICA_18 +#endif + +#define FREEGLUT_MENU_HEIGHT (glutBitmapHeight(FREEGLUT_MENU_FONT) + FREEGLUT_MENU_BORDER) +#define FREEGLUT_MENU_BORDER 2 -/* -- DEFINITIONS ---------------------------------------------------------- */ /* - * We'll be using freeglut fonts to draw the menu + * 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. */ -#define FREEGLUT_MENU_FONT GLUT_BITMAP_8_BY_13 -#define FREEGLUT_MENU_HEIGHT 15 -#define FREEGLUT_MENU_BORDER 8 - +#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}; +static float menu_pen_hfore [4] = {1.0f, 1.0f, 1.0f, 1.0f}; +static float menu_pen_hback [4] = {0.15f, 0.15f, 0.45f, 1.0f}; +#else +static float menu_pen_fore [4] = {0.0f, 0.0f, 0.0f, 1.0f}; +static float menu_pen_back [4] = {0.70f, 0.70f, 0.70f, 1.0f}; +static float menu_pen_hfore [4] = {0.0f, 0.0f, 0.0f, 1.0f}; +static float menu_pen_hback [4] = {1.0f, 1.0f, 1.0f, 1.0f}; +#endif /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */ /* - * Private static function to find a menu entry by index + * Private function to find a menu entry by index */ static SFG_MenuEntry *fghFindMenuEntry( SFG_Menu* menu, int index ) { @@ -73,7 +107,7 @@ static SFG_MenuEntry *fghFindMenuEntry( SFG_Menu* menu, int index ) } /* - * Private static function to check for the current menu/sub menu activity state + * Private function to check for the current menu/sub menu activity state */ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) { @@ -86,9 +120,6 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) for( menuEntry = (SFG_MenuEntry *)menu->Entries.First; menuEntry; menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next ) { - /* - * Is that an active sub menu by any case? - */ if( menuEntry->SubMenu != NULL && menuEntry->IsActive == TRUE ) { /* @@ -99,8 +130,8 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) GLboolean return_status = fghCheckMenuStatus( window, menuEntry->SubMenu ) ; /* - * Reactivate the submenu as the checkMenuStatus may have turned it off if the mouse - * is in its parent menu entry. + * Reactivate the submenu as the checkMenuStatus may have turned it off + * if the mouse is in its parent menu entry. */ menuEntry->SubMenu->IsActive = TRUE ; if ( return_status == TRUE ) @@ -114,9 +145,6 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) x = window->State.MouseX; y = window->State.MouseY; - /* - * Mark all menu entries inactive... - */ for( menuEntry = (SFG_MenuEntry *)menu->Entries.First; menuEntry; menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next ) { @@ -129,12 +157,13 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) /* * Check if the mouse cursor is contained within the current menu box */ - if ( ( x >= 0 ) && ( x < menu->Width ) && ( y >= 0 ) && ( y < menu->Height ) && ( window == menu->Window ) ) + if ( ( x >= FREEGLUT_MENU_BORDER ) && + ( x < menu->Width - FREEGLUT_MENU_BORDER ) && + ( y >= FREEGLUT_MENU_BORDER ) && + ( y < menu->Height - FREEGLUT_MENU_BORDER ) && + ( window == menu->Window ) ) { - /* - * Calculation of the highlighted menu item is easy enough now: - */ - int menuID = y / FREEGLUT_MENU_HEIGHT; + int menuID = ( y - FREEGLUT_MENU_BORDER ) / FREEGLUT_MENU_HEIGHT ; /* * The mouse cursor is somewhere over our box, check it out. @@ -142,15 +171,13 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) menuEntry = fghFindMenuEntry( menu, menuID + 1 ); assert( menuEntry != NULL ); - /* - * Mark the menu as active... - */ menuEntry->IsActive = TRUE; menuEntry->Ordinal = menuID; /* - * If this is not the same as the last active menu entry, deactivate the previous entry. - * Specifically, if the previous active entry was a submenu then deactivate it. + * If this is not the same as the last active menu entry, deactivate the + * previous entry. Specifically, if the previous active entry was a + * submenu then deactivate it. */ if ( menu->ActiveEntry && ( menuEntry != menu->ActiveEntry ) ) { @@ -159,11 +186,6 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) } menu->ActiveEntry = menuEntry ; - - /* - * Don't forget about marking the current menu as active, too: - */ - menu->IsActive = TRUE; /* @@ -181,9 +203,6 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) * Set up the initial menu position now... */ - /* - * Mark the menu as active, so that it gets displayed: - */ menuEntry->SubMenu->IsActive = TRUE ; /* @@ -192,6 +211,13 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) menuEntry->SubMenu->X = menu->X + menu->Width ; menuEntry->SubMenu->Y = menu->Y + menuEntry->Ordinal * FREEGLUT_MENU_HEIGHT ; + if ( menuEntry->SubMenu->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 ) ) + menuEntry->SubMenu->Y -= ( menuEntry->SubMenu->Height - + FREEGLUT_MENU_HEIGHT - 2 * FREEGLUT_MENU_BORDER ) ; + fgSetWindow ( menuEntry->SubMenu->Window ) ; glutPositionWindow ( menuEntry->SubMenu->X, menuEntry->SubMenu->Y ) ; glutReshapeWindow ( menuEntry->SubMenu->Width, menuEntry->SubMenu->Height ) ; @@ -201,13 +227,10 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) fgSetWindow ( current_window ) ; } - /* - * ...then check the submenu's state: - */ fghCheckMenuStatus( window, menuEntry->SubMenu ); /* - * Even if the submenu turned up inactive, activate it because its parent entry is active + * Activate it because its parent entry is active */ menuEntry->SubMenu->IsActive = TRUE ; } @@ -231,25 +254,38 @@ static void fghDisplayMenuBox( SFG_Menu* menu ) { SFG_MenuEntry *menuEntry; int i; + int border = FREEGLUT_MENU_BORDER ; /* * Have the menu box drawn first. The +- values are * here just to make it more nice-looking... */ - glColor4f( 0.1289f, 0.2257f, 0.28516f, 1.0f ); /* a non-black dark version of the below. */ - glBegin( GL_QUADS ); - glVertex2i( 0 , 0 ); - glVertex2i( menu->Width, 0 ); - glVertex2i( menu->Width, menu->Height ); - glVertex2i( 0 , menu->Height ); + glColor4f( 1.0f, 1.0f, 1.0f, 1.0f ); /* a non-black dark version of the below. */ + glBegin( GL_QUAD_STRIP ); + glVertex2i( menu->Width , 0 ); + glVertex2i( menu->Width-border, border); + glVertex2i( 0 , 0 ); + glVertex2i( border, border); + glVertex2i( 0 , menu->Height ); + glVertex2i( border, menu->Height-border); + glEnd(); + + glColor4f( 0.5f, 0.5f, 0.5f, 1.0f ); /* a non-black dark version of the below. */ + glBegin( GL_QUAD_STRIP ); + glVertex2i( 0 , menu->Height ); + glVertex2i( border, menu->Height-border); + glVertex2i( menu->Width , menu->Height ); + glVertex2i( menu->Width-border, menu->Height-border); + glVertex2i( menu->Width , 0 ); + glVertex2i( menu->Width-border, border); glEnd(); - glColor4f( 0.3f, 0.4f, 0.5f, 1.0f ); + glColor4fv ( menu_pen_back ) ; glBegin( GL_QUADS ); - glVertex2i( 1, 1 ); - glVertex2i( menu->Width-1, 1 ); - glVertex2i( menu->Width-1, menu->Height-1); - glVertex2i( 1, menu->Height-1); + glVertex2i( border, border); + glVertex2i( menu->Width-border, border); + glVertex2i( menu->Width-border, menu->Height-border); + glVertex2i( border, menu->Height-border); glEnd(); /* @@ -273,12 +309,12 @@ static void fghDisplayMenuBox( SFG_Menu* menu ) /* * So have the highlight drawn... */ - glColor4f( 0.2f, 0.3f, 0.4f, 1.0f ); + glColor4fv ( menu_pen_hback ) ; glBegin( GL_QUADS ); - glVertex2i( 2 , (menuID + 0)*FREEGLUT_MENU_HEIGHT + 1 ); - glVertex2i( menu->Width-2, (menuID + 0)*FREEGLUT_MENU_HEIGHT + 1 ); - glVertex2i( menu->Width-2, (menuID + 1)*FREEGLUT_MENU_HEIGHT + 2 ); - glVertex2i( 2 , (menuID + 1)*FREEGLUT_MENU_HEIGHT + 2 ); + glVertex2i( FREEGLUT_MENU_BORDER, (menuID + 0)*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(); } } @@ -286,17 +322,24 @@ static void fghDisplayMenuBox( SFG_Menu* menu ) /* * Print the menu entries now... */ - glColor4f( 1, 1, 1, 1 ); + + glColor4fv ( menu_pen_fore ); for( menuEntry = (SFG_MenuEntry *)menu->Entries.First, i=0; menuEntry; menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next, ++i ) { /* + * If the menu entry is active, set the color to white + */ + if ( menuEntry->IsActive ) + glColor4fv ( menu_pen_hfore ) ; + + /* * Move the raster into position... */ glRasterPos2i( - FREEGLUT_MENU_BORDER, - (i + 1)*FREEGLUT_MENU_HEIGHT-(int)(FREEGLUT_MENU_HEIGHT*0.3) /* Try to center the text - JCJ 31 July 2003*/ + 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*/ ); /* @@ -309,26 +352,21 @@ static void fghDisplayMenuBox( SFG_Menu* menu ) */ if ( menuEntry->SubMenu != NULL ) { - GLubyte arrow_char [] = { 0, 0, 32, 48, 56, 60, 62, 63, 62, 60, 56, 48, 32, 0, 0 } ; - int width = glutBitmapWidth ( FREEGLUT_MENU_FONT, ' ' ) ; - - glPushClientAttrib( GL_CLIENT_PIXEL_STORE_BIT ); - - /* - * Set up the pixel unpacking ways - */ - glPixelStorei( GL_UNPACK_SWAP_BYTES, GL_FALSE ); - glPixelStorei( GL_UNPACK_LSB_FIRST, GL_FALSE ); - glPixelStorei( GL_UNPACK_ROW_LENGTH, 0 ); - glPixelStorei( GL_UNPACK_SKIP_ROWS, 0 ); - glPixelStorei( GL_UNPACK_SKIP_PIXELS, 0 ); - glPixelStorei( GL_UNPACK_ALIGNMENT, 1 ); - - glRasterPos2i ( menu->Width - 2 - width, - (i + 1)*FREEGLUT_MENU_HEIGHT ) ; - glBitmap ( width, FREEGLUT_MENU_HEIGHT, 0, 0, 0.0, 0.0, arrow_char ) ; - glPopClientAttrib(); + int width = glutBitmapWidth ( FREEGLUT_MENU_FONT, '_' ) ; + int x_base = menu->Width - 2 - width; + int y_base = i*FREEGLUT_MENU_HEIGHT + FREEGLUT_MENU_BORDER; + glBegin( GL_TRIANGLES ); + glVertex2i( x_base, y_base + 2*FREEGLUT_MENU_BORDER); + glVertex2i( menu->Width - 2, y_base + (FREEGLUT_MENU_HEIGHT + FREEGLUT_MENU_BORDER) / 2 ); + glVertex2i( x_base, y_base + FREEGLUT_MENU_HEIGHT - FREEGLUT_MENU_BORDER); + glEnd( ); } + + /* + * If the menu entry is active, reset the color + */ + if ( menuEntry->IsActive ) + glColor4fv ( menu_pen_fore ) ; } /* @@ -475,17 +513,18 @@ void fgActivateMenu( SFG_Window* window, int button ) menu->X = window->State.MouseX + glutGet ( GLUT_WINDOW_X ) ; menu->Y = window->State.MouseY + glutGet ( GLUT_WINDOW_Y ) ; + if ( menu->X + menu->Width > glutGet ( GLUT_SCREEN_WIDTH ) ) + menu->X -=menu->Width ; + + if ( menu->Y + menu->Height > glutGet ( GLUT_SCREEN_HEIGHT ) ) + menu->Y -=menu->Height ; + fgSetWindow ( menu->Window ) ; glutPositionWindow ( menu->X, menu->Y ) ; glutReshapeWindow ( menu->Width, menu->Height ) ; glutPopWindow () ; glutShowWindow () ; menu->Window->ActiveMenu = menu ; - -/* if( x > ( glutGet( GLUT_WINDOW_WIDTH ) - menu->Width ) ) - menu->X = glutGet( GLUT_WINDOW_WIDTH ) - menu->Width; - if( y > ( glutGet( GLUT_WINDOW_HEIGHT ) - menu->Height) ) - menu->Y = glutGet( GLUT_WINDOW_HEIGHT ) - menu->Height; */ } /* @@ -590,11 +629,11 @@ void fgDeactivateMenu( SFG_Window *window ) /* * Is that an active submenu by any case? */ - if ( ( menuEntry->SubMenu != NULL ) && menuEntry->SubMenu->IsActive ) + if ( menuEntry->SubMenu != NULL ) fgDeactivateSubMenu ( menuEntry ) ; } - fgStructure.Window = current_window ; + fgSetWindow ( current_window ) ; } /* @@ -625,11 +664,11 @@ void fgDeactivateSubMenu( SFG_MenuEntry *menuEntry ) /* * Is that an active submenu by any case? */ - if ( ( subMenuIter->SubMenu != NULL ) && subMenuIter->SubMenu->IsActive ) + if ( subMenuIter->SubMenu != NULL ) fgDeactivateSubMenu ( subMenuIter ) ; } - fgStructure.Window = current_window ; + fgSetWindow ( current_window ) ; } /* @@ -661,7 +700,7 @@ void fghCalculateMenuBoxSize( void ) */ if (menuEntry->SubMenu != NULL) - menuEntry->Width += glutBitmapLength( FREEGLUT_MENU_FONT, " " ); + menuEntry->Width += glutBitmapLength( FREEGLUT_MENU_FONT, "_" ); /* * Check if it's the biggest we've found @@ -675,8 +714,8 @@ void fghCalculateMenuBoxSize( void ) /* * Store the menu's box size now: */ - fgStructure.Menu->Height = height; - fgStructure.Menu->Width = width + 2 * FREEGLUT_MENU_BORDER ; + fgStructure.Menu->Height = height + 2 * FREEGLUT_MENU_BORDER ; + fgStructure.Menu->Width = width + 4 * FREEGLUT_MENU_BORDER ; } @@ -715,20 +754,9 @@ 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 ); } @@ -739,11 +767,9 @@ void FGAPIENTRY glutSetMenu( int menuID ) { SFG_Menu* menu = fgMenuByID( menuID ); - freeglut_assert_ready; freeglut_return_if_fail( menu != NULL ); + freeglut_assert_ready; + freeglut_return_if_fail( menu != NULL ); - /* - * The current menu pointer is stored in fgStructure.Menu - */ fgStructure.Menu = menu; } @@ -754,14 +780,9 @@ 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 ); + freeglut_assert_ready; + freeglut_return_if_fail( fgStructure.Menu != NULL ); - /* - * Fill in the appropriate values... - */ menuEntry->Text = strdup( label ); menuEntry->ID = value; @@ -770,9 +791,6 @@ void FGAPIENTRY glutAddMenuEntry( const char* label, int value ) */ fgListAppend( &fgStructure.Menu->Entries, &menuEntry->Node ); - /* - * Update the menu's dimensions now - */ fghCalculateMenuBoxSize(); } @@ -784,16 +802,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; @@ -803,14 +815,7 @@ void FGAPIENTRY glutAddSubMenu( const char* label, int subMenuID ) */ 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(); } @@ -821,20 +826,15 @@ 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 ); + freeglut_assert_ready; + freeglut_return_if_fail( fgStructure.Menu ); /* * Get n-th menu entry in the current menu, starting from one: */ 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 normal menu entry, so: @@ -845,10 +845,6 @@ void FGAPIENTRY glutChangeToMenuEntry( int item, const char* label, int value ) menuEntry->Text = strdup( label ); menuEntry->ID = value; menuEntry->SubMenu = NULL; - - /* - * Update the menu's dimensions now - */ fghCalculateMenuBoxSize(); } @@ -860,35 +856,26 @@ 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 ); + freeglut_assert_ready; + freeglut_return_if_fail( fgStructure.Menu ); + freeglut_return_if_fail( subMenu ); /* * Get n-th menu entry in the current menu, starting from one: */ 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(); } @@ -899,36 +886,21 @@ 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 ); + freeglut_assert_ready; + freeglut_return_if_fail( fgStructure.Menu ); /* * Get n-th menu entry in the current menu, starting from one: */ menuEntry = fghFindMenuEntry( fgStructure.Menu, item ); - /* - * Make sure the menu entry exists - */ - freeglut_return_if_fail( menuEntry != NULL ); + freeglut_return_if_fail( menuEntry ); - /* - * Removing a menu entry is quite simple... - */ fgListRemove( &fgStructure.Menu->Entries, &menuEntry->Node ); - - /* - * Free the entry label string, too - */ - free( menuEntry->Text ); + if ( menuEntry->Text ) + free( menuEntry->Text ); free( menuEntry ); - - /* - * Update the menu's dimensions now - */ fghCalculateMenuBoxSize(); } @@ -939,19 +911,12 @@ void FGAPIENTRY glutAttachMenu( int button ) { freeglut_assert_ready; - /* - * There must be a current window and a current menu set: - */ - freeglut_return_if_fail( fgStructure.Window != NULL || fgStructure.Menu != NULL ); + freeglut_return_if_fail( fgStructure.Window ); + freeglut_return_if_fail( fgStructure.Menu ); - /* - * Make sure the button value is valid (0, 1 or 2, see freeglut.h) - */ - freeglut_return_if_fail( button == GLUT_LEFT_BUTTON || button == GLUT_MIDDLE_BUTTON || button == GLUT_RIGHT_BUTTON ); + freeglut_return_if_fail( button >= 0 ); + freeglut_return_if_fail( button < FREEGLUT_MAX_MENUS ); - /* - * It is safe now to attach the menu - */ fgStructure.Window->Menu[ button ] = fgStructure.Menu; /* @@ -967,19 +932,12 @@ void FGAPIENTRY glutDetachMenu( int button ) { freeglut_assert_ready; - /* - * There must be a current window set: - */ - freeglut_return_if_fail( fgStructure.Window != NULL ); + freeglut_return_if_fail( fgStructure.Window ); + freeglut_return_if_fail( fgStructure.Menu ); - /* - * Make sure the button value is valid (0, 1 or 2, see freeglut.h) - */ - freeglut_return_if_fail( button != 0 && button != 1 && button != 2 ); + freeglut_return_if_fail( button >= 0 ); + freeglut_return_if_fail( button < FREEGLUT_MAX_MENUS ); - /* - * It is safe now to detach the menu - */ fgStructure.Window->Menu[ button ] = NULL; }