X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=keys.c;h=e93f83ac95504136e3605ce7a1ba0a15ae0faf67;hp=b311d1ed56a35e0c7264a378ba4f1f4a1e6e3a65;hb=f4fad9dbeda77dc25174c242f04c5abe88fafaf9;hpb=ad8ec18c8a2884d92134fe13db3399ce5c039c78 diff --git a/keys.c b/keys.c index b311d1ed..e93f83ac 100644 --- a/keys.c +++ b/keys.c @@ -21,21 +21,306 @@ */ #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; 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 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= MAX_INPUTLINE) - i= MAX_INPUTLINE - key_linepos; + i= MAX_INPUTLINE - key_linepos - 1; if (i > 0) { - cbd[i]=0; - strcat(key_lines[edit_line], cbd); + 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; } - free(cbd); + Z_Free(cbd); } 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]); - // 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) @@ -317,6 +804,57 @@ Key_Console (int key, char 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 @@ -327,29 +865,62 @@ 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; 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; } key_linepos = pos + 1; } + else if(keydown[K_SHIFT]) // move cursor to the previous character ignoring colors + { + int pos; + 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_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 + { + if(pos-1 > 0 && key_line[pos-1] == STRING_COLOR_TAG && key_line[pos] == STRING_COLOR_TAG) // consider ^^ as a character + pos--; + pos--; + break; + } + // 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; } @@ -358,8 +929,9 @@ Key_Console (int key, char ascii) { if (key_linepos > 1) { - strcpy(key_lines[edit_line] + key_linepos - 1, key_lines[edit_line] + 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; } @@ -367,34 +939,80 @@ Key_Console (int key, char ascii) // delete char on cursor if (key == K_DEL || key == K_KP_DEL) { - if (key_linepos < (int)strlen(key_lines[edit_line])) - strcpy(key_lines[edit_line] + key_linepos, key_lines[edit_line] + key_linepos + 1); + size_t linelen; + linelen = strlen(key_line); + if (key_linepos < (int)linelen) + memmove(key_line + key_linepos, key_line + key_linepos + u8_bytelen(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; } + + 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_line); + pos = key_linepos; + + // 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_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++; + key_linepos += (int)u8_bytelen(key_line + key_linepos, 1); return; } @@ -408,53 +1026,120 @@ 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]) - { - history_line--; - strcpy(key_lines[edit_line], key_lines[history_line]); - key_linepos = (int)strlen(key_lines[edit_line]); - } + 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') + { + 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; + } + } + + if (key == K_PGUP || key == K_KP_PGUP) + { + if(keydown[K_CTRL]) { - strcpy(key_lines[edit_line], key_lines[history_line]); - key_linepos = (int)strlen(key_lines[edit_line]); + con_backscroll += ((vid_conheight.integer >> 2) / con_textsize.integer)-1; } + else + con_backscroll += ((vid_conheight.integer >> 1) / con_textsize.integer)-3; return; } - if (key == K_PGUP || key == K_KP_PGUP || key == K_MWHEELUP) + if (key == K_PGDN || key == K_KP_PGDN) + { + if(keydown[K_CTRL]) + { + con_backscroll -= ((vid_conheight.integer >> 2) / con_textsize.integer)-1; + } + else + con_backscroll -= ((vid_conheight.integer >> 1) / con_textsize.integer)-3; + return; + } + + if (key == K_MWHEELUP) { - con_backscroll += ((int) vid_conheight.integer >> 5); - if (con_backscroll > con_totallines - (vid_conheight.integer>>3) - 1) - con_backscroll = con_totallines - (vid_conheight.integer>>3) - 1; + 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_PGDN || key == K_KP_PGDN || key == K_MWHEELDOWN) + if (key == K_MWHEELDOWN) { - con_backscroll -= ((int) vid_conheight.integer >> 5); - if (con_backscroll < 0) - con_backscroll = 0; + 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 = con_totallines - (vid_conheight.integer>>3) - 1; + con_backscroll = CON_TEXTSIZE; else key_linepos = 1; return; @@ -465,43 +1150,60 @@ 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; } // 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; } } //============================================================================ -qboolean chat_team; +int chat_mode; char chat_buffer[MAX_INPUTLINE]; unsigned int chat_bufferlen = 0; static void -Key_Message (int key, char ascii) +Key_Message (int key, int ascii) { - - if (key == K_ENTER) + char vabuf[1024]; + if (key == K_ENTER || key == K_KP_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, true); // not Cbuf_AddText to allow semiclons in args; however, this allows no variables then. Use aliases! + else + Cmd_ForwardStringToServer(va(vabuf, sizeof(vabuf), "%s %s", chat_mode ? "say_team" : "say ", chat_buffer)); key_dest = key_game; chat_bufferlen = 0; @@ -509,6 +1211,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; @@ -518,20 +1222,31 @@ Key_Message (int key, char 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; } + if(key == K_TAB) { + chat_bufferlen = Nicks_CompleteChatLine(chat_buffer, sizeof(chat_buffer), chat_bufferlen); + 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; } //============================================================================ @@ -569,62 +1284,97 @@ 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]; - if (keynum == -1) + // -1 is an invalid code + if (keynum < 0) return ""; - if (keynum > 32 && keynum < 127) { // printable ascii - tinystr[0] = keynum; - tinystr[1] = 0; - return tinystr; - } + // search overrides first, because some characters are special for (kn = keynames; kn->name; kn++) if (keynum == kn->keynum) return kn->name; + // if it is printable, output it as a single character + if (keynum > 32 && keynum < 256) + { + if (tinystrlength >= 2) + { + tinystr[0] = keynum; + tinystr[1] = 0; + } + return tinystr; + } + + // if it is not overridden and not printable, we don't know what to do with it return ""; } -void +qboolean Key_SetBinding (int keynum, int bindmap, const char *binding) { char *newbinding; size_t l; - if (keynum == -1) - return; + if (keynum == -1 || keynum >= MAX_KEYS) + return false; + if ((bindmap < 0) || (bindmap >= MAX_BINDMAPS)) + return false; // free old bindings if (keybindings[bindmap][keynum]) { Z_Free (keybindings[bindmap][keynum]); keybindings[bindmap][keynum] = NULL; } + if(!binding[0]) // make "" binds be removed --blub + return true; // allocate memory for new binding l = strlen (binding); newbinding = (char *)Z_Malloc (l + 1); - strcpy (newbinding, binding); + 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 : 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; } @@ -634,7 +1384,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 @@ -642,6 +1393,7 @@ Key_In_Bind_f (void) { int i, c, b, m; char cmd[MAX_INPUTLINE]; + char *errchar = NULL; c = Cmd_Argc (); @@ -650,14 +1402,14 @@ 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; } b = Key_StringToKeynum (Cmd_Argv (2)); - if (b == -1) { + if (b == -1 || b >= MAX_KEYS) { Con_Printf("\"%s\" isn't a valid key\n", Cmd_Argv (2)); return; } @@ -677,13 +1429,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 (); @@ -692,15 +1446,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; } @@ -724,7 +1478,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 @@ -732,12 +1487,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) @@ -752,7 +1556,7 @@ Key_Bind_f (void) return; } b = Key_StringToKeynum (Cmd_Argv (1)); - if (b == -1) { + if (b == -1 || b >= MAX_KEYS) { Con_Printf("\"%s\" isn't a valid key\n", Cmd_Argv (1)); return; } @@ -772,7 +1576,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"); } /* @@ -784,52 +1589,108 @@ void Key_WriteBindings (qfile_t *f) { int i, j; + char bindbuf[MAX_INPUTLINE]; + char tinystr[2]; + const char *p; - for (i = 0; i < (int)(sizeof(keybindings[0])/sizeof(keybindings[0][0])); i++) - if (keybindings[0][i]) - FS_Printf(f, "bind \"%s\" \"%s\"\n", - Key_KeynumToString (i), keybindings[0][i]); - for (j = 1; 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]) - FS_Printf(f, "in_bind %d \"%s\" \"%s\"\n", - j, Key_KeynumToString (i), keybindings[j][i]); + { + p = keybindings[j][i]; + if (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, tinystr, sizeof(tinystr)), bindbuf); + else + FS_Printf(f, "in_bind %d %s \"%s\"\n", j, Key_KeynumToString (i, tinystr, sizeof(tinystr)), bindbuf); + } + } + } } 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; // // register our functions // - Cmd_AddCommand ("in_bind", Key_In_Bind_f); - Cmd_AddCommand ("in_unbind", Key_In_Unbind_f); - Cmd_AddCommand ("in_bindmap", Key_In_Bindmap_f); + 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); - Cmd_AddCommand ("unbind", Key_Unbind_f); - Cmd_AddCommand ("unbindall", Key_Unbindall_f); + 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; - bind = keybindings[key_bmap][key]; - if (!bind) - bind = keybindings[key_bmap2][key]; + if (key < 0 || key >= MAX_KEYS) + return NULL; + 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 pressed, int key); +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; + } + } +} /* =================== @@ -837,49 +1698,98 @@ Called by the system between frames for both key up and key down events 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, char ascii, qboolean down) +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(key_dest == key_game) + 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) { - q = CL_VM_InputEvent(!down, key); - if(q) - { - if (down) - keydown[key] = min(keydown[key] + 1, 2); - else - keydown[key] = 0; - return; + // increment key repeat count each time a down is received so that things + // which want to ignore key repeat can ignore it + keydown[key] = min(keydown[key] + 1, 2); + if(keydown[key] == 1) { + tbl_keyascii[key] = ascii; + tbl_keydest[key] = keydest; + } else { + ascii = tbl_keyascii[key]; + keydest = tbl_keydest[key]; } } - - if (!down) + else { // clear repeat count now that the key is released keydown[key] = 0; - // 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 (bind && bind[0] == '+') - Cbuf_AddText(va("-%s %i\n", bind + 1, key)); - return; + keydest = tbl_keydest[key]; + ascii = tbl_keyascii[key]; } - // from here on we know this is a down event - - // increment key repeat count each time a down is received so that things - // which want to ignore key repeat can ignore it - keydown[key] = min(keydown[key] + 1, 2); + 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 @@ -897,108 +1807,186 @@ 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]) + if (keydown[K_SHIFT]) { - Con_ToggleConsole_f (); + if(down) + { + Con_ToggleConsole_f (); + tbl_keydest[key] = key_void; // esc release should go nowhere (especially not to key_menu or key_game) + } return; } - switch (key_dest) + + switch (keydest) { + case key_console: + if(down) + { + if(key_consoleactive & KEY_CONSOLEACTIVE_FORCED) + { + key_consoleactive &= ~KEY_CONSOLEACTIVE_USER; +#ifdef CONFIG_MENU + MR_ToggleMenu(1); +#endif + } + else + Con_ToggleConsole_f(); + } + break; + case key_message: - Key_Message (key, ascii); + if (down) + Key_Message (key, ascii); // that'll close the message input break; + case key_menu: - MR_Keydown (key, ascii); + case key_menu_grabbed: +#ifdef CONFIG_MENU + MR_KeyEvent (key, ascii, down); +#endif break; + case key_game: - MR_ToggleMenu_f (); + // 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 ? 0 : 1, key, ascii); +#ifdef CONFIG_MENU + if (!q && down) + MR_ToggleMenu(1); +#endif break; + default: - if(UI_Callback_IsSlotUsed(key_dest - 3)) - UI_Callback_KeyDown (key, ascii); - else - Con_Printf ("Key_Event: Bad key_dest\n"); + Con_Printf ("Key_Event: Bad key_dest\n"); } return; } - // send function keydowns to interpreter no matter what mode is - if (key >= K_F1 && key <= K_F12) + // 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 && gamemode != GAME_BLOODOMNICIDE) { - // 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(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(vabuf, sizeof(vabuf), "-%s %i\n", bind + 1, key)); } return; } -#if 1 - // ignore binds (other than the above escape/F1-F12 keys) while in console - if (key_consoleactive) -#else - // respond to toggleconsole binds while in console unless the pressed key - // happens to be the color prefix character (such as on German keyboards) - if (key_consoleactive && (strncmp(bind, "toggleconsole", strlen("toggleconsole")) || ascii == STRING_COLOR_TAG)) -#endif + // send input to console if it wants it + if (keydest == key_console) { + if (!down) + return; + // 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) && (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; } + // handle toggleconsole in menu too + if (keydest == key_menu) + { + if (down && con_closeontoggleconsole.integer && bind && !strncmp(bind, "toggleconsole", strlen("toggleconsole")) && ascii != STRING_COLOR_TAG) + { + 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; + } + } + + // ignore binds while a video is played, let the video system handle the key event + if (cl_videoplaying) + { + 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; + } + // anything else is a key press into the game, chat line, or menu - switch (key_dest) + switch (keydest) { case key_message: - Key_Message (key, ascii); + if (down) + Key_Message (key, ascii); break; case key_menu: - MR_Keydown (key, ascii); + case key_menu_grabbed: +#ifdef CONFIG_MENU + MR_KeyEvent (key, ascii, down); +#endif break; case key_game: - // ignore key repeats on binds - if (bind && keydown[key] == 1) + 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) { - // 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(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(vabuf, sizeof(vabuf), "-%s %i\n", bind + 1, key)); } break; default: - if(UI_Callback_IsSlotUsed(key_dest - 3)) - UI_Callback_KeyDown (key, ascii); - else - Con_Printf ("Key_Event: Bad key_dest\n"); + Con_Printf ("Key_Event: Bad key_dest\n"); } } -/* -=================== -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 }