Don't allow shortcuts with Ctrl+Alt because on Windows they can be used as the AltGr...
[xonotic/darkplaces.git] / keys.c
diff --git a/keys.c b/keys.c
index 71f0960..d13c25d 100644 (file)
--- a/keys.c
+++ b/keys.c
 
 #include "quakedef.h"
 #include "cl_video.h"
+#include "utf8lib.h"
+#include "csprogs.h"
 
-cvar_t con_closeontoggleconsole = {CVAR_SAVE, "con_closeontoggleconsole","1", "allows toggleconsole binds to close the console as well"};
+cvar_t con_closeontoggleconsole = {CVAR_SAVE, "con_closeontoggleconsole","1", "allows toggleconsole binds to close the console as well; when set to 2, this even works when not at the start of the line in console input; when set to 3, this works even if the toggleconsole key is the color tag"};
 
 /*
 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];
+char           history_searchstring[MAX_INPUTLINE];
+qboolean       history_matchfound = false;
+conbuffer_t history;
+
+extern cvar_t  con_textsize;
+
+
+static void Key_History_Init(void)
+{
+       qfile_t *historyfile;
+       ConBuffer_Init(&history, HIST_TEXTSIZE, HIST_MAXLINES, zonemempool);
+
+// not necessary for mobile
+#ifndef DP_MOBILETOUCH
+       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);
+       }
+#endif
+
+       history_line = -1;
+}
+
+static void Key_History_Shutdown(void)
+{
+       // TODO write history to a file
+
+// not necessary for mobile
+#ifndef DP_MOBILETOUCH
+       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);
+       }
+#endif
+
+       ConBuffer_Shutdown(&history);
+}
+
+static void Key_History_Push(void)
+{
+       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
+       if(strcmp(key_line, "]rcon_password")) // putting these into the history just sucks
+       if(strncmp(key_line, "]rcon_password ", 15)) // putting these into the history just sucks
+               ConBuffer_AddLine(&history, key_line + 1, (int)strlen(key_line) - 1, 0);
+       Con_Printf("%s\n", key_line); // don't mark empty lines as history
+       history_line = -1;
+       if (history_matchfound)
+               history_matchfound = false;
+}
+
+static qboolean Key_History_Get_foundCommand(void)
+{
+       if (!history_matchfound)
+               return false;
+       strlcpy(key_line + 1, ConBuffer_GetLine(&history, history_line), sizeof(key_line) - 1);
+       key_linepos = (int)strlen(key_line);
+       history_matchfound = false;
+       return true;
+}
+
+static void Key_History_Up(void)
+{
+       if(history_line == -1) // editing the "new" line
+               strlcpy(history_savedline, key_line + 1, sizeof(history_savedline));
+
+       if (Key_History_Get_foundCommand())
+               return;
+
+       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 = (int)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 = (int)strlen(key_line);
+       }
+}
+
+static void Key_History_Down(void)
+{
+       if(history_line == -1) // editing the "new" line
+               return;
+
+       if (Key_History_Get_foundCommand())
+               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 = (int)strlen(key_line);
+}
+
+static void Key_History_First(void)
+{
+       if(history_line == -1) // editing the "new" line
+               strlcpy(history_savedline, key_line + 1, sizeof(history_savedline));
+
+       if (CONBUFFER_LINES_COUNT(&history) > 0)
+       {
+               history_line = 0;
+               strlcpy(key_line + 1, ConBuffer_GetLine(&history, history_line), sizeof(key_line) - 1);
+               key_linepos = (int)strlen(key_line);
+       }
+}
+
+static void Key_History_Last(void)
+{
+       if(history_line == -1) // editing the "new" line
+               strlcpy(history_savedline, key_line + 1, sizeof(history_savedline));
+
+       if (CONBUFFER_LINES_COUNT(&history) > 0)
+       {
+               history_line = CONBUFFER_LINES_COUNT(&history) - 1;
+               strlcpy(key_line + 1, ConBuffer_GetLine(&history, history_line), sizeof(key_line) - 1);
+               key_linepos = (int)strlen(key_line);
+       }
+}
+
+static void Key_History_Find_Backwards(void)
+{
+       int i;
+       const char *partial = key_line + 1;
+       char vabuf[1024];
+       size_t digits = strlen(va(vabuf, sizeof(vabuf), "%i", HIST_MAXLINES));
+
+       if (history_line == -1) // editing the "new" line
+               strlcpy(history_savedline, key_line + 1, sizeof(history_savedline));
+
+       if (strcmp(key_line + 1, history_searchstring)) // different string? Start a new search
+       {
+               strlcpy(history_searchstring, key_line + 1, sizeof(history_searchstring));
+               i = CONBUFFER_LINES_COUNT(&history) - 1;
+       }
+       else if (history_line == -1)
+               i = CONBUFFER_LINES_COUNT(&history) - 1;
+       else
+               i = history_line - 1;
+
+       if (!*partial)
+               partial = "*";
+       else if (!( strchr(partial, '*') || strchr(partial, '?') )) // no pattern?
+               partial = va(vabuf, sizeof(vabuf), "*%s*", partial);
+
+       for ( ; i >= 0; i--)
+               if (matchpattern_with_separator(ConBuffer_GetLine(&history, i), partial, true, "", false))
+               {
+                       Con_Printf("^2%*i^7 %s\n", (int)digits, i+1, ConBuffer_GetLine(&history, i));
+                       history_line = i;
+                       history_matchfound = true;
+                       return;
+               }
+}
+
+static void Key_History_Find_Forwards(void)
+{
+       int i;
+       const char *partial = key_line + 1;
+       char vabuf[1024];
+       size_t digits = strlen(va(vabuf, sizeof(vabuf), "%i", HIST_MAXLINES));
+
+       if (history_line == -1) // editing the "new" line
+               return;
+
+       if (strcmp(key_line + 1, history_searchstring)) // different string? Start a new search
+       {
+               strlcpy(history_searchstring, key_line + 1, sizeof(history_searchstring));
+               i = 0;
+       }
+       else i = history_line + 1;
+
+       if (!*partial)
+               partial = "*";
+       else if (!( strchr(partial, '*') || strchr(partial, '?') )) // no pattern?
+               partial = va(vabuf, sizeof(vabuf), "*%s*", partial);
+
+       for ( ; i < CONBUFFER_LINES_COUNT(&history); i++)
+               if (matchpattern_with_separator(ConBuffer_GetLine(&history, i), partial, true, "", false))
+               {
+                       Con_Printf("^2%*i^7 %s\n", (int)digits, i+1, ConBuffer_GetLine(&history, i));
+                       history_line = i;
+                       history_matchfound = true;
+                       return;
+               }
+}
+
+static void Key_History_Find_All(void)
+{
+       const char *partial = key_line + 1;
+       int i, count = 0;
+       char vabuf[1024];
+       size_t digits = strlen(va(vabuf, sizeof(vabuf), "%i", HIST_MAXLINES));
+       Con_Printf("History commands containing \"%s\":\n", key_line + 1);
+
+       if (!*partial)
+               partial = "*";
+       else if (!( strchr(partial, '*') || strchr(partial, '?') )) // no pattern?
+               partial = va(vabuf, sizeof(vabuf), "*%s*", partial);
+
+       for (i=0; i<CONBUFFER_LINES_COUNT(&history); i++)
+               if (matchpattern_with_separator(ConBuffer_GetLine(&history, i), partial, true, "", false))
+               {
+                       Con_Printf("%s%*i^7 %s\n", (i == history_line) ? "^2" : "^3", (int)digits, i+1, ConBuffer_GetLine(&history, i));
+                       count++;
+               }
+       Con_Printf("%i result%s\n\n", count, (count != 1) ? "s" : "");
+}
+
+static void Key_History_f(void)
+{
+       char *errchar = NULL;
+       int i = 0;
+       char vabuf[1024];
+       size_t digits = strlen(va(vabuf, sizeof(vabuf), "%i", HIST_MAXLINES));
+
+       if (Cmd_Argc () > 1)
+       {
+               if (!strcmp(Cmd_Argv (1), "-c"))
+               {
+                       ConBuffer_Clear(&history);
+                       return;
+               }
+               i = strtol(Cmd_Argv (1), &errchar, 0);
+               if ((i < 0) || (i > CONBUFFER_LINES_COUNT(&history)) || (errchar && *errchar))
+                       i = 0;
+               else
+                       i = CONBUFFER_LINES_COUNT(&history) - i;
+       }
+
+       for ( ; i<CONBUFFER_LINES_COUNT(&history); i++)
+               Con_Printf("^3%*i^7 %s\n", (int)digits, i+1, ConBuffer_GetLine(&history, i));
+       Con_Printf("\n");
+}
+
 static int     key_bmap, key_bmap2;
 static unsigned char keydown[MAX_KEYS];        // 0 = up, 1 = down, 2 = repeating
 
@@ -121,6 +404,8 @@ static const keyname_t   keynames[] = {
        {"KP_ENTER", K_KP_ENTER},
        {"KP_EQUALS", K_KP_EQUALS},
 
+       {"PRINTSCREEN", K_PRINTSCREEN},
+
 
 
        {"MOUSE1", K_MOUSE1},
@@ -201,6 +486,36 @@ static const keyname_t   keynames[] = {
        {"AUX31", K_AUX31},
        {"AUX32", K_AUX32},
 
+       {"X360_DPAD_UP", K_X360_DPAD_UP},
+       {"X360_DPAD_DOWN", K_X360_DPAD_DOWN},
+       {"X360_DPAD_LEFT", K_X360_DPAD_LEFT},
+       {"X360_DPAD_RIGHT", K_X360_DPAD_RIGHT},
+       {"X360_START", K_X360_START},
+       {"X360_BACK", K_X360_BACK},
+       {"X360_LEFT_THUMB", K_X360_LEFT_THUMB},
+       {"X360_RIGHT_THUMB", K_X360_RIGHT_THUMB},
+       {"X360_LEFT_SHOULDER", K_X360_LEFT_SHOULDER},
+       {"X360_RIGHT_SHOULDER", K_X360_RIGHT_SHOULDER},
+       {"X360_A", K_X360_A},
+       {"X360_B", K_X360_B},
+       {"X360_X", K_X360_X},
+       {"X360_Y", K_X360_Y},
+       {"X360_LEFT_TRIGGER", K_X360_LEFT_TRIGGER},
+       {"X360_RIGHT_TRIGGER", K_X360_RIGHT_TRIGGER},
+       {"X360_LEFT_THUMB_UP", K_X360_LEFT_THUMB_UP},
+       {"X360_LEFT_THUMB_DOWN", K_X360_LEFT_THUMB_DOWN},
+       {"X360_LEFT_THUMB_LEFT", K_X360_LEFT_THUMB_LEFT},
+       {"X360_LEFT_THUMB_RIGHT", K_X360_LEFT_THUMB_RIGHT},
+       {"X360_RIGHT_THUMB_UP", K_X360_RIGHT_THUMB_UP},
+       {"X360_RIGHT_THUMB_DOWN", K_X360_RIGHT_THUMB_DOWN},
+       {"X360_RIGHT_THUMB_LEFT", K_X360_RIGHT_THUMB_LEFT},
+       {"X360_RIGHT_THUMB_RIGHT", K_X360_RIGHT_THUMB_RIGHT},
+
+       {"JOY_UP", K_JOY_UP},
+       {"JOY_DOWN", K_JOY_DOWN},
+       {"JOY_LEFT", K_JOY_LEFT},
+       {"JOY_RIGHT", K_JOY_RIGHT},
+
        {"SEMICOLON", ';'},                     // because a raw semicolon separates commands
        {"TILDE", '~'},
        {"BACKQUOTE", '`'},
@@ -208,6 +523,135 @@ static const keyname_t   keynames[] = {
        {"APOSTROPHE", '\''},
        {"BACKSLASH", '\\'},            // because a raw backslash is used for special characters
 
+       {"MIDINOTE0", K_MIDINOTE0},
+       {"MIDINOTE1", K_MIDINOTE1},
+       {"MIDINOTE2", K_MIDINOTE2},
+       {"MIDINOTE3", K_MIDINOTE3},
+       {"MIDINOTE4", K_MIDINOTE4},
+       {"MIDINOTE5", K_MIDINOTE5},
+       {"MIDINOTE6", K_MIDINOTE6},
+       {"MIDINOTE7", K_MIDINOTE7},
+       {"MIDINOTE8", K_MIDINOTE8},
+       {"MIDINOTE9", K_MIDINOTE9},
+       {"MIDINOTE10", K_MIDINOTE10},
+       {"MIDINOTE11", K_MIDINOTE11},
+       {"MIDINOTE12", K_MIDINOTE12},
+       {"MIDINOTE13", K_MIDINOTE13},
+       {"MIDINOTE14", K_MIDINOTE14},
+       {"MIDINOTE15", K_MIDINOTE15},
+       {"MIDINOTE16", K_MIDINOTE16},
+       {"MIDINOTE17", K_MIDINOTE17},
+       {"MIDINOTE18", K_MIDINOTE18},
+       {"MIDINOTE19", K_MIDINOTE19},
+       {"MIDINOTE20", K_MIDINOTE20},
+       {"MIDINOTE21", K_MIDINOTE21},
+       {"MIDINOTE22", K_MIDINOTE22},
+       {"MIDINOTE23", K_MIDINOTE23},
+       {"MIDINOTE24", K_MIDINOTE24},
+       {"MIDINOTE25", K_MIDINOTE25},
+       {"MIDINOTE26", K_MIDINOTE26},
+       {"MIDINOTE27", K_MIDINOTE27},
+       {"MIDINOTE28", K_MIDINOTE28},
+       {"MIDINOTE29", K_MIDINOTE29},
+       {"MIDINOTE30", K_MIDINOTE30},
+       {"MIDINOTE31", K_MIDINOTE31},
+       {"MIDINOTE32", K_MIDINOTE32},
+       {"MIDINOTE33", K_MIDINOTE33},
+       {"MIDINOTE34", K_MIDINOTE34},
+       {"MIDINOTE35", K_MIDINOTE35},
+       {"MIDINOTE36", K_MIDINOTE36},
+       {"MIDINOTE37", K_MIDINOTE37},
+       {"MIDINOTE38", K_MIDINOTE38},
+       {"MIDINOTE39", K_MIDINOTE39},
+       {"MIDINOTE40", K_MIDINOTE40},
+       {"MIDINOTE41", K_MIDINOTE41},
+       {"MIDINOTE42", K_MIDINOTE42},
+       {"MIDINOTE43", K_MIDINOTE43},
+       {"MIDINOTE44", K_MIDINOTE44},
+       {"MIDINOTE45", K_MIDINOTE45},
+       {"MIDINOTE46", K_MIDINOTE46},
+       {"MIDINOTE47", K_MIDINOTE47},
+       {"MIDINOTE48", K_MIDINOTE48},
+       {"MIDINOTE49", K_MIDINOTE49},
+       {"MIDINOTE50", K_MIDINOTE50},
+       {"MIDINOTE51", K_MIDINOTE51},
+       {"MIDINOTE52", K_MIDINOTE52},
+       {"MIDINOTE53", K_MIDINOTE53},
+       {"MIDINOTE54", K_MIDINOTE54},
+       {"MIDINOTE55", K_MIDINOTE55},
+       {"MIDINOTE56", K_MIDINOTE56},
+       {"MIDINOTE57", K_MIDINOTE57},
+       {"MIDINOTE58", K_MIDINOTE58},
+       {"MIDINOTE59", K_MIDINOTE59},
+       {"MIDINOTE60", K_MIDINOTE60},
+       {"MIDINOTE61", K_MIDINOTE61},
+       {"MIDINOTE62", K_MIDINOTE62},
+       {"MIDINOTE63", K_MIDINOTE63},
+       {"MIDINOTE64", K_MIDINOTE64},
+       {"MIDINOTE65", K_MIDINOTE65},
+       {"MIDINOTE66", K_MIDINOTE66},
+       {"MIDINOTE67", K_MIDINOTE67},
+       {"MIDINOTE68", K_MIDINOTE68},
+       {"MIDINOTE69", K_MIDINOTE69},
+       {"MIDINOTE70", K_MIDINOTE70},
+       {"MIDINOTE71", K_MIDINOTE71},
+       {"MIDINOTE72", K_MIDINOTE72},
+       {"MIDINOTE73", K_MIDINOTE73},
+       {"MIDINOTE74", K_MIDINOTE74},
+       {"MIDINOTE75", K_MIDINOTE75},
+       {"MIDINOTE76", K_MIDINOTE76},
+       {"MIDINOTE77", K_MIDINOTE77},
+       {"MIDINOTE78", K_MIDINOTE78},
+       {"MIDINOTE79", K_MIDINOTE79},
+       {"MIDINOTE80", K_MIDINOTE80},
+       {"MIDINOTE81", K_MIDINOTE81},
+       {"MIDINOTE82", K_MIDINOTE82},
+       {"MIDINOTE83", K_MIDINOTE83},
+       {"MIDINOTE84", K_MIDINOTE84},
+       {"MIDINOTE85", K_MIDINOTE85},
+       {"MIDINOTE86", K_MIDINOTE86},
+       {"MIDINOTE87", K_MIDINOTE87},
+       {"MIDINOTE88", K_MIDINOTE88},
+       {"MIDINOTE89", K_MIDINOTE89},
+       {"MIDINOTE90", K_MIDINOTE90},
+       {"MIDINOTE91", K_MIDINOTE91},
+       {"MIDINOTE92", K_MIDINOTE92},
+       {"MIDINOTE93", K_MIDINOTE93},
+       {"MIDINOTE94", K_MIDINOTE94},
+       {"MIDINOTE95", K_MIDINOTE95},
+       {"MIDINOTE96", K_MIDINOTE96},
+       {"MIDINOTE97", K_MIDINOTE97},
+       {"MIDINOTE98", K_MIDINOTE98},
+       {"MIDINOTE99", K_MIDINOTE99},
+       {"MIDINOTE100", K_MIDINOTE100},
+       {"MIDINOTE101", K_MIDINOTE101},
+       {"MIDINOTE102", K_MIDINOTE102},
+       {"MIDINOTE103", K_MIDINOTE103},
+       {"MIDINOTE104", K_MIDINOTE104},
+       {"MIDINOTE105", K_MIDINOTE105},
+       {"MIDINOTE106", K_MIDINOTE106},
+       {"MIDINOTE107", K_MIDINOTE107},
+       {"MIDINOTE108", K_MIDINOTE108},
+       {"MIDINOTE109", K_MIDINOTE109},
+       {"MIDINOTE110", K_MIDINOTE110},
+       {"MIDINOTE111", K_MIDINOTE111},
+       {"MIDINOTE112", K_MIDINOTE112},
+       {"MIDINOTE113", K_MIDINOTE113},
+       {"MIDINOTE114", K_MIDINOTE114},
+       {"MIDINOTE115", K_MIDINOTE115},
+       {"MIDINOTE116", K_MIDINOTE116},
+       {"MIDINOTE117", K_MIDINOTE117},
+       {"MIDINOTE118", K_MIDINOTE118},
+       {"MIDINOTE119", K_MIDINOTE119},
+       {"MIDINOTE120", K_MIDINOTE120},
+       {"MIDINOTE121", K_MIDINOTE121},
+       {"MIDINOTE122", K_MIDINOTE122},
+       {"MIDINOTE123", K_MIDINOTE123},
+       {"MIDINOTE124", K_MIDINOTE124},
+       {"MIDINOTE125", K_MIDINOTE125},
+       {"MIDINOTE126", K_MIDINOTE126},
+       {"MIDINOTE127", K_MIDINOTE127},
+
        {NULL, 0}
 };
 
@@ -222,8 +666,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 +677,7 @@ Interactive line editing and console scrollback
 ====================
 */
 static void
