From 49451eea80a8a346065ed302ed391d7b51a60450 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 10 Dec 2011 13:22:36 +0900
Subject: [PATCH] Use the new menu/console bingings.

Now, the console toggle will always work (so long as the console is
toggleable in the first place).
---
 libs/console/client.c     | 51 +++++++++++++++++++++------------------
 libs/video/targets/keys.c |  2 +-
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/libs/console/client.c b/libs/console/client.c
index ae84a521d..bd9959b30 100644
--- a/libs/console/client.c
+++ b/libs/console/client.c
@@ -461,30 +461,35 @@ C_KeyEvent (knum_t key, short unicode, qboolean down)
 			return;
 	}
 
-	if (down && (key == QFK_ESCAPE || unicode == '\x1b')) {
-		switch (key_dest) {
-			case key_menu:
-				Menu_Leave ();
-				return;
-			case key_message:
-				if (chat_team) {
-					Con_ClearTyping (say_team_line, 1);
-				} else {
-					Con_ClearTyping (say_line, 1);
-				}
-				key_dest = key_game;
-				game_target = IMT_0;
-				return;
-			case key_console:
-				if (!con_data.force_commandline) {
-					Cbuf_AddText (con_data.cbuf, "toggleconsole\n");
+	if (down) {
+		if (key == key_togglemenu) {
+			switch (key_dest) {
+				case key_menu:
+					Menu_Leave ();
 					return;
-				}
-			case key_game:
-				Menu_Enter ();
-				return;
-			default:
-				Sys_Error ("Bad key_dest");
+				case key_message:
+					if (chat_team) {
+						Con_ClearTyping (say_team_line, 1);
+					} else {
+						Con_ClearTyping (say_line, 1);
+					}
+					key_dest = key_game;
+					game_target = IMT_0;
+					return;
+				case key_console:
+					if (!con_data.force_commandline) {
+						Cbuf_AddText (con_data.cbuf, "toggleconsole\n");
+						return;
+					}
+				case key_game:
+					Menu_Enter ();
+					return;
+				default:
+					Sys_Error ("Bad key_dest");
+			}
+		} else if (key == key_toggleconsole) {
+			ToggleConsole_f ();
+			return;
 		}
 	}
 
diff --git a/libs/video/targets/keys.c b/libs/video/targets/keys.c
index b2ff0b0c7..08178cdaf 100644
--- a/libs/video/targets/keys.c
+++ b/libs/video/targets/keys.c
@@ -857,7 +857,7 @@ Key_Event (knum_t key, short unicode, qboolean down)
 	}
 
 	// handle escape specially, so the user can never unbind it
-	if (unicode == '\x1b' || key == QFK_ESCAPE) {
+	if (key == key_togglemenu || key == key_toggleconsole) {
 		Key_Console (key, unicode);
 		return;
 	}