X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=keys.c;h=da4320e0ba311169feb8b90f5c77aecede172160;hb=59eb52a8948e5bcaaa12590ff71ae7e9c401a0f0;hp=d4935d0564a9bc6d441a97913023cc27e7ccde71;hpb=1fcfe575ba34645b03784bb75fe3b95f85785508;p=xonotic%2Fdarkplaces.git diff --git a/keys.c b/keys.c index d4935d05..da4320e0 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,38 +14,29 @@ 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; -static int key_count; // incremented every key event static int key_bmap, key_bmap2; char *keybindings[8][1024]; @@ -55,8 +44,7 @@ static qboolean consolekeys[1024]; // if true, can't be rebound while in // console static qboolean menubound[1024]; // if true, can't be rebound while in // menu -static unsigned int key_repeats[1024]; // if > 1, it is autorepeating -static qboolean keydown[1024]; +static qbyte keydown[1024]; // 0 = up, 1 = down, 2 = repeating typedef struct { const char *name; @@ -154,10 +142,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}, @@ -307,17 +307,16 @@ 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; + // 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; } @@ -366,16 +365,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; @@ -391,30 +381,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 @@ -427,15 +410,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; @@ -443,7 +426,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; } @@ -454,32 +437,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; } } @@ -493,13 +466,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; @@ -542,7 +511,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; @@ -785,12 +754,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]); } @@ -860,13 +829,251 @@ Should NOT be called during an interrupt! void Key_Event (int key, char ascii, qboolean down) { +#if 0 +#define USERPLAYING() ( !key_consoleactive && key_dest == key_game && (cls.state == ca_connected && cls.signon == SIGNONS) ) + const char *bind; + + // get key binding + bind = keybindings[ key_bmap ][ key ]; + if( !bind ) { + bind = keybindings[ key_bmap2 ][ key ]; + } + + // update key repeats + if( down ) { + keydown[ key ] = min(keydown[ key ] + 1, 2); + if( keydown[ key ] > 1 ) { + if( (key_consoleactive && !consolekeys[key]) || USERPLAYING() ) + return; // ignore most autorepeats + } + } else { + keydown[ key ] = 0; + } + + 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 ) { + // shift-escape is a safety measure for users who cant toggle the console otherwise + if( keydown[K_SHIFT] ) { + 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: + if (COM_CheckParm ("-demolooponly")) + { + CL_Disconnect (); + return; + } + MR_ToggleMenu_f(); + break; + default: + Sys_Error( "Bad key_dest" ); + } + return; + } + + if( !(key_consoleactive && consolekeys[ key ]) && bind && !strncmp( bind, "toggleconsole", strlen( "toggleconsole" ) ) ) { + Cbuf_AddText( bind ); + Cbuf_AddText( "\n" ); + if( ascii != STRING_COLOR_TAG ) { + return; + } + } else { + // during demo playback, all keys ingame bring up the main menu + if( cls.demoplayback && !key_consoleactive && key_dest == key_game ) { + if (!COM_CheckParm ("-demolooponly")) + 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" ); + } + } + } +#elif 1 +#define USERPLAYING() ( !key_consoleactive && key_dest == key_game && (cls.state == ca_connected && cls.signon == SIGNONS) ) + const char *bind; + + // get key binding + bind = keybindings[key_bmap][key]; + if (!bind) + bind = keybindings[key_bmap2][key]; + + if (!down) + { + // 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; + } + + // 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 + // situation). + // + // this also means that toggling the console on/off does not lose the old + // key_dest state + + // specially handle escape (togglemenu) and shift-escape (toggleconsole) + // engine bindings, these are not handled as normal binds so that the user + // can recover from a completely empty bindmap + if (key == K_ESCAPE) + { + // 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 || keydown[K_SHIFT]) + { + 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: + if(UI_Callback_IsSlotUsed(key_dest - 3)) + UI_Callback_KeyDown (key, ascii); + else + Sys_Error ("Bad key_dest"); + } + return; + } + + // send function keydowns to interpreter no matter what mode is + if (key >= K_F1 && key <= K_F12) + { + // 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 + { + Cbuf_AddText (bind); + Cbuf_AddText ("\n"); + } + } + 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 + { + Key_Console (key, ascii); + return; + } + + // anything else is a key press into the game, chat line, or menu + switch (key_dest) + { + case key_message: + Key_Message (key, ascii); + break; + case key_menu: + MR_Keydown (key, ascii); + break; + case key_game: + // ignore key repeats on binds + if (bind && keydown[key] == 1) + { + // button commands add keynum as a parm + if (bind[0] == '+') + Cbuf_AddText (va("%s %i\n", bind, key)); + else + { + Cbuf_AddText (bind); + Cbuf_AddText ("\n"); + } + } + break; + default: + if(UI_Callback_IsSlotUsed(key_dest - 3)) + UI_Callback_KeyDown (key, ascii); + else + Sys_Error ("Bad key_dest"); + } +#else const char *kb; char cmd[1024]; - keydown[key] = down; - if (!down) - key_repeats[key] = 0; + keydown[key] = 0; key_lastpress = key; key_count++; @@ -876,8 +1083,8 @@ Key_Event (int key, char ascii, qboolean down) // update auto-repeat status if (down) { - key_repeats[key]++; - if (key_repeats[key] > 1) { + keydown[key] = min(keydown[key] + 1, 2); + if (keydown[key] > 1) { if ((key_consoleactive && !consolekeys[key]) || (!key_consoleactive && key_dest == key_game && (cls.state == ca_connected && cls.signon == SIGNONS))) @@ -894,6 +1101,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); @@ -913,14 +1126,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])) @@ -949,7 +1154,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; @@ -974,7 +1179,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); @@ -995,7 +1200,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; @@ -1006,6 +1210,7 @@ Key_Event (int key, char ascii, qboolean down) Sys_Error ("Bad key_dest"); } } +#endif } /* @@ -1016,11 +1221,5 @@ Key_ClearStates void Key_ClearStates (void) { - int i; - - for (i = 0; i < (int)(sizeof(keydown)/sizeof(keydown[0])); i++) - { - keydown[i] = false; - key_repeats[i] = 0; - } + memset(keydown, 0, sizeof(keydown)); }