freeglut

Revision: 1612
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1612&view=rev
Author:   dcnieho
Date:     2013-04-06 14:08:59 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
Menu's work again in gamemode too now. We have to do a normal ShowWindow in gamemode, or the menu won't pop up over the gamemode window.
Also now using fgState.ActiveMenus instead of enumerating to see if there is an active menu

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_menu.c
    trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c
    trunk/freeglut/freeglut/src/mswin/fg_menu_mswin.c

Modified: trunk/freeglut/freeglut/src/fg_menu.c
===================================================================

--- trunk/freeglut/freeglut/src/fg_menu.c	2013-04-06 10:20:42 UTC (rev 1611)
+++ trunk/freeglut/freeglut/src/fg_menu.c	2013-04-06 14:08:59 UTC (rev 1612)
@@ -632,7 +632,7 @@
 
         is_handled = GL_TRUE;
     }
-    else if ( fgStructure.Menus.First ) /* 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... */
+    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();
@@ -784,7 +784,7 @@
 {
     /* The menu object creation code resides in freeglut_structure.c */
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCreateMenu" );
-    if (fgGetActiveMenu())
+    if (fgState.ActiveMenus)
         fgError("Menu manipulation not allowed while menus in use.");
 
     return fgCreateMenu( callback )->ID;
@@ -801,7 +801,7 @@
     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 */
@@ -846,7 +846,7 @@
     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 );
@@ -871,7 +871,7 @@
     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 );
@@ -895,7 +895,7 @@
     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 );
@@ -919,7 +919,7 @@
     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: */
@@ -949,7 +949,7 @@
     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 */
@@ -982,7 +982,7 @@
     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: */
@@ -1008,7 +1008,7 @@
     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 );
@@ -1027,7 +1027,7 @@
     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 );

Modified: trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2013-04-06 10:20:42 UTC (rev 1611)
+++ trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2013-04-06 14:08:59 UTC (rev 1612)
@@ -39,7 +39,7 @@
 extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
                                      unsigned char layer_type );
 
-extern void fgPlatformCheckMenuDeactivate();
+extern void fgPlatformCheckMenuDeactivate(HWND newFocusWnd);
 
 #ifdef WM_TOUCH
 typedef BOOL (WINAPI *pGetTouchInputInfo)(HTOUCHINPUT,UINT,PTOUCHINPUT,int);
@@ -969,14 +969,14 @@
         lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
 
         /* Check if there are any open menus that need to be closed */
-        fgPlatformCheckMenuDeactivate();
+        fgPlatformCheckMenuDeactivate((HWND)wParam);
         break;
 
     case WM_MOUSEACTIVATE:
         /* Clicks should not activate the menu.
          * Especially important when clicking on a menu's submenu item which has no effect.
          */
-        printf("WM_MOUSEACTIVATE\n");
+        /*printf("WM_MOUSEACTIVATE\n");*/
         if (window->IsMenu)
             lRet = MA_NOACTIVATEANDEAT;
         else
@@ -988,7 +988,7 @@
     case WM_NCRBUTTONDOWN:
         {
             SFG_Menu *menu;
-            if (fgStructure.Menus.First && (menu = fgGetActiveMenu()))
+            if (fgState.ActiveMenus && (menu = fgGetActiveMenu()))
                 /* user clicked non-client area of window while a menu is open. Close menu */
                 fgDeactivateMenu(menu->ParentWindow);
 
@@ -1767,8 +1767,8 @@
                 win = win->Parent;
             break;
         case DesireNormalState:
-            if (win->IsMenu)
-                cmdShow = SW_SHOWNA;    /* Just show, don't activate if its a menu */
+            if (win->IsMenu && (!fgStructure.GameModeWindow || win->ActiveMenu->ParentWindow != fgStructure.GameModeWindow))
+                cmdShow = SW_SHOWNA;    /* Just show, don't activate window if its a menu. Only exception is when the parent is a gamemode window as the menu would pop under it when we do this... */
             else
                 cmdShow = SW_SHOW;
             break;

Modified: trunk/freeglut/freeglut/src/mswin/fg_menu_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_menu_mswin.c	2013-04-06 10:20:42 UTC (rev 1611)
+++ trunk/freeglut/freeglut/src/mswin/fg_menu_mswin.c	2013-04-06 14:08:59 UTC (rev 1612)
@@ -37,18 +37,25 @@
     *y = glutGet ( GLUT_SCREEN_HEIGHT );
 }
 
