]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - keys.c
made darkplaces compile successfully with g++ to test for errors C doesn't care about...
[xonotic/darkplaces.git] / keys.c
diff --git a/keys.c b/keys.c
index 922ef11ea7245246ca20d7573646fcca51cfd67d..b17c3f66845ffa80bb038bc9c62c4b8ee5c01059 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
 
        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>
 
-extern void SCR_UpdateScreen (void);
 
 /*
 key up events are sent even if in console mode
 */
 
-#define MAX_INPUTLINE 256
-char           key_lines[32][MAX_INPUTLINE];
+int                    edit_line = MAX_INPUTLINES-1;
+int                    history_line = MAX_INPUTLINES-1;
+char           key_lines[MAX_INPUTLINES][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;
-
+qboolean       key_insert = true;      // insert key toggle (for editing)
 keydest_t      key_dest;
 int                    key_consoleactive;
+char           *keybindings[MAX_BINDMAPS][MAX_KEYS];
 
-static int     key_count;                                      // incremented every key event
 static int     key_bmap, key_bmap2;
-
-char                           *keybindings[8][1024];
-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[MAX_KEYS];        // 0 = up, 1 = down, 2 = repeating
 
 typedef struct {
        const char      *name;
@@ -154,10 +135,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},
@@ -212,7 +205,7 @@ static const keyname_t   keynames[] = {
 void
 Key_ClearEditLine (int edit_line)
 {
-       memset (key_lines[edit_line], '\0', MAX_INPUTLINE);
+       memset (key_lines[edit_line], '\0', sizeof(key_lines[edit_line]));
        key_lines[edit_line][0] = ']';
        key_linepos = 1;
 }
@@ -272,8 +265,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;
@@ -281,7 +272,7 @@ Key_Console (int key, char ascii)
                {
                        int i;
                        strtok(cbd, "\n\r\b");
-                       i = strlen(cbd);
+                       i = (int)strlen(cbd);
                        if (i + key_linepos >= MAX_INPUTLINE)
                                i= MAX_INPUTLINE - key_linepos;
                        if (i > 0)
@@ -294,7 +285,6 @@ Key_Console (int key, char ascii)
                }
                return;
        }
-       #endif
 
        if (key == 'l')
        {
@@ -310,17 +300,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;
        }
 
@@ -359,7 +348,7 @@ Key_Console (int key, char ascii)
        // delete char on cursor
        if (key == K_DEL || key == K_KP_DEL)
        {
-               if ((size_t)key_linepos < strlen(key_lines[edit_line]))
+               if (key_linepos < (int)strlen(key_lines[edit_line]))
                        strcpy(key_lines[edit_line] + key_linepos, key_lines[edit_line] + key_linepos + 1);
                return;
        }
@@ -369,16 +358,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 (key_linepos < (int)strlen(key_lines[edit_line]))
                        key_linepos++;
 
                return;
@@ -394,51 +374,44 @@ 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 = (int)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
                {
                        strcpy(key_lines[edit_line], key_lines[history_line]);
-                       key_linepos = strlen(key_lines[edit_line]);
+                       key_linepos = (int)strlen(key_lines[edit_line]);
                }
                return;
        }
 
        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 +419,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 +430,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 = (int)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 +459,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 +504,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;
@@ -594,8 +553,8 @@ Key_KeynumToString (int keynum)
 void
 Key_SetBinding (int keynum, int bindmap, const char *binding)
 {
-       char       *new;
-       int         l;
+       char *newbinding;
+       size_t l;
 
        if (keynum == -1)
                return;
@@ -607,10 +566,10 @@ Key_SetBinding (int keynum, int bindmap, const char *binding)
        }
 // allocate memory for new binding
        l = strlen (binding);
-       new = Z_Malloc (l + 1);
-       strcpy (new, binding);
-       new[l] = 0;
-       keybindings[bindmap][keynum] = new;
+       newbinding = (char *)Z_Malloc (l + 1);
+       strcpy (newbinding, binding);
+       newbinding[l] = 0;
+       keybindings[bindmap][keynum] = newbinding;
 }
 
 static void
@@ -788,12 +747,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]);
 }
 
@@ -809,33 +768,6 @@ Key_Init (void)
        }
        key_linepos = 1;
 
-//
-// init ascii characters in console mode
-//
-       for (i = 32; i < 128; i++)
-               consolekeys[i] = true;
-       consolekeys[K_ENTER] = true; consolekeys[K_KP_ENTER] = true;
-       consolekeys[K_TAB] = true;
-       consolekeys[K_LEFTARROW] = true; consolekeys[K_KP_LEFTARROW] = true;
-       consolekeys[K_RIGHTARROW] = true; consolekeys[K_KP_RIGHTARROW] = true;
-       consolekeys[K_UPARROW] = true; consolekeys[K_KP_UPARROW] = true;
-       consolekeys[K_DOWNARROW] = true; consolekeys[K_KP_DOWNARROW] = true;
-       consolekeys[K_BACKSPACE] = true;
-       consolekeys[K_DEL] = true; consolekeys[K_KP_DEL] = 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;
-       consolekeys[K_PGDN] = true; consolekeys[K_KP_PGDN] = true;
-       consolekeys[K_SHIFT] = true;
-       consolekeys[K_MWHEELUP] = true;
-       consolekeys[K_MWHEELDOWN] = true;
-       consolekeys['`'] = false;
-       consolekeys['~'] = false;
-
-       menubound[K_ESCAPE] = true;
-       for (i = 0; i < 12; i++)
-               menubound[K_F1 + i] = true;
-
 //
 // register our functions
 //
