X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=keys.c;h=82c3edf6fa47501bec130fc30620157d8746a349;hb=18ccad34785dd40794a2198ac79d05694b2f1a40;hp=b522bb4b816d37d1d731ea09fde3ba8abe762001;hpb=95f66338c8144989970daa0fa4b38c87e9af94a0;p=xonotic%2Fdarkplaces.git diff --git a/keys.c b/keys.c index b522bb4b..82c3edf6 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,17 +14,13 @@ 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 /* @@ -34,14 +28,13 @@ 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; @@ -318,17 +311,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; } @@ -377,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; @@ -402,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 @@ -438,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; @@ -454,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; } @@ -465,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; } } @@ -549,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; @@ -792,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]); } @@ -901,6 +867,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); @@ -920,14 +892,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])) @@ -956,7 +920,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; @@ -981,7 +945,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); @@ -1002,7 +966,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;