#include "quakedef.h"
#include "cl_video.h"
#include "utf8lib.h"
+#include "csprogs.h"
-cvar_t con_closeontoggleconsole = {CVAR_SAVE, "con_closeontoggleconsole","1", "allows toggleconsole binds to close the console as well; when set to 2, this even works when not at the start of the line in console input; when set to 3, this works even if the toggleconsole key is the color tag"};
+cvar_t con_closeontoggleconsole = {CVAR_CLIENT | CVAR_SAVE, "con_closeontoggleconsole","1", "allows toggleconsole binds to close the console as well; when set to 2, this even works when not at the start of the line in console input; when set to 3, this works even if the toggleconsole key is the color tag"};
/*
key up events are sent even if in console mode
qfile_t *historyfile;
ConBuffer_Init(&history, HIST_TEXTSIZE, HIST_MAXLINES, zonemempool);
+// not necessary for mobile
+#ifndef DP_MOBILETOUCH
historyfile = FS_OpenRealFile("darkplaces_history.txt", "rb", false); // rb to handle unix line endings on windows too
if(historyfile)
{
FS_Close(historyfile);
}
+#endif
history_line = -1;
}
{
// TODO write history to a file
+// not necessary for mobile
+#ifndef DP_MOBILETOUCH
qfile_t *historyfile = FS_OpenRealFile("darkplaces_history.txt", "w", false);
if(historyfile)
{
FS_Printf(historyfile, "%s\n", ConBuffer_GetLine(&history, i));
FS_Close(historyfile);
}
+#endif
ConBuffer_Shutdown(&history);
}
if(key_line[1]) // empty?
if(strcmp(key_line, "]quit")) // putting these into the history just sucks
if(strncmp(key_line, "]quit ", 6)) // putting these into the history just sucks
- ConBuffer_AddLine(&history, key_line + 1, strlen(key_line) - 1, 0);
+ if(strcmp(key_line, "]rcon_password")) // putting these into the history just sucks
+ if(strncmp(key_line, "]rcon_password ", 15)) // putting these into the history just sucks
+ ConBuffer_AddLine(&history, key_line + 1, (int)strlen(key_line) - 1, 0);
Con_Printf("%s\n", key_line); // don't mark empty lines as history
history_line = -1;
if (history_matchfound)
history_matchfound = false;
}
-qboolean Key_History_Get_foundCommand(void)
+static qboolean Key_History_Get_foundCommand(void)
{
if (!history_matchfound)
return false;
strlcpy(key_line + 1, ConBuffer_GetLine(&history, history_line), sizeof(key_line) - 1);
- key_linepos = strlen(key_line);
+ key_linepos = (int)strlen(key_line);
history_matchfound = false;
return true;
}
if(history_line != -1)
{
strlcpy(key_line + 1, ConBuffer_GetLine(&history, history_line), sizeof(key_line) - 1);
- key_linepos = strlen(key_line);
+ key_linepos = (int)strlen(key_line);
}
}
else if(history_line > 0)
{
--history_line; // this also does -1 -> 0, so it is good
strlcpy(key_line + 1, ConBuffer_GetLine(&history, history_line), sizeof(key_line) - 1);
- key_linepos = strlen(key_line);
+ key_linepos = (int)strlen(key_line);
}
}
strlcpy(key_line + 1, history_savedline, sizeof(key_line) - 1);
}
- key_linepos = strlen(key_line);
+ key_linepos = (int)strlen(key_line);
}
static void Key_History_First(void)
{
history_line = 0;
strlcpy(key_line + 1, ConBuffer_GetLine(&history, history_line), sizeof(key_line) - 1);
- key_linepos = strlen(key_line);
+ key_linepos = (int)strlen(key_line);
}
}
{
history_line = CONBUFFER_LINES_COUNT(&history) - 1;
strlcpy(key_line + 1, ConBuffer_GetLine(&history, history_line), sizeof(key_line) - 1);
- key_linepos = strlen(key_line);
+ key_linepos = (int)strlen(key_line);
}
}
{
int i;
const char *partial = key_line + 1;
- size_t digits = strlen(va("%i", HIST_MAXLINES));
+ char vabuf[1024];
+ size_t digits = strlen(va(vabuf, sizeof(vabuf), "%i", HIST_MAXLINES));
if (history_line == -1) // editing the "new" line
strlcpy(history_savedline, key_line + 1, sizeof(history_savedline));
if (!*partial)
partial = "*";
else if (!( strchr(partial, '*') || strchr(partial, '?') )) // no pattern?
- partial = va("*%s*", partial);
+ partial = va(vabuf, sizeof(vabuf), "*%s*", partial);
for ( ; i >= 0; i--)
if (matchpattern_with_separator(ConBuffer_GetLine(&history, i), partial, true, "", false))
{
int i;
const char *partial = key_line + 1;
- size_t digits = strlen(va("%i", HIST_MAXLINES));
+ char vabuf[1024];
+ size_t digits = strlen(va(vabuf, sizeof(vabuf), "%i", HIST_MAXLINES));
if (history_line == -1) // editing the "new" line
return;
if (!*partial)
partial = "*";
else if (!( strchr(partial, '*') || strchr(partial, '?') )) // no pattern?
- partial = va("*%s*", partial);
+ partial = va(vabuf, sizeof(vabuf), "*%s*", partial);
for ( ; i < CONBUFFER_LINES_COUNT(&history); i++)
if (matchpattern_with_separator(ConBuffer_GetLine(&history, i), partial, true, "", false))
{
const char *partial = key_line + 1;
int i, count = 0;
- size_t digits = strlen(va("%i", HIST_MAXLINES));
+ char vabuf[1024];
+ size_t digits = strlen(va(vabuf, sizeof(vabuf), "%i", HIST_MAXLINES));
Con_Printf("History commands containing \"%s\":\n", key_line + 1);
if (!*partial)
partial = "*";
else if (!( strchr(partial, '*') || strchr(partial, '?') )) // no pattern?
- partial = va("*%s*", partial);
+ partial = va(vabuf, sizeof(vabuf), "*%s*", partial);
for (i=0; i<CONBUFFER_LINES_COUNT(&history); i++)
if (matchpattern_with_separator(ConBuffer_GetLine(&history, i), partial, true, "", false))
Con_Printf("%i result%s\n\n", count, (count != 1) ? "s" : "");
}
-static void Key_History_f(void)
+static void Key_History_f(cmd_state_t *cmd)
{
char *errchar = NULL;
int i = 0;
- size_t digits = strlen(va("%i", HIST_MAXLINES));
+ char vabuf[1024];
+ size_t digits = strlen(va(vabuf, sizeof(vabuf), "%i", HIST_MAXLINES));
- if (Cmd_Argc () > 1)
+ if (Cmd_Argc (cmd) > 1)
{
- if (!strcmp(Cmd_Argv (1), "-c"))
+ if (!strcmp(Cmd_Argv(cmd, 1), "-c"))
{
ConBuffer_Clear(&history);
return;
}
- i = strtol(Cmd_Argv (1), &errchar, 0);
+ i = strtol(Cmd_Argv(cmd, 1), &errchar, 0);
if ((i < 0) || (i > CONBUFFER_LINES_COUNT(&history)) || (errchar && *errchar))
i = 0;
else
{"X360_RIGHT_THUMB_LEFT", K_X360_RIGHT_THUMB_LEFT},
{"X360_RIGHT_THUMB_RIGHT", K_X360_RIGHT_THUMB_RIGHT},
+ {"JOY_UP", K_JOY_UP},
+ {"JOY_DOWN", K_JOY_DOWN},
+ {"JOY_LEFT", K_JOY_LEFT},
+ {"JOY_RIGHT", K_JOY_RIGHT},
+
{"SEMICOLON", ';'}, // because a raw semicolon separates commands
{"TILDE", '~'},
{"BACKQUOTE", '`'},
====================
*/
static void
-Key_Console (int key, int unicode)
+Key_Console (cmd_state_t *cmd, int key, int unicode)
{
- // LordHavoc: copied most of this from Q2 to improve keyboard handling
+ // LadyHavoc: copied most of this from Q2 to improve keyboard handling
switch (key)
{
case K_KP_SLASH:
i= MAX_INPUTLINE - key_linepos - 1;
if (i > 0)
{
- // terencehill: insert the clipboard text between the characters of the line
- /*
- char *temp = (char *) Z_Malloc(MAX_INPUTLINE);
- cbd[i]=0;
- temp[0]=0;
- if ( key_linepos < (int)strlen(key_line) )
- strlcpy(temp, key_line + key_linepos, (int)strlen(key_line) - key_linepos +1);
- key_line[key_linepos] = 0;
- strlcat(key_line, cbd, sizeof(key_line));
- if (temp[0])
- strlcat(key_line, temp, sizeof(key_line));
- Z_Free(temp);
- key_linepos += i;
- */
- // blub: I'm changing this to use memmove() like the rest of the code does.
cbd[i] = 0;
memmove(key_line + key_linepos + i, key_line + key_linepos, sizeof(key_line) - key_linepos - i);
memcpy(key_line + key_linepos, cbd, i);
if (key == 'l' && keydown[K_CTRL])
{
- Cbuf_AddText ("clear\n");
+ Cbuf_AddText (cmd, "clear\n");
return;
}
if (key == K_ENTER || key == K_KP_ENTER)
{
- Cbuf_AddText (key_line+1); // skip the ]
- Cbuf_AddText ("\n");
+ Cbuf_AddText (cmd, key_line+1); // skip the ]
+ Cbuf_AddText (cmd, "\n");
Key_History_Push();
key_line[0] = ']';
key_line[1] = 0; // EvilTypeGuy: null terminate
key_linepos += cvar_len;
// save the content of the variable in cvar_str
- cvar_str = Cvar_VariableString(cvar);
- cvar_str_len = strlen(cvar_str);
+ cvar_str = Cvar_VariableString(&cvars_all, cvar, CVAR_CLIENT | CVAR_SERVER);
+ cvar_str_len = (int)strlen(cvar_str);
if (cvar_str_len==0)
return;
// insert space and cvar_str in key_line
- chars_to_move = strlen(&key_line[key_linepos]);
+ chars_to_move = (int)strlen(&key_line[key_linepos]);
if (key_linepos + 1 + cvar_str_len + chars_to_move < MAX_INPUTLINE)
{
if (chars_to_move)
// Enhanced command completion
// by EvilTypeGuy eviltypeguy@qeradiant.com
// Thanks to Fett, Taniwha
- Con_CompleteCommandLine();
+ Con_CompleteCommandLine(cmd);
return;
}
{
int pos;
size_t inchar = 0;
- pos = u8_prevbyte(key_line+1, key_linepos-1) + 1; // do NOT give the ']' to u8_prevbyte
+ pos = (int)u8_prevbyte(key_line+1, key_linepos-1) + 1; // do NOT give the ']' to u8_prevbyte
while (pos)
if(pos-1 > 0 && key_line[pos-1] == STRING_COLOR_TAG && isdigit(key_line[pos]))
pos-=2;
}
// we need to move to the beginning of the character when in a wide character:
u8_charidx(key_line, pos + 1, &inchar);
- key_linepos = pos + 1 - inchar;
+ key_linepos = (int)(pos + 1 - inchar);
}
else
{
- key_linepos = u8_prevbyte(key_line+1, key_linepos-1) + 1; // do NOT give the ']' to u8_prevbyte
+ key_linepos = (int)u8_prevbyte(key_line+1, key_linepos-1) + 1; // do NOT give the ']' to u8_prevbyte
}
return;
}
{
if (key_linepos > 1)
{
- int newpos = u8_prevbyte(key_line+1, key_linepos-1) + 1; // do NOT give the ']' to u8_prevbyte
+ int newpos = (int)u8_prevbyte(key_line+1, key_linepos-1) + 1; // do NOT give the ']' to u8_prevbyte
strlcpy(key_line + newpos, key_line + key_linepos, sizeof(key_line) + 1 - key_linepos);
key_linepos = newpos;
}
// skip the char
if (key_line[pos] == STRING_COLOR_TAG && key_line[pos+1] == STRING_COLOR_TAG) // consider ^^ as a character
pos++;
- pos += u8_bytelen(key_line + pos, 1);
+ pos += (int)u8_bytelen(key_line + pos, 1);
// now go beyond all next consecutive color tags, if any
if(pos < len)
key_linepos = pos;
}
else
- key_linepos += u8_bytelen(key_line + key_linepos, 1);
+ key_linepos += (int)u8_bytelen(key_line + key_linepos, 1);
return;
}
Key_History_Down();
return;
}
- // ~1.0795 = 82/76 using con_textsize 64 76 is height of the char, 6 is the distance between 2 lines
if (keydown[K_CTRL])
{
// text zoom reset
if (key == '0' || key == K_KP_INS)
{
- Cvar_SetValueQuick(&con_textsize, atoi(Cvar_VariableDefString("con_textsize")));
+ Cvar_SetValueQuick(&con_textsize, atoi(Cvar_VariableDefString(&cvars_all, "con_textsize", CVAR_CLIENT | CVAR_SERVER)));
return;
}
}
// check insert mode, or always insert if at end of line
if (key_insert || len == 0)
{
+ if (key_linepos + len + blen >= MAX_INPUTLINE)
+ return;
// can't use strcpy to move string to right
len++;
- //memmove(&key_line[key_linepos + u8_bytelen(key_line + key_linepos, 1)], &key_line[key_linepos], len);
+ if (key_linepos + blen + len >= MAX_INPUTLINE)
+ return;
memmove(&key_line[key_linepos + blen], &key_line[key_linepos], len);
}
+ else if (key_linepos + len + blen - u8_bytelen(key_line + key_linepos, 1) >= MAX_INPUTLINE)
+ return;
memcpy(key_line + key_linepos, buf, blen);
+ if (blen > len)
+ key_line[key_linepos + blen] = 0;
+ // END OF FIXME
key_linepos += blen;
- //key_linepos += u8_fromchar(unicode, key_line + key_linepos, sizeof(key_line) - key_linepos - 1);
- //key_line[key_linepos] = ascii;
- //key_linepos++;
}
}
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, int ascii)
+Key_Message (cmd_state_t *cmd, int key, int ascii)
{
- if (key == K_ENTER || ascii == 10 || ascii == 13)
+ char vabuf[1024];
+ if (key == K_ENTER || key == K_KP_ENTER || ascii == 10 || ascii == 13)
{
if(chat_mode < 0)
- Cmd_ExecuteString(chat_buffer, src_command); // not Cbuf_AddText to allow semiclons in args; however, this allows no variables then. Use aliases!
+ Cmd_ExecuteString(cmd, chat_buffer, src_command, true); // not Cbuf_AddText to allow semiclons in args; however, this allows no variables then. Use aliases!
else
- Cmd_ForwardStringToServer(va("%s %s", chat_mode ? "say_team" : "say ", chat_buffer));
+ Cmd_ForwardStringToServer(va(vabuf, sizeof(vabuf), "%s %s", chat_mode ? "say_team" : "say ", chat_buffer));
key_dest = key_game;
chat_bufferlen = 0;
if (key == K_BACKSPACE) {
if (chat_bufferlen) {
- chat_bufferlen = u8_prevbyte(chat_buffer, chat_bufferlen);
+ chat_bufferlen = (unsigned int)u8_prevbyte(chat_buffer, chat_bufferlen);
chat_buffer[chat_bufferlen] = 0;
}
return;
===================
*/
const char *
-Key_KeynumToString (int keynum)
+Key_KeynumToString (int keynum, char *tinystr, size_t tinystrlength)
{
const keyname_t *kn;
- static char tinystr[2];
// -1 is an invalid code
if (keynum < 0)
// if it is printable, output it as a single character
if (keynum > 32 && keynum < 256)
{
- tinystr[0] = keynum;
- tinystr[1] = 0;
+ if (tinystrlength >= 2)
+ {
+ tinystr[0] = keynum;
+ tinystr[1] = 0;
+ }
return tinystr;
}
}
static void
-Key_In_Unbind_f (void)
+Key_In_Unbind_f(cmd_state_t *cmd)
{
int b, m;
char *errchar = NULL;
- if (Cmd_Argc () != 3) {
+ if (Cmd_Argc (cmd) != 3) {
Con_Print("in_unbind <bindmap> <key> : remove commands from a key\n");
return;
}
- m = strtol(Cmd_Argv (1), &errchar, 0);
+ m = strtol(Cmd_Argv(cmd, 1), &errchar, 0);
if ((m < 0) || (m >= MAX_BINDMAPS) || (errchar && *errchar)) {
- Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
+ Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(cmd, 1));
return;
}
- b = Key_StringToKeynum (Cmd_Argv (2));
+ b = Key_StringToKeynum (Cmd_Argv(cmd, 2));
if (b == -1) {
- Con_Printf("\"%s\" isn't a valid key\n", Cmd_Argv (2));
+ Con_Printf("\"%s\" isn't a valid key\n", Cmd_Argv(cmd, 2));
return;
}
}
static void
-Key_In_Bind_f (void)
+Key_In_Bind_f(cmd_state_t *cmd)
{
int i, c, b, m;
- char cmd[MAX_INPUTLINE];
+ char line[MAX_INPUTLINE];
char *errchar = NULL;
- c = Cmd_Argc ();
+ c = Cmd_Argc (cmd);
if (c != 3 && c != 4) {
Con_Print("in_bind <bindmap> <key> [command] : attach a command to a key\n");
return;
}
- m = strtol(Cmd_Argv (1), &errchar, 0);
+ m = strtol(Cmd_Argv(cmd, 1), &errchar, 0);
if ((m < 0) || (m >= MAX_BINDMAPS) || (errchar && *errchar)) {
- Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
+ Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(cmd, 1));
return;
}
- b = Key_StringToKeynum (Cmd_Argv (2));
+ b = Key_StringToKeynum (Cmd_Argv(cmd, 2));
if (b == -1 || b >= MAX_KEYS) {
- Con_Printf("\"%s\" isn't a valid key\n", Cmd_Argv (2));
+ Con_Printf("\"%s\" isn't a valid key\n", Cmd_Argv(cmd, 2));
return;
}
if (c == 3) {
if (keybindings[m][b])
- Con_Printf("\"%s\" = \"%s\"\n", Cmd_Argv (2), keybindings[m][b]);
+ Con_Printf("\"%s\" = \"%s\"\n", Cmd_Argv(cmd, 2), keybindings[m][b]);
else
- Con_Printf("\"%s\" is not bound\n", Cmd_Argv (2));
+ Con_Printf("\"%s\" is not bound\n", Cmd_Argv(cmd, 2));
return;
}
// copy the rest of the command line
- cmd[0] = 0; // start out with a null string
+ line[0] = 0; // start out with a null string
for (i = 3; i < c; i++) {
- strlcat (cmd, Cmd_Argv (i), sizeof (cmd));
+ strlcat (line, Cmd_Argv(cmd, i), sizeof (line));
if (i != (c - 1))
- strlcat (cmd, " ", sizeof (cmd));
+ strlcat (line, " ", sizeof (line));
}
- if(!Key_SetBinding (b, m, cmd))
+ if(!Key_SetBinding (b, m, line))
Con_Printf("Key_SetBinding failed for unknown reason\n");
}
static void
-Key_In_Bindmap_f (void)
+Key_In_Bindmap_f(cmd_state_t *cmd)
{
int m1, m2, c;
char *errchar = NULL;
- c = Cmd_Argc ();
+ c = Cmd_Argc (cmd);
if (c != 3) {
Con_Print("in_bindmap <bindmap> <fallback>: set current bindmap and fallback\n");
return;
}
- m1 = strtol(Cmd_Argv (1), &errchar, 0);
+ m1 = strtol(Cmd_Argv(cmd, 1), &errchar, 0);
if ((m1 < 0) || (m1 >= MAX_BINDMAPS) || (errchar && *errchar)) {
- Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
+ Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(cmd, 1));
return;
}
- m2 = strtol(Cmd_Argv (2), &errchar, 0);
+ m2 = strtol(Cmd_Argv(cmd, 2), &errchar, 0);
if ((m2 < 0) || (m2 >= MAX_BINDMAPS) || (errchar && *errchar)) {
- Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(2));
+ Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(cmd, 2));
return;
}
}
static void
-Key_Unbind_f (void)
+Key_Unbind_f(cmd_state_t *cmd)
{
int b;
- if (Cmd_Argc () != 2) {
+ if (Cmd_Argc (cmd) != 2) {
Con_Print("unbind <key> : remove commands from a key\n");
return;
}
- b = Key_StringToKeynum (Cmd_Argv (1));
+ b = Key_StringToKeynum (Cmd_Argv(cmd, 1));
if (b == -1) {
- Con_Printf("\"%s\" isn't a valid key\n", Cmd_Argv (1));
+ Con_Printf("\"%s\" isn't a valid key\n", Cmd_Argv(cmd, 1));
return;
}
}
static void
-Key_Unbindall_f (void)
+Key_Unbindall_f(cmd_state_t *cmd)
{
int i, j;
Key_PrintBindList(int j)
{
char bindbuf[MAX_INPUTLINE];
+ char tinystr[2];
const char *p;
int i;
{
Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\", false);
if (j == 0)
- Con_Printf("^2%s ^7= \"%s\"\n", Key_KeynumToString (i), bindbuf);
+ Con_Printf("^2%s ^7= \"%s\"\n", Key_KeynumToString (i, tinystr, sizeof(tinystr)), bindbuf);
else
- Con_Printf("^3bindmap %d: ^2%s ^7= \"%s\"\n", j, Key_KeynumToString (i), bindbuf);
+ Con_Printf("^3bindmap %d: ^2%s ^7= \"%s\"\n", j, Key_KeynumToString (i, tinystr, sizeof(tinystr)), bindbuf);
}
}
}
static void
-Key_In_BindList_f (void)
+Key_In_BindList_f(cmd_state_t *cmd)
{
int m;
char *errchar = NULL;
- if(Cmd_Argc() >= 2)
+ if(Cmd_Argc(cmd) >= 2)
{
- m = strtol(Cmd_Argv(1), &errchar, 0);
+ m = strtol(Cmd_Argv(cmd, 1), &errchar, 0);
if ((m < 0) || (m >= MAX_BINDMAPS) || (errchar && *errchar)) {
- Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
+ Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(cmd, 1));
return;
}
Key_PrintBindList(m);
}
static void
-Key_BindList_f (void)
+Key_BindList_f(cmd_state_t *cmd)
{
Key_PrintBindList(0);
}
static void
-Key_Bind_f (void)
+Key_Bind_f(cmd_state_t *cmd)
{
int i, c, b;
- char cmd[MAX_INPUTLINE];
+ char line[MAX_INPUTLINE];
- c = Cmd_Argc ();
+ c = Cmd_Argc (cmd);
if (c != 2 && c != 3) {
Con_Print("bind <key> [command] : attach a command to a key\n");
return;
}
- b = Key_StringToKeynum (Cmd_Argv (1));
+ b = Key_StringToKeynum (Cmd_Argv(cmd, 1));
if (b == -1 || b >= MAX_KEYS) {
- Con_Printf("\"%s\" isn't a valid key\n", Cmd_Argv (1));
+ Con_Printf("\"%s\" isn't a valid key\n", Cmd_Argv(cmd, 1));
return;
}
if (c == 2) {
if (keybindings[0][b])
- Con_Printf("\"%s\" = \"%s\"\n", Cmd_Argv (1), keybindings[0][b]);
+ Con_Printf("\"%s\" = \"%s\"\n", Cmd_Argv(cmd, 1), keybindings[0][b]);
else
- Con_Printf("\"%s\" is not bound\n", Cmd_Argv (1));
+ Con_Printf("\"%s\" is not bound\n", Cmd_Argv(cmd, 1));
return;
}
// copy the rest of the command line
- cmd[0] = 0; // start out with a null string
+ line[0] = 0; // start out with a null string
for (i = 2; i < c; i++) {
- strlcat (cmd, Cmd_Argv (i), sizeof (cmd));
+ strlcat (line, Cmd_Argv(cmd, i), sizeof (line));
if (i != (c - 1))
- strlcat (cmd, " ", sizeof (cmd));
+ strlcat (line, " ", sizeof (line));
}
- if(!Key_SetBinding (b, 0, cmd))
+ if(!Key_SetBinding (b, 0, line))
Con_Printf("Key_SetBinding failed for unknown reason\n");
}
{
int i, j;
char bindbuf[MAX_INPUTLINE];
+ char tinystr[2];
const char *p;
for (j = 0; j < MAX_BINDMAPS; j++)
{
Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\", false); // don't need to escape $ because cvars are not expanded inside bind
if (j == 0)
- FS_Printf(f, "bind %s \"%s\"\n", Key_KeynumToString (i), bindbuf);
+ FS_Printf(f, "bind %s \"%s\"\n", Key_KeynumToString (i, tinystr, sizeof(tinystr)), bindbuf);
else
- FS_Printf(f, "in_bind %d %s \"%s\"\n", j, Key_KeynumToString (i), bindbuf);
+ FS_Printf(f, "in_bind %d %s \"%s\"\n", j, Key_KeynumToString (i, tinystr, sizeof(tinystr)), bindbuf);
}
}
}
//
// register our functions
//
- 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_bindlist", Key_In_BindList_f, "bindlist: displays bound keys for all bindmaps, or the given 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(&cmd_client, "in_bind", Key_In_Bind_f, "binds a command to the specified key in the selected bindmap");
+ Cmd_AddCommand(&cmd_client, "in_unbind", Key_In_Unbind_f, "removes command on the specified key in the selected bindmap");
+ Cmd_AddCommand(&cmd_client, "in_bindlist", Key_In_BindList_f, "bindlist: displays bound keys for all bindmaps, or the given bindmap");
+ Cmd_AddCommand(&cmd_client, "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(&cmd_client, "in_releaseall", Key_ReleaseAll_f, "releases all currently pressed keys (debug command)");
- 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 ("bindlist", Key_BindList_f, "bindlist: displays bound keys for bindmap 0 bindmaps");
- Cmd_AddCommand ("unbindall", Key_Unbindall_f, "removes all commands from all keys in all bindmaps (leaving only shift-escape and escape)");
+ Cmd_AddCommand(&cmd_client, "bind", Key_Bind_f, "binds a command to the specified key in bindmap 0");
+ Cmd_AddCommand(&cmd_client, "unbind", Key_Unbind_f, "removes a command on the specified key in bindmap 0");
+ Cmd_AddCommand(&cmd_client, "bindlist", Key_BindList_f, "bindlist: displays bound keys for bindmap 0 bindmaps");
+ Cmd_AddCommand(&cmd_client, "unbindall", Key_Unbindall_f, "removes all commands from all keys in all bindmaps (leaving only shift-escape and escape)");
- Cmd_AddCommand ("history", Key_History_f, "prints the history of executed commands (history X prints the last X entries, history -c clears the whole history)");
+ Cmd_AddCommand(&cmd_client, "history", Key_History_f, "prints the history of executed commands (history X prints the last X entries, history -c clears the whole history)");
Cvar_RegisterVariable (&con_closeontoggleconsole);
}
}
}
-qboolean CL_VM_InputEvent (qboolean down, int key, int ascii);
-
/*
===================
Called by the system between frames for both key up and key down events
void
Key_Event (int key, int ascii, qboolean down)
{
+ cmd_state_t *cmd = &cmd_client;
const char *bind;
qboolean q;
keydest_t keydest = key_dest;
+ char vabuf[1024];
if (key < 0 || key >= MAX_KEYS)
return;
return;
}
- if (ascii == 0x80 && utf8_enable.integer) // pressing AltGr-5 (or AltGr-e) and for some reason we get windows-1252 encoding?
- ascii = 0x20AC; // we want the Euro currency sign
- // TODO find out which vid_ drivers do it and fix it there
- // but catching U+0080 here is no loss as that char is not useful anyway
-
// get key binding
bind = keybindings[key_bmap][key];
if (!bind)
if(key_consoleactive)
keydest = key_console;
-
+
if (down)
{
// increment key repeat count each time a down is received so that things
if(keydest == key_void)
return;
-
+
// 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
{
if(down)
{
- Con_ToggleConsole_f ();
+ Con_ToggleConsole_f(&cmd_client);
tbl_keydest[key] = key_void; // esc release should go nowhere (especially not to key_menu or key_game)
}
return;
if(key_consoleactive & KEY_CONSOLEACTIVE_FORCED)
{
key_consoleactive &= ~KEY_CONSOLEACTIVE_USER;
+#ifdef CONFIG_MENU
MR_ToggleMenu(1);
+#endif
}
else
- Con_ToggleConsole_f();
+ Con_ToggleConsole_f(&cmd_client);
}
break;
case key_message:
if (down)
- Key_Message (key, ascii); // that'll close the message input
+ Key_Message (cmd, key, ascii); // that'll close the message input
break;
case key_menu:
case key_menu_grabbed:
+#ifdef CONFIG_MENU
MR_KeyEvent (key, ascii, down);
+#endif
break;
case key_game:
// csqc has priority over toggle menu if it wants to (e.g. handling escape for UI stuff in-game.. :sick:)
- q = CL_VM_InputEvent(down, key, ascii);
+ q = CL_VM_InputEvent(down ? 0 : 1, key, ascii);
+#ifdef CONFIG_MENU
if (!q && down)
MR_ToggleMenu(1);
+#endif
break;
default:
{
// button commands add keynum as a parm
if (bind[0] == '+')
- Cbuf_AddText (va("%s %i\n", bind, key));
+ Cbuf_AddText (cmd, va(vabuf, sizeof(vabuf), "%s %i\n", bind, key));
else
{
- Cbuf_AddText (bind);
- Cbuf_AddText ("\n");
+ Cbuf_AddText (cmd, bind);
+ Cbuf_AddText (cmd, "\n");
}
} else if(bind[0] == '+' && !down && keydown[key] == 0)
- Cbuf_AddText(va("-%s %i\n", bind + 1, key));
+ Cbuf_AddText(cmd, va(vabuf, sizeof(vabuf), "-%s %i\n", bind + 1, key));
}
return;
}
// (special exemption for german keyboard layouts)
if (con_closeontoggleconsole.integer && bind && !strncmp(bind, "toggleconsole", strlen("toggleconsole")) && (key_consoleactive & KEY_CONSOLEACTIVE_USER) && (con_closeontoggleconsole.integer >= ((ascii != STRING_COLOR_TAG) ? 2 : 3) || key_linepos == 1))
{
- Con_ToggleConsole_f ();
+ Con_ToggleConsole_f(&cmd_client);
return;
}
- Key_Console (key, ascii);
+
+ if (COM_CheckParm ("-noconsole"))
+ return; // only allow the key bind to turn off console
+
+ Key_Console (cmd, key, ascii);
return;
}
{
if (down && con_closeontoggleconsole.integer && bind && !strncmp(bind, "toggleconsole", strlen("toggleconsole")) && ascii != STRING_COLOR_TAG)
{
- Con_ToggleConsole_f ();
+ Cbuf_AddText(cmd, "toggleconsole\n"); // Deferred to next frame so we're not sending the text event to the console.
tbl_keydest[key] = key_void; // key release should go nowhere (especially not to key_menu or key_game)
return;
}
if (cl_videoplaying)
{
if (gamemode == GAME_BLOODOMNICIDE) // menu controls key events
+#ifdef CONFIG_MENU
MR_KeyEvent(key, ascii, down);
+#else
+ {
+ }
+#endif
else
CL_Video_KeyEvent (key, ascii, keydown[key] != 0);
return;
{
case key_message:
if (down)
- Key_Message (key, ascii);
+ Key_Message (cmd, key, ascii);
break;
case key_menu:
case key_menu_grabbed:
+#ifdef CONFIG_MENU
MR_KeyEvent (key, ascii, down);
+#endif
break;
case key_game:
- q = CL_VM_InputEvent(down, key, ascii);
+ q = CL_VM_InputEvent(down ? 0 : 1, key, ascii);
// ignore key repeats on binds and only send the bind if the event hasnt been already processed by csqc
if (!q && bind)
{
{
// button commands add keynum as a parm
if (bind[0] == '+')
- Cbuf_AddText (va("%s %i\n", bind, key));
+ Cbuf_AddText (cmd, va(vabuf, sizeof(vabuf), "%s %i\n", bind, key));
else
{
- Cbuf_AddText (bind);
- Cbuf_AddText ("\n");
+ Cbuf_AddText (cmd, bind);
+ Cbuf_AddText (cmd, "\n");
}
} else if(bind[0] == '+' && !down && keydown[key] == 0)
- Cbuf_AddText(va("-%s %i\n", bind + 1, key));
+ Cbuf_AddText(cmd, va(vabuf, sizeof(vabuf), "-%s %i\n", bind + 1, key));
}
break;
default:
}
}
-/*
-===================
-Key_ClearStates
-===================
-*/
+// a helper to simulate release of ALL keys
void
-Key_ClearStates (void)
+Key_ReleaseAll (void)
{
- memset(keydown, 0, sizeof(keydown));
+ int key;
+ // clear the event queue first
+ eventqueue_idx = 0;
+ // then send all down events (possibly into the event queue)
+ for(key = 0; key < MAX_KEYS; ++key)
+ if(keydown[key])
+ Key_Event(key, 0, false);
+ // now all keys are guaranteed down (once the event queue is unblocked)
+ // and only future events count
}
+
+void Key_ReleaseAll_f(cmd_state_t *cmd)
+{
+ Key_ReleaseAll();
+}
\ No newline at end of file