X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=keys.c;h=91f4f55c52013dc52f974ad7b621c8173c510f20;hp=4d5f4fb392f1cf31f3da789e3114430f0e2d05fc;hb=fbf1b6e59f36920a1deaa277178c4c7023128fa7;hpb=1cf3ca527c99b74bf7616dcf74e3854b58d0d553 diff --git a/keys.c b/keys.c index 4d5f4fb3..91f4f55c 100644 --- a/keys.c +++ b/keys.c @@ -1,6 +1,4 @@ /* - $RCSfile$ - Copyright (C) 1996-1997 Id Software, Inc. This program is free software; you can redistribute it and/or @@ -16,19 +14,14 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to: - + Free Software Foundation, Inc. 59 Temple Place - Suite 330 Boston, MA 02111-1307, USA - */ -static const char rcsid[] = - "$Id$"; #include "quakedef.h" -#include -extern void SCR_UpdateScreen (void); /* key up events are sent even if in console mode @@ -50,13 +43,13 @@ int key_consoleactive; static int key_count; // incremented every key event static int key_bmap, key_bmap2; -char *keybindings[8][256]; -static qboolean consolekeys[256]; // if true, can't be rebound while in +char *keybindings[8][1024]; +static qboolean consolekeys[1024]; // if true, can't be rebound while in // console -static qboolean menubound[256]; // if true, can't be rebound while in +static qboolean menubound[1024]; // if true, can't be rebound while in // menu -static unsigned int key_repeats[256]; // if > 1, it is autorepeating -static qboolean keydown[256]; +static unsigned int key_repeats[1024]; // if > 1, it is autorepeating +static qboolean keydown[1024]; typedef struct { const char *name; @@ -154,10 +147,22 @@ static const keyname_t keynames[] = { {"KP_ENTER", K_KP_ENTER}, {"KP_EQUALS", K_KP_EQUALS}, - {"JOY1", K_JOY1}, - {"JOY2", K_JOY2}, - {"JOY3", K_JOY3}, - {"JOY4", K_JOY4}, + {"JOY1", K_JOY1}, + {"JOY2", K_JOY2}, + {"JOY3", K_JOY3}, + {"JOY4", K_JOY4}, + {"JOY5", K_JOY5}, + {"JOY6", K_JOY6}, + {"JOY7", K_JOY7}, + {"JOY8", K_JOY8}, + {"JOY9", K_JOY9}, + {"JOY10", K_JOY10}, + {"JOY11", K_JOY11}, + {"JOY12", K_JOY12}, + {"JOY13", K_JOY13}, + {"JOY14", K_JOY14}, + {"JOY15", K_JOY15}, + {"JOY16", K_JOY16}, {"AUX1", K_AUX1}, {"AUX2", K_AUX2}, @@ -272,8 +277,6 @@ Key_Console (int key, char ascii) break; } - // LordHavoc: FIXME: implement this sometime - #if 0 if ((toupper(key) == 'V' && keydown[K_CTRL]) || ((key == K_INS || key == K_KP_INS) && keydown[K_SHIFT])) { char *cbd; @@ -294,7 +297,6 @@ Key_Console (int key, char ascii) } return; } - #endif if (key == 'l') { @@ -309,7 +311,7 @@ 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]); + Con_Printf("%s\n",key_lines[edit_line]); edit_line = (edit_line + 1) & 31; history_line = edit_line; key_lines[edit_line][0] = ']'; @@ -317,10 +319,7 @@ Key_Console (int key, char ascii) key_linepos = 1; // force an update, because the command may take some time if (cls.state == ca_disconnected) - { CL_UpdateScreen (); - CL_UpdateScreen (); - } return; } @@ -430,7 +429,7 @@ Key_Console (int key, char ascii) if (key == K_PGUP || key == K_KP_PGUP || key == K_MWHEELUP) { - con_backscroll += ((int) scr_conlines >> 4); + con_backscroll += ((int) vid.conheight >> 5); if (con_backscroll > con_totallines - (vid.conheight>>3) - 1) con_backscroll = con_totallines - (vid.conheight>>3) - 1; return; @@ -438,7 +437,7 @@ Key_Console (int key, char ascii) if (key == K_PGDN || key == K_KP_PGDN || key == K_MWHEELDOWN) { - con_backscroll -= ((int) scr_conlines >> 4); + con_backscroll -= ((int) vid.conheight >> 5); if (con_backscroll < 0) con_backscroll = 0; return; @@ -496,13 +495,9 @@ static void Key_Message (int key, char ascii) { - if (key == K_ENTER) { - if (chat_team) - Cbuf_AddText ("say_team \""); - else - Cbuf_AddText ("say \""); - Cbuf_AddText (chat_buffer); - Cbuf_AddText ("\"\n"); + if (key == K_ENTER) + { + Cmd_ForwardStringToServer(va("%s %s", chat_team ? "say_team" : "say ", chat_buffer)); key_dest = key_game; chat_bufferlen = 0; @@ -545,7 +540,7 @@ the given string. Single ascii characters return themselves, while the K_* names are matched up. =================== */ -static int +int Key_StringToKeynum (const char *str) { const keyname_t *kn; @@ -619,19 +614,19 @@ Key_In_Unbind_f (void) int b, m; if (Cmd_Argc () != 3) { - Con_Printf ("in_unbind : remove commands from a key\n"); + 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); + Con_Printf("%d isn't a valid bindmap\n", m); return; } b = Key_StringToKeynum (Cmd_Argv (2)); if (b == -1) { - Con_Printf ("\"%s\" isn't a valid key\n", Cmd_Argv (2)); + Con_Printf("\"%s\" isn't a valid key\n", Cmd_Argv (2)); return; } @@ -647,27 +642,27 @@ Key_In_Bind_f (void) c = Cmd_Argc (); if (c != 3 && c != 4) { - Con_Printf ("in_bind [command] : attach a command to a key\n"); + Con_Print("in_bind [command] : attach a command to 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); + Con_Printf("%d isn't a valid bindmap\n", m); return; } b = Key_StringToKeynum (Cmd_Argv (2)); if (b == -1) { - Con_Printf ("\"%s\" isn't a valid key\n", Cmd_Argv (2)); + Con_Printf("\"%s\" isn't a valid key\n", Cmd_Argv (2)); return; } if (c == 3) { if (keybindings[m][b]) - Con_Printf ("\"%s\" = \"%s\"\n", Cmd_Argv (2), keybindings[m][b]); + Con_Printf("\"%s\" = \"%s\"\n", Cmd_Argv (2), keybindings[m][b]); else - Con_Printf ("\"%s\" is not bound\n", Cmd_Argv (2)); + Con_Printf("\"%s\" is not bound\n", Cmd_Argv (2)); return; } // copy the rest of the command line @@ -689,19 +684,19 @@ Key_In_Bindmap_f (void) c = Cmd_Argc (); if (c != 3) { - Con_Printf ("in_bindmap : set current bindmap and fallback\n"); + Con_Print("in_bindmap : set current bindmap and fallback\n"); return; } m1 = strtol(Cmd_Argv (1), NULL, 0); if ((m1 < 0) || (m1 >= 8)) { - Con_Printf ("%d isn't a valid bindmap\n", m1); + Con_Printf("%d isn't a valid bindmap\n", m1); return; } m2 = strtol(Cmd_Argv (2), NULL, 0); if ((m2 < 0) || (m2 >= 8)) { - Con_Printf ("%d isn't a valid bindmap\n", m2); + Con_Printf("%d isn't a valid bindmap\n", m2); return; } @@ -715,13 +710,13 @@ Key_Unbind_f (void) int b; if (Cmd_Argc () != 2) { - Con_Printf ("unbind : remove commands from a key\n"); + Con_Print("unbind : remove commands from a key\n"); return; } b = Key_StringToKeynum (Cmd_Argv (1)); if (b == -1) { - Con_Printf ("\"%s\" isn't a valid key\n", Cmd_Argv (1)); + Con_Printf("\"%s\" isn't a valid key\n", Cmd_Argv (1)); return; } @@ -734,7 +729,7 @@ Key_Unbindall_f (void) int i, j; for (j = 0; j < 8; j++) - for (i = 0; i < 256; i++) + for (i = 0; i < (int)(sizeof(keybindings[0])/sizeof(keybindings[0][0])); i++) if (keybindings[j][i]) Key_SetBinding (i, j, ""); } @@ -749,20 +744,20 @@ Key_Bind_f (void) c = Cmd_Argc (); if (c != 2 && c != 3) { - Con_Printf ("bind [command] : attach a command to a key\n"); + Con_Print("bind [command] : attach a command to a key\n"); return; } b = Key_StringToKeynum (Cmd_Argv (1)); if (b == -1) { - Con_Printf ("\"%s\" isn't a valid key\n", Cmd_Argv (1)); + Con_Printf("\"%s\" isn't a valid key\n", Cmd_Argv (1)); return; } if (c == 2) { if (keybindings[0][b]) - Con_Printf ("\"%s\" = \"%s\"\n", Cmd_Argv (1), keybindings[0][b]); + Con_Printf("\"%s\" = \"%s\"\n", Cmd_Argv (1), keybindings[0][b]); else - Con_Printf ("\"%s\" is not bound\n", Cmd_Argv (1)); + Con_Printf("\"%s\" is not bound\n", Cmd_Argv (1)); return; } // copy the rest of the command line @@ -786,14 +781,14 @@ Key_WriteBindings (qfile_t *f) { int i, j; - for (i = 0; i < 256; i++) + for (i = 0; i < (int)(sizeof(keybindings[0])/sizeof(keybindings[0][0])); i++) if (keybindings[0][i]) - FS_Printf (f, "bind %s \"%s\"\n", + FS_Printf(f, "bind \"%s\" \"%s\"\n", Key_KeynumToString (i), keybindings[0][i]); for (j = 1; j < 8; j++) - for (i = 0; i < 256; i++) + 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", + FS_Printf(f, "in_bind %d \"%s\" \"%s\"\n", j, Key_KeynumToString (i), keybindings[j][i]); } @@ -822,6 +817,7 @@ Key_Init (void) consolekeys[K_DOWNARROW] = true; consolekeys[K_KP_DOWNARROW] = true; consolekeys[K_BACKSPACE] = true; consolekeys[K_DEL] = true; consolekeys[K_KP_DEL] = true; + consolekeys[K_INS] = true; consolekeys[K_KP_INS] = true; consolekeys[K_HOME] = true; consolekeys[K_KP_HOME] = true; consolekeys[K_END] = true; consolekeys[K_KP_END] = true; consolekeys[K_PGUP] = true; consolekeys[K_KP_PGUP] = true; @@ -829,6 +825,10 @@ Key_Init (void) consolekeys[K_SHIFT] = true; consolekeys[K_MWHEELUP] = true; consolekeys[K_MWHEELDOWN] = true; + consolekeys[K_KP_PLUS] = true; + consolekeys[K_KP_MINUS] = true; + consolekeys[K_KP_DIVIDE] = true; + consolekeys[K_KP_MULTIPLY] = true; consolekeys['`'] = false; consolekeys['~'] = false; @@ -877,7 +877,7 @@ Key_Event (int key, char ascii, qboolean down) key_repeats[key]++; if (key_repeats[key] > 1) { if ((key_consoleactive && !consolekeys[key]) || - (key_dest == key_game && + (!key_consoleactive && key_dest == key_game && (cls.state == ca_connected && cls.signon == SIGNONS))) return; // ignore most autorepeats } @@ -911,14 +911,6 @@ Key_Event (int key, char ascii, qboolean down) return; } - // console key is hardcoded, so the user can never unbind it - if (key == '`' || key == '~') - { - if (down) - Con_ToggleConsole_f (); - return; - } - if (down) { if (!(kb = keybindings[key_bmap][key])) @@ -947,7 +939,7 @@ Key_Event (int key, char ascii, qboolean down) kb = keybindings[key_bmap2][key]; if (kb && kb[0] == '+') { - snprintf (cmd, sizeof(cmd), "-%s %i\n", kb + 1, key); + dpsnprintf (cmd, sizeof(cmd), "-%s %i\n", kb + 1, key); Cbuf_AddText (cmd); } return; @@ -972,7 +964,7 @@ Key_Event (int key, char ascii, qboolean down) kb = keybindings[key_bmap2][key]; if (kb) { if (kb[0] == '+') { // button commands add keynum as a parm - snprintf (cmd, sizeof(cmd), "%s %i\n", kb, key); + dpsnprintf (cmd, sizeof(cmd), "%s %i\n", kb, key); Cbuf_AddText (cmd); } else { Cbuf_AddText (kb); @@ -993,7 +985,6 @@ Key_Event (int key, char ascii, qboolean down) case key_menu: MR_Keydown (key, ascii); break; - case key_game: Key_Console (key, ascii); break; @@ -1016,7 +1007,7 @@ Key_ClearStates (void) { int i; - for (i = 0;i < 256;i++) + for (i = 0; i < (int)(sizeof(keydown)/sizeof(keydown[0])); i++) { keydown[i] = false; key_repeats[i] = 0;