-Key_Console (int key, int ascii)
+Key_Console (int key, int unicode)
 {
        // LordHavoc: copied most of this from Q2 to improve keyboard handling
        switch (key)
@@ -282,7 +726,12 @@ Key_Console (int key, int ascii)
                break;
        }
 
-       if ((toupper(key) == 'V' && keydown[K_CTRL]) || ((key == K_INS || key == K_KP_INS) && keydown[K_SHIFT]))
+       // Don't allow shortcuts with Ctrl+Alt because on Windows they can be used
+       // as the AltGr key (which generates Ctrl+Alt) to type special characters
+       if (keydown[K_CTRL] && keydown[K_ALT])
+               goto add_char;
+
+       if ((key == 'v' && keydown[K_CTRL]) || ((key == K_INS || key == K_KP_INS) && keydown[K_SHIFT]))
        {
                char *cbd, *p;
                if ((cbd = Sys_GetClipboardData()) != 0)
@@ -292,11 +741,13 @@ Key_Console (int key, int ascii)
                        p = cbd;
                        while (*p)
                        {
-                               if (*p == '\n' || *p == '\r' || *p == '\b')
+                               if (*p == '\r' && *(p+1) == '\n')
                                {
-                                       *p++ = 0;
-                                       break;
+                                       *p++ = ';';
+                                       *p++ = ' ';
                                }
+                               else if (*p == '\n' || *p == '\r' || *p == '\b')
+                                       *p++ = ';';
                                p++;
                        }
 #else
@@ -307,17 +758,9 @@ Key_Console (int key, int ascii)
                                i= MAX_INPUTLINE - key_linepos - 1;
                        if (i > 0)
                        {
-                               // terencehill: insert the clipboard text between the characters of the line
-                               char *temp = Z_Malloc(MAX_INPUTLINE);
-                               cbd[i]=0;
-                               temp[0]=0;
-                               if ( key_linepos < (int)strlen(key_lines[edit_line]) )
-                                       strlcpy(temp, key_lines[edit_line] + key_linepos, (int)strlen(key_lines[edit_line]) - key_linepos +1);
-                               key_lines[edit_line][key_linepos] = 0;
-                               strlcat(key_lines[edit_line], cbd, sizeof(key_lines[edit_line]));
-                               if (temp[0])
-                                       strlcat(key_lines[edit_line], temp, sizeof(key_lines[edit_line]));
-                               Z_Free(temp);
+                               cbd[i] = 0;
+                               memmove(key_line + key_linepos + i, key_line + key_linepos, sizeof(key_line) - key_linepos - i);
+                               memcpy(key_line + key_linepos, cbd, i);
                                key_linepos += i;
                        }
                        Z_Free(cbd);
@@ -325,28 +768,38 @@ Key_Console (int key, int 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)
@@ -356,6 +809,57 @@ Key_Console (int key, int ascii)
 
        if (key == K_TAB)
        {
+               if(keydown[K_CTRL]) // append to the cvar its value
+               {
+                       int             cvar_len, cvar_str_len, chars_to_move;
+                       char    k;
+                       char    cvar[MAX_INPUTLINE];
+                       const char *cvar_str;
+                       
+                       // go to the start of the variable
+                       while(--key_linepos)
+                       {
+                               k = key_line[key_linepos];
+                               if(k == '\"' || k == ';' || k == ' ' || k == '\'')
+                                       break;
+                       }
+                       key_linepos++;
+                       
+                       // save the variable name in cvar
+                       for(cvar_len=0; (k = key_line[key_linepos + cvar_len]) != 0; cvar_len++)
+                       {
+                               if(k == '\"' || k == ';' || k == ' ' || k == '\'')
+                                       break;
+                               cvar[cvar_len] = k;
+                       }
+                       if (cvar_len==0)
+                               return;
+                       cvar[cvar_len] = 0;
+                       
+                       // go to the end of the cvar
+                       key_linepos += cvar_len;
+                       
+                       // save the content of the variable in cvar_str
+                       cvar_str = Cvar_VariableString(cvar);
+                       cvar_str_len = (int)strlen(cvar_str);
+                       if (cvar_str_len==0)
+                               return;
+                       
+                       // insert space and cvar_str in key_line
+                       chars_to_move = (int)strlen(&key_line[key_linepos]);
+                       if (key_linepos + 1 + cvar_str_len + chars_to_move < MAX_INPUTLINE)
+                       {
+                               if (chars_to_move)
+                                       memmove(&key_line[key_linepos + 1 + cvar_str_len], &key_line[key_linepos], chars_to_move);
+                               key_line[key_linepos++] = ' ';
+                               memcpy(&key_line[key_linepos], cvar_str, cvar_str_len);
+                               key_linepos += cvar_str_len;
+                               key_line[key_linepos + chars_to_move] = 0;
+                       }
+                       else
+                               Con_Printf("Couldn't append cvar value, edit line too long.\n");
+                       return;
+               }
                // Enhanced command completion
                // by EvilTypeGuy eviltypeguy@qeradiant.com
                // Thanks to Fett, Taniwha
@@ -378,10 +882,19 @@ Key_Console (int key, int ascii)
                        int             pos;
                        char    k;
                        pos = key_linepos-1;
+
+                       if(pos) // skip all "; ' after the word
+                               while(--pos)
+                               {
+                                       k = key_line[pos];
+                                       if (!(k == '\"' || k == ';' || k == ' ' || k == '\''))
+                                               break;
+                               }
+
                        if(pos)
                                while(--pos)
                                {
-                                       k = key_lines[edit_line][pos];
+                                       k = key_line[pos];
                                        if(k == '\"' || k == ';' || k == ' ' || k == '\'')
                                                break;
                                }
@@ -390,22 +903,29 @@ Key_Console (int key, int ascii)
                else if(keydown[K_SHIFT]) // move cursor to the previous character ignoring colors
                {
                        int             pos;
-                       pos = key_linepos-1;
+                       size_t          inchar = 0;
+                       pos = (int)u8_prevbyte(key_line+1, key_linepos-1) + 1; // do NOT give the ']' to u8_prevbyte
                        while (pos)
-                               if(pos-1 > 0 && key_lines[edit_line][pos-1] == STRING_COLOR_TAG && isdigit(key_lines[edit_line][pos]))
+                               if(pos-1 > 0 && key_line[pos-1] == STRING_COLOR_TAG && isdigit(key_line[pos]))
                                        pos-=2;
-                               else if(pos-4 > 0 && key_lines[edit_line][pos-4] == STRING_COLOR_TAG && key_lines[edit_line][pos-3] == STRING_COLOR_RGB_TAG_CHAR
-                                               && isxdigit(key_lines[edit_line][pos-2]) && isxdigit(key_lines[edit_line][pos-1]) && isxdigit(key_lines[edit_line][pos]))
+                               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
                                {
+                                       if(pos-1 > 0 && key_line[pos-1] == STRING_COLOR_TAG && key_line[pos] == STRING_COLOR_TAG) // consider ^^ as a character
+                                               pos--;
                                        pos--;
                                        break;
                                }
-                       key_linepos = pos + 1;
+                       // we need to move to the beginning of the character when in a wide character:
+                       u8_charidx(key_line, pos + 1, &inchar);
+                       key_linepos = (int)(pos + 1 - inchar);
                }
                else
-                       key_linepos--;
+               {
+                       key_linepos = (int)u8_prevbyte(key_line+1, key_linepos-1) + 1; // do NOT give the ']' to u8_prevbyte
+               }
                return;
        }
 
@@ -414,8 +934,9 @@ Key_Console (int key, int 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);
-                       key_linepos--;
+                       int newpos = (int)u8_prevbyte(key_line+1, key_linepos-1) + 1; // do NOT give the ']' to u8_prevbyte
+                       strlcpy(key_line + newpos, key_line + key_linepos, sizeof(key_line) + 1 - key_linepos);
+                       key_linepos = newpos;
                }
                return;
        }
