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

Yuri D\'Elia\'s changes to get the virtual maximum screen extent instead of the actual screen size.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@579 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2005-04-22 20:35:24 +00:00
parent a972964124
commit 3baca83139
1 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,6 +133,37 @@ static void fghDeactivateSubMenu( SFG_MenuEntry *menuEntry )
fgSetWindow( current_window ); fgSetWindow( current_window );
} }
/*
* Private function to get the virtual maximum screen extent
*/
static GLvoid fghGetVMaxExtent( SFG_Window* window, int* x, int* y )
{
if( fgStructure.GameMode )
{
#if TARGET_HOST_UNIX_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 * Private function to check for the current menu/sub menu activity state
*/ */
@ -215,23 +246,22 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu )
{ {
if ( ! menuEntry->SubMenu->IsActive ) if ( ! menuEntry->SubMenu->IsActive )
{ {
int max_x, max_y;
SFG_Window *current_window = fgStructure.CurrentWindow; SFG_Window *current_window = fgStructure.CurrentWindow;
/* Set up the initial menu position now... */ /* Set up the initial menu position now... */
menuEntry->SubMenu->IsActive = GL_TRUE; menuEntry->SubMenu->IsActive = GL_TRUE;
/* Set up the initial submenu position now: */ /* Set up the initial submenu position now: */
fghGetVMaxExtent(menu->ParentWindow, &max_x, &max_y);
menuEntry->SubMenu->X = menu->X + menu->Width; menuEntry->SubMenu->X = menu->X + menu->Width;
menuEntry->SubMenu->Y = menu->Y + menuEntry->SubMenu->Y = menu->Y +
menuEntry->Ordinal * FREEGLUT_MENU_HEIGHT; menuEntry->Ordinal * FREEGLUT_MENU_HEIGHT;
if( menuEntry->SubMenu->X + menuEntry->SubMenu->Width > if( menuEntry->SubMenu->X + menuEntry->SubMenu->Width > max_x )
glutGet( GLUT_SCREEN_WIDTH ) ) menuEntry->SubMenu->X = menu->X - menuEntry->SubMenu->Width;
menuEntry->SubMenu->X = menu->X -
menuEntry->SubMenu->Width;
if( menuEntry->SubMenu->Y + menuEntry->SubMenu->Height > if( menuEntry->SubMenu->Y + menuEntry->SubMenu->Height > max_y )
glutGet( GLUT_SCREEN_HEIGHT ) )
menuEntry->SubMenu->Y -= ( menuEntry->SubMenu->Height - menuEntry->SubMenu->Y -= ( menuEntry->SubMenu->Height -
FREEGLUT_MENU_HEIGHT - FREEGLUT_MENU_HEIGHT -
2 * FREEGLUT_MENU_BORDER ); 2 * FREEGLUT_MENU_BORDER );
@ -493,6 +523,8 @@ void fgDisplayMenu( void )
*/ */
static void fghActivateMenu( SFG_Window* window, int button ) 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: */ /* We'll be referencing this menu a lot, so remember its address: */
SFG_Menu* menu = window->Menu[ button ]; SFG_Menu* menu = window->Menu[ button ];
@ -507,8 +539,9 @@ static void fghActivateMenu( SFG_Window* window, int button )
fgState.ActiveMenus++; fgState.ActiveMenus++;
/* Set up the initial menu position now: */ /* Set up the initial menu position now: */
menu->X = window->State.MouseX + glutGet( GLUT_WINDOW_X ); fghGetVMaxExtent(menu->ParentWindow, &max_x, &max_y);
menu->Y = window->State.MouseY + glutGet( GLUT_WINDOW_Y ); menu->X = window->State.MouseX + max_x;
menu->Y = window->State.MouseY + max_y;
if( menu->X + menu->Width > glutGet ( GLUT_SCREEN_WIDTH ) ) if( menu->X + menu->Width > glutGet ( GLUT_SCREEN_WIDTH ) )
menu->X -=menu->Width; menu->X -=menu->Width;