-void fgPlatformCheckMenuDeactivate()
+void fgPlatformCheckMenuDeactivate(HWND newFocusWnd)
 {
     /* User/system switched application focus.
      * If we have an open menu, close it.
      */
     SFG_Menu* menu = NULL;
 
-    if ( fgStructure.Menus.First )
+    if ( fgState.ActiveMenus )
         menu = fgGetActiveMenu();
 
     if ( menu )
-        fgDeactivateMenu(menu->ParentWindow);
+    {
+        if (newFocusWnd != menu->Window->Window.Handle)
+            /* When in GameMode, the menu's parent window will lose focus when the menu is opened.
+             * This is sadly necessary as we need to do an activating ShowWindow() for the menu
+             * to pop up over the gamemode window
+             */
+            fgDeactivateMenu(menu->ParentWindow);
+    }
 };
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2003	Jan	Feb	Mar	Apr	May	Jun	Jul (6)	Aug (31)	Sep (34)	Oct (74)	Nov (88)	Dec (66)
2004	Jan (11)	Feb (21)	Mar (26)	Apr (1)	May (9)	Jun (2)	Jul	Aug (8)	Sep (8)	Oct (4)	Nov	Dec (8)
2005	Jan (34)	Feb (5)	Mar (1)	Apr (20)	May (34)	Jun (24)	Jul (28)	Aug (4)	Sep (3)	Oct (5)	Nov	Dec
2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (3)	Sep (15)	Oct	Nov (1)	Dec
2007	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (16)	Oct (5)	Nov (3)	Dec (4)
2008	Jan (1)	Feb	Mar	Apr (1)	May	Jun	Jul (2)	Aug	Sep	Oct	Nov (19)	Dec
2009	Jan	Feb (26)	Mar (20)	Apr (4)	May (11)	Jun (2)	Jul (4)	Aug (1)	Sep	Oct	Nov (21)	Dec (13)
2010	Jan (8)	Feb (1)	Mar	Apr	May (1)	Jun	Jul	Aug	Sep	Oct	Nov (2)	Dec
2011	Jan (12)	Feb	Mar (24)	Apr	May (6)	Jun (4)	Jul	Aug	Sep (15)	Oct	Nov (5)	Dec (16)
2012	Jan (64)	Feb (44)	Mar (137)	Apr (48)	May (53)	Jun (21)	Jul (34)	Aug (8)	Sep (2)	Oct	Nov (97)	Dec (3)
2013	Jan (10)	Feb (32)	Mar (34)	Apr (48)	May (7)	Jun	Jul	Aug (1)	Sep	Oct	Nov (1)	Dec
2014	Jan (48)	Feb	Mar (2)	Apr (1)	May (5)	Jun (9)	Jul	Aug (10)	Sep (1)	Oct (19)	Nov (4)	Dec (3)
2015	Jan (6)	Feb (7)	Mar (7)	Apr	May	Jun (10)	Jul (3)	Aug	Sep	Oct (3)	Nov	Dec (6)
2016	Jan (11)	Feb (1)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2017	Jan	Feb	Mar	Apr (7)	May (4)	Jun (23)	Jul (8)	Aug	Sep	Oct (2)	Nov	Dec
2018	Jan	Feb	Mar (4)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

S	M	T	W	T	F	S
	1 (4)	2	3 (1)	4 (13)	5 (17)	6 (7)
7 (3)	8	9	10	11	12	13
14	15	16	17	18 (1)	19	20 (2)
21	22	23	24	25	26	27
28	29	30

Thanks for helping keep SourceForge clean.

freeglut

Status: Beta

Brought to you by: dcnieho, fayjf, fayjf2, jtsiomb, sjbaker

freeglut-cvs — A read-only list that tracks CVS activity.