FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Takeshi Nishimura\'s menu changes--menus should now work properly. Use

Browse Source 
the GLUT \"GLUTmech\" and \"walker\" demos to test them.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@606 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2005-05-12 13:00:49 +00:00
parent 74da1b5cf9
commit 90cd4fe1c1
3 changed files with 96 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
freeglut/freeglut/src/freeglut_internal.h
View File

@ -543,6 +543,8 @@ struct tagSFG_MenuEntry
/* /*
* A window, making part of freeglut windows hierarchy. * A window, making part of freeglut windows hierarchy.
* Should be kept portable. * Should be kept portable.
*
* NOTE that ActiveMenu is set to menu itself if the window is a menu.
*/ */
struct tagSFG_Window struct tagSFG_Window
{ {
@ -813,6 +815,7 @@ SFG_Menu* fgMenuByID( int menuID );
* The menu activation and deactivation the code. This is the meat * The menu activation and deactivation the code. This is the meat
* of the menu user interface handling code... * of the menu user interface handling code...
*/ */
void fgUpdateMenuHighlight ( SFG_Menu *menu );
GLboolean fgCheckActiveMenu ( SFG_Window *window, int button, GLboolean pressed, GLboolean fgCheckActiveMenu ( SFG_Window *window, int button, GLboolean pressed,
int mouse_x, int mouse_y ); int mouse_x, int mouse_y );
void fgDeactivateMenu( SFG_Window *window ); void fgDeactivateMenu( SFG_Window *window );

28
freeglut/freeglut/src/freeglut_main.c
View File

@ -592,6 +592,8 @@ void FGAPIENTRY glutMainLoopEvent( void )
if( ( width != window->State.OldWidth ) || if( ( width != window->State.OldWidth ) ||
( height != window->State.OldHeight ) ) ( height != window->State.OldHeight ) )
{ {
SFG_Window *current_window = fgStructure.CurrentWindow;
window->State.OldWidth = width; window->State.OldWidth = width;
window->State.OldHeight = height; window->State.OldHeight = height;
if( FETCH_WCB( *window, Reshape ) ) if( FETCH_WCB( *window, Reshape ) )
@ -602,6 +604,8 @@ void FGAPIENTRY glutMainLoopEvent( void )
glViewport( 0, 0, width, height ); glViewport( 0, 0, width, height );
} }
glutPostRedisplay( ); glutPostRedisplay( );
if( window->IsMenu )
fgSetWindow( current_window );
} }
} }
break; break;
@ -628,8 +632,7 @@ void FGAPIENTRY glutMainLoopEvent( void )
if( event.xexpose.count == 0 ) if( event.xexpose.count == 0 )
{ {
GETWINDOW( xexpose ); GETWINDOW( xexpose );
fgSetWindow( window ); window->State.Redisplay = GL_TRUE;
glutPostRedisplay( );
} }
break; break;
@ -695,6 +698,10 @@ void FGAPIENTRY glutMainLoopEvent( void )
case LeaveNotify: case LeaveNotify:
GETWINDOW( xcrossing ); GETWINDOW( xcrossing );
GETMOUSE( xcrossing ); GETMOUSE( xcrossing );
if( ( event.type == LeaveNotify ) && window->IsMenu &&
window->ActiveMenu && window->ActiveMenu->IsActive )
fgUpdateMenuHighlight( window->ActiveMenu );
INVOKE_WCB( *window, Entry, ( ( EnterNotify == event.type ) ? INVOKE_WCB( *window, Entry, ( ( EnterNotify == event.type ) ?
GLUT_ENTERED : GLUT_ENTERED :
GLUT_LEFT ) ); GLUT_LEFT ) );
@ -714,8 +721,8 @@ void FGAPIENTRY glutMainLoopEvent( void )
window->ActiveMenu->Window->State.MouseY = window->ActiveMenu->Window->State.MouseY =
event.xmotion.y_root - window->ActiveMenu->Y; event.xmotion.y_root - window->ActiveMenu->Y;
} }
window->ActiveMenu->Window->State.Redisplay = GL_TRUE ;
fgSetWindow( window->ActiveMenu->ParentWindow ); fgUpdateMenuHighlight( window->ActiveMenu );
break; break;
} }
@ -1056,7 +1063,13 @@ void FGAPIENTRY glutMainLoop( void )
else else
{ {
if( fgState.IdleCallback ) if( fgState.IdleCallback )
{
if( fgStructure.CurrentWindow &&
fgStructure.CurrentWindow->IsMenu )
/* fail safe */
fgSetWindow( window );
fgState.IdleCallback( ); fgState.IdleCallback( );
}
fghSleepForEvents( ); fghSleepForEvents( );
} }
@ -1272,6 +1285,10 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
* XXX if the flag is false we invoke the Entry callback and set the flag to true. * XXX if the flag is false we invoke the Entry callback and set the flag to true.
*/ */
case 0x02a2: /* This is the message we get when the mouse is leaving the window */ case 0x02a2: /* This is the message we get when the mouse is leaving the window */
if( window->IsMenu &&
window->ActiveMenu && window->ActiveMenu->IsActive )
fgUpdateMenuHighlight( window->ActiveMenu );
INVOKE_WCB( *window, Entry, ( GLUT_LEFT ) ); INVOKE_WCB( *window, Entry, ( GLUT_LEFT ) );
break ; break ;
@ -1291,8 +1308,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
if ( window->ActiveMenu ) if ( window->ActiveMenu )
{ {
window->State.Redisplay = GL_TRUE; fgUpdateMenuHighlight( window->ActiveMenu );
fgSetWindow ( window->ActiveMenu->ParentWindow );
break; break;
} }

