X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_menu.c;h=ea5837e807d3aff8115170ca7e1079565437f349;hb=ded8742fba5a4622b49778679cc7e26d197d75c5;hp=25b98a3859630b00b7f71071acfda29cedf3d84e;hpb=4634982c39857ee13ad0c5fa67b3ad197a37daf1;p=freeglut diff --git a/src/freeglut_menu.c b/src/freeglut_menu.c index 25b98a3..ea5837e 100644 --- a/src/freeglut_menu.c +++ b/src/freeglut_menu.c @@ -25,6 +25,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#define FREEGLUT_BUILDING_LIB #include #include "freeglut_internal.h" @@ -52,7 +53,7 @@ * 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 || TARGET_HOST_WINCE +#if TARGET_HOST_MS_WINDOWS #define FREEGLUT_MENU_FONT GLUT_BITMAP_8_BY_13 #else #define FREEGLUT_MENU_FONT GLUT_BITMAP_HELVETICA_18 @@ -71,7 +72,7 @@ * too. These variables should be stuffed into global state and initialized * via the glutInit*() system. */ -#if TARGET_HOST_WIN32 || TARGET_HOST_WINCE +#if TARGET_HOST_MS_WINDOWS 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}; @@ -110,7 +111,6 @@ static SFG_MenuEntry *fghFindMenuEntry( SFG_Menu* menu, int index ) */ static void fghDeactivateSubMenu( SFG_MenuEntry *menuEntry ) { - SFG_Window *current_window = fgStructure.Window; SFG_MenuEntry *subMenuIter; /* Hide the present menu's window */ fgSetWindow( menuEntry->SubMenu->Window ); @@ -119,24 +119,58 @@ static void fghDeactivateSubMenu( SFG_MenuEntry *menuEntry ) /* Forget about having that menu active anymore, now: */ menuEntry->SubMenu->Window->ActiveMenu = NULL; menuEntry->SubMenu->IsActive = GL_FALSE; + menuEntry->SubMenu->ActiveEntry = NULL; /* Hide all submenu windows, and the root menu's window. */ for ( subMenuIter = (SFG_MenuEntry *)menuEntry->SubMenu->Entries.First; subMenuIter; subMenuIter = (SFG_MenuEntry *)subMenuIter->Node.Next ) { + subMenuIter->IsActive = GL_FALSE; + /* Is that an active submenu by any case? */ if( subMenuIter->SubMenu ) fghDeactivateSubMenu( subMenuIter ); } - fgSetWindow( current_window ); + fgSetWindow ( menuEntry->SubMenu->ParentWindow ) ; +} + +/* + * Private function to get the virtual maximum screen extent + */ +static GLvoid fghGetVMaxExtent( SFG_Window* window, int* x, int* y ) +{ + if( fgStructure.GameModeWindow ) + { +#if TARGET_HOST_POSIX_X11 + int wx, wy; + Window w; + + XTranslateCoordinates( + fgDisplay.Display, + window->Window.Handle, + fgDisplay.RootWindow, + 0, 0, &wx, &wy, &w); + + *x = fgState.GameModeSize.X + wx; + *y = fgState.GameModeSize.Y + wy; +#else + *x = glutGet ( GLUT_SCREEN_WIDTH ); + *y = glutGet ( GLUT_SCREEN_HEIGHT ); +#endif + } + else + { + *x = fgDisplay.ScreenWidth; + *y = fgDisplay.ScreenHeight; + } } /* * Private function to check for the current menu/sub menu activity state */ -static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) +static GLboolean fghCheckMenuStatus( SFG_Menu* menu ) { SFG_MenuEntry* menuEntry; int x, y; @@ -153,36 +187,28 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) * will mean that it caught the mouse cursor and we do not need * to regenerate the activity list, and so our parents do... */ - GLboolean return_status = fghCheckMenuStatus( window, - menuEntry->SubMenu ); + GLboolean return_status; + + menuEntry->SubMenu->Window->State.MouseX = + menu->Window->State.MouseX + menu->X - menuEntry->SubMenu->X; + menuEntry->SubMenu->Window->State.MouseY = + menu->Window->State.MouseY + menu->Y - menuEntry->SubMenu->Y; + return_status = fghCheckMenuStatus( menuEntry->SubMenu ); - /* - * Reactivate the submenu as the checkMenuStatus may have turned - * it off if the mouse is in its parent menu entry. - */ - menuEntry->SubMenu->IsActive = GL_TRUE; if ( return_status ) return GL_TRUE; } } /* That much about our sub menus, let's get to checking the current menu: */ - x = window->State.MouseX; - y = window->State.MouseY; - - for( menuEntry = (SFG_MenuEntry *)menu->Entries.First; - menuEntry; - menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next ) - menuEntry->IsActive = GL_FALSE; - - menu->IsActive = GL_FALSE; + x = menu->Window->State.MouseX; + y = menu->Window->State.MouseY; /* Check if the mouse cursor is contained within the current menu box */ if( ( x >= FREEGLUT_MENU_BORDER ) && ( x < menu->Width - FREEGLUT_MENU_BORDER ) && ( y >= FREEGLUT_MENU_BORDER ) && - ( y < menu->Height - FREEGLUT_MENU_BORDER ) && - ( window == menu->Window ) ) + ( y < menu->Height - FREEGLUT_MENU_BORDER ) ) { int menuID = ( y - FREEGLUT_MENU_BORDER ) / FREEGLUT_MENU_HEIGHT; @@ -203,8 +229,15 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) if( menu->ActiveEntry->SubMenu ) fghDeactivateSubMenu( menu->ActiveEntry ); + if( menuEntry != menu->ActiveEntry ) + { + menu->Window->State.Redisplay = GL_TRUE; + if( menu->ActiveEntry ) + menu->ActiveEntry->IsActive = GL_FALSE; + } + menu->ActiveEntry = menuEntry; - menu->IsActive = GL_TRUE; + menu->IsActive = GL_TRUE; /* XXX Do we need this? */ /* * OKi, we have marked that entry as active, but it would be also @@ -215,26 +248,29 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) { if ( ! menuEntry->SubMenu->IsActive ) { - SFG_Window *current_window = fgStructure.Window; + int max_x, max_y; + SFG_Window *current_window = fgStructure.CurrentWindow; /* Set up the initial menu position now... */ menuEntry->SubMenu->IsActive = GL_TRUE; /* Set up the initial submenu position now: */ + fghGetVMaxExtent(menu->ParentWindow, &max_x, &max_y); 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->X + menuEntry->SubMenu->Width > max_x ) + 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 > max_y ) + { menuEntry->SubMenu->Y -= ( menuEntry->SubMenu->Height - FREEGLUT_MENU_HEIGHT - 2 * FREEGLUT_MENU_BORDER ); + if( menuEntry->SubMenu->Y < 0 ) + menuEntry->SubMenu->Y = 0; + } fgSetWindow( menuEntry->SubMenu->Window ); glutPositionWindow( menuEntry->SubMenu->X, @@ -245,12 +281,15 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) glutShowWindow( ); menuEntry->SubMenu->Window->ActiveMenu = menuEntry->SubMenu; fgSetWindow( current_window ); + menuEntry->SubMenu->Window->State.MouseX = + x + menu->X - menuEntry->SubMenu->X; + menuEntry->SubMenu->Window->State.MouseY = + y + menu->Y - menuEntry->SubMenu->Y; + fghCheckMenuStatus( menuEntry->SubMenu ); } - fghCheckMenuStatus( window, menuEntry->SubMenu ); - /* Activate it because its parent entry is active */ - menuEntry->SubMenu->IsActive = GL_TRUE; + menuEntry->SubMenu->IsActive = GL_TRUE; /* XXX Do we need this? */ } /* Report back that we have caught the menu cursor */ @@ -258,6 +297,15 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) } /* Looks like the menu cursor is somewhere else... */ + if( menu->ActiveEntry && menu->ActiveEntry->IsActive && + ( !menu->ActiveEntry->SubMenu || + !menu->ActiveEntry->SubMenu->IsActive ) ) + { + menu->Window->State.Redisplay = GL_TRUE; + menu->ActiveEntry->IsActive = GL_FALSE; + menu->ActiveEntry = NULL; + } + return GL_FALSE; } @@ -376,21 +424,6 @@ static void fghDisplayMenuBox( SFG_Menu* menu ) if( menuEntry->IsActive ) glColor4fv( menu_pen_fore ); } - - /* Now we are ready to check if any of our children needs to be redrawn: */ - 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 && menuEntry->IsActive ) - { - /* Yeah, indeed. Have it redrawn now: */ - fgSetWindow( menuEntry->SubMenu->Window ); - fghDisplayMenuBox( menuEntry->SubMenu ); - fgSetWindow( menu->Window ); - } - } } /* @@ -428,7 +461,13 @@ static void fghExecuteMenuCallback( SFG_Menu* menu ) 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; } } @@ -440,10 +479,10 @@ static void fghExecuteMenuCallback( SFG_Menu* menu ) */ void fgDisplayMenu( void ) { - SFG_Window* window = fgStructure.Window; + SFG_Window* window = fgStructure.CurrentWindow; SFG_Menu* menu = NULL; - FREEGLUT_INTERNAL_ERROR_EXIT ( fgStructure.Window, "Displaying menu in nonexistent window", + FREEGLUT_INTERNAL_ERROR_EXIT ( fgStructure.CurrentWindow, "Displaying menu in nonexistent window", "fgDisplayMenu" ); /* Check if there is an active menu attached to this window... */ @@ -473,7 +512,6 @@ void fgDisplayMenu( void ) glPushMatrix( ); glLoadIdentity( ); - fghCheckMenuStatus( window, menu ); fghDisplayMenuBox( menu ); glPopAttrib( ); @@ -493,8 +531,11 @@ void fgDisplayMenu( void ) */ static void fghActivateMenu( SFG_Window* window, int button ) { + int max_x, max_y; + /* We'll be referencing this menu a lot, so remember its address: */ SFG_Menu* menu = window->Menu[ button ]; + SFG_Window* current_window = fgStructure.CurrentWindow; /* If the menu is already active in another window, deactivate it there */ if ( menu->ParentWindow ) @@ -507,14 +548,25 @@ static void fghActivateMenu( SFG_Window* window, int button ) fgState.ActiveMenus++; /* 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 ); - if( menu->X + menu->Width > glutGet ( GLUT_SCREEN_WIDTH ) ) + if( menu->X + menu->Width > max_x ) menu->X -=menu->Width; - if( menu->Y + menu->Height > glutGet ( GLUT_SCREEN_HEIGHT ) ) + if( menu->Y + menu->Height > max_y ) + { menu->Y -=menu->Height; + if( menu->Y < 0 ) + 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; fgSetWindow( menu->Window ); glutPositionWindow( menu->X, menu->Y ); @@ -522,6 +574,18 @@ static void fghActivateMenu( SFG_Window* window, int button ) glutPopWindow( ); glutShowWindow( ); menu->Window->ActiveMenu = menu; + fghCheckMenuStatus( menu ); + fgSetWindow( current_window ); +} + +/* + * Update Highlight states of the menu + * + * Current mouse position is in menu->Window->State.MouseX/Y. + */ +void fgUpdateMenuHighlight ( SFG_Menu *menu ) +{ + fghCheckMenuStatus( menu ); } /* @@ -557,18 +621,17 @@ GLboolean fgCheckActiveMenu ( SFG_Window *window, int button, GLboolean pressed, } /* In the menu, invoke the callback and deactivate the menu */ - if( fghCheckMenuStatus( window->ActiveMenu->Window, - window->ActiveMenu ) ) + if( fghCheckMenuStatus( window->ActiveMenu ) ) { /* * Save the current window and menu and set the current * window to the window whose menu this is */ - SFG_Window *save_window = fgStructure.Window; - SFG_Menu *save_menu = fgStructure.Menu; + SFG_Window *save_window = fgStructure.CurrentWindow; + SFG_Menu *save_menu = fgStructure.CurrentMenu; SFG_Window *parent_window = window->ActiveMenu->ParentWindow; fgSetWindow( parent_window ); - fgStructure.Menu = window->ActiveMenu; + fgStructure.CurrentMenu = window->ActiveMenu; /* Execute the menu callback */ fghExecuteMenuCallback( window->ActiveMenu ); @@ -576,7 +639,7 @@ GLboolean fgCheckActiveMenu ( SFG_Window *window, int button, GLboolean pressed, /* Restore the current window and menu */ fgSetWindow( save_window ); - fgStructure.Menu = save_menu; + fgStructure.CurrentMenu = save_menu; } else if( pressed ) /* @@ -608,7 +671,6 @@ GLboolean fgCheckActiveMenu ( SFG_Window *window, int button, GLboolean pressed, { /* XXX Posting a requisite Redisplay seems bogus. */ window->State.Redisplay = GL_TRUE; - fgSetWindow( window ); fghActivateMenu( window, button ); return GL_TRUE; } @@ -621,7 +683,7 @@ GLboolean fgCheckActiveMenu ( SFG_Window *window, int button, GLboolean pressed, */ void fgDeactivateMenu( SFG_Window *window ) { - SFG_Window *current_window = fgStructure.Window; + SFG_Window *parent_window = NULL; /* Check if there is an active menu attached to this window... */ SFG_Menu* menu = window->ActiveMenu; @@ -630,6 +692,8 @@ void fgDeactivateMenu( SFG_Window *window ) /* Did we find an active window? */ freeglut_return_if_fail( menu ); + parent_window = menu->ParentWindow; + /* Hide the present menu's window */ fgSetWindow( menu->Window ); glutHideWindow( ); @@ -639,6 +703,7 @@ void fgDeactivateMenu( SFG_Window *window ) menu->ParentWindow->ActiveMenu = NULL; fghSetMenuParentWindow ( NULL, menu ); menu->IsActive = GL_FALSE; + menu->ActiveEntry = NULL; fgState.ActiveMenus--; @@ -647,12 +712,14 @@ void fgDeactivateMenu( SFG_Window *window ) menuEntry; menuEntry = ( SFG_MenuEntry * )menuEntry->Node.Next ) { + menuEntry->IsActive = GL_FALSE; + /* Is that an active submenu by any case? */ if( menuEntry->SubMenu ) fghDeactivateSubMenu( menuEntry ); } - fgSetWindow( current_window ); + fgSetWindow ( parent_window ) ; } /* @@ -664,10 +731,10 @@ void fghCalculateMenuBoxSize( void ) int width = 0, height = 0; /* Make sure there is a current menu set */ - freeglut_return_if_fail( fgStructure.Menu ); + freeglut_return_if_fail( fgStructure.CurrentMenu ); /* The menu's box size depends on the menu entries: */ - for( menuEntry = ( SFG_MenuEntry * )fgStructure.Menu->Entries.First; + for( menuEntry = ( SFG_MenuEntry * )fgStructure.CurrentMenu->Entries.First; menuEntry; menuEntry = ( SFG_MenuEntry * )menuEntry->Node.Next ) { @@ -695,8 +762,8 @@ void fghCalculateMenuBoxSize( void ) } /* Store the menu's box size now: */ - fgStructure.Menu->Height = height + 2 * FREEGLUT_MENU_BORDER; - fgStructure.Menu->Width = width + 4 * FREEGLUT_MENU_BORDER; + fgStructure.CurrentMenu->Height = height + 2 * FREEGLUT_MENU_BORDER; + fgStructure.CurrentMenu->Width = width + 4 * FREEGLUT_MENU_BORDER; } @@ -712,6 +779,14 @@ int FGAPIENTRY glutCreateMenu( void(* callback)( int ) ) return fgCreateMenu( callback )->ID; } +#if TARGET_HOST_MS_WINDOWS +int FGAPIENTRY __glutCreateMenuWithExit( void(* callback)( int ), void (__cdecl *exit_function)(int) ) +{ + __glutExitFunc = exit_function; + return glutCreateMenu( callback ); +} +#endif + /* * Destroys a menu object, removing all references to it */ @@ -735,8 +810,8 @@ int FGAPIENTRY glutGetMenu( void ) { FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGetMenu" ); - if( fgStructure.Menu ) - return fgStructure.Menu->ID; + if( fgStructure.CurrentMenu ) + return fgStructure.CurrentMenu->ID; return 0; } @@ -753,7 +828,7 @@ void FGAPIENTRY glutSetMenu( int menuID ) freeglut_return_if_fail( menu ); - fgStructure.Menu = menu; + fgStructure.CurrentMenu = menu; } /* @@ -764,13 +839,13 @@ 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.Menu ); + freeglut_return_if_fail( fgStructure.CurrentMenu ); menuEntry->Text = strdup( label ); menuEntry->ID = value; /* Have the new menu entry attached to the current menu */ - fgListAppend( &fgStructure.Menu->Entries, &menuEntry->Node ); + fgListAppend( &fgStructure.CurrentMenu->Entries, &menuEntry->Node ); fghCalculateMenuBoxSize( ); } @@ -787,14 +862,14 @@ void FGAPIENTRY glutAddSubMenu( const char *label, int subMenuID ) menuEntry = ( SFG_MenuEntry * )calloc( sizeof( SFG_MenuEntry ), 1 ); subMenu = fgMenuByID( subMenuID ); - freeglut_return_if_fail( fgStructure.Menu ); + freeglut_return_if_fail( fgStructure.CurrentMenu ); freeglut_return_if_fail( subMenu ); menuEntry->Text = strdup( label ); menuEntry->SubMenu = subMenu; menuEntry->ID = -1; - fgListAppend( &fgStructure.Menu->Entries, &menuEntry->Node ); + fgListAppend( &fgStructure.CurrentMenu->Entries, &menuEntry->Node ); fghCalculateMenuBoxSize( ); } @@ -806,10 +881,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.Menu ); + freeglut_return_if_fail( fgStructure.CurrentMenu ); /* Get n-th menu entry in the current menu, starting from one: */ - menuEntry = fghFindMenuEntry( fgStructure.Menu, item ); + menuEntry = fghFindMenuEntry( fgStructure.CurrentMenu, item ); freeglut_return_if_fail( menuEntry ); @@ -836,11 +911,11 @@ void FGAPIENTRY glutChangeToSubMenu( int item, const char* label, subMenu = fgMenuByID( subMenuID ); menuEntry = NULL; - freeglut_return_if_fail( fgStructure.Menu ); + freeglut_return_if_fail( fgStructure.CurrentMenu ); freeglut_return_if_fail( subMenu ); /* Get n-th menu entry in the current menu, starting from one: */ - menuEntry = fghFindMenuEntry( fgStructure.Menu, item ); + menuEntry = fghFindMenuEntry( fgStructure.CurrentMenu, item ); freeglut_return_if_fail( menuEntry ); @@ -862,14 +937,14 @@ void FGAPIENTRY glutRemoveMenuItem( int item ) SFG_MenuEntry* menuEntry; FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutRemoveMenuItem" ); - freeglut_return_if_fail( fgStructure.Menu ); + freeglut_return_if_fail( fgStructure.CurrentMenu ); /* Get n-th menu entry in the current menu, starting from one: */ - menuEntry = fghFindMenuEntry( fgStructure.Menu, item ); + menuEntry = fghFindMenuEntry( fgStructure.CurrentMenu, item ); freeglut_return_if_fail( menuEntry ); - fgListRemove( &fgStructure.Menu->Entries, &menuEntry->Node ); + fgListRemove( &fgStructure.CurrentMenu->Entries, &menuEntry->Node ); if ( menuEntry->Text ) free( menuEntry->Text ); @@ -884,13 +959,13 @@ void FGAPIENTRY glutAttachMenu( int button ) { FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutAttachMenu" ); - freeglut_return_if_fail( fgStructure.Window ); - freeglut_return_if_fail( fgStructure.Menu ); + freeglut_return_if_fail( fgStructure.CurrentWindow ); + freeglut_return_if_fail( fgStructure.CurrentMenu ); freeglut_return_if_fail( button >= 0 ); freeglut_return_if_fail( button < FREEGLUT_MAX_MENUS ); - fgStructure.Window->Menu[ button ] = fgStructure.Menu; + fgStructure.CurrentWindow->Menu[ button ] = fgStructure.CurrentMenu; } /* @@ -900,13 +975,13 @@ void FGAPIENTRY glutDetachMenu( int button ) { FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutDetachMenu" ); - freeglut_return_if_fail( fgStructure.Window ); - freeglut_return_if_fail( fgStructure.Menu ); + freeglut_return_if_fail( fgStructure.CurrentWindow ); + freeglut_return_if_fail( fgStructure.CurrentMenu ); freeglut_return_if_fail( button >= 0 ); freeglut_return_if_fail( button < FREEGLUT_MAX_MENUS ); - fgStructure.Window->Menu[ button ] = NULL; + fgStructure.CurrentWindow->Menu[ button ] = NULL; } /* @@ -915,13 +990,13 @@ void FGAPIENTRY glutDetachMenu( int button ) void* FGAPIENTRY glutGetMenuData( void ) { FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGetMenuData" ); - return fgStructure.Menu->UserData; + return fgStructure.CurrentMenu->UserData; } void FGAPIENTRY glutSetMenuData(void* data) { FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetMenuData" ); - fgStructure.Menu->UserData=data; + fgStructure.CurrentMenu->UserData=data; } /*** END OF FILE ***/