X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_menu.c;h=3b3a5cb67ae42801f302c54918e01cc62666feab;hb=5d724da03c1b5988304888c17c5eba8a40c0a529;hp=1194908c5b32e62dab247da8c31a98017f4bf098;hpb=12518ea3f1e251120bc666d2d6e8e26632b65eda;p=freeglut diff --git a/src/freeglut_menu.c b/src/freeglut_menu.c index 1194908..3b3a5cb 100644 --- a/src/freeglut_menu.c +++ b/src/freeglut_menu.c @@ -29,54 +29,67 @@ #include "config.h" #endif -#define G_LOG_DOMAIN "freeglut-menu" - #include "../include/GL/freeglut.h" #include "freeglut_internal.h" -/* - * TODO BEFORE THE STABLE RELEASE: - * - * It would be cool if the submenu entries were somehow marked, for example with a dings - * on the right menu border or something like that. Think about the possibility of doing - * the menu on layers *or* using the native window system instead of OpenGL. - */ - /* -- DEFINITIONS ---------------------------------------------------------- */ /* - * We'll be using freeglut fonts to draw the menu + * FREEGLUT_MENU_FONT can be any freeglut bitmapped font. + * (Stroked fonts would not be out of the question, but we'd need to alter + * code, since GLUT (hence freeglut) does not quite unify stroked and + * bitmapped font handling.) + * Old UNIX/X11 GLUT (BSD, UNIX, IRIX, LINUX, HPUX, ...) used a system + * font best approximated by an 18-pixel HELVETICA, I think. MS-WINDOWS + * GLUT used something closest to the 8x13 fixed-width font. (Old + * GLUT apparently uses host-system menus rather than building its own. + * freeglut is building its own menus from scratch.) + * + * FREEGLUT_MENU_HEIGHT gives the height of ONE menu box. This should be + * the distances between two adjacent menu entries. It should scale + * automatically with the font choice, so you needn't alter it---unless you + * use a stroked font. + * + * FREEGLUT_MENU_BORDER says how many pixels to allow around the edge of a + * menu. (It also seems to be the same as the number of pixels used as + * a border around *items* to separate them from neighbors. John says + * that that wasn't the original intent...if not, perhaps we need another + * symbolic constant, FREEGLUT_MENU_ITEM_BORDER, or such.) */ -#define FREEGLUT_MENU_FONT GLUT_BITMAP_8_BY_13 -/*#define FREEGLUT_MENU_FONT GLUT_BITMAP_HELVETICA_18*/ -#define FREEGLUT_MENU_HEIGHT (glutBitmapHeight(FREEGLUT_MENU_FONT) + FREEGLUT_MENU_BORDER) +#if TARGET_HOST_WIN32 +#define FREEGLUT_MENU_FONT GLUT_BITMAP_8_BY_13 +#else +#define FREEGLUT_MENU_FONT GLUT_BITMAP_HELVETICA_18 +#endif + +#define FREEGLUT_MENU_HEIGHT (glutBitmapHeight(FREEGLUT_MENU_FONT) + FREEGLUT_MENU_BORDER) #define FREEGLUT_MENU_BORDER 2 /* - * These variables should be moved into the freeglut global state, but for now, - * we'll put them here. They are for rendering the freeglut menu items. + * 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 * too. These variables should be stuffed into global state and initialized * via the glutInit*() system. */ +#if TARGET_HOST_WIN32 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}; - -#if TARGET_HOST_WIN32 static float menu_pen_hfore [4] = {1.0f, 1.0f, 1.0f, 1.0f}; static float menu_pen_hback [4] = {0.15f, 0.15f, 0.45f, 1.0f}; #else +static float menu_pen_fore [4] = {0.0f, 0.0f, 0.0f, 1.0f}; +static float menu_pen_back [4] = {0.70f, 0.70f, 0.70f, 1.0f}; static float menu_pen_hfore [4] = {0.0f, 0.0f, 0.0f, 1.0f}; static float menu_pen_hback [4] = {1.0f, 1.0f, 1.0f, 1.0f}; #endif - /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */ /* - * Private static function to find a menu entry by index + * Private function to find a menu entry by index */ static SFG_MenuEntry *fghFindMenuEntry( SFG_Menu* menu, int index ) { @@ -94,7 +107,7 @@ static SFG_MenuEntry *fghFindMenuEntry( SFG_Menu* menu, int index ) } /* - * Private static 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 ) { @@ -107,9 +120,6 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) 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 != NULL && menuEntry->IsActive == TRUE ) { /* @@ -120,8 +130,8 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) GLboolean return_status = fghCheckMenuStatus( window, menuEntry->SubMenu ) ; /* - * Reactivate the submenu as the checkMenuStatus may have turned it off if the mouse - * is in its parent menu entry. + * Reactivate the submenu as the checkMenuStatus may have turned it off + * if the mouse is in its parent menu entry. */ menuEntry->SubMenu->IsActive = TRUE ; if ( return_status == TRUE ) @@ -135,9 +145,6 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) x = window->State.MouseX; y = window->State.MouseY; - /* - * Mark all menu entries inactive... - */ for( menuEntry = (SFG_MenuEntry *)menu->Entries.First; menuEntry; menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next ) { @@ -150,13 +157,12 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) /* * 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 ) && + if ( ( x >= FREEGLUT_MENU_BORDER ) && + ( x < menu->Width - FREEGLUT_MENU_BORDER ) && + ( y >= FREEGLUT_MENU_BORDER ) && + ( y < menu->Height - FREEGLUT_MENU_BORDER ) && ( window == menu->Window ) ) { - /* - * Calculation of the highlighted menu item is easy enough now: - */ int menuID = ( y - FREEGLUT_MENU_BORDER ) / FREEGLUT_MENU_HEIGHT ; /* @@ -165,15 +171,13 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) menuEntry = fghFindMenuEntry( menu, menuID + 1 ); assert( menuEntry != NULL ); - /* - * Mark the menu as active... - */ menuEntry->IsActive = TRUE; menuEntry->Ordinal = menuID; /* - * If this is not the same as the last active menu entry, deactivate the previous entry. - * Specifically, if the previous active entry was a submenu then deactivate it. + * If this is not the same as the last active menu entry, deactivate the + * previous entry. Specifically, if the previous active entry was a + * submenu then deactivate it. */ if ( menu->ActiveEntry && ( menuEntry != menu->ActiveEntry ) ) { @@ -182,11 +186,6 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) } menu->ActiveEntry = menuEntry ; - - /* - * Don't forget about marking the current menu as active, too: - */ - menu->IsActive = TRUE; /* @@ -204,9 +203,6 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) * Set up the initial menu position now... */ - /* - * Mark the menu as active, so that it gets displayed: - */ menuEntry->SubMenu->IsActive = TRUE ; /* @@ -215,13 +211,12 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) 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 > glutGet ( GLUT_SCREEN_WIDTH ) ) + menuEntry->SubMenu->X = menu->X - menuEntry->SubMenu->Width ; - if ( menuEntry->SubMenu->Y + menuEntry->SubMenu->Height > glutGet ( -GLUT_SCREEN_HEIGHT ) ) - menuEntry->SubMenu->Y -=menuEntry->SubMenu->Height ; + if ( menuEntry->SubMenu->Y + menuEntry->SubMenu->Height > glutGet ( GLUT_SCREEN_HEIGHT ) ) + menuEntry->SubMenu->Y -= ( menuEntry->SubMenu->Height - + FREEGLUT_MENU_HEIGHT - 2 * FREEGLUT_MENU_BORDER ) ; fgSetWindow ( menuEntry->SubMenu->Window ) ; glutPositionWindow ( menuEntry->SubMenu->X, menuEntry->SubMenu->Y ) ; @@ -232,13 +227,10 @@ GLUT_SCREEN_HEIGHT ) ) fgSetWindow ( current_window ) ; } - /* - * ...then check the submenu's state: - */ fghCheckMenuStatus( window, menuEntry->SubMenu ); /* - * Even if the submenu turned up inactive, activate it because its parent entry is active + * Activate it because its parent entry is active */ menuEntry->SubMenu->IsActive = TRUE ; } @@ -533,7 +525,6 @@ void fgActivateMenu( SFG_Window* window, int button ) glutPopWindow () ; glutShowWindow () ; menu->Window->ActiveMenu = menu ; - } /* @@ -638,7 +629,7 @@ void fgDeactivateMenu( SFG_Window *window ) /* * Is that an active submenu by any case? */ - if ( ( menuEntry->SubMenu != NULL ) && menuEntry->SubMenu->IsActive ) + if ( menuEntry->SubMenu != NULL ) fgDeactivateSubMenu ( menuEntry ) ; } @@ -673,7 +664,7 @@ void fgDeactivateSubMenu( SFG_MenuEntry *menuEntry ) /* * Is that an active submenu by any case? */ - if ( ( subMenuIter->SubMenu != NULL ) && subMenuIter->SubMenu->IsActive ) + if ( subMenuIter->SubMenu != NULL ) fgDeactivateSubMenu ( subMenuIter ) ; } @@ -763,20 +754,9 @@ int FGAPIENTRY glutGetMenu( void ) { freeglut_assert_ready; - /* - * Is there a current menu set? - */ if( fgStructure.Menu != NULL ) - { - /* - * Yes, there is indeed... - */ return( fgStructure.Menu->ID ); - } - /* - * No, there is no current menu at all - */ return( 0 ); } @@ -787,11 +767,9 @@ void FGAPIENTRY glutSetMenu( int menuID ) { SFG_Menu* menu = fgMenuByID( menuID ); - freeglut_assert_ready; freeglut_return_if_fail( menu != NULL ); + freeglut_assert_ready; + freeglut_return_if_fail( menu != NULL ); - /* - * The current menu pointer is stored in fgStructure.Menu - */ fgStructure.Menu = menu; } @@ -802,14 +780,9 @@ void FGAPIENTRY glutAddMenuEntry( const char* label, int value ) { SFG_MenuEntry* menuEntry = (SFG_MenuEntry *)calloc( sizeof(SFG_MenuEntry), 1 ); - /* - * Make sure there is a current menu set - */ - freeglut_assert_ready; freeglut_return_if_fail( fgStructure.Menu != NULL ); + freeglut_assert_ready; + freeglut_return_if_fail( fgStructure.Menu != NULL ); - /* - * Fill in the appropriate values... - */ menuEntry->Text = strdup( label ); menuEntry->ID = value; @@ -818,9 +791,6 @@ void FGAPIENTRY glutAddMenuEntry( const char* label, int value ) */ fgListAppend( &fgStructure.Menu->Entries, &menuEntry->Node ); - /* - * Update the menu's dimensions now - */ fghCalculateMenuBoxSize(); } @@ -832,16 +802,10 @@ void FGAPIENTRY glutAddSubMenu( const char* label, int subMenuID ) SFG_MenuEntry* menuEntry = (SFG_MenuEntry *)calloc( sizeof(SFG_MenuEntry), 1 ); SFG_Menu* subMenu = fgMenuByID( subMenuID ); - /* - * Make sure there is a current menu and the sub menu - * we want to attach actually exists... - */ - freeglut_assert_ready; freeglut_return_if_fail( fgStructure.Menu != NULL ); + freeglut_assert_ready; + freeglut_return_if_fail( fgStructure.Menu != NULL ); freeglut_return_if_fail( subMenu != NULL ); - /* - * Fill in the appropriate values - */ menuEntry->Text = strdup( label ); menuEntry->SubMenu = subMenu; menuEntry->ID = -1; @@ -851,14 +815,7 @@ void FGAPIENTRY glutAddSubMenu( const char* label, int subMenuID ) */ fghSetSubmenuParentWindow ( fgStructure.Menu->ParentWindow, subMenu ) ; - /* - * Have the new menu entry attached to the current menu - */ fgListAppend( &fgStructure.Menu->Entries, &menuEntry->Node ); - - /* - * Update the menu's dimensions now - */ fghCalculateMenuBoxSize(); } @@ -869,20 +826,15 @@ void FGAPIENTRY glutChangeToMenuEntry( int item, const char* label, int value ) { SFG_MenuEntry* menuEntry = NULL; - /* - * Make sure there is a current menu set... - */ - freeglut_assert_ready; freeglut_return_if_fail( fgStructure.Menu != NULL ); + freeglut_assert_ready; + freeglut_return_if_fail( fgStructure.Menu ); /* * Get n-th menu entry in the current menu, starting from one: */ menuEntry = fghFindMenuEntry( fgStructure.Menu, item ); - /* - * Make sure the menu entry exists - */ - freeglut_return_if_fail( menuEntry != NULL ); + freeglut_return_if_fail( menuEntry ); /* * We want it to become a normal menu entry, so: @@ -893,10 +845,6 @@ void FGAPIENTRY glutChangeToMenuEntry( int item, const char* label, int value ) menuEntry->Text = strdup( label ); menuEntry->ID = value; menuEntry->SubMenu = NULL; - - /* - * Update the menu's dimensions now - */ fghCalculateMenuBoxSize(); } @@ -908,35 +856,26 @@ void FGAPIENTRY glutChangeToSubMenu( int item, const char* label, int subMenuID SFG_Menu* subMenu = fgMenuByID( subMenuID ); SFG_MenuEntry* menuEntry = NULL; - /* - * Make sure there is a current menu set and the sub menu exists... - */ - freeglut_assert_ready; freeglut_return_if_fail( fgStructure.Menu != NULL ); - freeglut_return_if_fail( subMenu != NULL ); + freeglut_assert_ready; + freeglut_return_if_fail( fgStructure.Menu ); + freeglut_return_if_fail( subMenu ); /* * Get n-th menu entry in the current menu, starting from one: */ menuEntry = fghFindMenuEntry( fgStructure.Menu, item ); - /* - * Make sure the menu entry exists - */ - freeglut_return_if_fail( menuEntry != NULL ); + freeglut_return_if_fail( menuEntry ); /* * We want it to become a sub menu entry, so: */ - if( menuEntry->Text != NULL ) + if( menuEntry->Text ) free( menuEntry->Text ); menuEntry->Text = strdup( label ); menuEntry->SubMenu = subMenu; menuEntry->ID = -1; - - /* - * Update the menu's dimensions now - */ fghCalculateMenuBoxSize(); } @@ -947,36 +886,21 @@ void FGAPIENTRY glutRemoveMenuItem( int item ) { SFG_MenuEntry* menuEntry; - /* - * Make sure there is a current menu set - */ - freeglut_assert_ready; freeglut_return_if_fail( fgStructure.Menu != NULL ); + freeglut_assert_ready; + freeglut_return_if_fail( fgStructure.Menu ); /* * Get n-th menu entry in the current menu, starting from one: */ menuEntry = fghFindMenuEntry( fgStructure.Menu, item ); - /* - * Make sure the menu entry exists - */ - freeglut_return_if_fail( menuEntry != NULL ); + freeglut_return_if_fail( menuEntry ); - /* - * Removing a menu entry is quite simple... - */ fgListRemove( &fgStructure.Menu->Entries, &menuEntry->Node ); - - /* - * Free the entry label string, too - */ - free( menuEntry->Text ); + if ( menuEntry->Text ) + free( menuEntry->Text ); free( menuEntry ); - - /* - * Update the menu's dimensions now - */ fghCalculateMenuBoxSize(); } @@ -987,19 +911,12 @@ void FGAPIENTRY glutAttachMenu( int button ) { freeglut_assert_ready; - /* - * There must be a current window and a current menu set: - */ - freeglut_return_if_fail( fgStructure.Window != NULL || fgStructure.Menu != NULL ); + freeglut_return_if_fail( fgStructure.Window ); + freeglut_return_if_fail( fgStructure.Menu ); - /* - * Make sure the button value is valid (0, 1 or 2, see freeglut.h) - */ - freeglut_return_if_fail( button == GLUT_LEFT_BUTTON || button == GLUT_MIDDLE_BUTTON || button == GLUT_RIGHT_BUTTON ); + freeglut_return_if_fail( button >= 0 ); + freeglut_return_if_fail( button < FREEGLUT_MAX_MENUS ); - /* - * It is safe now to attach the menu - */ fgStructure.Window->Menu[ button ] = fgStructure.Menu; /* @@ -1015,19 +932,12 @@ void FGAPIENTRY glutDetachMenu( int button ) { freeglut_assert_ready; - /* - * There must be a current window set: - */ - freeglut_return_if_fail( fgStructure.Window != NULL ); + freeglut_return_if_fail( fgStructure.Window ); + freeglut_return_if_fail( fgStructure.Menu ); - /* - * Make sure the button value is valid (0, 1 or 2, see freeglut.h) - */ - freeglut_return_if_fail( button != 0 && button != 1 && button != 2 ); + freeglut_return_if_fail( button >= 0 ); + freeglut_return_if_fail( button < FREEGLUT_MAX_MENUS ); - /* - * It is safe now to detach the menu - */ fgStructure.Window->Menu[ button ] = NULL; }