@@ -424,9 +945,9 @@ Key_Console (int key, int 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 + u8_bytelen(key_line + key_linepos, 1), linelen - key_linepos);
                return;
        }
 
@@ -434,44 +955,61 @@ Key_Console (int key, int ascii)
        // 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]) // 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;
                        }
+                       
+                       if (pos < len) // skip all "; ' after the word
+                               while(++pos < len)
+                               {
+                                       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_lines[edit_line]);
+                       len = (int)strlen(key_line);
                        pos = key_linepos;
-                       // check if there is a color tag right after the cursor
-                       if (key_lines[edit_line][pos] == STRING_COLOR_TAG)
-                       {
-                               if(isdigit(key_lines[edit_line][pos+1]))
-                                       pos+=1;
-                               else if(key_lines[edit_line][pos+1] == STRING_COLOR_RGB_TAG_CHAR && isxdigit(key_lines[edit_line][pos+2]) && isxdigit(key_lines[edit_line][pos+3]) && isxdigit(key_lines[edit_line][pos+4]))
-                                       pos+=4;
-                       }
-                       pos++;
+                       
+                       // go beyond all initial 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;
+                               }
+                       
+                       // skip the char
+                       if (key_line[pos] == STRING_COLOR_TAG && key_line[pos+1] == STRING_COLOR_TAG) // consider ^^ as a character
+                               pos++;
+                       pos += (int)u8_bytelen(key_line + pos, 1);
                        
                        // now go beyond all next consecutive color tags, if any
                        if(pos < len)
