*/
#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
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;
}
- free(cbd);
+ Z_Free(cbd);
}
return;
}
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;
{
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;
// 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;
}
{
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;
}
}
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;
}
if (keydown[K_CTRL])
con_backscroll = 0;
else
- key_linepos = strlen(key_lines[edit_line]);
+ key_linepos = (int)strlen(key_lines[edit_line]);
return;
}
char *newbinding;
size_t l;
- if (keynum == -1)
+ if (keynum == -1 || keynum >= MAX_KEYS)
return;
// free old bindings
// 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;
}
}
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;
}
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;
}
//
// register our functions
//
- Cmd_AddCommand ("in_bind", Key_In_Bind_f);
- Cmd_AddCommand ("in_unbind", Key_In_Unbind_f);
- Cmd_AddCommand ("in_bindmap", Key_In_Bindmap_f);
+ Cmd_AddCommand ("in_bind", Key_In_Bind_f, "binds a command to the specified key in the selected bindmap");
+ Cmd_AddCommand ("in_unbind", Key_In_Unbind_f, "removes command on the specified key in the selected bindmap");
+ Cmd_AddCommand ("in_bindmap", Key_In_Bindmap_f, "selects active foreground and background (used only if a key is not bound in the foreground) bindmaps for typing");
+
+ 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)");
- Cmd_AddCommand ("bind", Key_Bind_f);
- Cmd_AddCommand ("unbind", Key_Unbind_f);
- Cmd_AddCommand ("unbindall", Key_Unbindall_f);
+ 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];
const char *bind;
qboolean q;
+ if (key < 0 || key >= MAX_KEYS)
+ return;
+
// get key binding
bind = keybindings[key_bmap][key];
if (!bind)
}
}
- if (!down)
+ if (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);
+ }
+ else
{
// clear repeat count now that the key is released
keydown[key] = 0;
// 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
// 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])
+ if (((key_consoleactive & KEY_CONSOLEACTIVE_USER) || keydown[K_SHIFT]) && down)
{
Con_ToggleConsole_f ();
return;
switch (key_dest)
{
case key_message:
- Key_Message (key, ascii);
+ if (down)
+ Key_Message (key, ascii);
break;
case key_menu:
- MR_Keydown (key, ascii);
+ MR_KeyEvent (key, ascii, down);
break;
case key_game:
- MR_ToggleMenu_f ();
+ if (down)
+ MR_ToggleMenu_f ();
break;
default:
- if(UI_Callback_IsSlotUsed(key_dest - 3))
- UI_Callback_KeyDown (key, ascii);
- else
- Con_Printf ("Key_Event: Bad key_dest\n");
+ Con_Printf ("Key_Event: Bad key_dest\n");
}
return;
}
// send function keydowns to interpreter no matter what mode is
- if (key >= K_F1 && key <= K_F12)
+ if (key >= K_F1 && key <= K_F12 && down)
{
// ignore key repeats on F1-F12 binds
if (keydown[key] > 1)
return;
}
-#if 1
+#if 0
// ignore binds (other than the above escape/F1-F12 keys) while in console
- if (key_consoleactive)
+ 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 && (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)
{
case key_message:
- Key_Message (key, ascii);
+ if (down)
+ Key_Message (key, ascii);
break;
case key_menu:
- MR_Keydown (key, ascii);
+ MR_KeyEvent (key, ascii, down);
break;
case key_game:
// ignore key repeats on binds
- if (bind && keydown[key] == 1)
+ if (bind && keydown[key] == 1 && down)
{
// button commands add keynum as a parm
if (bind[0] == '+')
}
break;
default:
- if(UI_Callback_IsSlotUsed(key_dest - 3))
- UI_Callback_KeyDown (key, ascii);
- else
- Con_Printf ("Key_Event: Bad key_dest\n");
+ Con_Printf ("Key_Event: Bad key_dest\n");
}
}
projects / xonotic / darkplaces.git / blobdiff