added BX_WAL_SUPPORT to extensions list and documented it (.wal texture support has...

[xonotic/darkplaces.git] / keys.c

diff --git a/keys.c b/keys.c
index 8bdc4e1de06e8b2a3c910d63a9136ff74aea1215..7ef45f1dedabeaeaae1063530e5830693afcf385 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -21,7 +21,9 @@
 */
 
 #include "quakedef.h"
+#include "cl_video.h"
 
+cvar_t con_closeontoggleconsole = {CVAR_SAVE, "con_closeontoggleconsole","0", "allows toggleconsole binds to close the console as well"};
 
 /*
 key up events are sent even if in console mode
@@ -280,7 +282,7 @@ Key_Console (int key, char ascii)
                        if (i > 0)
                        {
                                cbd[i]=0;
-                               strcat(key_lines[edit_line], cbd);
+                               strlcat(key_lines[edit_line], cbd, sizeof(key_lines[edit_line]));
                                key_linepos += i;
                        }
                        Z_Free(cbd);
@@ -302,6 +304,8 @@ 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]);
+               if(key_lines[edit_line][1] == 0) // empty line (just a ])?
+                       return; // no, no, you can't submit empty lines to the history...
                // LordHavoc: redesigned edit_line/history_line
                edit_line = 31;
                history_line = edit_line;
@@ -358,7 +362,7 @@ Key_Console (int key, char ascii)
        {
                if (key_linepos > 1)
                {
-                       strcpy(key_lines[edit_line] + key_linepos - 1, key_lines[edit_line] + key_linepos);
+                       strlcpy(key_lines[edit_line] + key_linepos - 1, key_lines[edit_line] + key_linepos, sizeof(key_lines[edit_line]) + 1 - key_linepos);
                        key_linepos--;
                }
                return;
@@ -367,8 +371,10 @@ Key_Console (int key, char ascii)
        // delete char on cursor
        if (key == K_DEL || key == K_KP_DEL)
        {
-               if (key_linepos < (int)strlen(key_lines[edit_line]))
-                       strcpy(key_lines[edit_line] + key_linepos, key_lines[edit_line] + key_linepos + 1);
+               size_t linelen;
+               linelen = strlen(key_lines[edit_line]);
+               if (key_linepos < (int)linelen)
+                       memmove(key_lines[edit_line] + key_linepos, key_lines[edit_line] + key_linepos + 1, linelen - key_linepos);
                return;
        }
 
@@ -410,9 +416,11 @@ Key_Console (int key, char ascii)
        {
                if (history_line > 0 && key_lines[history_line-1][1])
                {
+                       size_t linelen;
                        history_line--;
-                       strcpy(key_lines[edit_line], key_lines[history_line]);
-                       key_linepos = (int)strlen(key_lines[edit_line]);
+                       linelen = strlen(key_lines[history_line]);
+                       memcpy(key_lines[edit_line], key_lines[history_line], linelen + 1);
+                       key_linepos = (int)linelen;
                }
                return;
        }
@@ -429,8 +437,10 @@ Key_Console (int key, char ascii)
                }
                else
                {
-                       strcpy(key_lines[edit_line], key_lines[history_line]);
-                       key_linepos = (int)strlen(key_lines[edit_line]);
+                       size_t linelen;
+                       linelen = strlen(key_lines[history_line]);
+                       memcpy(key_lines[edit_line], key_lines[history_line], linelen + 1);
+                       key_linepos = (int)linelen;
                }
                return;
        }
@@ -596,7 +606,7 @@ Key_SetBinding (int keynum, int bindmap, const char *binding)
        char *newbinding;
        size_t l;
 
-       if (keynum == -1)
+       if (keynum == -1 || keynum >= MAX_KEYS)
                return;
 
 // free old bindings
@@ -607,7 +617,7 @@ Key_SetBinding (int keynum, int bindmap, const char *binding)
 // allocate memory for new binding
        l = strlen (binding);
        newbinding = (char *)Z_Malloc (l + 1);
-       strcpy (newbinding, binding);
+       memcpy (newbinding, binding, l + 1);
        newbinding[l] = 0;
        keybindings[bindmap][keynum] = newbinding;
 }
@@ -657,7 +667,7 @@ Key_In_Bind_f (void)
        }
 
        b = Key_StringToKeynum (Cmd_Argv (2));
-       if (b == -1) {
+       if (b == -1 || b >= MAX_KEYS) {
                Con_Printf("\"%s\" isn't a valid key\n", Cmd_Argv (2));
                return;
        }
@@ -752,7 +762,7 @@ Key_Bind_f (void)
                return;
        }
        b = Key_StringToKeynum (Cmd_Argv (1));
-       if (b == -1) {
+       if (b == -1 || b >= MAX_KEYS) {
                Con_Printf("\"%s\" isn't a valid key\n", Cmd_Argv (1));
                return;
        }
@@ -818,11 +828,15 @@ Key_Init (void)
        Cmd_AddCommand ("bind", Key_Bind_f, "binds a command to the specified key in bindmap 0");
        Cmd_AddCommand ("unbind", Key_Unbind_f, "removes a command on the specified key in bindmap 0");
        Cmd_AddCommand ("unbindall", Key_Unbindall_f, "removes all commands from all keys in all bindmaps (leaving only shift-escape and escape)");
+
+       Cvar_RegisterVariable (&con_closeontoggleconsole);
 }
 
 const char *Key_GetBind (int key)
 {
        const char *bind;
+       if (key < 0 || key >= MAX_KEYS)
+               return NULL;
        bind = keybindings[key_bmap][key];
        if (!bind)
                bind = keybindings[key_bmap2][key];
@@ -843,6 +857,9 @@ Key_Event (int key, char ascii, qboolean down)
        const char *bind;
        qboolean q;
 
+       if (key < 0 || key >= MAX_KEYS)
+               return;
+
        // get key binding
        bind = keybindings[key_bmap][key];
        if (!bind)
@@ -946,19 +963,26 @@ Key_Event (int key, char ascii, qboolean down)
                return;
        }
 
-#if 1
+#if 0
        // ignore binds (other than the above escape/F1-F12 keys) while in console
        if (key_consoleactive && down)
 #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 && down && (strncmp(bind, "toggleconsole", strlen("toggleconsole")) || ascii == STRING_COLOR_TAG))
+       if (key_consoleactive && down && (!con_closeontoggleconsole.integer || !bind || strncmp(bind, "toggleconsole", strlen("toggleconsole")) || ascii == STRING_COLOR_TAG))
 #endif
        {
                Key_Console (key, ascii);
                return;
        }
 
+       // ignore binds while a video is played, let the video system handle the key event
+       if (cl_videoplaying)
+       {
+               CL_Video_KeyEvent (key, ascii, keydown[key] != 0);
+               return;
+       }
+
        // anything else is a key press into the game, chat line, or menu
        switch (key_dest)
        {