115
freeglut/freeglut/src/freeglut_menu.c
View File

@ -119,18 +119,21 @@ static void fghDeactivateSubMenu( SFG_MenuEntry *menuEntry )
/* Forget about having that menu active anymore, now: */ /* Forget about having that menu active anymore, now: */
menuEntry->SubMenu->Window->ActiveMenu = NULL; menuEntry->SubMenu->Window->ActiveMenu = NULL;
menuEntry->SubMenu->IsActive = GL_FALSE; menuEntry->SubMenu->IsActive = GL_FALSE;
menuEntry->SubMenu->ActiveEntry = NULL;
/* Hide all submenu windows, and the root menu's window. */ /* Hide all submenu windows, and the root menu's window. */
for ( subMenuIter = (SFG_MenuEntry *)menuEntry->SubMenu->Entries.First; for ( subMenuIter = (SFG_MenuEntry *)menuEntry->SubMenu->Entries.First;
subMenuIter; subMenuIter;
subMenuIter = (SFG_MenuEntry *)subMenuIter->Node.Next ) subMenuIter = (SFG_MenuEntry *)subMenuIter->Node.Next )
{ {
subMenuIter->IsActive = GL_FALSE;
/* Is that an active submenu by any case? */ /* Is that an active submenu by any case? */
if( subMenuIter->SubMenu ) if( subMenuIter->SubMenu )
fghDeactivateSubMenu( subMenuIter ); fghDeactivateSubMenu( subMenuIter );
} }
fgSetWindow( current_window ); fgSetWindow ( menuEntry->SubMenu->ParentWindow ) ;
} }
/* /*
@ -167,7 +170,7 @@ static GLvoid fghGetVMaxExtent( SFG_Window* window, int* x, int* y )
/* /*
* Private 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 ) static GLboolean fghCheckMenuStatus( SFG_Menu* menu )
{ {
SFG_MenuEntry* menuEntry; SFG_MenuEntry* menuEntry;
int x, y; int x, y;
@ -184,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 * will mean that it caught the mouse cursor and we do not need
* to regenerate the activity list, and so our parents do... * to regenerate the activity list, and so our parents do...
*/ */
GLboolean return_status = fghCheckMenuStatus( window, GLboolean return_status;
menuEntry->SubMenu );
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 ) if ( return_status )
return GL_TRUE; return GL_TRUE;
} }
} }
/* That much about our sub menus, let's get to checking the current menu: */ /* That much about our sub menus, let's get to checking the current menu: */
x = window->State.MouseX; x = menu->Window->State.MouseX;
y = window->State.MouseY; y = menu->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;
/* Check if the mouse cursor is contained within the current menu box */ /* Check if the mouse cursor is contained within the current menu box */
if( ( x >= FREEGLUT_MENU_BORDER ) && if( ( x >= FREEGLUT_MENU_BORDER ) &&
( x < menu->Width - FREEGLUT_MENU_BORDER ) && ( x < menu->Width - FREEGLUT_MENU_BORDER ) &&
( y >= FREEGLUT_MENU_BORDER ) && ( y >= FREEGLUT_MENU_BORDER ) &&
( y < menu->Height - FREEGLUT_MENU_BORDER ) && ( y < menu->Height - FREEGLUT_MENU_BORDER ) )
( window == menu->Window ) )
{ {
int menuID = ( y - FREEGLUT_MENU_BORDER ) / FREEGLUT_MENU_HEIGHT; int menuID = ( y - FREEGLUT_MENU_BORDER ) / FREEGLUT_MENU_HEIGHT;
@ -234,8 +229,15 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu )
if( menu->ActiveEntry->SubMenu ) if( menu->ActiveEntry->SubMenu )
fghDeactivateSubMenu( menu->ActiveEntry ); 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->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 * OKi, we have marked that entry as active, but it would be also
@ -275,12 +277,15 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu )
glutShowWindow( ); glutShowWindow( );
menuEntry->SubMenu->Window->ActiveMenu = menuEntry->SubMenu; menuEntry->SubMenu->Window->ActiveMenu = menuEntry->SubMenu;
fgSetWindow( current_window ); 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 */ /* 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 */ /* Report back that we have caught the menu cursor */
@ -288,6 +293,15 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu )
} }
/* Looks like the menu cursor is somewhere else... */ /* 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; return GL_FALSE;
} }
@ -406,21 +420,6 @@ static void fghDisplayMenuBox( SFG_Menu* menu )
if( menuEntry->IsActive ) if( menuEntry->IsActive )
glColor4fv( menu_pen_fore ); 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 );
}
}
} }
/* /*
@ -458,7 +457,13 @@ static void fghExecuteMenuCallback( SFG_Menu* menu )
fghExecuteMenuCallback( menuEntry->SubMenu ); fghExecuteMenuCallback( menuEntry->SubMenu );
else else
if( menu->Callback ) if( menu->Callback )
{
SFG_Menu *save_menu = fgStructure.CurrentMenu;
fgStructure.CurrentMenu = menu;
menu->Callback( menuEntry->ID ); menu->Callback( menuEntry->ID );
fgStructure.CurrentMenu = save_menu;
}
return; return;
} }
} }
@ -503,7 +508,6 @@ void fgDisplayMenu( void )
glPushMatrix( ); glPushMatrix( );
glLoadIdentity( ); glLoadIdentity( );
fghCheckMenuStatus( window, menu );
fghDisplayMenuBox( menu ); fghDisplayMenuBox( menu );
glPopAttrib( ); glPopAttrib( );
@ -527,6 +531,7 @@ static void fghActivateMenu( SFG_Window* window, int button )
/* We'll be referencing this menu a lot, so remember its address: */ /* We'll be referencing this menu a lot, so remember its address: */
SFG_Menu* menu = window->Menu[ button ]; 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 the menu is already active in another window, deactivate it there */
if ( menu->ParentWindow ) if ( menu->ParentWindow )
@ -540,6 +545,7 @@ static void fghActivateMenu( SFG_Window* window, int button )
/* Set up the initial menu position now: */ /* Set up the initial menu position now: */
fghGetVMaxExtent(menu->ParentWindow, &max_x, &max_y); fghGetVMaxExtent(menu->ParentWindow, &max_x, &max_y);
fgSetWindow( window );
menu->X = window->State.MouseX + glutGet( GLUT_WINDOW_X ); menu->X = window->State.MouseX + glutGet( GLUT_WINDOW_X );
menu->Y = window->State.MouseY + glutGet( GLUT_WINDOW_Y ); menu->Y = window->State.MouseY + glutGet( GLUT_WINDOW_Y );
@ -549,12 +555,29 @@ static void fghActivateMenu( SFG_Window* window, int button )
if( menu->Y + menu->Height > max_y ) if( menu->Y + menu->Height > max_y )
menu->Y -=menu->Height; menu->Y -=menu->Height;
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 ); fgSetWindow( menu->Window );
glutPositionWindow( menu->X, menu->Y ); glutPositionWindow( menu->X, menu->Y );
glutReshapeWindow( menu->Width, menu->Height ); glutReshapeWindow( menu->Width, menu->Height );
glutPopWindow( ); glutPopWindow( );
glutShowWindow( ); glutShowWindow( );
menu->Window->ActiveMenu = menu; 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 );
} }
/* /*
@ -590,8 +613,7 @@ GLboolean fgCheckActiveMenu ( SFG_Window *window, int button, GLboolean pressed,
} }
/* In the menu, invoke the callback and deactivate the menu */ /* In the menu, invoke the callback and deactivate the menu */
if( fghCheckMenuStatus( window->ActiveMenu->Window, if( fghCheckMenuStatus( window->ActiveMenu ) )
window->ActiveMenu ) )
{ {
/* /*
* Save the current window and menu and set the current * Save the current window and menu and set the current
@ -641,7 +663,6 @@ GLboolean fgCheckActiveMenu ( SFG_Window *window, int button, GLboolean pressed,
{ {
/* XXX Posting a requisite Redisplay seems bogus. */ /* XXX Posting a requisite Redisplay seems bogus. */
window->State.Redisplay = GL_TRUE; window->State.Redisplay = GL_TRUE;
fgSetWindow( window );
fghActivateMenu( window, button ); fghActivateMenu( window, button );
return GL_TRUE; return GL_TRUE;
} }
@ -655,6 +676,7 @@ GLboolean fgCheckActiveMenu ( SFG_Window *window, int button, GLboolean pressed,
void fgDeactivateMenu( SFG_Window *window ) void fgDeactivateMenu( SFG_Window *window )
{ {
SFG_Window *current_window = fgStructure.CurrentWindow; SFG_Window *current_window = fgStructure.CurrentWindow;
SFG_Window *parent_window = NULL;
/* Check if there is an active menu attached to this window... */ /* Check if there is an active menu attached to this window... */
SFG_Menu* menu = window->ActiveMenu; SFG_Menu* menu = window->ActiveMenu;
@ -663,6 +685,8 @@ void fgDeactivateMenu( SFG_Window *window )
/* Did we find an active window? */ /* Did we find an active window? */
freeglut_return_if_fail( menu ); freeglut_return_if_fail( menu );
parent_window = menu->ParentWindow;
/* Hide the present menu's window */ /* Hide the present menu's window */
fgSetWindow( menu->Window ); fgSetWindow( menu->Window );
glutHideWindow( ); glutHideWindow( );
@ -672,6 +696,7 @@ void fgDeactivateMenu( SFG_Window *window )
menu->ParentWindow->ActiveMenu = NULL; menu->ParentWindow->ActiveMenu = NULL;
fghSetMenuParentWindow ( NULL, menu ); fghSetMenuParentWindow ( NULL, menu );
menu->IsActive = GL_FALSE; menu->IsActive = GL_FALSE;
menu->ActiveEntry = NULL;
fgState.ActiveMenus--; fgState.ActiveMenus--;
@ -680,12 +705,14 @@ void fgDeactivateMenu( SFG_Window *window )
menuEntry; menuEntry;
menuEntry = ( SFG_MenuEntry * )menuEntry->Node.Next ) menuEntry = ( SFG_MenuEntry * )menuEntry->Node.Next )
{ {
menuEntry->IsActive = GL_FALSE;
/* Is that an active submenu by any case? */ /* Is that an active submenu by any case? */
if( menuEntry->SubMenu ) if( menuEntry->SubMenu )
fghDeactivateSubMenu( menuEntry ); fghDeactivateSubMenu( menuEntry );
} }
fgSetWindow( current_window ); fgSetWindow ( parent_window ) ;
} }
/* /*