-                               while (key_lines[edit_line][pos] == STRING_COLOR_TAG)
+                               while (key_line[pos] == STRING_COLOR_TAG)
                                {
-                                       if(isdigit(key_lines[edit_line][pos+1]))
+                                       if(isdigit(key_line[pos+1]))
                                                pos+=2;
-                                       else if(key_lines[edit_line][pos+1] == STRING_COLOR_RGB_TAG_CHAR && isxdigit(key_lines[edit_line][pos+2]) && isxdigit(key_lines[edit_line][pos+3]) && isxdigit(key_lines[edit_line][pos+4]))
+                                       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;
@@ -479,7 +1017,7 @@ Key_Console (int key, int ascii)
                        key_linepos = pos;
                }
                else
-                       key_linepos++;
+                       key_linepos += (int)u8_bytelen(key_line + key_linepos, 1);
                return;
        }
 
@@ -493,63 +1031,120 @@ Key_Console (int key, int 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)
+               Key_History_Down();
+               return;
+       }
+
+       if (keydown[K_CTRL])
+       {
+               // prints all the matching commands
+               if (key == 'f')
                {
-                       history_line = edit_line;
-                       key_lines[edit_line][0] = ']';
-                       key_lines[edit_line][1] = 0;
-                       key_linepos = 1;
+                       Key_History_Find_All();
+                       return;
                }
-               else
+               // Search forwards/backwards, pointing the history's index to the
+               // matching command but without fetching it to let one continue the search.
+               // To fetch it, it suffices to just press UP or DOWN.
+               if (key == 'r')
                {
-                       size_t linelen;
-                       linelen = strlen(key_lines[history_line]);
-                       memcpy(key_lines[edit_line], key_lines[history_line], linelen + 1);
-                       key_linepos = (int)linelen;
+                       if (keydown[K_SHIFT])
+                               Key_History_Find_Forwards();
+                       else
+                               Key_History_Find_Backwards();
+                       return;
+               }
+               // go to the last/first command of the history
+               if (key == ',')
+               {
+                       Key_History_First();
+                       return;
+               }
+               if (key == '.')
+               {
+                       Key_History_Last();
+                       return;
                }
-               return;
        }
 
