#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"};
+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"};
/*
key up events are sent even if in console mode
keydest_t key_dest;
int key_consoleactive;
char *keybindings[MAX_BINDMAPS][MAX_KEYS];
-int history_line;
+
+int history_line;
char history_savedline[MAX_INPUTLINE];
+char history_searchstring[MAX_INPUTLINE];
+qboolean history_matchfound = false;
conbuffer_t history;
extern cvar_t con_textsize;
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;
+}
+
+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 = (int)strlen(key_line);
+ history_matchfound = false;
+ return true;
}
static void Key_History_Up(void)
if(history_line == -1) // editing the "new" line
strlcpy(history_savedline, key_line + 1, sizeof(history_savedline));
+ if (Key_History_Get_foundCommand())
+ return;
+
if(history_line == -1)
{
history_line = CONBUFFER_LINES_COUNT(&history) - 1;
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);
}
}
if(history_line == -1) // editing the "new" line
return;
+ if (Key_History_Get_foundCommand())
+ return;
+
if(history_line < CONBUFFER_LINES_COUNT(&history) - 1)
{
++history_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)
+{
+ if(history_line == -1) // editing the "new" line
+ strlcpy(history_savedline, key_line + 1, sizeof(history_savedline));
+
+ if (CONBUFFER_LINES_COUNT(&history) > 0)
+ {
+ history_line = 0;
+ strlcpy(key_line + 1, ConBuffer_GetLine(&history, history_line), sizeof(key_line) - 1);
+ key_linepos = (int)strlen(key_line);
+ }
+}
+
+static void Key_History_Last(void)
+{
+ if(history_line == -1) // editing the "new" line
+ strlcpy(history_savedline, key_line + 1, sizeof(history_savedline));
+
+ if (CONBUFFER_LINES_COUNT(&history) > 0)
+ {
+ history_line = CONBUFFER_LINES_COUNT(&history) - 1;
+ strlcpy(key_line + 1, ConBuffer_GetLine(&history, history_line), sizeof(key_line) - 1);
+ key_linepos = (int)strlen(key_line);
+ }
+}
+
+static void Key_History_Find_Backwards(void)
+{
+ int i;
+ const char *partial = key_line + 1;
+ 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 (strcmp(key_line + 1, history_searchstring)) // different string? Start a new search
+ {
+ strlcpy(history_searchstring, key_line + 1, sizeof(history_searchstring));
+ i = CONBUFFER_LINES_COUNT(&history) - 1;
+ }
+ else if (history_line == -1)
+ i = CONBUFFER_LINES_COUNT(&history) - 1;
+ else
+ i = history_line - 1;
+
+ if (!*partial)
+ partial = "*";
+ else if (!( strchr(partial, '*') || strchr(partial, '?') )) // no pattern?
+ partial = va(vabuf, sizeof(vabuf), "*%s*", partial);
+
+ for ( ; i >= 0; i--)
+ if (matchpattern_with_separator(ConBuffer_GetLine(&history, i), partial, true, "", false))
+ {
+ Con_Printf("^2%*i^7 %s\n", (int)digits, i+1, ConBuffer_GetLine(&history, i));
+ history_line = i;
+ history_matchfound = true;
+ return;
+ }
+}
+
+static void Key_History_Find_Forwards(void)
+{
+ int i;
+ const char *partial = key_line + 1;
+ char vabuf[1024];
+ size_t digits = strlen(va(vabuf, sizeof(vabuf), "%i", HIST_MAXLINES));
+
+ if (history_line == -1) // editing the "new" line
+ return;
+
+ if (strcmp(key_line + 1, history_searchstring)) // different string? Start a new search
+ {
+ strlcpy(history_searchstring, key_line + 1, sizeof(history_searchstring));
+ i = 0;
+ }
+ else i = history_line + 1;
+
+ if (!*partial)
+ partial = "*";
+ else if (!( strchr(partial, '*') || strchr(partial, '?') )) // no pattern?
+ 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))
+ {
+ Con_Printf("^2%*i^7 %s\n", (int)digits, i+1, ConBuffer_GetLine(&history, i));
+ history_line = i;
+ history_matchfound = true;
+ return;
+ }
+}
+
+static void Key_History_Find_All(void)
+{
+ const char *partial = key_line + 1;
+ int i, count = 0;
+ 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(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("%s%*i^7 %s\n", (i == history_line) ? "^2" : "^3", (int)digits, i+1, ConBuffer_GetLine(&history, i));
+ count++;
+ }
+ Con_Printf("%i result%s\n\n", count, (count != 1) ? "s" : "");
+}
+
+static void Key_History_f(void)
+{
+ char *errchar = NULL;
+ int i = 0;
+ char vabuf[1024];
+ size_t digits = strlen(va(vabuf, sizeof(vabuf), "%i", HIST_MAXLINES));
+
+ if (Cmd_Argc () > 1)
+ {
+ if (!strcmp(Cmd_Argv (1), "-c"))
+ {
+ ConBuffer_Clear(&history);
+ return;
+ }
+ i = strtol(Cmd_Argv (1), &errchar, 0);
+ if ((i < 0) || (i > CONBUFFER_LINES_COUNT(&history)) || (errchar && *errchar))
+ i = 0;
+ else
+ i = CONBUFFER_LINES_COUNT(&history) - i;
+ }
+
+ for ( ; i<CONBUFFER_LINES_COUNT(&history); i++)
+ Con_Printf("^3%*i^7 %s\n", (int)digits, i+1, ConBuffer_GetLine(&history, i));
+ Con_Printf("\n");
}
static int key_bmap, key_bmap2;
{"AUX31", K_AUX31},
{"AUX32", K_AUX32},
+ {"X360_DPAD_UP", K_X360_DPAD_UP},
+ {"X360_DPAD_DOWN", K_X360_DPAD_DOWN},
+ {"X360_DPAD_LEFT", K_X360_DPAD_LEFT},
+ {"X360_DPAD_RIGHT", K_X360_DPAD_RIGHT},
+ {"X360_START", K_X360_START},
+ {"X360_BACK", K_X360_BACK},
+ {"X360_LEFT_THUMB", K_X360_LEFT_THUMB},
+ {"X360_RIGHT_THUMB", K_X360_RIGHT_THUMB},
+ {"X360_LEFT_SHOULDER", K_X360_LEFT_SHOULDER},
+ {"X360_RIGHT_SHOULDER", K_X360_RIGHT_SHOULDER},
+ {"X360_A", K_X360_A},
+ {"X360_B", K_X360_B},
+ {"X360_X", K_X360_X},
+ {"X360_Y", K_X360_Y},
+ {"X360_LEFT_TRIGGER", K_X360_LEFT_TRIGGER},
+ {"X360_RIGHT_TRIGGER", K_X360_RIGHT_TRIGGER},
+ {"X360_LEFT_THUMB_UP", K_X360_LEFT_THUMB_UP},
+ {"X360_LEFT_THUMB_DOWN", K_X360_LEFT_THUMB_DOWN},
+ {"X360_LEFT_THUMB_LEFT", K_X360_LEFT_THUMB_LEFT},
+ {"X360_LEFT_THUMB_RIGHT", K_X360_LEFT_THUMB_RIGHT},
+ {"X360_RIGHT_THUMB_UP", K_X360_RIGHT_THUMB_UP},
+ {"X360_RIGHT_THUMB_DOWN", K_X360_RIGHT_THUMB_DOWN},
+ {"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", '`'},
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);
// save the content of the variable in cvar_str
cvar_str = Cvar_VariableString(cvar);
- cvar_str_len = strlen(cvar_str);
+ 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)
else if(keydown[K_SHIFT]) // move cursor to the previous character ignoring colors
{
int pos;
- size_t inchar;
- pos = u8_prevbyte(key_line, key_linepos);
+ size_t inchar = 0;
+ 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, key_linepos);
+ 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, key_linepos);
+ 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])
+ {
+ // prints all the matching commands
+ if (key == 'f')
+ {
+ Key_History_Find_All();
+ return;
+ }
+ // Search forwards/backwards, pointing the history's index to the
+ // matching command but without fetching it to let one continue the search.
+ // To fetch it, it suffices to just press UP or DOWN.
+ if (key == 'r')
+ {
+ if (keydown[K_SHIFT])
+ Key_History_Find_Forwards();
+ else
+ Key_History_Find_Backwards();
+ return;
+ }
+ // go to the last/first command of the history
+ if (key == ',')
+ {
+ Key_History_First();
+ return;
+ }
+ if (key == '.')
+ {
+ Key_History_Last();
+ return;
+ }
+ }
+
if (key == K_PGUP || key == K_KP_PGUP)
{
if(keydown[K_CTRL])
if (key == K_HOME || key == K_KP_HOME)
{
if (keydown[K_CTRL])
- con_backscroll = INT_MAX;
+ con_backscroll = CON_TEXTSIZE;
else
key_linepos = 1;
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)
{
+ char vabuf[1024];
if (key == K_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(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;
return;
}
+ // ctrl+key generates an ascii value < 32 and shows a char from the charmap
+ if (ascii > 0 && ascii < 32 && utf8_enable.integer)
+ ascii = 0xE000 + ascii;
+
if (chat_bufferlen == sizeof (chat_buffer) - 1)
return; // all full
===================
*/
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;
}
}
-void
+qboolean
Key_SetBinding (int keynum, int bindmap, const char *binding)
{
char *newbinding;
size_t l;
if (keynum == -1 || keynum >= MAX_KEYS)
- return;
+ return false;
+ if ((bindmap < 0) || (bindmap >= MAX_BINDMAPS))
+ return false;
// free old bindings
if (keybindings[bindmap][keynum]) {
keybindings[bindmap][keynum] = NULL;
}
if(!binding[0]) // make "" binds be removed --blub
- return;
+ return true;
// allocate memory for new binding
l = strlen (binding);
newbinding = (char *)Z_Malloc (l + 1);
memcpy (newbinding, binding, l + 1);
newbinding[l] = 0;
keybindings[bindmap][keynum] = newbinding;
+ return true;
+}
+
+void Key_GetBindMap(int *fg, int *bg)
+{
+ if(fg)
+ *fg = key_bmap;
+ if(bg)
+ *bg = key_bmap2;
+}
+
+qboolean Key_SetBindMap(int fg, int bg)
+{
+ if(fg >= MAX_BINDMAPS)
+ return false;
+ if(bg >= MAX_BINDMAPS)
+ return false;
+ if(fg >= 0)
+ key_bmap = fg;
+ if(bg >= 0)
+ key_bmap2 = bg;
+ return true;
}
static void
}
m = strtol(Cmd_Argv (1), &errchar, 0);
- if ((m < 0) || (m >= 8) || (errchar && *errchar)) {
+ if ((m < 0) || (m >= MAX_BINDMAPS) || (errchar && *errchar)) {
Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
return;
}
return;
}
- Key_SetBinding (b, m, "");
+ if(!Key_SetBinding (b, m, ""))
+ Con_Printf("Key_SetBinding failed for unknown reason\n");
}
static void
}
m = strtol(Cmd_Argv (1), &errchar, 0);
- if ((m < 0) || (m >= 8) || (errchar && *errchar)) {
+ if ((m < 0) || (m >= MAX_BINDMAPS) || (errchar && *errchar)) {
Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
return;
}
strlcat (cmd, " ", sizeof (cmd));
}
- Key_SetBinding (b, m, cmd);
+ if(!Key_SetBinding (b, m, cmd))
+ Con_Printf("Key_SetBinding failed for unknown reason\n");
}
static void
}
m1 = strtol(Cmd_Argv (1), &errchar, 0);
- if ((m1 < 0) || (m1 >= 8) || (errchar && *errchar)) {
+ if ((m1 < 0) || (m1 >= MAX_BINDMAPS) || (errchar && *errchar)) {
Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
return;
}
m2 = strtol(Cmd_Argv (2), &errchar, 0);
- if ((m2 < 0) || (m2 >= 8) || (errchar && *errchar)) {
+ if ((m2 < 0) || (m2 >= MAX_BINDMAPS) || (errchar && *errchar)) {
Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(2));
return;
}
return;
}
- Key_SetBinding (b, 0, "");
+ if(!Key_SetBinding (b, 0, ""))
+ Con_Printf("Key_SetBinding failed for unknown reason\n");
}
static void
{
int i, j;
- for (j = 0; 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])
Key_SetBinding (i, j, "");
Key_PrintBindList(int j)
{
char bindbuf[MAX_INPUTLINE];
+ char tinystr[2];
const char *p;
int i;
p = keybindings[j][i];
if (p)
{
- Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\");
+ 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);
}
}
}
if(Cmd_Argc() >= 2)
{
m = strtol(Cmd_Argv(1), &errchar, 0);
- if ((m < 0) || (m >= 8) || (errchar && *errchar)) {
+ if ((m < 0) || (m >= MAX_BINDMAPS) || (errchar && *errchar)) {
Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
return;
}
strlcat (cmd, " ", sizeof (cmd));
}
- Key_SetBinding (b, 0, cmd);
+ if(!Key_SetBinding (b, 0, cmd))
+ 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++)
p = keybindings[j][i];
if (p)
{
- Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\"); // don't need to escape $ because cvars are not expanded inside bind
+ 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);
}
}
}
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 ("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);
}
Key_History_Shutdown();
}
-const char *Key_GetBind (int key)
+const char *Key_GetBind (int key, int bindmap)
{
const char *bind;
if (key < 0 || key >= MAX_KEYS)
return NULL;
- bind = keybindings[key_bmap][key];
- if (!bind)
- bind = keybindings[key_bmap2][key];
+ if(bindmap >= MAX_BINDMAPS)
+ return NULL;
+ if(bindmap >= 0)
+ {
+ bind = keybindings[bindmap][key];
+ }
+ else
+ {
+ bind = keybindings[key_bmap][key];
+ if (!bind)
+ bind = keybindings[key_bmap2][key];
+ }
return bind;
}
-qboolean CL_VM_InputEvent (qboolean down, int key, int ascii);
+void Key_FindKeysForCommand (const char *command, int *keys, int numkeys, int bindmap)
+{
+ int count;
+ int j;
+ const char *b;
+
+ for (j = 0;j < numkeys;j++)
+ keys[j] = -1;
+
+ if(bindmap >= MAX_BINDMAPS)
+ return;
+
+ count = 0;
+
+ for (j = 0; j < MAX_KEYS; ++j)
+ {
+ b = Key_GetBind(j, bindmap);
+ if (!b)
+ continue;
+ if (!strcmp (b, command) )
+ {
+ keys[count++] = j;
+ if (count == numkeys)
+ break;
+ }
+ }
+}
/*
===================
static char tbl_keyascii[MAX_KEYS];
static keydest_t tbl_keydest[MAX_KEYS];
+typedef struct eventqueueitem_s
+{
+ int key;
+ int ascii;
+ qboolean down;
+}
+eventqueueitem_t;
+static int events_blocked = 0;
+static eventqueueitem_t eventqueue[32];
+static unsigned eventqueue_idx = 0;
+
+static void Key_EventQueue_Add(int key, int ascii, qboolean down)
+{
+ if(eventqueue_idx < sizeof(eventqueue) / sizeof(*eventqueue))
+ {
+ eventqueue[eventqueue_idx].key = key;
+ eventqueue[eventqueue_idx].ascii = ascii;
+ eventqueue[eventqueue_idx].down = down;
+ ++eventqueue_idx;
+ }
+}
+
+void Key_EventQueue_Block(void)
+{
+ // block key events until call to Unblock
+ events_blocked = true;
+}
+
+void Key_EventQueue_Unblock(void)
+{
+ // unblocks key events again
+ unsigned i;
+ events_blocked = false;
+ for(i = 0; i < eventqueue_idx; ++i)
+ Key_Event(eventqueue[i].key, eventqueue[i].ascii, eventqueue[i].down);
+ eventqueue_idx = 0;
+}
+
void
Key_Event (int key, int ascii, qboolean down)
{
const char *bind;
qboolean q;
keydest_t keydest = key_dest;
+ char vabuf[1024];
if (key < 0 || key >= MAX_KEYS)
return;
+ if(events_blocked)
+ {
+ Key_EventQueue_Add(key, ascii, down);
+ return;
+ }
+
// get key binding
bind = keybindings[key_bmap][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 ? ascii : '?', down ? "down" : "up", keydown[key], bind ? bind : "");
+ if (developer_insane.integer)
+ Con_DPrintf("Key_Event(%i, '%c', %s) keydown %i bind \"%s\"\n", key, ascii ? ascii : '?', down ? "down" : "up", keydown[key], bind ? 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(key_consoleactive & KEY_CONSOLEACTIVE_FORCED)
{
key_consoleactive &= ~KEY_CONSOLEACTIVE_USER;
- MR_ToggleMenu_f ();
+#ifdef CONFIG_MENU
+ MR_ToggleMenu(1);
+#endif
}
else
Con_ToggleConsole_f();
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_f ();
+ MR_ToggleMenu(1);
+#endif
break;
default:
}
// send function keydowns to interpreter no matter what mode is (unless the menu has specifically grabbed the keyboard, for rebinding keys)
+ // VorteX: Omnicide does bind F* keys
if (keydest != key_menu_grabbed)
- if (key >= K_F1 && key <= K_F12)
+ if (key >= K_F1 && key <= K_F12 && gamemode != GAME_BLOODOMNICIDE)
{
if (bind)
{
{
// button commands add keynum as a parm
if (bind[0] == '+')
- Cbuf_AddText (va("%s %i\n", bind, key));
+ Cbuf_AddText (va(vabuf, sizeof(vabuf), "%s %i\n", bind, key));
else
{
Cbuf_AddText (bind);
Cbuf_AddText ("\n");
}
} else if(bind[0] == '+' && !down && keydown[key] == 0)
- Cbuf_AddText(va("-%s %i\n", bind + 1, key));
+ Cbuf_AddText(va(vabuf, sizeof(vabuf), "-%s %i\n", bind + 1, key));
}
return;
}
// con_closeontoggleconsole enables toggleconsole keys to close the
// console, as long as they are not the color prefix character
// (special exemption for german keyboard layouts)
- if (con_closeontoggleconsole.integer && bind && !strncmp(bind, "toggleconsole", strlen("toggleconsole")) && (key_consoleactive & KEY_CONSOLEACTIVE_USER) && ascii != STRING_COLOR_TAG)
+ 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 ();
return;
}
+
+ if (COM_CheckParm ("-noconsole"))
+ return; // only allow the key bind to turn off console
+
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);
+ 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;
}
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 (va(vabuf, sizeof(vabuf), "%s %i\n", bind, key));
else
{
Cbuf_AddText (bind);
Cbuf_AddText ("\n");
}
} else if(bind[0] == '+' && !down && keydown[key] == 0)
- Cbuf_AddText(va("-%s %i\n", bind + 1, key));
+ Cbuf_AddText(va(vabuf, sizeof(vabuf), "-%s %i\n", bind + 1, key));
}
break;
default:
}
}
+// a helper to simulate release of ALL keys
+void
+Key_ReleaseAll (void)
+{
+ 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
+}
+
/*
===================
Key_ClearStates