X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_menu.c;h=a0b544c8f487be4e3d2935bb06bcec144f0d502d;hb=8756c552d99adeed03a7bdd7c8b0da8c77f5c475;hp=d7ee2acbe663e7e1e93584e70d6e9ebae0505cbc;hpb=9786fb052e94dc0a4c0a40aaa3133d35a5d7061f;p=freeglut diff --git a/src/freeglut_menu.c b/src/freeglut_menu.c index d7ee2ac..a0b544c 100644 --- a/src/freeglut_menu.c +++ b/src/freeglut_menu.c @@ -47,9 +47,30 @@ /* * We'll be using freeglut fonts to draw the menu */ -#define FREEGLUT_MENU_FONT GLUT_BITMAP_8_BY_13 -#define FREEGLUT_MENU_HEIGHT 15 -#define FREEGLUT_MENU_BORDER 8 +#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) +#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. + * 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. + */ +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_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 ---------------------------------------------------- */ @@ -62,7 +83,7 @@ static SFG_MenuEntry *fghFindMenuEntry( SFG_Menu* menu, int index ) SFG_MenuEntry *entry; int i = 1; - for( entry = menu->Entries.First; entry; entry = entry->Node.Next) + for( entry = (SFG_MenuEntry *)menu->Entries.First; entry; entry = (SFG_MenuEntry *)entry->Node.Next) { if (i == index) break; @@ -83,8 +104,8 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) /* * First of all check any of the active sub menus... */ - for( menuEntry = menu->Entries.First; menuEntry; - menuEntry = menuEntry->Node.Next ) + for( menuEntry = (SFG_MenuEntry *)menu->Entries.First; menuEntry; + menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next ) { /* * Is that an active sub menu by any case? @@ -117,8 +138,8 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) /* * Mark all menu entries inactive... */ - for( menuEntry = menu->Entries.First; menuEntry; - menuEntry = menuEntry->Node.Next ) + for( menuEntry = (SFG_MenuEntry *)menu->Entries.First; menuEntry; + menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next ) { menuEntry->IsActive = FALSE; } @@ -129,12 +150,14 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu ) /* * Check if the mouse cursor is contained within the current menu box */ - if ( ( x >= 0 ) && ( x < menu->Width ) && ( y >= 0 ) && ( y < menu->Height ) && ( window == menu->Window ) ) + 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_HEIGHT; + int menuID = ( y - FREEGLUT_MENU_BORDER ) / FREEGLUT_MENU_HEIGHT ; /* * The mouse cursor is somewhere over our box, check it out. @@ -192,6 +215,14 @@ 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->Y + menuEntry->SubMenu->Height > glutGet ( +GLUT_SCREEN_HEIGHT ) ) + menuEntry->SubMenu->Y -=menuEntry->SubMenu->Height ; + fgSetWindow ( menuEntry->SubMenu->Window ) ; glutPositionWindow ( menuEntry->SubMenu->X, menuEntry->SubMenu->Y ) ; glutReshapeWindow ( menuEntry->SubMenu->Width, menuEntry->SubMenu->Height ) ; @@ -231,32 +262,45 @@ static void fghDisplayMenuBox( SFG_Menu* menu ) { SFG_MenuEntry *menuEntry; int i; + int border = FREEGLUT_MENU_BORDER ; /* * Have the menu box drawn first. The +- values are * here just to make it more nice-looking... */ - glColor4f( 0.1289f, 0.2257f, 0.28516f, 1.0f ); /* a non-black dark version of the below. */ - glBegin( GL_QUADS ); - glVertex2i( 0 , 0 ); - glVertex2i( menu->Width, 0 ); - glVertex2i( menu->Width, menu->Height ); - glVertex2i( 0 , menu->Height ); + glColor4f( 1.0f, 1.0f, 1.0f, 1.0f ); /* a non-black dark version of the below. */ + glBegin( GL_QUAD_STRIP ); + glVertex2i( menu->Width , 0 ); + glVertex2i( menu->Width-border, border); + glVertex2i( 0 , 0 ); + glVertex2i( border, border); + glVertex2i( 0 , menu->Height ); + glVertex2i( border, menu->Height-border); + glEnd(); + + glColor4f( 0.5f, 0.5f, 0.5f, 1.0f ); /* a non-black dark version of the below. */ + glBegin( GL_QUAD_STRIP ); + glVertex2i( 0 , menu->Height ); + glVertex2i( border, menu->Height-border); + glVertex2i( menu->Width , menu->Height ); + glVertex2i( menu->Width-border, menu->Height-border); + glVertex2i( menu->Width , 0 ); + glVertex2i( menu->Width-border, border); glEnd(); - glColor4f( 0.3f, 0.4f, 0.5f, 1.0f ); + glColor4fv ( menu_pen_back ) ; glBegin( GL_QUADS ); - glVertex2i( 1, 1 ); - glVertex2i( menu->Width-1, 1 ); - glVertex2i( menu->Width-1, menu->Height-1); - glVertex2i( 1, menu->Height-1); + glVertex2i( border, border); + glVertex2i( menu->Width-border, border); + glVertex2i( menu->Width-border, menu->Height-border); + glVertex2i( border, menu->Height-border); glEnd(); /* * Check if any of the submenus is currently active... */ - for( menuEntry = menu->Entries.First; menuEntry; - menuEntry = menuEntry->Node.Next ) + for( menuEntry = (SFG_MenuEntry *)menu->Entries.First; menuEntry; + menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next ) { /* * Has the menu been marked as active, maybe? @@ -273,12 +317,12 @@ static void fghDisplayMenuBox( SFG_Menu* menu ) /* * So have the highlight drawn... */ - glColor4f( 0.2f, 0.3f, 0.4f, 1.0f ); + glColor4fv ( menu_pen_hback ) ; glBegin( GL_QUADS ); - glVertex2i( 2 , (menuID + 0)*FREEGLUT_MENU_HEIGHT + 1 ); - glVertex2i( menu->Width-2, (menuID + 0)*FREEGLUT_MENU_HEIGHT + 1 ); - glVertex2i( menu->Width-2, (menuID + 1)*FREEGLUT_MENU_HEIGHT + 2 ); - glVertex2i( 2 , (menuID + 1)*FREEGLUT_MENU_HEIGHT + 2 ); + glVertex2i( FREEGLUT_MENU_BORDER, (menuID + 0)*FREEGLUT_MENU_HEIGHT + FREEGLUT_MENU_BORDER ); + glVertex2i( menu->Width-FREEGLUT_MENU_BORDER, (menuID + 0)*FREEGLUT_MENU_HEIGHT + FREEGLUT_MENU_BORDER ); + glVertex2i( menu->Width-FREEGLUT_MENU_BORDER, (menuID + 1)*FREEGLUT_MENU_HEIGHT + FREEGLUT_MENU_BORDER ); + glVertex2i( FREEGLUT_MENU_BORDER, (menuID + 1)*FREEGLUT_MENU_HEIGHT + FREEGLUT_MENU_BORDER ); glEnd(); } } @@ -286,17 +330,24 @@ static void fghDisplayMenuBox( SFG_Menu* menu ) /* * Print the menu entries now... */ - glColor4f( 1, 1, 1, 1 ); - for( menuEntry = menu->Entries.First, i=0; menuEntry; - menuEntry = menuEntry->Node.Next, ++i ) + glColor4fv ( menu_pen_fore ); + + for( menuEntry = (SFG_MenuEntry *)menu->Entries.First, i=0; menuEntry; + menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next, ++i ) { /* + * If the menu entry is active, set the color to white + */ + if ( menuEntry->IsActive ) + glColor4fv ( menu_pen_hfore ) ; + + /* * Move the raster into position... */ glRasterPos2i( - FREEGLUT_MENU_BORDER, - (i + 1)*FREEGLUT_MENU_HEIGHT-(int)(FREEGLUT_MENU_HEIGHT*0.3) /* Try to center the text - JCJ 31 July 2003*/ + 2 * FREEGLUT_MENU_BORDER, + (i + 1)*FREEGLUT_MENU_HEIGHT-(int)(FREEGLUT_MENU_HEIGHT*0.3 - FREEGLUT_MENU_BORDER ) /* Try to center the text - JCJ 31 July 2003*/ ); /* @@ -309,33 +360,28 @@ static void fghDisplayMenuBox( SFG_Menu* menu ) */ if ( menuEntry->SubMenu != NULL ) { - GLubyte arrow_char [] = { 0, 0, 32, 48, 56, 60, 62, 63, 62, 60, 56, 48, 32, 0, 0 } ; - int width = glutBitmapWidth ( FREEGLUT_MENU_FONT, ' ' ) ; - - glPushClientAttrib( GL_CLIENT_PIXEL_STORE_BIT ); - - /* - * Set up the pixel unpacking ways - */ - glPixelStorei( GL_UNPACK_SWAP_BYTES, GL_FALSE ); - glPixelStorei( GL_UNPACK_LSB_FIRST, GL_FALSE ); - glPixelStorei( GL_UNPACK_ROW_LENGTH, 0 ); - glPixelStorei( GL_UNPACK_SKIP_ROWS, 0 ); - glPixelStorei( GL_UNPACK_SKIP_PIXELS, 0 ); - glPixelStorei( GL_UNPACK_ALIGNMENT, 1 ); - - glRasterPos2i ( menu->Width - 2 - width, - (i + 1)*FREEGLUT_MENU_HEIGHT ) ; - glBitmap ( width, FREEGLUT_MENU_HEIGHT, 0, 0, 0.0, 0.0, arrow_char ) ; - glPopClientAttrib(); + int width = glutBitmapWidth ( FREEGLUT_MENU_FONT, '_' ) ; + int x_base = menu->Width - 2 - width; + int y_base = i*FREEGLUT_MENU_HEIGHT + FREEGLUT_MENU_BORDER; + glBegin( GL_TRIANGLES ); + glVertex2i( x_base, y_base + 2*FREEGLUT_MENU_BORDER); + glVertex2i( menu->Width - 2, y_base + (FREEGLUT_MENU_HEIGHT + FREEGLUT_MENU_BORDER) / 2 ); + glVertex2i( x_base, y_base + FREEGLUT_MENU_HEIGHT - FREEGLUT_MENU_BORDER); + glEnd( ); } + + /* + * If the menu entry is active, reset the color + */ + if ( menuEntry->IsActive ) + glColor4fv ( menu_pen_fore ) ; } /* * Now we are ready to check if any of our children needs to be redrawn: */ - for( menuEntry = menu->Entries.First; menuEntry; - menuEntry = menuEntry->Node.Next ) + for( menuEntry = (SFG_MenuEntry *)menu->Entries.First; menuEntry; + menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next ) { /* * Is that an active sub menu by any case? @@ -361,7 +407,7 @@ static void fghSetSubmenuParentWindow ( SFG_Window *window, SFG_Menu *menu ) menu->ParentWindow = window ; - for ( menuEntry = menu->Entries.First; menuEntry; menuEntry = menuEntry->Node.Next ) + for ( menuEntry = (SFG_MenuEntry *)menu->Entries.First; menuEntry; menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next ) { if ( menuEntry->SubMenu != NULL ) fghSetSubmenuParentWindow ( window, menuEntry->SubMenu ) ; @@ -475,6 +521,12 @@ void fgActivateMenu( SFG_Window* window, int button ) menu->X = window->State.MouseX + glutGet ( GLUT_WINDOW_X ) ; menu->Y = window->State.MouseY + glutGet ( GLUT_WINDOW_Y ) ; + if ( menu->X + menu->Width > glutGet ( GLUT_SCREEN_WIDTH ) ) + menu->X -=menu->Width ; + + if ( menu->Y + menu->Height > glutGet ( GLUT_SCREEN_HEIGHT ) ) + menu->Y -=menu->Height ; + fgSetWindow ( menu->Window ) ; glutPositionWindow ( menu->X, menu->Y ) ; glutReshapeWindow ( menu->Width, menu->Height ) ; @@ -482,10 +534,6 @@ void fgActivateMenu( SFG_Window* window, int button ) glutShowWindow () ; menu->Window->ActiveMenu = menu ; -/* if( x > ( glutGet( GLUT_WINDOW_WIDTH ) - menu->Width ) ) - menu->X = glutGet( GLUT_WINDOW_WIDTH ) - menu->Width; - if( y > ( glutGet( GLUT_WINDOW_HEIGHT ) - menu->Height) ) - menu->Y = glutGet( GLUT_WINDOW_HEIGHT ) - menu->Height; */ } /* @@ -514,7 +562,7 @@ void fgExecuteMenuCallback( SFG_Menu* menu ) /* * First of all check any of the active sub menus... */ - for( menuEntry = menu->Entries.First; menuEntry; menuEntry = menuEntry->Node.Next) + for( menuEntry = (SFG_MenuEntry *)menu->Entries.First; menuEntry; menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next) { /* * Is this menu entry active? @@ -584,17 +632,17 @@ void fgDeactivateMenu( SFG_Window *window ) /* * Hide all submenu windows, and the root menu's window. */ - for ( menuEntry = menu->Entries.First; menuEntry; - menuEntry = menuEntry->Node.Next ) + for ( menuEntry = (SFG_MenuEntry *)menu->Entries.First; menuEntry; + menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next ) { /* * Is that an active submenu by any case? */ - if ( ( menuEntry->SubMenu != NULL ) && menuEntry->SubMenu->IsActive ) + if ( menuEntry->SubMenu != NULL ) fgDeactivateSubMenu ( menuEntry ) ; } - fgStructure.Window = current_window ; + fgSetWindow ( current_window ) ; } /* @@ -619,17 +667,17 @@ void fgDeactivateSubMenu( SFG_MenuEntry *menuEntry ) /* * Hide all submenu windows, and the root menu's window. */ - for ( subMenuIter = menuEntry->SubMenu->Entries.First; subMenuIter; - subMenuIter = subMenuIter->Node.Next ) + for ( subMenuIter = (SFG_MenuEntry *)menuEntry->SubMenu->Entries.First; subMenuIter; + subMenuIter = (SFG_MenuEntry *)subMenuIter->Node.Next ) { /* * Is that an active submenu by any case? */ - if ( ( subMenuIter->SubMenu != NULL ) && subMenuIter->SubMenu->IsActive ) + if ( subMenuIter->SubMenu != NULL ) fgDeactivateSubMenu ( subMenuIter ) ; } - fgStructure.Window = current_window ; + fgSetWindow ( current_window ) ; } /* @@ -648,8 +696,8 @@ void fghCalculateMenuBoxSize( void ) /* * The menu's box size depends on the menu entries: */ - for( menuEntry = fgStructure.Menu->Entries.First; menuEntry; - menuEntry = menuEntry->Node.Next) + for( menuEntry = (SFG_MenuEntry *)fgStructure.Menu->Entries.First; menuEntry; + menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next) { /* * Update the menu entry's width value @@ -661,7 +709,7 @@ void fghCalculateMenuBoxSize( void ) */ if (menuEntry->SubMenu != NULL) - menuEntry->Width += glutBitmapLength( FREEGLUT_MENU_FONT, " " ); + menuEntry->Width += glutBitmapLength( FREEGLUT_MENU_FONT, "_" ); /* * Check if it's the biggest we've found @@ -675,8 +723,8 @@ void fghCalculateMenuBoxSize( void ) /* * Store the menu's box size now: */ - fgStructure.Menu->Height = height; - fgStructure.Menu->Width = width + 2 * FREEGLUT_MENU_BORDER ; + fgStructure.Menu->Height = height + 2 * FREEGLUT_MENU_BORDER ; + fgStructure.Menu->Width = width + 4 * FREEGLUT_MENU_BORDER ; } @@ -752,7 +800,7 @@ void FGAPIENTRY glutSetMenu( int menuID ) */ void FGAPIENTRY glutAddMenuEntry( const char* label, int value ) { - SFG_MenuEntry* menuEntry = calloc( sizeof(SFG_MenuEntry), 1 ); + SFG_MenuEntry* menuEntry = (SFG_MenuEntry *)calloc( sizeof(SFG_MenuEntry), 1 ); /* * Make sure there is a current menu set @@ -781,7 +829,7 @@ void FGAPIENTRY glutAddMenuEntry( const char* label, int value ) */ void FGAPIENTRY glutAddSubMenu( const char* label, int subMenuID ) { - SFG_MenuEntry* menuEntry = calloc( sizeof(SFG_MenuEntry), 1 ); + SFG_MenuEntry* menuEntry = (SFG_MenuEntry *)calloc( sizeof(SFG_MenuEntry), 1 ); SFG_Menu* subMenu = fgMenuByID( subMenuID ); /*