-       if (key == K_PGUP || key == K_KP_PGUP || key == K_MWHEELUP)
+       if (key == K_PGUP || key == K_KP_PGUP)
        {
                if(keydown[K_CTRL])
                {
-                       con_backscroll += 3;
+                       con_backscroll += ((vid_conheight.integer >> 2) / con_textsize.integer)-1;
                }
                else
-                       con_backscroll += ((int) vid_conheight.integer >> 5);
+                       con_backscroll += ((vid_conheight.integer >> 1) / con_textsize.integer)-3;
                return;
        }
 
-       if (key == K_PGDN || key == K_KP_PGDN || key == K_MWHEELDOWN)
+       if (key == K_PGDN || key == K_KP_PGDN)
        {
                if(keydown[K_CTRL])
                {
-                       con_backscroll -= 3;
+                       con_backscroll -= ((vid_conheight.integer >> 2) / con_textsize.integer)-1;
                }
                else
-                       con_backscroll -= ((int) vid_conheight.integer >> 5);
+                       con_backscroll -= ((vid_conheight.integer >> 1) / con_textsize.integer)-3;
+               return;
+       }
+       if (key == K_MWHEELUP)
+       {
+               if(keydown[K_CTRL])
+                       con_backscroll += 1;
+               else if(keydown[K_SHIFT])
+                       con_backscroll += ((vid_conheight.integer >> 2) / con_textsize.integer)-1;
+               else
+                       con_backscroll += 5;
                return;
        }
 
+       if (key == K_MWHEELDOWN)
+       {
+               if(keydown[K_CTRL])
+                       con_backscroll -= 1;
+               else if(keydown[K_SHIFT])
+                       con_backscroll -= ((vid_conheight.integer >> 2) / con_textsize.integer)-1;
+               else
+                       con_backscroll -= 5;
+               return;
+       }
+
+       if (keydown[K_CTRL])
+       {
+               // text zoom in
+               if (key == '+' || key == K_KP_PLUS)
+               {
+                       if (con_textsize.integer < 128)
+                               Cvar_SetValueQuick(&con_textsize, con_textsize.integer + 1);
+                       return;
+               }
+               // text zoom out
+               if (key == '-' || key == K_KP_MINUS)
+               {
+                       if (con_textsize.integer > 1)
+                               Cvar_SetValueQuick(&con_textsize, con_textsize.integer - 1);
+                       return;
+               }
+               // text zoom reset
+               if (key == '0' || key == K_KP_INS)
+               {
+                       Cvar_SetValueQuick(&con_textsize, atoi(Cvar_VariableDefString("con_textsize")));
+                       return;
+               }
+       }
+
        if (key == K_HOME || key == K_KP_HOME)
        {
                if (keydown[K_CTRL])
-                       con_backscroll = INT_MAX;
+                       con_backscroll = CON_TEXTSIZE;
                else
                        key_linepos = 1;
                return;
@@ -560,27 +1155,43 @@ Key_Console (int key, int ascii)
                if (keydown[K_CTRL])
                        con_backscroll = 0;
                else
-                       key_linepos = (int)strlen(key_lines[edit_line]);
+                       key_linepos = (int)strlen(key_line);
                return;
        }
 
