r3199 - trunk/data/qcsrc/menu-div0test/nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-01-20 12:26:34 -0500 (Sun, 20 Jan 2008)
New Revision: 3199

Modified:
   trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_join.c
   trunk/data/qcsrc/menu-div0test/nexuiz/serverlist.c
Log:
when typing in server list box, enter the text into the server search box


Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_join.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_join.c	2008-01-20 16:42:53 UTC (rev 3198)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_join.c	2008-01-20 17:26:34 UTC (rev 3199)
@@ -32,6 +32,7 @@
 			e.onChange = ServerList_Filter_Change;
 			e.onChangeEntity = slist;
 			clearbtn.onClickEntity = e;
+			slist.controlledTextbox = e;
 		me.TD(me, 1, 0.5, e = makeNexuizCheckBox(0, "menu_slist_showempty", "Empty"));
 			slist.filterShowEmpty = e.checked;
 			e.onClickEntity = slist;

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/serverlist.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/serverlist.c	2008-01-20 16:42:53 UTC (rev 3198)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/serverlist.c	2008-01-20 17:26:34 UTC (rev 3199)
@@ -25,6 +25,7 @@
 	ATTRIB(NexuizServerList, filterShowEmpty, float, 1)
 	ATTRIB(NexuizServerList, filterShowFull, float, 1)
 	ATTRIB(NexuizServerList, filterString, string, string_null)
+	ATTRIB(NexuizServerList, controlledTextbox, entity, NULL)
 	ATTRIB(NexuizServerList, nextRefreshTime, float, 0)
 	METHOD(NexuizServerList, refreshServerList, void(entity, float)) // refresh mode: 0 = just reparametrize, 1 = send new requests, 2 = clear
 	ATTRIB(NexuizServerList, needsRefresh, float, 1)
@@ -361,10 +362,16 @@
 
 float keyDownNexuizServerList(entity me, float scan, float ascii, float shift)
 {
-	if(scan == K_ENTER || scan == K_SPACE)
+	if(scan == K_ENTER)
+	{
 		ServerList_Connect_Click(NULL, me);
+		return 1;
+	}
+	else if(keyDownListBox(me, scan, ascii, shift))
+		return 1;
+	else if(!me.controlledTextbox)
+		return 0;
 	else
-		return keyDownListBox(me, scan, ascii, shift);
-	return 1;
+		return me.controlledTextbox.keyDown(me.controlledTextbox, scan, ascii, shift);
 }
 #endif