/*
- * freeglut_menu.c
+ * fg_menu.c
*
* Pull-down menu creation and handling.
*
* 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.
*/
static GLvoid fghGetVMaxExtent( SFG_Window* window, int* x, int* y )
{
if( fgStructure.GameModeWindow )
- fgPlatformGetGameModeVMaxExtent ( window, x, y );
+ fgPlatformGetGameModeVMaxExtent ( window, x, y );
else
{
*x = fgDisplay.ScreenWidth;
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->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;
}
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.MenuStatusCallback(GLUT_MENU_IN_USE, window->State.MouseX, window->State.MouseY, fgState.MenuStatusCallbackData);
}
fgSetWindow( menu->Window );
* location.
* - Down-click any button outside the menu, menu active:
* deactivate the menu, and potentially activate a new menu
- * at the new mouse location
+ * 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
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) */
+ /* 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->Callback( active_entry->ID, active_menu->CallbackData );
/* Restore the current window and menu */
fgSetWindow( save_window );
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 );
+
+ /* 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( !is_clicked &&
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.MenuStatusCallback(GLUT_MENU_NOT_IN_USE, mouse_pos.X, mouse_pos.Y, fgState.MenuStatusCallbackData);
}
}
}
/*
* Creates a new menu object, adding it to the freeglut structure
*/
+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 */
+ FGCBMenu* reference;
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCreateMenu" );
- if (fgGetActiveMenu())
- fgError("Menu manipulation not allowed while menus in use.");
-
- return fgCreateMenu( callback )->ID;
+ if (!callback)
+ {
+ return glutCreateMenuUcall( NULL, NULL );
+ }
+ reference = &callback;
+ return glutCreateMenuUcall( fghCreateMenuCallback, *((FGCBUserData*)reference) );
}
/*
menu = fgMenuByID( menuID );
freeglut_return_if_fail( menu );
- if (fgGetActiveMenu())
+ 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 );
}
menuEntry = (SFG_MenuEntry *)calloc( sizeof(SFG_MenuEntry), 1 );
freeglut_return_if_fail( fgStructure.CurrentMenu );
- if (fgGetActiveMenu())
+ if (fgState.ActiveMenus)
fgError("Menu manipulation not allowed while menus in use.");
menuEntry->Text = strdup( label );
subMenu = fgMenuByID( subMenuID );
freeglut_return_if_fail( fgStructure.CurrentMenu );
- if (fgGetActiveMenu())
+ if (fgState.ActiveMenus)
fgError("Menu manipulation not allowed while menus in use.");
freeglut_return_if_fail( subMenu );
menu = fgMenuByID( menuID );
freeglut_return_if_fail( menu );
- if (fgGetActiveMenu())
+ if (fgState.ActiveMenus)
fgError("Menu manipulation not allowed while menus in use.");
font = fghFontByID( fontID );
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutChangeToMenuEntry" );
freeglut_return_if_fail( fgStructure.CurrentMenu );
- if (fgGetActiveMenu())
+ if (fgState.ActiveMenus)
fgError("Menu manipulation not allowed while menus in use.");
/* Get n-th menu entry in the current menu, starting from one: */
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutChangeToSubMenu" );
freeglut_return_if_fail( fgStructure.CurrentMenu );
- if (fgGetActiveMenu())
+ if (fgState.ActiveMenus)
fgError("Menu manipulation not allowed while menus in use.");
/* Get handle to sub menu */
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutRemoveMenuItem" );
freeglut_return_if_fail( fgStructure.CurrentMenu );
- if (fgGetActiveMenu())
+ if (fgState.ActiveMenus)
fgError("Menu manipulation not allowed while menus in use.");
/* Get n-th menu entry in the current menu, starting from one: */
freeglut_return_if_fail( fgStructure.CurrentWindow );
freeglut_return_if_fail( fgStructure.CurrentMenu );
- if (fgGetActiveMenu())
+ if (fgState.ActiveMenus)
fgError("Menu manipulation not allowed while menus in use.");
freeglut_return_if_fail( button >= 0 );
freeglut_return_if_fail( fgStructure.CurrentWindow );
freeglut_return_if_fail( fgStructure.CurrentMenu );
- if (fgGetActiveMenu())
+ if (fgState.ActiveMenus)
fgError("Menu manipulation not allowed while menus in use.");
freeglut_return_if_fail( button >= 0 );