+       add_char:
+
        // non printable
-       if (ascii < 32)
+       if (unicode < 32)
                return;
 
        if (key_linepos < MAX_INPUTLINE-1)
        {
+               char buf[16];
                int len;
-               len = (int)strlen(&key_lines[edit_line][key_linepos]);
+               int blen;
+               blen = u8_fromchar(unicode, buf, sizeof(buf));
+               if (!blen)
+                       return;
+               len = (int)strlen(&key_line[key_linepos]);
                // check insert mode, or always insert if at end of line
                if (key_insert || len == 0)
                {
+                       if (key_linepos + len + blen >= MAX_INPUTLINE)
+                               return;
                        // 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);
+                       if (key_linepos + blen + len >= MAX_INPUTLINE)
+                               return;
+                       memmove(&key_line[key_linepos + blen], &key_line[key_linepos], len);
                }
-               key_lines[edit_line][key_linepos] = ascii;
-               key_linepos++;
+               else if (key_linepos + len + blen - u8_bytelen(key_line + key_linepos, 1) >= MAX_INPUTLINE)
+                       return;
+               memcpy(key_line + key_linepos, buf, blen);
+               if (blen > len)
+                       key_line[key_linepos + blen] = 0;
+               // END OF FIXME
+               key_linepos += blen;
        }
 }
 
@@ -590,18 +1201,16 @@ 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, int ascii)
 {
-
-       if (key == K_ENTER || ascii == 10 || ascii == 13)
+       char vabuf[1024];
+       if (key == K_ENTER || key == K_KP_ENTER || ascii == 10 || ascii == 13)
        {
                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!
+                       Cmd_ExecuteString(chat_buffer, src_command, true); // 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));
+                       Cmd_ForwardStringToServer(va(vabuf, sizeof(vabuf), "%s %s", chat_mode ? "say_team" : "say ", chat_buffer));
 
                key_dest = key_game;
                chat_bufferlen = 0;
@@ -620,7 +1229,7 @@ Key_Message (int key, int ascii)
 
        if (key == K_BACKSPACE) {
                if (chat_bufferlen) {
-                       chat_bufferlen--;
+                       chat_bufferlen = (unsigned int)u8_prevbyte(chat_buffer, chat_bufferlen);
                        chat_buffer[chat_bufferlen] = 0;
                }
                return;
@@ -631,14 +1240,20 @@ Key_Message (int key, int ascii)
                return;
        }
 
+       // ctrl+key generates an ascii value < 32 and shows a char from the charmap
+       if (ascii > 0 && ascii < 32 && utf8_enable.integer)
+               ascii = 0xE000 + ascii;
+
        if (chat_bufferlen == sizeof (chat_buffer) - 1)
                return;                                                 // all full
 
        if (!ascii)
                return;                                                 // non printable
 
-       chat_buffer[chat_bufferlen++] = ascii;
-       chat_buffer[chat_bufferlen] = 0;
+       chat_bufferlen += u8_fromchar(ascii, chat_buffer+chat_bufferlen, sizeof(chat_buffer) - chat_bufferlen - 1);
+
+       //chat_buffer[chat_bufferlen++] = ascii;
+       //chat_buffer[chat_bufferlen] = 0;
 }
 
 //============================================================================
@@ -676,10 +1291,9 @@ FIXME: handle quote special (general escape sequence?)
 ===================
 */
 const char *
-Key_KeynumToString (int keynum)
+Key_KeynumToString (int keynum, char *tinystr, size_t tinystrlength)
 {
        const keyname_t  *kn;
-       static char tinystr[2];
 
        // -1 is an invalid code
        if (keynum < 0)
@@ -693,8 +1307,11 @@ Key_KeynumToString (int keynum)
        // if it is printable, output it as a single character
        if (keynum > 32 && keynum < 256)
        {
-               tinystr[0] = keynum;
-               tinystr[1] = 0;
+               if (tinystrlength >= 2)
+               {
+                       tinystr[0] = keynum;
+                       tinystr[1] = 0;
+               }
                return tinystr;
        }
 
@@ -703,14 +1320,16 @@ Key_KeynumToString (int keynum)
 }
 
 
-void
+qboolean
 Key_SetBinding (int keynum, int bindmap, const char *binding)
 {
        char *newbinding;
        size_t l;
 
        if (keynum == -1 || keynum >= MAX_KEYS)
-               return;
+               return false;
+       if ((bindmap < 0) || (bindmap >= MAX_BINDMAPS))
+               return false;
 
 // free old bindings
        if (keybindings[bindmap][keynum]) {
@@ -718,28 +1337,51 @@ Key_SetBinding (int keynum, int bindmap, const char *binding)
                keybindings[bindmap][keynum] = NULL;
        }
        if(!binding[0]) // make "" binds be removed --blub
-               return;
+               return true;
 // allocate memory for new binding
        l = strlen (binding);
        newbinding = (char *)Z_Malloc (l + 1);
        memcpy (newbinding, binding, l + 1);
        newbinding[l] = 0;
        keybindings[bindmap][keynum] = newbinding;
+       return true;
+}
+
+void Key_GetBindMap(int *fg, int *bg)
+{
+       if(fg)
+               *fg = key_bmap;
+       if(bg)
+               *bg = key_bmap2;
+}
+
+qboolean Key_SetBindMap(int fg, int bg)
+{
+       if(fg >= MAX_BINDMAPS)
+               return false;
+       if(bg >= MAX_BINDMAPS)
+               return false;
+       if(fg >= 0)
+               key_bmap = fg;
+       if(bg >= 0)
+               key_bmap2 = bg;
+       return true;
 }
 
 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 >= MAX_BINDMAPS) || (errchar && *errchar)) {
+               Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
                return;
        }
 
@@ -749,7 +1391,8 @@ Key_In_Unbind_f (void)
                return;
        }
 
-       Key_SetBinding (b, m, "");
+       if(!Key_SetBinding (b, m, ""))
+               Con_Printf("Key_SetBinding failed for unknown reason\n");
 }
 
 static void
@@ -757,6 +1400,7 @@ Key_In_Bind_f (void)
 {
        int         i, c, b, m;
        char        cmd[MAX_INPUTLINE];
+       char *errchar = NULL;
 
        c = Cmd_Argc ();
 
@@ -765,9 +1409,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 >= MAX_BINDMAPS) || (errchar && *errchar)) {
+               Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
                return;
        }
 
@@ -792,13 +1436,15 @@ Key_In_Bind_f (void)
                        strlcat (cmd, " ", sizeof (cmd));
        }
 
-       Key_SetBinding (b, m, cmd);
+       if(!Key_SetBinding (b, m, cmd))
+               Con_Printf("Key_SetBinding failed for unknown reason\n");
 }
 
 static void
 Key_In_Bindmap_f (void)
 {
        int         m1, m2, c;
+       char *errchar = NULL;
 
        c = Cmd_Argc ();
 
@@ -807,15 +1453,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 >= MAX_BINDMAPS) || (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 >= MAX_BINDMAPS) || (errchar && *errchar)) {
+               Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(2));
                return;
        }
 
