/*
- * 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.
*/
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;
}
}
/* 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 */
( !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;
}
/*
* 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 )
{
* 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
* window to the window whose menu this is
*/
SFG_Window *save_window = fgStructure.CurrentWindow;
- SFG_Menu *save_menu = fgStructure.CurrentMenu, *active_menu = window->ActiveMenu;
- SFG_MenuEntry *active_entry = active_menu->ActiveEntry;
+ 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;
- /* get clicked entry */
- while (active_entry->SubMenu)
+ /* ignore clicks on the submenu entry */
+ if (!active_entry->SubMenu)
{
- active_menu = active_entry->SubMenu;
- active_entry = active_menu->ActiveEntry;
- }
-
- fgSetWindow( parent_window );
- fgStructure.CurrentMenu = active_menu;
+ 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) */
- fgDeactivateMenu( parent_window );
- active_menu->Callback( active_entry->ID );
+ /* 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... */
}
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 &&
/*
* 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(
fgStructure.CurrentMenu->Font,
(unsigned char *)"_"
/*
* Creates a new menu object, adding it to the freeglut structure
*/
-int FGAPIENTRY glutCreateMenu( FGCBMenu callback )
+int FGAPIENTRY glutCreateMenuUcall( FGCBMenuUC callback, FGCBUserData userData )
{
- /* The menu object creation code resides in freeglut_structure.c */
- FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCreateMenu" );
- if (fgGetActiveMenu())
+ /* 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 )->ID;
+ return fgCreateMenu( callback, userData )->ID;
+}
+
+/* Standard glutCreateMenu */
+void glutCreateMenuCallback( int menu, FGCBUserData userData )
+{
+ FGCBMenu callback = (FGCBMenu)userData;
+ callback( menu );
+}
+
+int FGAPIENTRY glutCreateMenu( FGCBMenu callback )
+{
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCreateMenu" );
+ return glutCreateMenuUcall( glutCreateMenuCallback, (FGCBUserData)callback );
}
/*
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 );
projects / freeglut / blobdiff