@@ -858,41 +790,62 @@ Should NOT be called during an interrupt!
 void
 Key_Event (int key, char ascii, qboolean down)
 {
-       const char      *kb;
-       char            cmd[1024];
+       const char *bind;
 
-       keydown[key] = down;
+       // get key binding
+       bind = keybindings[key_bmap][key];
+       if (!bind)
+               bind = keybindings[key_bmap2][key];
 
        if (!down)
-               key_repeats[key] = 0;
-
-       key_lastpress = key;
-       key_count++;
-       if (key_count <= 0) {
-               return;                                                 // just catching keys for Con_NotifyBox
+       {
+               // 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;
        }
 
-       // update auto-repeat status
-       if (down) {
-               key_repeats[key]++;
-               if (key_repeats[key] > 1) {
-                       if ((key_consoleactive && !consolekeys[key]) ||
-                                       (key_dest == key_game &&
-                                        (cls.state == ca_connected && cls.signon == SIGNONS)))
-                               return;                                         // ignore most autorepeats
-               }
-       }
+       // from here on we know this is a down event
 
-       if (key == K_CTRL)
-               ctrl_down = down;
+       // 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).
        //
-       // handle escape specially, so the user can never unbind it
-       //
-       if (key == K_ESCAPE) {
-               if (!down)
+       // 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;
-               switch (key_dest) {
+               // 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 & KEY_CONSOLEACTIVE_USER) || keydown[K_SHIFT])
+               {
+                       Con_ToggleConsole_f ();
+                       return;
+               }
+               switch (key_dest)
+               {
                        case key_message:
                                Key_Message (key, ascii);
                                break;
@@ -906,103 +859,72 @@ Key_Event (int key, char ascii, qboolean down)
                                if(UI_Callback_IsSlotUsed(key_dest - 3))
                                        UI_Callback_KeyDown (key, ascii);
                                else
-                                       Sys_Error ("Bad key_dest");
+                                       Con_Printf ("Key_Event: Bad key_dest");
                }
                return;
        }
 
-       // console key is hardcoded, so the user can never unbind it
-       if (key == '`' || key == '~')
+       // send function keydowns to interpreter no matter what mode is
+       if (key >= K_F1 && key <= K_F12)
        {
-               if (down)
-                       Con_ToggleConsole_f ();
+               // 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 (down)
+#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
        {
-               if (!(kb = keybindings[key_bmap][key]))
-                       kb = keybindings[key_bmap2][key];
-               if (kb && !strncmp(kb, "toggleconsole", strlen("toggleconsole")))
-               {
-                       Cbuf_AddText (kb);
-                       Cbuf_AddText ("\n");
-                       return;
-               }
+               Key_Console (key, ascii);
+               return;
        }
 
-       if (key_consoleactive && consolekeys[key] && down)
-               Key_Console (key, ascii);
-       else
+       // anything else is a key press into the game, chat line, or menu
+       switch (key_dest)
        {
-               //
-               // 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 (!down) {
-                       if (!(kb = keybindings[key_bmap][key]))
-                               kb = keybindings[key_bmap2][key];
-
-                       if (kb && kb[0] == '+') {
-                               snprintf (cmd, sizeof(cmd), "-%s %i\n", kb + 1, key);
-                               Cbuf_AddText (cmd);
-                       }
-                       return;
-               }
-
-               //
-               // during demo playback, most keys bring up the main menu
-               //
-               if (cls.demoplayback && down && consolekeys[key] && key_dest == key_game) {
-                       MR_ToggleMenu_f ();
-                       return;
-               }
-
-               //
-               // if not a consolekey, send to the interpreter no matter what mode is
-               //
-               if ((key_dest == key_menu && menubound[key])
-                               || (key_consoleactive && !consolekeys[key])
-                               || (key_dest == key_game &&
-                                       ((cls.state == ca_connected) || !consolekeys[key]))) {
-                       if (!(kb = keybindings[key_bmap][key]))
-                               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);
-                                       Cbuf_AddText (cmd);
-                               } else {
-                                       Cbuf_AddText (kb);
+               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");
                                }
                        }
-                       return;
-               }
-
-               if (!down)
-                       return;                                                 // other systems only care about key
-               // down events
-
-               switch (key_dest) {
-                       case key_message:
-                               Key_Message (key, ascii);
-                               break;
-                       case key_menu:
-                               MR_Keydown (key, ascii);
-                               break;
-
-                       case key_game:
-                               Key_Console (key, ascii);
-                               break;
-                       default:
-                               if(UI_Callback_IsSlotUsed(key_dest - 3))
-                                       UI_Callback_KeyDown (key, ascii);
-                               else
-                                       Sys_Error ("Bad key_dest");
-               }
+                       break;
+               default:
+                       if(UI_Callback_IsSlotUsed(key_dest - 3))
+                               UI_Callback_KeyDown (key, ascii);
+                       else
+                               Con_Printf ("Key_Event: Bad key_dest");
        }
 }
 
@@ -1014,11 +936,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));
 }