@@ -839,7 +1485,8 @@ Key_Unbind_f (void)
                return;
        }
 
-       Key_SetBinding (b, 0, "");
+       if(!Key_SetBinding (b, 0, ""))
+               Con_Printf("Key_SetBinding failed for unknown reason\n");
 }
 
 static void
@@ -847,12 +1494,61 @@ Key_Unbindall_f (void)
 {
        int         i, j;
 
-       for (j = 0; j < 8; j++)
+       for (j = 0; j < MAX_BINDMAPS; j++)
                for (i = 0; i < (int)(sizeof(keybindings[0])/sizeof(keybindings[0][0])); i++)
                        if (keybindings[j][i])
                                Key_SetBinding (i, j, "");
 }
 
+static void
+Key_PrintBindList(int j)
+{
+       char bindbuf[MAX_INPUTLINE];
+       char tinystr[2];
+       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, "\"\\", false);
+                       if (j == 0)
+                               Con_Printf("^2%s ^7= \"%s\"\n", Key_KeynumToString (i, tinystr, sizeof(tinystr)), bindbuf);
+                       else
+                               Con_Printf("^3bindmap %d: ^2%s ^7= \"%s\"\n", j, Key_KeynumToString (i, tinystr, sizeof(tinystr)), 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 >= MAX_BINDMAPS) || (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)
@@ -887,7 +1583,8 @@ Key_Bind_f (void)
                        strlcat (cmd, " ", sizeof (cmd));
        }
 
