391 (-2)

[xonotic/darkplaces.git] / keys.c

diff --git a/keys.c b/keys.c
index 52363ee0c62f8013889bbd999fd062461f49ae7f..d069adfa3f9590817e8b09b54c56bde4c6ab271e 100644 (file)
--- 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 <ctype.h>
 
 
 /*
@@ -38,7 +32,7 @@ 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                    key_insert = true;      // insert key toggle (for editing)
 
 int         edit_line = 0;
 int         history_line = 0;
@@ -325,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;
        }
 
@@ -377,16 +368,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;
@@ -438,7 +420,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;
@@ -446,7 +428,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;
@@ -465,7 +447,7 @@ Key_Console (int key, char ascii)
        }
 
        // non printable
-       if (ascii < 32 || ascii > 126)
+       if (ascii < 32)
                return;
 
        if (key_linepos < MAX_INPUTLINE-1)
@@ -549,7 +531,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;
@@ -920,14 +902,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 +930,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 +955,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 +976,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;