X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=keys.c;h=1ef9a251d17942d52ba6a36ebc67d296a5c09a45;hp=de6b3cefcc82a92bdce4639ddba6f0524b79ff4d;hb=7a9b79a3f43171ae7cc991b270879c303f3fcc4e;hpb=3cab50b986cfa5b25d0b6b4d525512ee8e811417

diff --git a/keys.c b/keys.c
index de6b3cef..1ef9a251 100644
--- a/keys.c
+++ b/keys.c
@@ -29,14 +29,124 @@ cvar_t con_closeontoggleconsole = {CVAR_SAVE, "con_closeontoggleconsole","1", "a
 key up events are sent even if in console mode
 */
 
-int			edit_line = MAX_INPUTLINES-1;
-int			history_line = MAX_INPUTLINES-1;
-char		key_lines[MAX_INPUTLINES][MAX_INPUTLINE];
+char		key_line[MAX_INPUTLINE];
 int			key_linepos;
 qboolean	key_insert = true;	// insert key toggle (for editing)
 keydest_t	key_dest;
 int			key_consoleactive;
 char		*keybindings[MAX_BINDMAPS][MAX_KEYS];
+int         history_line;
+char		history_savedline[MAX_INPUTLINE];
+conbuffer_t history;
+#define HIST_TEXTSIZE 262144
+#define HIST_MAXLINES 4096
+
+static void Key_History_Init()
+{
+	qfile_t *historyfile;
+	ConBuffer_Init(&history, HIST_TEXTSIZE, HIST_MAXLINES, zonemempool);
+
+	historyfile = FS_OpenRealFile("darkplaces_history.txt", "rb", false); // rb to handle unix line endings on windows too
+	if(historyfile)
+	{
+		char buf[MAX_INPUTLINE];
+		int bufpos;
+		int c;
+
+		bufpos = 0;
+		for(;;)
+		{
+			c = FS_Getc(historyfile);
+			if(c < 0 || c == 0 || c == '\r' || c == '\n')
+			{
+				if(bufpos > 0)
+				{
+					buf[bufpos] = 0;
+					ConBuffer_AddLine(&history, buf, bufpos, 0);
+					bufpos = 0;
+				}
+				if(c < 0)
+					break;
+			}
+			else
+			{
+				if(bufpos < MAX_INPUTLINE - 1)
+					buf[bufpos++] = c;
+			}
+		}
+
+		FS_Close(historyfile);
+	}
+
+	history_line = -1;
+}
+
+static void Key_History_Shutdown()
+{
+	// TODO write history to a file
+
+	qfile_t *historyfile = FS_OpenRealFile("darkplaces_history.txt", "w", false);
+	if(historyfile)
+	{
+		int i;
+		for(i = 0; i < CONBUFFER_LINES_COUNT(&history); ++i)
+			FS_Printf(historyfile, "%s\n", ConBuffer_GetLine(&history, i));
+		FS_Close(historyfile);
+	}
+
+	ConBuffer_Shutdown(&history);
+}
+
+static void Key_History_Push()
+{
+	if(key_line[1]) // empty?
+	if(strcmp(key_line, "]quit")) // putting these into the history just sucks
+	if(strncmp(key_line, "]quit ", 6)) // putting these into the history just sucks
+		ConBuffer_AddLine(&history, key_line + 1, strlen(key_line) - 1, 0);
+	Con_Printf("%s\n", key_line); // don't mark empty lines as history
+	history_line = -1;
+}
+
+static void Key_History_Up()
+{
+	if(history_line == -1) // editing the "new" line
+		strlcpy(history_savedline, key_line + 1, sizeof(history_savedline));
+
+	if(history_line == -1)
+	{
+		history_line = CONBUFFER_LINES_COUNT(&history) - 1;
+		if(history_line != -1)
+		{
+			strlcpy(key_line + 1, ConBuffer_GetLine(&history, history_line), sizeof(key_line) - 1);
+			key_linepos = strlen(key_line);
+		}
+	}
+	else if(history_line > 0)
+	{
+		--history_line; // this also does -1 -> 0, so it is good
+		strlcpy(key_line + 1, ConBuffer_GetLine(&history, history_line), sizeof(key_line) - 1);
+		key_linepos = strlen(key_line);
+	}
+}
+
+static void Key_History_Down()
+{
+	if(history_line == -1) // editing the "new" line
+		return;
+
+	if(history_line < CONBUFFER_LINES_COUNT(&history) - 1)
+	{
+		++history_line;
+		strlcpy(key_line + 1, ConBuffer_GetLine(&history, history_line), sizeof(key_line) - 1);
+	}
+	else
+	{
+		history_line = -1;
+		strlcpy(key_line + 1, history_savedline, sizeof(key_line) - 1);
+	}
+
+	key_linepos = strlen(key_line);
+}
 
 static int	key_bmap, key_bmap2;
 static unsigned char keydown[MAX_KEYS];	// 0 = up, 1 = down, 2 = repeating
@@ -222,8 +332,8 @@ static const keyname_t   keynames[] = {
 void
 Key_ClearEditLine (int edit_line)
 {
-	memset (key_lines[edit_line], '\0', sizeof(key_lines[edit_line]));
-	key_lines[edit_line][0] = ']';
+	memset (key_line, '\0', sizeof(key_line));
+	key_line[0] = ']';
 	key_linepos = 1;
 }
 
@@ -233,7 +343,7 @@ Interactive line editing and console scrollback
 ====================
 */
 static void
-Key_Console (int key, char ascii)
+Key_Console (int key, int ascii)
 {
 	// LordHavoc: copied most of this from Q2 to improve keyboard handling
 	switch (key)
@@ -282,7 +392,7 @@ Key_Console (int key, char ascii)
 		break;
 	}
 
-	if ((toupper(key) == 'V' && keydown[K_CTRL]) || ((key == K_INS || key == K_KP_INS) && keydown[K_SHIFT]))
+	if ((key == 'v' && keydown[K_CTRL]) || ((key == K_INS || key == K_KP_INS) && keydown[K_SHIFT]))
 	{
 		char *cbd, *p;
 		if ((cbd = Sys_GetClipboardData()) != 0)
@@ -304,11 +414,20 @@ Key_Console (int key, char ascii)
 #endif
 			i = (int)strlen(cbd);
 			if (i + key_linepos >= MAX_INPUTLINE)
-				i= MAX_INPUTLINE - key_linepos;
+				i= MAX_INPUTLINE - key_linepos - 1;
 			if (i > 0)
 			{
+				// terencehill: insert the clipboard text between the characters of the line
+				char *temp = (char *) Z_Malloc(MAX_INPUTLINE);
 				cbd[i]=0;
-				strlcat(key_lines[edit_line], cbd, sizeof(key_lines[edit_line]));
+				temp[0]=0;
+				if ( key_linepos < (int)strlen(key_line) )
+					strlcpy(temp, key_line + key_linepos, (int)strlen(key_line) - key_linepos +1);
+				key_line[key_linepos] = 0;
+				strlcat(key_line, cbd, sizeof(key_line));
+				if (temp[0])
+					strlcat(key_line, temp, sizeof(key_line));
+				Z_Free(temp);
 				key_linepos += i;
 			}
 			Z_Free(cbd);
@@ -316,28 +435,38 @@ Key_Console (int key, char ascii)
 		return;
 	}
 
-	if (key == 'l')
+	if (key == 'l' && keydown[K_CTRL])
 	{
-		if (keydown[K_CTRL])
-		{
-			Cbuf_AddText ("clear\n");
-			return;
-		}
+		Cbuf_AddText ("clear\n");
+		return;
+	}
+
+	if (key == 'u' && keydown[K_CTRL]) // like vi/readline ^u: delete currently edited line
+	{
+		// clear line
+		key_line[0] = ']';
+		key_line[1] = 0;
+		key_linepos = 1;
+		return;
+	}
+
+	if (key == 'q' && keydown[K_CTRL]) // like zsh ^q: push line to history, don't execute, and clear
+	{
+		// clear line
+		Key_History_Push();
+		key_line[0] = ']';
+		key_line[1] = 0;
+		key_linepos = 1;
+		return;
 	}
 
 	if (key == K_ENTER || key == K_KP_ENTER)
 	{
-		Cbuf_AddText (key_lines[edit_line]+1);	// skip the ]
+		Cbuf_AddText (key_line+1);	// skip the ]
 		Cbuf_AddText ("\n");
-		Con_Printf("%s\n",key_lines[edit_line]);
-		if(key_lines[edit_line][1] == 0) // empty line (just a ])?
-			return; // no, no, you can't submit empty lines to the history...
-		// LordHavoc: redesigned edit_line/history_line
-		edit_line = 31;
-		history_line = edit_line;
-		memmove(key_lines[0], key_lines[1], sizeof(key_lines[0]) * edit_line);
-		key_lines[edit_line][0] = ']';
-		key_lines[edit_line][1] = 0;	// EvilTypeGuy: null terminate
+		Key_History_Push();
+		key_line[0] = ']';
+		key_line[1] = 0;	// EvilTypeGuy: null terminate
 		key_linepos = 1;
 		// force an update, because the command may take some time
 		if (cls.state == ca_disconnected)
@@ -357,14 +486,14 @@ Key_Console (int key, char ascii)
 	// Advanced Console Editing by Radix radix@planetquake.com
 	// Added/Modified by EvilTypeGuy eviltypeguy@qeradiant.com
 	// Enhanced by [515]
+	// Enhanced by terencehill
 
-	// left arrow will just move left one without erasing, backspace will
-	// actually erase character
+	// move cursor to the previous character
 	if (key == K_LEFTARROW || key == K_KP_LEFTARROW)
 	{
 		if (key_linepos < 2)
 			return;
-		if(keydown[K_CTRL])
+		if(keydown[K_CTRL]) // move cursor to the previous word
 		{
 			int		pos;
 			char	k;
@@ -372,12 +501,29 @@ Key_Console (int key, char ascii)
 			if(pos)
 				while(--pos)
 				{
-					k = key_lines[edit_line][pos];
+					k = key_line[pos];
 					if(k == '\"' || k == ';' || k == ' ' || k == '\'')
 						break;
 				}
 			key_linepos = pos + 1;
 		}
+		else if(keydown[K_SHIFT]) // move cursor to the previous character ignoring colors
+		{
+			int		pos;
+			pos = key_linepos-1;
+			while (pos)
+				if(pos-1 > 0 && key_line[pos-1] == STRING_COLOR_TAG && isdigit(key_line[pos]))
+					pos-=2;
+				else if(pos-4 > 0 && key_line[pos-4] == STRING_COLOR_TAG && key_line[pos-3] == STRING_COLOR_RGB_TAG_CHAR
+						&& isxdigit(key_line[pos-2]) && isxdigit(key_line[pos-1]) && isxdigit(key_line[pos]))
+					pos-=5;
+				else
+				{
+					pos--;
+					break;
+				}
+			key_linepos = pos + 1;
+		}
 		else
 			key_linepos--;
 		return;
@@ -388,7 +534,7 @@ Key_Console (int key, char ascii)
 	{
 		if (key_linepos > 1)
 		{
-			strlcpy(key_lines[edit_line] + key_linepos - 1, key_lines[edit_line] + key_linepos, sizeof(key_lines[edit_line]) + 1 - key_linepos);
+			strlcpy(key_line + key_linepos - 1, key_line + key_linepos, sizeof(key_line) + 1 - key_linepos);
 			key_linepos--;
 		}
 		return;
@@ -398,33 +544,60 @@ Key_Console (int key, char ascii)
 	if (key == K_DEL || key == K_KP_DEL)
 	{
 		size_t linelen;
-		linelen = strlen(key_lines[edit_line]);
+		linelen = strlen(key_line);
 		if (key_linepos < (int)linelen)
-			memmove(key_lines[edit_line] + key_linepos, key_lines[edit_line] + key_linepos + 1, linelen - key_linepos);
+			memmove(key_line + key_linepos, key_line + key_linepos + 1, linelen - key_linepos);
 		return;
 	}
 
 
-	// if we're at the end, get one character from previous line,
-	// otherwise just go right one
+	// move cursor to the next character
 	if (key == K_RIGHTARROW || key == K_KP_RIGHTARROW)
 	{
-		if (key_linepos >= (int)strlen(key_lines[edit_line]))
+		if (key_linepos >= (int)strlen(key_line))
 			return;
-		if(keydown[K_CTRL])
+		if(keydown[K_CTRL]) // move cursor to the next word
 		{
 			int		pos, len;
 			char	k;
-			len = (int)strlen(key_lines[edit_line]);
+			len = (int)strlen(key_line);
 			pos = key_linepos;
 			while(++pos < len)
 			{
-				k = key_lines[edit_line][pos];
+				k = key_line[pos];
 				if(k == '\"' || k == ';' || k == ' ' || k == '\'')
 					break;
 			}
 			key_linepos = pos;
 		}
+		else if(keydown[K_SHIFT]) // move cursor to the next character ignoring colors
+		{
+			int		pos, len;
+			len = (int)strlen(key_line);
+			pos = key_linepos;
+			// check if there is a color tag right after the cursor
+			if (key_line[pos] == STRING_COLOR_TAG)
+			{
+				if(isdigit(key_line[pos+1]))
+					pos+=1;
+				else if(key_line[pos+1] == STRING_COLOR_RGB_TAG_CHAR && isxdigit(key_line[pos+2]) && isxdigit(key_line[pos+3]) && isxdigit(key_line[pos+4]))
+					pos+=4;
+			}
+			pos++;
+			
+			// now go beyond all next consecutive color tags, if any
+			if(pos < len)
+				while (key_line[pos] == STRING_COLOR_TAG)
+				{
+					if(isdigit(key_line[pos+1]))
+						pos+=2;
+					else if(key_line[pos+1] == STRING_COLOR_RGB_TAG_CHAR && isxdigit(key_line[pos+2]) && isxdigit(key_line[pos+3]) && isxdigit(key_line[pos+4]))
+						pos+=5;
+					else
+						break;
+				}
+			key_linepos = pos;
+		}
 		else
 			key_linepos++;
 		return;
@@ -440,46 +613,35 @@ Key_Console (int key, char ascii)
 
 	if (key == K_UPARROW || key == K_KP_UPARROW || (key == 'p' && keydown[K_CTRL]))
 	{
-		if (history_line > 0 && key_lines[history_line-1][1])
-		{
-			size_t linelen;
-			history_line--;
-			linelen = strlen(key_lines[history_line]);
-			memcpy(key_lines[edit_line], key_lines[history_line], linelen + 1);
-			key_linepos = (int)linelen;
-		}
+		Key_History_Up();
 		return;
 	}
 
 	if (key == K_DOWNARROW || key == K_KP_DOWNARROW || (key == 'n' && keydown[K_CTRL]))
 	{
-		history_line++;
-		if (history_line >= edit_line)
-		{
-			history_line = edit_line;
-			key_lines[edit_line][0] = ']';
-			key_lines[edit_line][1] = 0;
-			key_linepos = 1;
-		}
-		else
-		{
-			size_t linelen;
-			linelen = strlen(key_lines[history_line]);
-			memcpy(key_lines[edit_line], key_lines[history_line], linelen + 1);
-			key_linepos = (int)linelen;
-		}
+		Key_History_Down();
 		return;
 	}
 
 	if (key == K_PGUP || key == K_KP_PGUP || key == K_MWHEELUP)
 	{
-		con_backscroll += ((int) vid_conheight.integer >> 5);
+		if(keydown[K_CTRL])
+		{
+			con_backscroll += 3;
+		}
+		else
+			con_backscroll += ((int) vid_conheight.integer >> 5);
 		return;
 	}
 
 	if (key == K_PGDN || key == K_KP_PGDN || key == K_MWHEELDOWN)
 	{
-		con_backscroll -= ((int) vid_conheight.integer >> 5);
+		if(keydown[K_CTRL])
+		{
+			con_backscroll -= 3;
+		}
+		else
+			con_backscroll -= ((int) vid_conheight.integer >> 5);
 		return;
 	}
 
@@ -497,7 +659,7 @@ Key_Console (int key, char ascii)
 		if (keydown[K_CTRL])
 			con_backscroll = 0;
 		else
-			key_linepos = (int)strlen(key_lines[edit_line]);
+			key_linepos = (int)strlen(key_line);
 		return;
 	}
 
@@ -508,34 +670,37 @@ Key_Console (int key, char ascii)
 	if (key_linepos < MAX_INPUTLINE-1)
 	{
 		int len;
-		len = (int)strlen(&key_lines[edit_line][key_linepos]);
+		len = (int)strlen(&key_line[key_linepos]);
 		// check insert mode, or always insert if at end of line
 		if (key_insert || len == 0)
 		{
 			// can't use strcpy to move string to right
 			len++;
-			memmove(&key_lines[edit_line][key_linepos + 1], &key_lines[edit_line][key_linepos], len);
+			memmove(&key_line[key_linepos + 1], &key_line[key_linepos], len);
 		}
-		key_lines[edit_line][key_linepos] = ascii;
+		key_line[key_linepos] = ascii;
 		key_linepos++;
 	}
 }
 
 //============================================================================
 
-qboolean	chat_team;
+int chat_mode;
 char		chat_buffer[MAX_INPUTLINE];
 unsigned int	chat_bufferlen = 0;
 
 extern int Nicks_CompleteChatLine(char *buffer, size_t size, unsigned int pos);
 
 static void
-Key_Message (int key, char ascii)
+Key_Message (int key, int ascii)
 {
 
 	if (key == K_ENTER || ascii == 10 || ascii == 13)
 	{
-		Cmd_ForwardStringToServer(va("%s %s", chat_team ? "say_team" : "say ", chat_buffer));
+		if(chat_mode < 0)
+			Cmd_ExecuteString(chat_buffer, src_command); // not Cbuf_AddText to allow semiclons in args; however, this allows no variables then. Use aliases!
+		else
+			Cmd_ForwardStringToServer(va("%s %s", chat_mode ? "say_team" : "say ", chat_buffer));
 
 		key_dest = key_game;
 		chat_bufferlen = 0;
@@ -543,6 +708,8 @@ Key_Message (int key, char ascii)
 		return;
 	}
 
+	// TODO add support for arrow keys and simple editing
+
 	if (key == K_ESCAPE) {
 		key_dest = key_game;
 		chat_bufferlen = 0;
@@ -663,15 +830,16 @@ static void
 Key_In_Unbind_f (void)
 {
 	int         b, m;
+	char *errchar = NULL;
 
 	if (Cmd_Argc () != 3) {
 		Con_Print("in_unbind <bindmap> <key> : remove commands from a key\n");
 		return;
 	}
 
-	m = strtol(Cmd_Argv (1), NULL, 0);
-	if ((m < 0) || (m >= 8)) {
-		Con_Printf("%d isn't a valid bindmap\n", m);
+	m = strtol(Cmd_Argv (1), &errchar, 0);
+	if ((m < 0) || (m >= 8) || (errchar && *errchar)) {
+		Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
 		return;
 	}
 
@@ -689,6 +857,7 @@ Key_In_Bind_f (void)
 {
 	int         i, c, b, m;
 	char        cmd[MAX_INPUTLINE];
+	char *errchar = NULL;
 
 	c = Cmd_Argc ();
 
@@ -697,9 +866,9 @@ Key_In_Bind_f (void)
 		return;
 	}
 
-	m = strtol(Cmd_Argv (1), NULL, 0);
-	if ((m < 0) || (m >= 8)) {
-		Con_Printf("%d isn't a valid bindmap\n", m);
+	m = strtol(Cmd_Argv (1), &errchar, 0);
+	if ((m < 0) || (m >= 8) || (errchar && *errchar)) {
+		Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
 		return;
 	}
 
@@ -731,6 +900,7 @@ static void
 Key_In_Bindmap_f (void)
 {
 	int         m1, m2, c;
+	char *errchar = NULL;
 
 	c = Cmd_Argc ();
 
@@ -739,15 +909,15 @@ Key_In_Bindmap_f (void)
 		return;
 	}
 
-	m1 = strtol(Cmd_Argv (1), NULL, 0);
-	if ((m1 < 0) || (m1 >= 8)) {
-		Con_Printf("%d isn't a valid bindmap\n", m1);
+	m1 = strtol(Cmd_Argv (1), &errchar, 0);
+	if ((m1 < 0) || (m1 >= 8) || (errchar && *errchar)) {
+		Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
 		return;
 	}
 
-	m2 = strtol(Cmd_Argv (2), NULL, 0);
-	if ((m2 < 0) || (m2 >= 8)) {
-		Con_Printf("%d isn't a valid bindmap\n", m2);
+	m2 = strtol(Cmd_Argv (2), &errchar, 0);
+	if ((m2 < 0) || (m2 >= 8) || (errchar && *errchar)) {
+		Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(2));
 		return;
 	}
 
@@ -785,6 +955,54 @@ Key_Unbindall_f (void)
 				Key_SetBinding (i, j, "");
 }
 
+static void
+Key_PrintBindList(int j)
+{
+	char bindbuf[MAX_INPUTLINE];
+	const char *p;
+	int i;
+
+	for (i = 0; i < (int)(sizeof(keybindings[0])/sizeof(keybindings[0][0])); i++)
+	{
+		p = keybindings[j][i];
+		if (p)
+		{
+			Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\");
+			if (j == 0)
+				Con_Printf("^2%s ^7= \"%s\"\n", Key_KeynumToString (i), bindbuf);
+			else
+				Con_Printf("^3bindmap %d: ^2%s ^7= \"%s\"\n", j, Key_KeynumToString (i), bindbuf);
+		}
+	}
+}
+
+static void
+Key_In_BindList_f (void)
+{
+	int m;
+	char *errchar = NULL;
+
+	if(Cmd_Argc() >= 2)
+	{
+		m = strtol(Cmd_Argv(1), &errchar, 0);
+		if ((m < 0) || (m >= 8) || (errchar && *errchar)) {
+			Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
+			return;
+		}
+		Key_PrintBindList(m);
+	}
+	else
+	{
+		for (m = 0; m < MAX_BINDMAPS; m++)
+			Key_PrintBindList(m);
+	}
+}
+
+static void
+Key_BindList_f (void)
+{
+	Key_PrintBindList(0);
+}
 
 static void
 Key_Bind_f (void)
@@ -855,12 +1073,9 @@ Key_WriteBindings (qfile_t *f)
 void
 Key_Init (void)
 {
-	int         i;
-
-	for (i = 0; i < 32; i++) {
-		key_lines[i][0] = ']';
-		key_lines[i][1] = 0;
-	}
+	Key_History_Init();
+	key_line[0] = ']';
+	key_line[1] = 0;
 	key_linepos = 1;
 
 //
@@ -868,15 +1083,23 @@ Key_Init (void)
 //
 	Cmd_AddCommand ("in_bind", Key_In_Bind_f, "binds a command to the specified key in the selected bindmap");
 	Cmd_AddCommand ("in_unbind", Key_In_Unbind_f, "removes command on the specified key in the selected bindmap");
+	Cmd_AddCommand ("in_bindlist", Key_In_BindList_f, "bindlist: displays bound keys for all bindmaps, or the given bindmap");
 	Cmd_AddCommand ("in_bindmap", Key_In_Bindmap_f, "selects active foreground and background (used only if a key is not bound in the foreground) bindmaps for typing");
 
 	Cmd_AddCommand ("bind", Key_Bind_f, "binds a command to the specified key in bindmap 0");
 	Cmd_AddCommand ("unbind", Key_Unbind_f, "removes a command on the specified key in bindmap 0");
+	Cmd_AddCommand ("bindlist", Key_BindList_f, "bindlist: displays bound keys for bindmap 0 bindmaps");
 	Cmd_AddCommand ("unbindall", Key_Unbindall_f, "removes all commands from all keys in all bindmaps (leaving only shift-escape and escape)");
 
 	Cvar_RegisterVariable (&con_closeontoggleconsole);
 }
 
+void
+Key_Shutdown (void)
+{
+	Key_History_Shutdown();
+}
+
 const char *Key_GetBind (int key)
 {
 	const char *bind;
@@ -900,7 +1123,7 @@ static char tbl_keyascii[MAX_KEYS];
 static keydest_t tbl_keydest[MAX_KEYS];
 
 void
-Key_Event (int key, char ascii, qboolean down)
+Key_Event (int key, int ascii, qboolean down)
 {
 	const char *bind;
 	qboolean q;
@@ -960,65 +1183,86 @@ Key_Event (int key, char ascii, qboolean down)
 		// ignore key repeats on escape
 		if (keydown[key] > 1)
 			return;
+
 		// escape does these things:
 		// key_consoleactive - close console
 		// key_message - abort messagemode
 		// key_menu - go to parent menu (or key_game)
 		// key_game - open menu
+
 		// in all modes shift-escape toggles console
-		if (((key_consoleactive & KEY_CONSOLEACTIVE_USER) || keydown[K_SHIFT]) && down)
+		if (keydown[K_SHIFT])
 		{
-			Con_ToggleConsole_f ();
-			tbl_keydest[key] = key_void; // ignore the release
+			if(down)
+			{
+				Con_ToggleConsole_f ();
+				tbl_keydest[key] = key_void; // esc release should go nowhere (especially not to key_menu or key_game)
+			}
 			return;
 		}
-#if 0
+
 		switch (keydest)
 		{
+			case key_console:
+				if(down)
+				{
+					if(key_consoleactive & KEY_CONSOLEACTIVE_FORCED)
+					{
+						key_consoleactive &= ~KEY_CONSOLEACTIVE_USER;
+						MR_ToggleMenu_f ();
+					}
+					else
+						Con_ToggleConsole_f();
+				}
+				break;
+
 			case key_message:
 				if (down)
-					Key_Message (key, ascii);
+					Key_Message (key, ascii); // that'll close the message input
 				break;
+
 			case key_menu:
 			case key_menu_grabbed:
 				MR_KeyEvent (key, ascii, down);
 				break;
+
 			case key_game:
 				// csqc has priority over toggle menu if it wants to (e.g. handling escape for UI stuff in-game.. :sick:)
 				q = CL_VM_InputEvent(down, key, ascii);
 				if (!q && down)
 					MR_ToggleMenu_f ();
 				break;
+
 			default:
 				Con_Printf ("Key_Event: Bad key_dest\n");
 		}
 		return;
-#endif
 	}
 
 	// send function keydowns to interpreter no matter what mode is (unless the menu has specifically grabbed the keyboard, for rebinding keys)
 	if (keydest != key_menu_grabbed)
-	if (key >= K_F1 && key <= K_F12 && down)
+	if (key >= K_F1 && key <= K_F12)
 	{
-		// ignore key repeats on F1-F12 binds
-		if (keydown[key] > 1)
-			return;
 		if (bind)
 		{
-			// button commands add keynum as a parm
-			if (bind[0] == '+')
-				Cbuf_AddText (va("%s %i\n", bind, key));
-			else
+			if(keydown[key] == 1 && down)
 			{
-				Cbuf_AddText (bind);
-				Cbuf_AddText ("\n");
-			}
+				// button commands add keynum as a parm
+				if (bind[0] == '+')
+					Cbuf_AddText (va("%s %i\n", bind, key));
+				else
+				{
+					Cbuf_AddText (bind);
+					Cbuf_AddText ("\n");
+				}
+			} else if(bind[0] == '+' && !down && keydown[key] == 0)
+				Cbuf_AddText(va("-%s %i\n", bind + 1, key));
 		}
 		return;
 	}
 
 	// send input to console if it wants it
-	if (keydest == key_console && key != K_ESCAPE)
+	if (keydest == key_console)
 	{
 		if (!down)
 			return;
@@ -1028,25 +1272,22 @@ Key_Event (int key, char ascii, qboolean down)
 		if (con_closeontoggleconsole.integer && bind && !strncmp(bind, "toggleconsole", strlen("toggleconsole")) && (key_consoleactive & KEY_CONSOLEACTIVE_USER) && ascii != STRING_COLOR_TAG)
 		{
 			Con_ToggleConsole_f ();
-			tbl_keydest[key] = key_void; // ignore the release
 			return;
 		}
 		Key_Console (key, ascii);
 		return;
 	}
 
-
-	// FIXME: actually the up-bind should only be called if the button was actually pressed while key_dest == key_game [12/17/2007 Black]
-	//			 especially CL_VM_InputEvent should be able to prevent it from being called (to intercept the binds)
-	// key up events only generate commands if the game key binding is a button
-	// command (leading + sign).  These will occur even in console mode, to
-	// keep the character from continuing an action started before a console
-	// switch.  Button commands include the kenum as a parameter, so multiple
-	// downs can be matched with ups
-	/*
-	if (!down && bind && bind[0] == '+')
-		Cbuf_AddText(va("-%s %i\n", bind + 1, key));
-	*/
+	// handle toggleconsole in menu too
+	if (keydest == key_menu)
+	{
+		if (down && con_closeontoggleconsole.integer && bind && !strncmp(bind, "toggleconsole", strlen("toggleconsole")) && ascii != STRING_COLOR_TAG)
+		{
+			Con_ToggleConsole_f ();
+			tbl_keydest[key] = key_void; // key release should go nowhere (especially not to key_menu or key_game)
+			return;
+		}
+	}
 
 	// ignore binds while a video is played, let the video system handle the key event
 	if (cl_videoplaying)
@@ -1085,11 +1326,6 @@ Key_Event (int key, char ascii, qboolean down)
 					Cbuf_AddText(va("-%s %i\n", bind + 1, key));
 			}
 			break;
-		case key_console:
-			// This happens for example when pressing shift in the console
-			// closing the console, and then releasing shift.
-			// Con_Printf("Key_Event: Console key ignored\n");
-			break;
 		default:
 			Con_Printf ("Key_Event: Bad key_dest\n");
 	}