X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=keys.c;h=610f448a7186d290cc82d29782b13f44bb5e4456;hp=b311d1ed56a35e0c7264a378ba4f1f4a1e6e3a65;hb=8dbdf573f8e4be21b6455440ffd7800646931c14;hpb=ad8ec18c8a2884d92134fe13db3399ce5c039c78 diff --git a/keys.c b/keys.c index b311d1ed..610f448a 100644 --- a/keys.c +++ b/keys.c @@ -21,7 +21,9 @@ */ #include "quakedef.h" +#include "cl_video.h" +cvar_t con_closeontoggleconsole = {CVAR_SAVE, "con_closeontoggleconsole","1", "allows toggleconsole binds to close the console as well"}; /* key up events are sent even if in console mode @@ -187,11 +189,12 @@ static const keyname_t keynames[] = { {"AUX31", K_AUX31}, {"AUX32", K_AUX32}, - {"SEMICOLON", ';'}, // because a raw semicolon seperates commands + {"SEMICOLON", ';'}, // because a raw semicolon separates commands {"TILDE", '~'}, {"BACKQUOTE", '`'}, {"QUOTE", '"'}, {"APOSTROPHE", '\''}, + {"BACKSLASH", '\\'}, // because a raw backslash is used for special characters {NULL, 0} }; @@ -280,10 +283,10 @@ Key_Console (int key, char ascii) if (i > 0) { cbd[i]=0; - strcat(key_lines[edit_line], cbd); + strlcat(key_lines[edit_line], cbd, sizeof(key_lines[edit_line])); key_linepos += i; } - free(cbd); + Z_Free(cbd); } return; } @@ -302,6 +305,8 @@ Key_Console (int key, char ascii) Cbuf_AddText (key_lines[edit_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; @@ -358,7 +363,7 @@ Key_Console (int key, char ascii) { if (key_linepos > 1) { - strcpy(key_lines[edit_line] + key_linepos - 1, key_lines[edit_line] + key_linepos); + strlcpy(key_lines[edit_line] + key_linepos - 1, key_lines[edit_line] + key_linepos, sizeof(key_lines[edit_line]) + 1 - key_linepos); key_linepos--; } return; @@ -367,8 +372,10 @@ 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_lines[edit_line]); + if (key_linepos < (int)linelen) + memmove(key_lines[edit_line] + key_linepos, key_lines[edit_line] + key_linepos + 1, linelen - key_linepos); return; } @@ -410,9 +417,11 @@ Key_Console (int key, char ascii) { if (history_line > 0 && key_lines[history_line-1][1]) { + size_t linelen; history_line--; - strcpy(key_lines[edit_line], key_lines[history_line]); - key_linepos = (int)strlen(key_lines[edit_line]); + linelen = strlen(key_lines[history_line]); + memcpy(key_lines[edit_line], key_lines[history_line], linelen + 1); + key_linepos = (int)linelen; } return; } @@ -429,8 +438,10 @@ Key_Console (int key, char ascii) } else { - strcpy(key_lines[edit_line], key_lines[history_line]); - key_linepos = (int)strlen(key_lines[edit_line]); + size_t linelen; + linelen = strlen(key_lines[history_line]); + memcpy(key_lines[edit_line], key_lines[history_line], linelen + 1); + key_linepos = (int)linelen; } return; } @@ -495,11 +506,13 @@ qboolean chat_team; char chat_buffer[MAX_INPUTLINE]; unsigned int chat_bufferlen = 0; +extern unsigned int Nicks_CompleteChatLine(char *buffer, size_t size, int pos); + static void Key_Message (int key, char ascii) { - if (key == K_ENTER) + if (key == K_ENTER || ascii == 10 || ascii == 13) { Cmd_ForwardStringToServer(va("%s %s", chat_team ? "say_team" : "say ", chat_buffer)); @@ -524,6 +537,11 @@ Key_Message (int key, char ascii) return; } + if(key == K_TAB) { + chat_bufferlen = Nicks_CompleteChatLine(chat_buffer, sizeof(chat_buffer), chat_bufferlen); + return; + } + if (chat_bufferlen == sizeof (chat_buffer) - 1) return; // all full @@ -574,18 +592,24 @@ Key_KeynumToString (int keynum) 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) + { + 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 ""; } @@ -596,7 +620,7 @@ Key_SetBinding (int keynum, int bindmap, const char *binding) char *newbinding; size_t l; - if (keynum == -1) + if (keynum == -1 || keynum >= MAX_KEYS) return; // free old bindings @@ -604,10 +628,12 @@ Key_SetBinding (int keynum, int bindmap, const char *binding) Z_Free (keybindings[bindmap][keynum]); keybindings[bindmap][keynum] = NULL; } + if(!binding[0]) // make "" binds be removed --blub + return; // 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; } @@ -657,7 +683,7 @@ Key_In_Bind_f (void) } 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; } @@ -752,7 +778,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; } @@ -784,16 +810,24 @@ void Key_WriteBindings (qfile_t *f) { int i, j; + char bindbuf[MAX_INPUTLINE]; + 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, "\"\\"); + if (j == 0) + FS_Printf(f, "bind %s \"%s\"\n", Key_KeynumToString (i), bindbuf); + else + FS_Printf(f, "in_bind %d %s \"%s\"\n", j, Key_KeynumToString (i), bindbuf); + } + } + } } @@ -811,18 +845,22 @@ Key_Init (void) // // 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_bindmap", Key_In_Bindmap_f, "selects active foreground and background (used only if a key is not bound in the foreground) bindmaps for typing"); - Cmd_AddCommand ("bind", Key_Bind_f); - 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 ("unbindall", Key_Unbindall_f, "removes all commands from all keys in all bindmaps (leaving only shift-escape and escape)"); + + Cvar_RegisterVariable (&con_closeontoggleconsole); } const char *Key_GetBind (int key) { const char *bind; + if (key < 0 || key >= MAX_KEYS) + return NULL; bind = keybindings[key_bmap][key]; if (!bind) bind = keybindings[key_bmap2][key]; @@ -843,11 +881,17 @@ Key_Event (int key, char ascii, qboolean down) const char *bind; qboolean q; + if (key < 0 || key >= MAX_KEYS) + 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(key_dest == key_game) { q = CL_VM_InputEvent(!down, key); @@ -861,7 +905,13 @@ Key_Event (int key, char ascii, qboolean down) } } - if (!down) + if (down) + { + // 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); + } + else { // clear repeat count now that the key is released keydown[key] = 0; @@ -872,15 +922,8 @@ Key_Event (int key, char ascii, qboolean down) // downs can be matched with ups if (bind && bind[0] == '+') Cbuf_AddText(va("-%s %i\n", bind + 1, key)); - return; } - // 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); - // 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 @@ -903,7 +946,7 @@ Key_Event (int key, char ascii, qboolean down) // 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 (((key_consoleactive & KEY_CONSOLEACTIVE_USER) || keydown[K_SHIFT]) && down) { Con_ToggleConsole_f (); return; @@ -911,25 +954,24 @@ Key_Event (int key, char ascii, qboolean down) switch (key_dest) { case key_message: - Key_Message (key, ascii); + if (down) + Key_Message (key, ascii); break; case key_menu: - MR_Keydown (key, ascii); + MR_KeyEvent (key, ascii, down); break; case key_game: - MR_ToggleMenu_f (); + if (down) + MR_ToggleMenu_f (); 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) + if (key >= K_F1 && key <= K_F12 && down) { // ignore key repeats on F1-F12 binds if (keydown[key] > 1) @@ -948,31 +990,39 @@ Key_Event (int key, char ascii, qboolean down) return; } -#if 1 +#if 0 // ignore binds (other than the above escape/F1-F12 keys) while in console - if (key_consoleactive) + if (key_consoleactive && down) #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)) + if (key_consoleactive && down && (!con_closeontoggleconsole.integer || !bind || strncmp(bind, "toggleconsole", strlen("toggleconsole")) || ascii == STRING_COLOR_TAG)) #endif { Key_Console (key, ascii); return; } + // 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); + return; + } + // anything else is a key press into the game, chat line, or menu switch (key_dest) { case key_message: - Key_Message (key, ascii); + if (down) + Key_Message (key, ascii); break; case key_menu: - MR_Keydown (key, ascii); + MR_KeyEvent (key, ascii, down); break; case key_game: // ignore key repeats on binds - if (bind && keydown[key] == 1) + if (bind && keydown[key] == 1 && down) { // button commands add keynum as a parm if (bind[0] == '+') @@ -985,10 +1035,7 @@ Key_Event (int key, char ascii, qboolean down) } 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"); } }