#include "quakedef.h"
#include "cl_video.h"
+cvar_t con_closeontoggleconsole = {CVAR_SAVE, "con_closeontoggleconsole","1", "allows toggleconsole binds to close the console as well"};
+
/*
key up events are sent even if in console mode
*/
{"AUX31", K_AUX31},
{"AUX32", K_AUX32},
- {"SEMICOLON", ';'}, // because a raw semicolon seperates commands
+ {"SEMICOLON", ';'}, // because a raw semicolon separates commands
{"TILDE", '~'},
{"BACKQUOTE", '`'},
{"QUOTE", '"'},
{"APOSTROPHE", '\''},
+ {"BACKSLASH", '\\'}, // because a raw backslash is used for special characters
{NULL, 0}
};
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);
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;
}
char chat_buffer[MAX_INPUTLINE];
unsigned int chat_bufferlen = 0;
+extern int Nicks_CompleteChatLine(char *buffer, size_t size, unsigned int pos);
+
static void
Key_Message (int key, char ascii)
{
- if (key == K_ENTER)
+ if (key == K_ENTER || ascii == 10 || ascii == 13)
{
Cmd_ForwardStringToServer(va("%s %s", chat_team ? "say_team" : "say ", chat_buffer));
return;
}
+ if(key == K_TAB) {
+ chat_bufferlen = Nicks_CompleteChatLine(chat_buffer, sizeof(chat_buffer), chat_bufferlen);
+ return;
+ }
+
if (chat_bufferlen == sizeof (chat_buffer) - 1)
return; // all full
const keyname_t *kn;
static char tinystr[2];
- if (keynum == -1)
+ // -1 is an invalid code
+ if (keynum < 0)
return "<KEY NOT FOUND>";
- if (keynum > 32 && keynum < 127) { // printable ascii
- tinystr[0] = keynum;
- tinystr[1] = 0;
- return tinystr;
- }
+ // search overrides first, because some characters are special
for (kn = keynames; kn->name; kn++)
if (keynum == kn->keynum)
return kn->name;
+ // if it is printable, output it as a single character
+ if (keynum > 32 && keynum < 256)
+ {
+ tinystr[0] = keynum;
+ tinystr[1] = 0;
+ return tinystr;
+ }
+
+ // if it is not overridden and not printable, we don't know what to do with it
return "<UNKNOWN KEYNUM>";
}
Z_Free (keybindings[bindmap][keynum]);
keybindings[bindmap][keynum] = NULL;
}
+ if(!binding[0]) // make "" binds be removed --blub
+ return;
// 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;
}
Key_WriteBindings (qfile_t *f)
{
int i, j;
+ char bindbuf[MAX_INPUTLINE];
+ const char *p;
- for (i = 0; i < (int)(sizeof(keybindings[0])/sizeof(keybindings[0][0])); i++)
- if (keybindings[0][i])
- FS_Printf(f, "bind \"%s\" \"%s\"\n",
- Key_KeynumToString (i), keybindings[0][i]);
- for (j = 1; j < 8; j++)
+ for (j = 0; j < MAX_BINDMAPS; 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",
- j, Key_KeynumToString (i), keybindings[j][i]);
+ {
+ p = keybindings[j][i];
+ if (p)
+ {
+ Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\");
+ if (j == 0)
+ FS_Printf(f, "bind %s \"%s\"\n", Key_KeynumToString (i), bindbuf);
+ else
+ FS_Printf(f, "in_bind %d %s \"%s\"\n", j, Key_KeynumToString (i), bindbuf);
+ }
+ }
+ }
}
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)
if (!bind)
bind = keybindings[key_bmap2][key];
+ if (developer.integer >= 1000)
+ Con_Printf("Key_Event(%i, '%c', %s) keydown %i bind \"%s\"\n", key, ascii, down ? "down" : "up", keydown[key], bind ? bind : "");
+
if(key_dest == key_game)
{
q = CL_VM_InputEvent(!down, key);
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);
projects / xonotic / darkplaces.git / blobdiff