-       Key_SetBinding (b, 0, cmd);
+       if(!Key_SetBinding (b, 0, cmd))
+               Con_Printf("Key_SetBinding failed for unknown reason\n");
 }
 
 /*
@@ -900,6 +1597,7 @@ Key_WriteBindings (qfile_t *f)
 {
        int         i, j;
        char bindbuf[MAX_INPUTLINE];
+       char tinystr[2];
        const char *p;
 
        for (j = 0; j < MAX_BINDMAPS; j++)
@@ -909,11 +1607,11 @@ Key_WriteBindings (qfile_t *f)
                        p = keybindings[j][i];
                        if (p)
                        {
-                               Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\");
+                               Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\", false); // don't need to escape $ because cvars are not expanded inside bind
                                if (j == 0)
-                                       FS_Printf(f, "bind %s \"%s\"\n", Key_KeynumToString (i), bindbuf);
+                                       FS_Printf(f, "bind %s \"%s\"\n", Key_KeynumToString (i, tinystr, sizeof(tinystr)), bindbuf);
                                else
-                                       FS_Printf(f, "in_bind %d %s \"%s\"\n", j, Key_KeynumToString (i), bindbuf);
+                                       FS_Printf(f, "in_bind %d %s \"%s\"\n", j, Key_KeynumToString (i, tinystr, sizeof(tinystr)), bindbuf);
                        }
                }
        }
@@ -923,12 +1621,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;
 
 //
@@ -936,27 +1631,73 @@ 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 ("in_releaseall", Key_ReleaseAll, "releases all currently pressed keys (debug command)");
 
        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)");
 
+       Cmd_AddCommand ("history", Key_History_f, "prints the history of executed commands (history X prints the last X entries, history -c clears the whole history)");
+
        Cvar_RegisterVariable (&con_closeontoggleconsole);
 }
 
-const char *Key_GetBind (int key)
+void
+Key_Shutdown (void)
+{
+       Key_History_Shutdown();
+}
+
+const char *Key_GetBind (int key, int bindmap)
 {
        const char *bind;
        if (key < 0 || key >= MAX_KEYS)
                return NULL;
-       bind = keybindings[key_bmap][key];
-       if (!bind)
-               bind = keybindings[key_bmap2][key];
+       if(bindmap >= MAX_BINDMAPS)
+               return NULL;
+       if(bindmap >= 0)
+       {
+               bind = keybindings[bindmap][key];
+       }
+       else
+       {
+               bind = keybindings[key_bmap][key];
+               if (!bind)
+                       bind = keybindings[key_bmap2][key];
+       }
        return bind;
 }
 
-qboolean CL_VM_InputEvent (qboolean down, int key, int ascii);
+void Key_FindKeysForCommand (const char *command, int *keys, int numkeys, int bindmap)
+{
+       int             count;
+       int             j;
+       const char      *b;
+
+       for (j = 0;j < numkeys;j++)
+               keys[j] = -1;
+
+       if(bindmap >= MAX_BINDMAPS)
+               return;
+
+       count = 0;
+
+       for (j = 0; j < MAX_KEYS; ++j)
+       {
+               b = Key_GetBind(j, bindmap);
+               if (!b)
+                       continue;
+               if (!strcmp (b, command) )
+               {
+                       keys[count++] = j;
+                       if (count == numkeys)
+                               break;
+               }
+       }
+}
 
 /*
 ===================
@@ -967,27 +1708,72 @@ Should NOT be called during an interrupt!
 static char tbl_keyascii[MAX_KEYS];
 static keydest_t tbl_keydest[MAX_KEYS];
 
+typedef struct eventqueueitem_s
+{
+       int key;
+       int ascii;
+       qboolean down;
+}
+eventqueueitem_t;
+static int events_blocked = 0;
+static eventqueueitem_t eventqueue[32];
+static unsigned eventqueue_idx = 0;
+
+static void Key_EventQueue_Add(int key, int ascii, qboolean down)
+{
+       if(eventqueue_idx < sizeof(eventqueue) / sizeof(*eventqueue))
+       {
+               eventqueue[eventqueue_idx].key = key;
+               eventqueue[eventqueue_idx].ascii = ascii;
+               eventqueue[eventqueue_idx].down = down;
+               ++eventqueue_idx;
+       }
+}
+
+void Key_EventQueue_Block(void)
+{
+       // block key events until call to Unblock
+       events_blocked = true;
+}
+
+void Key_EventQueue_Unblock(void)
+{
+       // unblocks key events again
+       unsigned i;
+       events_blocked = false;
+       for(i = 0; i < eventqueue_idx; ++i)
+               Key_Event(eventqueue[i].key, eventqueue[i].ascii, eventqueue[i].down);
+       eventqueue_idx = 0;
+}
+
 void
 Key_Event (int key, int ascii, qboolean down)
 {
        const char *bind;
        qboolean q;
        keydest_t keydest = key_dest;
+       char vabuf[1024];
 
        if (key < 0 || key >= MAX_KEYS)
                return;
 
+       if(events_blocked)
+       {
+               Key_EventQueue_Add(key, ascii, down);
+               return;
+       }
+
        // get key binding
        bind = keybindings[key_bmap][key];
        if (!bind)
                bind = keybindings[key_bmap2][key];
 
-       if (developer.integer >= 1000)
-               Con_Printf("Key_Event(%i, '%c', %s) keydown %i bind \"%s\"\n", key, ascii, down ? "down" : "up", keydown[key], bind ? bind : "");
+       if (developer_insane.integer)
+               Con_DPrintf("Key_Event(%i, '%c', %s) keydown %i bind \"%s\"\n", key, ascii ? ascii : '?', down ? "down" : "up", keydown[key], bind ? bind : "");
 
        if(key_consoleactive)
                keydest = key_console;
-       
+
        if (down)
        {
                // increment key repeat count each time a down is received so that things
@@ -1011,7 +1797,7 @@ Key_Event (int key, int ascii, qboolean down)
 
        if(keydest == key_void)
                return;
-       
+
        // key_consoleactive is a flag not a key_dest because the console is a
        // high priority overlay ontop of the normal screen (designed as a safety
        // feature so that developers and users can rescue themselves from a bad
@@ -1054,7 +1840,9 @@ Key_Event (int key, int ascii, qboolean down)
                                        if(key_consoleactive & KEY_CONSOLEACTIVE_FORCED)
                                        {
                                                key_consoleactive &= ~KEY_CONSOLEACTIVE_USER;
-                                               MR_ToggleMenu_f ();
+#ifdef CONFIG_MENU
+                                               MR_ToggleMenu(1);
+#endif
                                        }
                                        else
                                                Con_ToggleConsole_f();
@@ -1068,14 +1856,18 @@ Key_Event (int key, int ascii, qboolean down)
 
                        case key_menu:
                        case key_menu_grabbed:
+#ifdef CONFIG_MENU
                                MR_KeyEvent (key, ascii, down);
+#endif
                                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);
+                               q = CL_VM_InputEvent(down ? 0 : 1, key, ascii);
+#ifdef CONFIG_MENU
                                if (!q && down)
-                                       MR_ToggleMenu_f ();
+                                       MR_ToggleMenu(1);
+#endif
                                break;
 
                        default:
@@ -1085,8 +1877,9 @@ Key_Event (int key, int ascii, qboolean down)
        }
 
        // send function keydowns to interpreter no matter what mode is (unless the menu has specifically grabbed the keyboard, for rebinding keys)
+       // VorteX: Omnicide does bind F* keys
        if (keydest != key_menu_grabbed)
-       if (key >= K_F1 && key <= K_F12)
+       if (key >= K_F1 && key <= K_F12 && gamemode != GAME_BLOODOMNICIDE)
        {
                if (bind)
                {
@@ -1094,14 +1887,14 @@ Key_Event (int key, int ascii, qboolean down)
                        {
                                // button commands add keynum as a parm
                                if (bind[0] == '+')
-                                       Cbuf_AddText (va("%s %i\n", bind, key));
+                                       Cbuf_AddText (va(vabuf, sizeof(vabuf), "%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));
+                               Cbuf_AddText(va(vabuf, sizeof(vabuf), "-%s %i\n", bind + 1, key));
                }
                return;
        }
@@ -1114,11 +1907,15 @@ Key_Event (int key, int ascii, qboolean down)
                // con_closeontoggleconsole enables toggleconsole keys to close the
                // console, as long as they are not the color prefix character
                // (special exemption for german keyboard layouts)
-               if (con_closeontoggleconsole.integer && bind && !strncmp(bind, "toggleconsole", strlen("toggleconsole")) && (key_consoleactive & KEY_CONSOLEACTIVE_USER) && ascii != STRING_COLOR_TAG)
+               if (con_closeontoggleconsole.integer && bind && !strncmp(bind, "toggleconsole", strlen("toggleconsole")) && (key_consoleactive & KEY_CONSOLEACTIVE_USER) && (con_closeontoggleconsole.integer >= ((ascii != STRING_COLOR_TAG) ? 2 : 3) || key_linepos == 1))
                {
                        Con_ToggleConsole_f ();
                        return;
                }
+
+               if (COM_CheckParm ("-noconsole"))
+                       return; // only allow the key bind to turn off console
+
                Key_Console (key, ascii);
                return;
        }
@@ -1128,7 +1925,7 @@ Key_Event (int key, int ascii, qboolean down)
        {
                if (down && con_closeontoggleconsole.integer && bind && !strncmp(bind, "toggleconsole", strlen("toggleconsole")) && ascii != STRING_COLOR_TAG)
                {
-                       Con_ToggleConsole_f ();
+                       Cbuf_AddText("toggleconsole\n");  // Deferred to next frame so we're not sending the text event to the console.
                        tbl_keydest[key] = key_void; // key release should go nowhere (especially not to key_menu or key_game)
                        return;
                }
@@ -1137,7 +1934,15 @@ Key_Event (int key, int ascii, qboolean down)
        // ignore binds while a video is played, let the video system handle the key event
        if (cl_videoplaying)
        {
-               CL_Video_KeyEvent (key, ascii, keydown[key] != 0);
+               if (gamemode == GAME_BLOODOMNICIDE) // menu controls key events
+#ifdef CONFIG_MENU
+                       MR_KeyEvent(key, ascii, down);
+#else
+                       {
+                       }
+#endif
+               else
+                       CL_Video_KeyEvent (key, ascii, keydown[key] != 0);
                return;
        }
 
@@ -1150,10 +1955,12 @@ Key_Event (int key, int ascii, qboolean down)
                        break;
                case key_menu:
                case key_menu_grabbed:
+#ifdef CONFIG_MENU
                        MR_KeyEvent (key, ascii, down);
+#endif
                        break;
                case key_game:
-                       q = CL_VM_InputEvent(down, key, ascii);
+                       q = CL_VM_InputEvent(down ? 0 : 1, key, ascii);
                        // ignore key repeats on binds and only send the bind if the event hasnt been already processed by csqc
                        if (!q && bind)
                        {
@@ -1161,14 +1968,14 @@ Key_Event (int key, int ascii, qboolean down)
                                {
                                        // button commands add keynum as a parm
                                        if (bind[0] == '+')
-                                               Cbuf_AddText (va("%s %i\n", bind, key));
+                                               Cbuf_AddText (va(vabuf, sizeof(vabuf), "%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));
+                                       Cbuf_AddText(va(vabuf, sizeof(vabuf), "-%s %i\n", bind + 1, key));
                        }
                        break;
                default:
@@ -1176,13 +1983,17 @@ Key_Event (int key, int ascii, qboolean down)
        }
 }
 
-/*
-===================
-Key_ClearStates
-===================
-*/
+// a helper to simulate release of ALL keys
 void
-Key_ClearStates (void)
+Key_ReleaseAll (void)
 {
-       memset(keydown, 0, sizeof(keydown));
+       int key;
+       // clear the event queue first
+       eventqueue_idx = 0;
+       // then send all down events (possibly into the event queue)
+       for(key = 0; key < MAX_KEYS; ++key)
+               if(keydown[key])
+                       Key_Event(key, 0, false);
+       // now all keys are guaranteed down (once the event queue is unblocked)
+       // and only future events count
 }