X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_menu.c;h=daad294a7ee64a5289ca524da9739eb0b1be38a6;hb=155d9d0f851f035871188033b7b757ac2fd02693;hp=65ec6741be5beff0fc74cb9fc7a1a38d7d0b19b1;hpb=3a423ad871d823ee0707057c22b4ef90fd66e1aa;p=freeglut diff --git a/src/fg_menu.c b/src/fg_menu.c index 65ec674..daad294 100644 --- a/src/fg_menu.c +++ b/src/fg_menu.c @@ -1,5 +1,5 @@ /* - * freeglut_menu.c + * fg_menu.c * * Pull-down menu creation and handling. * @@ -43,8 +43,8 @@ * 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 + * FREEGLUT_MENUENTRY_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. * @@ -56,8 +56,8 @@ */ /* See platform-specific header files for menu font and color definitions */ -#define FREEGLUT_MENU_HEIGHT (glutBitmapHeight(FREEGLUT_MENU_FONT) + \ - FREEGLUT_MENU_BORDER) +#define FREEGLUT_MENUENTRY_HEIGHT(font) (glutBitmapHeight(font) + \ + FREEGLUT_MENU_BORDER) #define FREEGLUT_MENU_BORDER 2 @@ -65,7 +65,7 @@ * 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 + * Old GLUT appeared to be system-dependent for its colors (sigh) so we are * too. These variables should be stuffed into global state and initialized * via the glutInit*() system. */ @@ -76,6 +76,9 @@ static float menu_pen_hback [4] = FREEGLUT_MENU_PEN_HBACK_COLORS; extern GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y ); +extern void fghPlatformGetCursorPos(const SFG_Window *window, GLboolean client, SFG_XYUse *mouse_pos); +extern SFG_Font* fghFontByID( void* font ); +extern void fgPlatformHideWindow( SFG_Window* window ); /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */ @@ -106,8 +109,7 @@ static void fghDeactivateSubMenu( SFG_MenuEntry *menuEntry ) { SFG_MenuEntry *subMenuIter; /* Hide the present menu's window */ - fgSetWindow( menuEntry->SubMenu->Window ); - glutHideWindow( ); + fgPlatformHideWindow( menuEntry->SubMenu->Window ); /* Forget about having that menu active anymore, now: */ menuEntry->SubMenu->Window->ActiveMenu = NULL; @@ -125,8 +127,6 @@ static void fghDeactivateSubMenu( SFG_MenuEntry *menuEntry ) if( subMenuIter->SubMenu ) fghDeactivateSubMenu( subMenuIter ); } - - fgSetWindow ( menuEntry->SubMenu->ParentWindow ) ; } /* @@ -186,7 +186,7 @@ static GLboolean fghCheckMenuStatus( SFG_Menu* menu ) ( y >= FREEGLUT_MENU_BORDER ) && ( y < menu->Height - FREEGLUT_MENU_BORDER ) ) { - int menuID = ( y - FREEGLUT_MENU_BORDER ) / FREEGLUT_MENU_HEIGHT; + int menuID = ( y - FREEGLUT_MENU_BORDER ) / FREEGLUT_MENUENTRY_HEIGHT(menu->Font); /* The mouse cursor is somewhere over our box, check it out. */ menuEntry = fghFindMenuEntry( menu, menuID + 1 ); @@ -207,16 +207,16 @@ static GLboolean fghCheckMenuStatus( SFG_Menu* menu ) if( menuEntry != menu->ActiveEntry ) { - menu->Window->State.Redisplay = GL_TRUE; + menu->Window->State.WorkMask |= GLUT_DISPLAY_WORK; if( menu->ActiveEntry ) menu->ActiveEntry->IsActive = GL_FALSE; } menu->ActiveEntry = menuEntry; - menu->IsActive = GL_TRUE; /* XXX Do we need this? */ + menu->IsActive = GL_TRUE; /* - * OKi, we have marked that entry as active, but it would be also + * OK, we have marked that entry as active, but it would be also * nice to have its contents updated, in case it's a sub menu. * Also, ignore the return value of the check function: */ @@ -234,7 +234,7 @@ static GLboolean fghCheckMenuStatus( SFG_Menu* menu ) fghGetVMaxExtent(menu->ParentWindow, &max_x, &max_y); menuEntry->SubMenu->X = menu->X + menu->Width; menuEntry->SubMenu->Y = menu->Y + - menuEntry->Ordinal * FREEGLUT_MENU_HEIGHT; + menuEntry->Ordinal * FREEGLUT_MENUENTRY_HEIGHT(menu->Font); if( menuEntry->SubMenu->X + menuEntry->SubMenu->Width > max_x ) menuEntry->SubMenu->X = menu->X - menuEntry->SubMenu->Width; @@ -242,7 +242,7 @@ static GLboolean fghCheckMenuStatus( SFG_Menu* menu ) if( menuEntry->SubMenu->Y + menuEntry->SubMenu->Height > max_y ) { menuEntry->SubMenu->Y -= ( menuEntry->SubMenu->Height - - FREEGLUT_MENU_HEIGHT - + FREEGLUT_MENUENTRY_HEIGHT(menu->Font) - 2 * FREEGLUT_MENU_BORDER ); if( menuEntry->SubMenu->Y < 0 ) menuEntry->SubMenu->Y = 0; @@ -265,7 +265,7 @@ static GLboolean fghCheckMenuStatus( SFG_Menu* menu ) } /* Activate it because its parent entry is active */ - menuEntry->SubMenu->IsActive = GL_TRUE; /* XXX Do we need this? */ + menuEntry->SubMenu->IsActive = GL_TRUE; } /* Report back that we have caught the menu cursor */ @@ -277,7 +277,7 @@ static GLboolean fghCheckMenuStatus( SFG_Menu* menu ) ( !menu->ActiveEntry->SubMenu || !menu->ActiveEntry->SubMenu->IsActive ) ) { - menu->Window->State.Redisplay = GL_TRUE; + menu->Window->State.WorkMask |= GLUT_DISPLAY_WORK; menu->ActiveEntry->IsActive = GL_FALSE; menu->ActiveEntry = NULL; } @@ -347,13 +347,13 @@ static void fghDisplayMenuBox( SFG_Menu* menu ) glColor4fv( menu_pen_hback ); glBegin( GL_QUADS ); glVertex2i( border, - (menuID + 0)*FREEGLUT_MENU_HEIGHT + border ); + (menuID + 0)*FREEGLUT_MENUENTRY_HEIGHT(menu->Font) + border ); glVertex2i( menu->Width - border, - (menuID + 0)*FREEGLUT_MENU_HEIGHT + border ); + (menuID + 0)*FREEGLUT_MENUENTRY_HEIGHT(menu->Font) + border ); glVertex2i( menu->Width - border, - (menuID + 1)*FREEGLUT_MENU_HEIGHT + border ); + (menuID + 1)*FREEGLUT_MENUENTRY_HEIGHT(menu->Font) + border ); glVertex2i( border, - (menuID + 1)*FREEGLUT_MENU_HEIGHT + border ); + (menuID + 1)*FREEGLUT_MENUENTRY_HEIGHT(menu->Font) + border ); glEnd( ); } } @@ -374,25 +374,25 @@ static void fghDisplayMenuBox( SFG_Menu* menu ) /* Try to center the text - JCJ 31 July 2003*/ glRasterPos2i( 2 * border, - ( i + 1 )*FREEGLUT_MENU_HEIGHT - - ( int )( FREEGLUT_MENU_HEIGHT*0.3 - border ) + ( i + 1 )*FREEGLUT_MENUENTRY_HEIGHT(menu->Font) - + ( int )( FREEGLUT_MENUENTRY_HEIGHT(menu->Font)*0.3 - border ) ); /* Have the label drawn, character after character: */ - glutBitmapString( FREEGLUT_MENU_FONT, + glutBitmapString( menu->Font, (unsigned char *)menuEntry->Text); /* If it's a submenu, draw a right arrow */ if( menuEntry->SubMenu ) { - int width = glutBitmapWidth( FREEGLUT_MENU_FONT, '_' ); + int width = glutBitmapWidth( menu->Font, '_' ); int x_base = menu->Width - 2 - width; - int y_base = i*FREEGLUT_MENU_HEIGHT + border; + int y_base = i*FREEGLUT_MENUENTRY_HEIGHT(menu->Font) + border; glBegin( GL_TRIANGLES ); glVertex2i( x_base, y_base + 2*border); glVertex2i( menu->Width - 2, y_base + - ( FREEGLUT_MENU_HEIGHT + border) / 2 ); - glVertex2i( x_base, y_base + FREEGLUT_MENU_HEIGHT - border ); + ( FREEGLUT_MENUENTRY_HEIGHT(menu->Font) + border) / 2 ); + glVertex2i( x_base, y_base + FREEGLUT_MENUENTRY_HEIGHT(menu->Font) - border ); glEnd( ); } @@ -419,36 +419,6 @@ static void fghSetMenuParentWindow( SFG_Window *window, SFG_Menu *menu ) fghSetMenuParentWindow( window, menuEntry->SubMenu ); } -/* - * Function to check for menu entry selection on menu deactivation - */ -static void fghExecuteMenuCallback( SFG_Menu* menu ) -{ - SFG_MenuEntry *menuEntry; - - /* First of all check any of the active sub menus... */ - for( menuEntry = (SFG_MenuEntry *)menu->Entries.First; - menuEntry; - menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next) - { - if( menuEntry->IsActive ) - { - if( menuEntry->SubMenu ) - fghExecuteMenuCallback( menuEntry->SubMenu ); - else - if( menu->Callback ) - { - SFG_Menu *save_menu = fgStructure.CurrentMenu; - fgStructure.CurrentMenu = menu; - menu->Callback( menuEntry->ID ); - fgStructure.CurrentMenu = save_menu; - } - - return; - } - } -} - /* * Displays the currently active menu for the current window @@ -508,6 +478,7 @@ void fgDisplayMenu( void ) static void fghActivateMenu( SFG_Window* window, int button ) { int max_x, max_y; + SFG_XYUse mouse_pos; /* We'll be referencing this menu a lot, so remember its address: */ SFG_Menu* menu = window->Menu[ button ]; @@ -526,9 +497,17 @@ static void fghActivateMenu( SFG_Window* window, int button ) /* Set up the initial menu position now: */ fghGetVMaxExtent(menu->ParentWindow, &max_x, &max_y); fgSetWindow( window ); - menu->X = window->State.MouseX + glutGet( GLUT_WINDOW_X ); - menu->Y = window->State.MouseY + glutGet( GLUT_WINDOW_Y ); + /* get mouse position on screen (window->State.MouseX and window->State.MouseY + * are relative to client area origin), and not easy to correct given that + * glutGet( GLUT_WINDOW_X ) and glutGet( GLUT_WINDOW_Y ) return relative to parent + * origin when looking at a child window + * for parent windows: window->State.MouseX + glutGet( GLUT_WINDOW_X ) == mouse_pos.X + */ + fghPlatformGetCursorPos(NULL, GL_FALSE, &mouse_pos); + menu->X = mouse_pos.X; + menu->Y = mouse_pos.Y; + /* Make sure the whole menu is on the screen */ if( menu->X + menu->Width > max_x ) menu->X -=menu->Width; @@ -539,10 +518,21 @@ static void fghActivateMenu( SFG_Window* window, int button ) menu->Y = 0; } - menu->Window->State.MouseX = - window->State.MouseX + glutGet( GLUT_WINDOW_X ) - menu->X; - menu->Window->State.MouseY = - window->State.MouseY + glutGet( GLUT_WINDOW_Y ) - menu->Y; + /* Set position of mouse relative to top-left menu in menu's window state (could as well set 0 at creation time...) */ + menu->Window->State.MouseX = mouse_pos.X - menu->X; + menu->Window->State.MouseY = mouse_pos.Y - menu->Y; + + /* Menu status callback */ + if (fgState.MenuStateCallback || fgState.MenuStatusCallback) + { + fgStructure.CurrentMenu = menu; + fgStructure.CurrentWindow = window; + if (fgState.MenuStateCallback) + fgState.MenuStateCallback(GLUT_MENU_IN_USE); + if (fgState.MenuStatusCallback) + /* window->State.MouseX and window->State.MouseY are relative to client area origin, as needed */ + fgState.MenuStatusCallback(GLUT_MENU_IN_USE, window->State.MouseX, window->State.MouseY, fgState.MenuStatusCallbackData); + } fgSetWindow( menu->Window ); glutPositionWindow( menu->X, menu->Y ); @@ -556,8 +546,7 @@ static void fghActivateMenu( SFG_Window* window, int button ) /* * Update Highlight states of the menu - * - * Current mouse position is in menu->Window->State.MouseX/Y. + * NB: Current mouse position is in menu->Window->State.MouseX/Y */ void fgUpdateMenuHighlight ( SFG_Menu *menu ) { @@ -570,13 +559,17 @@ void fgUpdateMenuHighlight ( SFG_Menu *menu ) GLboolean fgCheckActiveMenu ( SFG_Window *window, int button, GLboolean pressed, int mouse_x, int mouse_y ) { + GLboolean is_handled = GL_FALSE; + GLboolean is_clicked = GL_FALSE; /* * Near as I can tell, this is the menu behaviour: * - Down-click the menu button, menu not active: activate * the menu with its upper left-hand corner at the mouse * location. * - Down-click any button outside the menu, menu active: - * deactivate the menu + * deactivate the menu, and potentially activate a new menu + * at the new mouse location. This includes clicks in + * different windows of course * - Down-click any button inside the menu, menu active: * select the menu entry and deactivate the menu * - Up-click the menu button, menu not active: nothing happens @@ -596,7 +589,7 @@ GLboolean fgCheckActiveMenu ( SFG_Window *window, int button, GLboolean pressed, mouse_y - window->ActiveMenu->Y; } - /* In the menu, invoke the callback and deactivate the menu */ + /* In the menu, deactivate the menu and invoke the callback */ if( fghCheckMenuStatus( window->ActiveMenu ) ) { /* @@ -604,18 +597,26 @@ GLboolean fgCheckActiveMenu ( SFG_Window *window, int button, GLboolean pressed, * window to the window whose menu this is */ SFG_Window *save_window = fgStructure.CurrentWindow; - SFG_Menu *save_menu = fgStructure.CurrentMenu; + SFG_Menu *save_menu = fgStructure.CurrentMenu, *active_menu = window->ActiveMenu; /* active menu is always the one with the mouse in it, due to fghCheckMenuStatus */ + SFG_MenuEntry *active_entry = active_menu->ActiveEntry; /* currently highlighted item -> must be the one that was just clicked */ SFG_Window *parent_window = window->ActiveMenu->ParentWindow; - fgSetWindow( parent_window ); - fgStructure.CurrentMenu = window->ActiveMenu; - /* Execute the menu callback */ - fghExecuteMenuCallback( window->ActiveMenu ); - fgDeactivateMenu( parent_window ); + /* ignore clicks on the submenu entry */ + if (!active_entry->SubMenu) + { + fgSetWindow( parent_window ); + fgStructure.CurrentMenu = active_menu; + + /* Deactivate menu and then call callback (we don't want menu to stay in view while callback is executing, and user should be able to change menus in callback) */ + fgDeactivateMenu( parent_window ); + active_menu->Callback( active_entry->ID, active_menu->CallbackData ); + + /* Restore the current window and menu */ + fgSetWindow( save_window ); + fgStructure.CurrentMenu = save_menu; + } - /* Restore the current window and menu */ - fgSetWindow( save_window ); - fgStructure.CurrentMenu = save_menu; + is_clicked = GL_TRUE; /* Don't reopen... */ } else if( pressed ) /* @@ -626,38 +627,47 @@ GLboolean fgCheckActiveMenu ( SFG_Window *window, int button, GLboolean pressed, */ { fgDeactivateMenu( window->ActiveMenu->ParentWindow ); + /* Could reopen again in different location, as is_clicked remains false */ } - /* - * XXX Why does an active menu require a redisplay at - * XXX this point? If this can come out cleanly, then - * XXX it probably should do so; if not, a comment should - * XXX explain it. - */ - if( ! window->IsMenu ) - window->State.Redisplay = GL_TRUE; + is_handled = GL_TRUE; + } + else if ( fgState.ActiveMenus ) /* Don't have to check whether this was a downpress or an uppress, there is no way to get an uppress in another window before a downpress... */ + { + /* if another window than the one clicked in has an open menu, close it */ + SFG_Menu *menu = fgGetActiveMenu(); + if ( menu ) /* any open menu? */ + fgDeactivateMenu( menu->ParentWindow ); - return GL_TRUE; + /* Leave is_handled to false, we didn't do anything relevant from the perspective of the window that was clicked */ } /* No active menu, let's check whether we need to activate one. */ - if( ( 0 <= button ) && + if( !is_clicked && + ( 0 <= button ) && ( FREEGLUT_MAX_MENUS > button ) && ( window->Menu[ button ] ) && pressed ) { - /* XXX Posting a requisite Redisplay seems bogus. */ - window->State.Redisplay = GL_TRUE; - fghActivateMenu( window, button ); - return GL_TRUE; + /* If mouseclick was outside the parent window, ignore. This can + * happen when another mouse button is already depressed and the + * window thus has mouse capture + */ + if (window->State.MouseX>0 && window->State.MouseY>0 && + window->State.MouseXState.Width && window->State.MouseYState.Height) + { + fghActivateMenu( window, button ); + is_handled = GL_TRUE; + } } - return GL_FALSE; + return is_handled; } /* * Deactivates a menu pointed by the function argument. */ +static SFG_Menu* menuDeactivating = NULL; void fgDeactivateMenu( SFG_Window *window ) { SFG_Window *parent_window = NULL; @@ -669,12 +679,15 @@ void fgDeactivateMenu( SFG_Window *window ) /* Check if there is an active menu attached to this window... */ menu = window->ActiveMenu; freeglut_return_if_fail( menu ); + /* Check if we are already deactivating this menu, abort in that case (glutHideWindow below can cause this function to be called again on the same menu..) */ + if (menu==menuDeactivating) + return; + menuDeactivating = menu; parent_window = menu->ParentWindow; /* Hide the present menu's window */ - fgSetWindow( menu->Window ); - glutHideWindow( ); + fgPlatformHideWindow( menu->Window ); /* Forget about having that menu active anymore, now: */ menu->Window->ActiveMenu = NULL; @@ -696,8 +709,25 @@ void fgDeactivateMenu( SFG_Window *window ) if( menuEntry->SubMenu ) fghDeactivateSubMenu( menuEntry ); } + /* Done deactivating menu */ + menuDeactivating = NULL; - fgSetWindow ( parent_window ) ; + /* Menu status callback */ + if (fgState.MenuStateCallback || fgState.MenuStatusCallback) + { + fgStructure.CurrentMenu = menu; + fgStructure.CurrentWindow = parent_window; + if (fgState.MenuStateCallback) + fgState.MenuStateCallback(GLUT_MENU_NOT_IN_USE); + if (fgState.MenuStatusCallback) + { + /* Get cursor position relative to parent_window's client area */ + SFG_XYUse mouse_pos; + fghPlatformGetCursorPos(parent_window, GL_TRUE, &mouse_pos); + + fgState.MenuStatusCallback(GLUT_MENU_NOT_IN_USE, mouse_pos.X, mouse_pos.Y, fgState.MenuStatusCallbackData); + } + } } /* @@ -718,17 +748,17 @@ void fghCalculateMenuBoxSize( void ) { /* Update the menu entry's width value */ menuEntry->Width = glutBitmapLength( - FREEGLUT_MENU_FONT, + fgStructure.CurrentMenu->Font, (unsigned char *)menuEntry->Text ); /* * If the entry is a submenu, then it needs to be wider to - * accomodate the arrow. JCJ 31 July 2003 + * accommodate the arrow. */ - if (menuEntry->SubMenu ) + if (menuEntry->SubMenu) menuEntry->Width += glutBitmapLength( - FREEGLUT_MENU_FONT, + fgStructure.CurrentMenu->Font, (unsigned char *)"_" ); @@ -736,7 +766,7 @@ void fghCalculateMenuBoxSize( void ) if( menuEntry->Width > width ) width = menuEntry->Width; - height += FREEGLUT_MENU_HEIGHT; + height += FREEGLUT_MENUENTRY_HEIGHT(fgStructure.CurrentMenu->Font); } /* Store the menu's box size now: */ @@ -750,11 +780,34 @@ void fghCalculateMenuBoxSize( void ) /* * Creates a new menu object, adding it to the freeglut structure */ -int FGAPIENTRY glutCreateMenu( void(* callback)( int ) ) +int FGAPIENTRY glutCreateMenuUcall( FGCBMenuUC callback, FGCBUserData userData ) +{ + /* The menu object creation code resides in fg_structure.c */ + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCreateMenuUcall" ); + if (fgState.ActiveMenus) + { + fgError( "Menu manipulation not allowed while menus in use." ); + } + + return fgCreateMenu( callback, userData )->ID; +} + +/* Standard glutCreateMenu */ +static void fghCreateMenuCallback( int menu, FGCBUserData userData ) +{ + FGCBMenu* callback = (FGCBMenu*)&userData; + (*callback)( menu ); +} + +int FGAPIENTRY glutCreateMenu( FGCBMenu callback ) { - /* The menu object creation code resides in freeglut_structure.c */ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCreateMenu" ); - return fgCreateMenu( callback )->ID; + if (!callback) + { + return glutCreateMenuUcall( NULL, NULL ); + } + FGCBMenu* reference = &callback; + return glutCreateMenuUcall( fghCreateMenuCallback, *((FGCBUserData*)reference) ); } /* @@ -768,8 +821,10 @@ void FGAPIENTRY glutDestroyMenu( int menuID ) menu = fgMenuByID( menuID ); freeglut_return_if_fail( menu ); + if (fgState.ActiveMenus) + fgError("Menu manipulation not allowed while menus in use."); - /* The menu object destruction code resides in freeglut_structure.c */ + /* The menu object destruction code resides in fg_structure.c */ fgDestroyMenu( menu ); } @@ -809,7 +864,10 @@ void FGAPIENTRY glutAddMenuEntry( const char* label, int value ) SFG_MenuEntry* menuEntry; FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutAddMenuEntry" ); menuEntry = (SFG_MenuEntry *)calloc( sizeof(SFG_MenuEntry), 1 ); + freeglut_return_if_fail( fgStructure.CurrentMenu ); + if (fgState.ActiveMenus) + fgError("Menu manipulation not allowed while menus in use."); menuEntry->Text = strdup( label ); menuEntry->ID = value; @@ -833,6 +891,9 @@ void FGAPIENTRY glutAddSubMenu( const char *label, int subMenuID ) subMenu = fgMenuByID( subMenuID ); freeglut_return_if_fail( fgStructure.CurrentMenu ); + if (fgState.ActiveMenus) + fgError("Menu manipulation not allowed while menus in use."); + freeglut_return_if_fail( subMenu ); menuEntry->Text = strdup( label ); @@ -844,6 +905,31 @@ void FGAPIENTRY glutAddSubMenu( const char *label, int subMenuID ) } /* + * Changes the current menu's font + */ +void FGAPIENTRY glutSetMenuFont( int menuID, void* fontID ) +{ + SFG_Font* font; + SFG_Menu* menu; + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetMenuFont" ); + menu = fgMenuByID( menuID ); + freeglut_return_if_fail( menu ); + + if (fgState.ActiveMenus) + fgError("Menu manipulation not allowed while menus in use."); + + font = fghFontByID( fontID ); + if (!font) + { + fgWarning("glutChangeMenuFont: bitmap font 0x%08x not found. Make sure you're not passing a stroke font. Ignoring...\n",fontID); + return; + } + + fgStructure.CurrentMenu->Font = fontID; + fghCalculateMenuBoxSize( ); +} + +/* * Changes the specified menu item in the current menu into a menu entry */ void FGAPIENTRY glutChangeToMenuEntry( int item, const char* label, int value ) @@ -851,7 +937,10 @@ void FGAPIENTRY glutChangeToMenuEntry( int item, const char* label, int value ) SFG_MenuEntry* menuEntry = NULL; FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutChangeToMenuEntry" ); + freeglut_return_if_fail( fgStructure.CurrentMenu ); + if (fgState.ActiveMenus) + fgError("Menu manipulation not allowed while menus in use."); /* Get n-th menu entry in the current menu, starting from one: */ menuEntry = fghFindMenuEntry( fgStructure.CurrentMenu, item ); @@ -878,10 +967,14 @@ void FGAPIENTRY glutChangeToSubMenu( int item, const char* label, SFG_MenuEntry* menuEntry; FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutChangeToSubMenu" ); - subMenu = fgMenuByID( subMenuID ); - menuEntry = NULL; freeglut_return_if_fail( fgStructure.CurrentMenu ); + if (fgState.ActiveMenus) + fgError("Menu manipulation not allowed while menus in use."); + + /* Get handle to sub menu */ + subMenu = fgMenuByID( subMenuID ); + menuEntry = NULL; freeglut_return_if_fail( subMenu ); /* Get n-th menu entry in the current menu, starting from one: */ @@ -907,7 +1000,10 @@ void FGAPIENTRY glutRemoveMenuItem( int item ) SFG_MenuEntry* menuEntry; FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutRemoveMenuItem" ); + freeglut_return_if_fail( fgStructure.CurrentMenu ); + if (fgState.ActiveMenus) + fgError("Menu manipulation not allowed while menus in use."); /* Get n-th menu entry in the current menu, starting from one: */ menuEntry = fghFindMenuEntry( fgStructure.CurrentMenu, item ); @@ -930,7 +1026,10 @@ void FGAPIENTRY glutAttachMenu( int button ) FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutAttachMenu" ); freeglut_return_if_fail( fgStructure.CurrentWindow ); + freeglut_return_if_fail( fgStructure.CurrentMenu ); + if (fgState.ActiveMenus) + fgError("Menu manipulation not allowed while menus in use."); freeglut_return_if_fail( button >= 0 ); freeglut_return_if_fail( button < FREEGLUT_MAX_MENUS ); @@ -946,7 +1045,10 @@ void FGAPIENTRY glutDetachMenu( int button ) FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutDetachMenu" ); freeglut_return_if_fail( fgStructure.CurrentWindow ); + freeglut_return_if_fail( fgStructure.CurrentMenu ); + if (fgState.ActiveMenus) + fgError("Menu manipulation not allowed while menus in use."); freeglut_return_if_fail( button >= 0 ); freeglut_return_if_fail( button < FREEGLUT_MAX_MENUS );