r3066 - in trunk/data/qcsrc: menu menu-div0test

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-12-31 08:38:56 -0500 (Mon, 31 Dec 2007)
New Revision: 3066

Modified:
   trunk/data/qcsrc/menu-div0test/menu.qc
   trunk/data/qcsrc/menu-div0test/msys.qh
   trunk/data/qcsrc/menu/mbuiltin.qc
   trunk/data/qcsrc/menu/msys.qc
Log:
The key grabber uses the recent engine commit to be able to grab keys (so binding F keys works too). It will fail in previous engines. Update your engines, people!


Modified: trunk/data/qcsrc/menu/mbuiltin.qc
===================================================================
--- trunk/data/qcsrc/menu/mbuiltin.qc	2007-12-31 13:16:22 UTC (rev 3065)
+++ trunk/data/qcsrc/menu/mbuiltin.qc	2007-12-31 13:38:56 UTC (rev 3066)
@@ -246,6 +246,8 @@
 void gecko_navigate( string name, string URI ) = #489;
 float gecko_keyevent( string name, float key, float eventtype ) = #490;
 void gecko_mousemove( string name, float x, float y ) = #491;
+void gecko_resize( string name, float w, float h ) = #492;
+vector gecko_get_texture_extent( string name ) = #493;
 
 #ifdef FIXEDFOPEN
 float 	fopen( string filename, float mode ) =

Modified: trunk/data/qcsrc/menu/msys.qc
===================================================================
--- trunk/data/qcsrc/menu/msys.qc	2007-12-31 13:16:22 UTC (rev 3065)
+++ trunk/data/qcsrc/menu/msys.qc	2007-12-31 13:38:56 UTC (rev 3066)
@@ -155,9 +155,10 @@
 ///////////////////////////
 // key dest constants
 
+float KEY_UNKNOWN	= 	-1;
 float KEY_GAME 		=	0;
 float KEY_MENU		=	2;
-float KEY_UNKNOWN	= 	3;
+float KEY_MENU_GRABBED = 3;
 
 ///////////////////////////
 // file constants

Modified: trunk/data/qcsrc/menu-div0test/menu.qc
===================================================================
--- trunk/data/qcsrc/menu-div0test/menu.qc	2007-12-31 13:16:22 UTC (rev 3065)
+++ trunk/data/qcsrc/menu-div0test/menu.qc	2007-12-31 13:38:56 UTC (rev 3066)
@@ -127,9 +127,16 @@
 	menuPrevTime = t;
 	time += frametime;
 
-	if(Menu_Active)
-		if(getkeydest() != KEY_MENU || getmousetarget() != MT_MENU)
-			m_hide();
+	if(getkeydest() == KEY_MENU || getkeydest() == KEY_MENU_GRABBED)
+	{
+		setkeydest(keyGrabber ? KEY_MENU_GRABBED : KEY_MENU);
+	}
+	else
+	{
+		if(Menu_Active)
+			if(getmousetarget() != MT_MENU)
+				m_hide();
+	}
 
 	if(cvar("cl_capturevideo"))
 		frametime = 1 / cvar("cl_capturevideo_fps"); // make capturevideo work smoothly

Modified: trunk/data/qcsrc/menu-div0test/msys.qh
===================================================================
--- trunk/data/qcsrc/menu-div0test/msys.qh	2007-12-31 13:16:22 UTC (rev 3065)
+++ trunk/data/qcsrc/menu-div0test/msys.qh	2007-12-31 13:38:56 UTC (rev 3066)
@@ -154,9 +154,10 @@
 ///////////////////////////
 // key dest constants
 
+float KEY_UNKNOWN	= 	-1;
 float KEY_GAME 		=	0;
 float KEY_MENU		=	2;
-float KEY_UNKNOWN	= 	3;
+float KEY_MENU_GRABBED = 3;
 
 ///////////////////////////
 // file constants