X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=keys.c;h=a98f5433b1df8963608f402bf5f706cf908ae581;hp=d350717a3033699d7e394f0e0fb000acfa789a00;hb=5deb3054efec963265e40b9155ac6af3149a763a;hpb=65dd735da686284b222120237628795a86e3e6b2 diff --git a/keys.c b/keys.c index d350717a..a98f5433 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,33 +14,27 @@ 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 */ #define MAX_INPUTLINE 256 +int edit_line = 31; +int history_line = 31; char key_lines[32][MAX_INPUTLINE]; int key_linepos; static int ctrl_down = false; static int key_lastpress; -int key_insert; // insert key toggle (for editing) - -int edit_line = 0; -int history_line = 0; +int key_insert = true; // insert key toggle (for editing) keydest_t key_dest; int key_consoleactive; @@ -154,10 +146,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 +276,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 +296,6 @@ Key_Console (int key, char ascii) } return; } - #endif if (key == 'l') { @@ -309,18 +310,17 @@ 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]); - edit_line = (edit_line + 1) & 31; + 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_linepos = 1; // force an update, because the command may take some time if (cls.state == ca_disconnected) - { - CL_UpdateScreen (); CL_UpdateScreen (); - } return; } @@ -369,16 +369,7 @@ Key_Console (int key, char ascii) // otherwise just go right one if (key == K_RIGHTARROW || key == K_KP_RIGHTARROW) { - if (strlen(key_lines[edit_line]) == (size_t)key_linepos) - { - if (strlen(key_lines[(edit_line + 31) & 31]) <= (size_t)key_linepos) - return; // no character to get - - key_lines[edit_line][key_linepos] = key_lines[(edit_line + 31) & 31][key_linepos]; - key_linepos++; - key_lines[edit_line][key_linepos] = 0; - } - else + if ((size_t)key_linepos < strlen(key_lines[edit_line])) key_linepos++; return; @@ -394,30 +385,23 @@ Key_Console (int key, char ascii) if (key == K_UPARROW || key == K_KP_UPARROW || (key == 'p' && keydown[K_CTRL])) { - do + if (history_line > 0 && key_lines[history_line-1][1]) { - history_line = (history_line - 1) & 31; - } while (history_line != edit_line - && !key_lines[history_line][1]); - if (history_line == edit_line) - history_line = (edit_line+1)&31; - strcpy(key_lines[edit_line], key_lines[history_line]); - key_linepos = strlen(key_lines[edit_line]); + history_line--; + strcpy(key_lines[edit_line], key_lines[history_line]); + key_linepos = strlen(key_lines[edit_line]); + } return; } if (key == K_DOWNARROW || key == K_KP_DOWNARROW || (key == 'n' && keydown[K_CTRL])) { - if (history_line == edit_line) return; - do - { - history_line = (history_line + 1) & 31; - } - while (history_line != edit_line - && !key_lines[history_line][1]); - if (history_line == edit_line) + history_line++; + if (history_line >= edit_line) { + history_line = edit_line; key_lines[edit_line][0] = ']'; + key_lines[edit_line][1] = 0; key_linepos = 1; } else @@ -430,15 +414,15 @@ Key_Console (int key, char ascii) if (key == K_PGUP || key == K_KP_PGUP || key == K_MWHEELUP) { - con_backscroll += ((int) scr_conlines >> 4); - if (con_backscroll > con_totallines - (vid.conheight>>3) - 1) - con_backscroll = con_totallines - (vid.conheight>>3) - 1; + 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; return; } if (key == K_PGDN || key == K_KP_PGDN || key == K_MWHEELDOWN) { - con_backscroll -= ((int) scr_conlines >> 4); + con_backscroll -= ((int) vid_conheight.integer >> 5); if (con_backscroll < 0) con_backscroll = 0; return; @@ -446,7 +430,7 @@ Key_Console (int key, char ascii) if (key == K_HOME || key == K_KP_HOME) { - con_backscroll = con_totallines - (vid.conheight>>3) - 1; + con_backscroll = con_totallines - (vid_conheight.integer>>3) - 1; return; } @@ -457,32 +441,22 @@ Key_Console (int key, char ascii) } // non printable - if (ascii < 32 || ascii > 126) + if (ascii < 32) return; if (key_linepos < MAX_INPUTLINE-1) { - int i; - - if (key_insert) // check insert mode + int len; + len = strlen(&key_lines[edit_line][key_linepos]); + // check insert mode, or always insert if at end of line + if (key_insert || len == 0) { - // can't do strcpy to move string to right - i = strlen(key_lines[edit_line]) - 1; - - if (i == 254) - i--; - - for (; i >= key_linepos; i--) - key_lines[edit_line][i + 1] = key_lines[edit_line][i]; + // 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); } - - // only null terminate if at the end - i = key_lines[edit_line][key_linepos]; key_lines[edit_line][key_linepos] = ascii; key_linepos++; - - if (!i) - key_lines[edit_line][key_linepos] = 0; } } @@ -496,13 +470,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 +515,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 +589,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 +617,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 +659,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 +685,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; } @@ -749,20 +719,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 @@ -788,12 +758,12 @@ Key_WriteBindings (qfile_t *f) 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 < (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 +792,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,8 +800,12 @@ Key_Init (void) consolekeys[K_SHIFT] = true; consolekeys[K_MWHEELUP] = true; consolekeys[K_MWHEELDOWN] = true; - consolekeys['`'] = false; - consolekeys['~'] = false; + consolekeys[K_KP_PLUS] = true; + consolekeys[K_KP_MINUS] = true; + consolekeys[K_KP_DIVIDE] = true; + consolekeys[K_KP_MULTIPLY] = true; + consolekeys['`'] = true; + consolekeys['~'] = true; menubound[K_ESCAPE] = true; for (i = 0; i < 12; i++) @@ -858,6 +833,109 @@ Should NOT be called during an interrupt! void Key_Event (int key, char ascii, qboolean down) { +#if 1 +#define USERPLAYING() ( !key_consoleactive && key_dest == key_game && (cls.state == ca_connected && cls.signon == SIGNONS) ) +//#define CONSOLEKEY() (key_consoleactive && !consolekeys[key]) +#define CONSOLEKEY() ( key_dest == key_console) + const char *bind; + + // get key binding + bind = keybindings[ key_bmap ][ key ]; + if( !bind ) { + bind = keybindings[ key_bmap2 ][ key ]; + } + + // set key state + keydown[ key ] = down; + + // update key repeats + if( down ) { + key_repeats[ key ]++; + if( key_repeats[ key ] > 1 ) { + if( (key_consoleactive && !consolekeys[key]) || USERPLAYING() ) + return; // ignore most autorepeats + } + } else { + key_repeats[ key ] = 0; + } + + if( key == K_CTRL ) { + ctrl_down = down; + } + + if( !down ) { + if( bind && bind[ 0 ] == '+') { + Cbuf_AddText( va( "-%s %i\n", bind + 1, key) ); + } + } else { + // handle ESCAPE specially, so unbinding wont help + if( key == K_ESCAPE ) { + // ctrl-escape is a safety measure for users who cant toggle the console otherwise + if( ctrl_down ) { + Con_ToggleConsole_f(); + return; + } + switch( key_dest ) { + case key_message: + Key_Message( key, ascii ); + break; + case key_menu: + MR_Keydown( key, ascii ); + break; + case key_game: + MR_ToggleMenu_f(); + break; + default: + Sys_Error( "Bad key_dest" ); + } + return; + } + + if (bind && !strncmp( bind, "toggleconsole", strlen( "toggleconsole" ) ) ) + { + Cbuf_AddText( bind ); + Cbuf_AddText( "\n" ); + } else { + // during demo playback, all keys ingame bring up the main menu + if( cls.demoplayback && !key_consoleactive && key_dest == key_game ) { + MR_ToggleMenu_f (); + return; + } + + // menu bind/function keys or normal binds + if( (key_dest == key_menu && menubound[key]) || USERPLAYING() ) { + if( bind ) { + if( bind[0] == '+' ) { // button commands add keynum as a parm + Cbuf_AddText( va( "%s %i\n", bind, key ) ); + } else { + Cbuf_AddText( bind ); + Cbuf_AddText( "\n" ); + } + } + return; + } + } + + // either console or game state key functions + if( key_consoleactive ) { + Key_Console( key, ascii ); + } else { + switch (key_dest) { + case key_message: + Key_Message( key, ascii ); + break; + case key_menu: + MR_Keydown( key, ascii ); + break; + case key_game: + // unbound key + break; + default: + Sys_Error( "Bad key_dest" ); + } + } + } +#else const char *kb; char cmd[1024]; @@ -877,7 +955,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 } @@ -892,6 +970,12 @@ Key_Event (int key, char ascii, qboolean down) if (key == K_ESCAPE) { if (!down) return; + // ctrl-escape is a safety measure + if (ctrl_down) + { + Con_ToggleConsole_f (); + return; + } switch (key_dest) { case key_message: Key_Message (key, ascii); @@ -911,14 +995,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 +1023,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 +1048,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 +1069,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; @@ -1004,6 +1079,7 @@ Key_Event (int key, char ascii, qboolean down) Sys_Error ("Bad key_dest"); } } +#endif } /*