#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
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;
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
key_linepos = 1;
}
+// key modifier states
+#define KM_NONE (!keydown[K_CTRL] && !keydown[K_SHIFT] && !keydown[K_ALT])
+#define KM_CTRL_SHIFT_ALT ( keydown[K_CTRL] && keydown[K_SHIFT] && keydown[K_ALT])
+#define KM_CTRL_SHIFT ( keydown[K_CTRL] && keydown[K_SHIFT] && !keydown[K_ALT])
+#define KM_CTRL_ALT ( keydown[K_CTRL] && !keydown[K_SHIFT] && keydown[K_ALT])
+#define KM_SHIFT_ALT (!keydown[K_CTRL] && keydown[K_SHIFT] && keydown[K_ALT])
+#define KM_CTRL ( keydown[K_CTRL] && !keydown[K_SHIFT] && !keydown[K_ALT])
+#define KM_SHIFT (!keydown[K_CTRL] && keydown[K_SHIFT] && !keydown[K_ALT])
+#define KM_ALT (!keydown[K_CTRL] && !keydown[K_SHIFT] && keydown[K_ALT])
+
/*
====================
Interactive line editing and console scrollback
====================
*/
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:
- key = '/';
- break;
- case K_KP_MINUS:
- key = '-';
- break;
- case K_KP_PLUS:
- key = '+';
- break;
- case K_KP_HOME:
- key = '7';
- break;
- case K_KP_UPARROW:
- key = '8';
- break;
- case K_KP_PGUP:
- key = '9';
- break;
- case K_KP_LEFTARROW:
- key = '4';
- break;
- case K_KP_5:
- key = '5';
- break;
- case K_KP_RIGHTARROW:
- key = '6';
- break;
- case K_KP_END:
- key = '1';
- break;
- case K_KP_DOWNARROW:
- key = '2';
- break;
- case K_KP_PGDN:
- key = '3';
- break;
- case K_KP_INS:
- key = '0';
- break;
- case K_KP_DEL:
- key = '.';
- break;
- }
-
- if ((key == 'v' && keydown[K_CTRL]) || ((key == K_INS || key == K_KP_INS) && keydown[K_SHIFT]))
+ case K_KP_SLASH: key = '/'; break;
+ case K_KP_MINUS: key = '-'; break;
+ case K_KP_PLUS: key = '+'; break;
+ case K_KP_HOME: key = '7'; break;
+ case K_KP_UPARROW: key = '8'; break;
+ case K_KP_PGUP: key = '9'; break;
+ case K_KP_LEFTARROW: key = '4'; break;
+ case K_KP_5: key = '5'; break;
+ case K_KP_RIGHTARROW: key = '6'; break;
+ case K_KP_END: key = '1'; break;
+ case K_KP_DOWNARROW: key = '2'; break;
+ case K_KP_PGDN: key = '3'; break;
+ case K_KP_INS: key = '0'; break;
+ case K_KP_DEL: key = '.'; break;
+ }
+
+ // Forbid Ctrl Alt shortcuts since on Windows they are used to type some characters
+ // in certain non-English keyboards using the AltGr key (which emulates Ctrl Alt)
+ // Reference: "Why Ctrl+Alt shouldn't be used as a shortcut modifier"
+ // https://blogs.msdn.microsoft.com/oldnewthing/20040329-00/?p=40003
+ if (keydown[K_CTRL] && keydown[K_ALT])
+ goto add_char;
+
+ if ((key == 'v' && KM_CTRL) || ((key == K_INS || key == K_KP_INS) && KM_SHIFT))
{
char *cbd, *p;
if ((cbd = Sys_GetClipboardData()) != 0)
return;
}
- if (key == 'l' && keydown[K_CTRL])
+ if (key == 'l' && KM_CTRL)
{
- Cbuf_AddText ("clear\n");
+ Cbuf_AddText (cmd, "clear\n");
return;
}
- if (key == 'u' && keydown[K_CTRL]) // like vi/readline ^u: delete currently edited line
+ if (key == 'u' && KM_CTRL) // like vi/readline ^u: delete currently edited line
{
// clear line
key_line[0] = ']';
return;
}
- if (key == 'q' && keydown[K_CTRL]) // like zsh ^q: push line to history, don't execute, and clear
+ if (key == 'q' && KM_CTRL) // like zsh ^q: push line to history, don't execute, and clear
{
// clear line
Key_History_Push();
return;
}
- if (key == K_ENTER || key == K_KP_ENTER)
+ if ((key == K_ENTER || key == K_KP_ENTER) && KM_NONE)
{
- 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
if (key == K_TAB)
{
- if(keydown[K_CTRL]) // append to the cvar its value
+ if (KM_CTRL) // append the cvar value to the cvar name
{
int cvar_len, cvar_str_len, chars_to_move;
char k;
key_linepos += cvar_len;
// save the content of the variable in cvar_str
- cvar_str = Cvar_VariableString(cvar);
+ cvar_str = Cvar_VariableString(&cvars_all, cvar, CVAR_CLIENT | CVAR_SERVER);
cvar_str_len = (int)strlen(cvar_str);
if (cvar_str_len==0)
return;
Con_Printf("Couldn't append cvar value, edit line too long.\n");
return;
}
- // Enhanced command completion
- // by EvilTypeGuy eviltypeguy@qeradiant.com
- // Thanks to Fett, Taniwha
- Con_CompleteCommandLine();
- return;
+
+ if (KM_NONE)
+ {
+ // Enhanced command completion
+ // by EvilTypeGuy eviltypeguy@qeradiant.com
+ // Thanks to Fett, Taniwha
+ Con_CompleteCommandLine(cmd);
+ return;
+ }
}
// Advanced Console Editing by Radix radix@planetquake.com
// move cursor to the previous character
if (key == K_LEFTARROW || key == K_KP_LEFTARROW)
{
- if (key_linepos < 2)
- return;
- if(keydown[K_CTRL]) // move cursor to the previous word
+ if(KM_CTRL) // move cursor to the previous word
{
int pos;
char k;
+ if (key_linepos < 2)
+ return;
pos = key_linepos-1;
if(pos) // skip all "; ' after the word
break;
}
key_linepos = pos + 1;
+ return;
}
- else if(keydown[K_SHIFT]) // move cursor to the previous character ignoring colors
+
+ if(KM_SHIFT) // move cursor to the previous character ignoring colors
{
int pos;
size_t inchar = 0;
+ if (key_linepos < 2)
+ return;
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]))
// we need to move to the beginning of the character when in a wide character:
u8_charidx(key_line, pos + 1, &inchar);
key_linepos = (int)(pos + 1 - inchar);
+ return;
}
- else
+
+ if(KM_NONE)
{
+ if (key_linepos < 2)
+ return;
key_linepos = (int)u8_prevbyte(key_line+1, key_linepos-1) + 1; // do NOT give the ']' to u8_prevbyte
+ return;
}
- return;
}
// delete char before cursor
- if (key == K_BACKSPACE || (key == 'h' && keydown[K_CTRL]))
+ if ((key == K_BACKSPACE && KM_NONE) || (key == 'h' && KM_CTRL))
{
if (key_linepos > 1)
{
}
// delete char on cursor
- if (key == K_DEL || key == K_KP_DEL)
+ if ((key == K_DEL || key == K_KP_DEL) && KM_NONE)
{
size_t linelen;
linelen = strlen(key_line);
// move cursor to the next character
if (key == K_RIGHTARROW || key == K_KP_RIGHTARROW)
{
- if (key_linepos >= (int)strlen(key_line))
- return;
- if(keydown[K_CTRL]) // move cursor to the next word
+ if (KM_CTRL) // move cursor to the next word
{
int pos, len;
char k;
len = (int)strlen(key_line);
+ if (key_linepos >= len)
+ return;
pos = key_linepos;
while(++pos < len)
break;
}
key_linepos = pos;
+ return;
}
- else if(keydown[K_SHIFT]) // move cursor to the next character ignoring colors
+
+ if (KM_SHIFT) // move cursor to the next character ignoring colors
{
int pos, len;
len = (int)strlen(key_line);
+ if (key_linepos >= len)
+ return;
pos = key_linepos;
// go beyond all initial consecutive color tags, if any
break;
}
key_linepos = pos;
+ return;
}
- else
+
+ if (KM_NONE)
+ {
+ if (key_linepos >= (int)strlen(key_line))
+ return;
key_linepos += (int)u8_bytelen(key_line + key_linepos, 1);
- return;
+ return;
+ }
}
- if (key == K_INS || key == K_KP_INS) // toggle insert mode
+ if ((key == K_INS || key == K_KP_INS) && KM_NONE) // toggle insert mode
{
key_insert ^= 1;
return;
// End Advanced Console Editing
- if (key == K_UPARROW || key == K_KP_UPARROW || (key == 'p' && keydown[K_CTRL]))
+ if (((key == K_UPARROW || key == K_KP_UPARROW) && KM_NONE) || (key == 'p' && KM_CTRL))
{
Key_History_Up();
return;
}
- if (key == K_DOWNARROW || key == K_KP_DOWNARROW || (key == 'n' && keydown[K_CTRL]))
+ if (((key == K_DOWNARROW || key == K_KP_DOWNARROW) && KM_NONE) || (key == 'n' && KM_CTRL))
{
Key_History_Down();
return;
if (keydown[K_CTRL])
{
// prints all the matching commands
- if (key == 'f')
+ if (key == 'f' && KM_CTRL)
{
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 (key == 'r' && KM_CTRL_SHIFT)
{
- if (keydown[K_SHIFT])
- Key_History_Find_Forwards();
- else
- Key_History_Find_Backwards();
+ Key_History_Find_Forwards();
+ return;
+ }
+ if (key == 'r' && KM_CTRL)
+ {
+ Key_History_Find_Backwards();
return;
}
+
// go to the last/first command of the history
- if (key == ',')
+ if (key == ',' && KM_CTRL)
{
Key_History_First();
return;
}
- if (key == '.')
+ if (key == '.' && KM_CTRL)
{
Key_History_Last();
return;
if (key == K_PGUP || key == K_KP_PGUP)
{
- if(keydown[K_CTRL])
+ if (KM_CTRL)
{
con_backscroll += ((vid_conheight.integer >> 2) / con_textsize.integer)-1;
+ return;
}
- else
+ if (KM_NONE)
+ {
con_backscroll += ((vid_conheight.integer >> 1) / con_textsize.integer)-3;
- return;
+ return;
+ }
}
if (key == K_PGDN || key == K_KP_PGDN)
{
- if(keydown[K_CTRL])
+ if (KM_CTRL)
{
con_backscroll -= ((vid_conheight.integer >> 2) / con_textsize.integer)-1;
+ return;
}
- else
+ if (KM_NONE)
+ {
con_backscroll -= ((vid_conheight.integer >> 1) / con_textsize.integer)-3;
- return;
+ return;
+ }
}
-
+
if (key == K_MWHEELUP)
{
- if(keydown[K_CTRL])
+ if (KM_CTRL)
+ {
con_backscroll += 1;
- else if(keydown[K_SHIFT])
+ return;
+ }
+ if (KM_SHIFT)
+ {
con_backscroll += ((vid_conheight.integer >> 2) / con_textsize.integer)-1;
- else
+ return;
+ }
+ if (KM_NONE)
+ {
con_backscroll += 5;
- return;
+ return;
+ }
}
if (key == K_MWHEELDOWN)
{
- if(keydown[K_CTRL])
+ if (KM_CTRL)
+ {
con_backscroll -= 1;
- else if(keydown[K_SHIFT])
+ return;
+ }
+ if (KM_SHIFT)
+ {
con_backscroll -= ((vid_conheight.integer >> 2) / con_textsize.integer)-1;
- else
+ return;
+ }
+ if (KM_NONE)
+ {
con_backscroll -= 5;
- return;
+ return;
+ }
}
if (keydown[K_CTRL])
{
// text zoom in
- if (key == '+' || key == K_KP_PLUS)
+ if ((key == '+' || key == K_KP_PLUS) && KM_CTRL)
{
if (con_textsize.integer < 128)
Cvar_SetValueQuick(&con_textsize, con_textsize.integer + 1);
return;
}
// text zoom out
- if (key == '-' || key == K_KP_MINUS)
+ if ((key == '-' || key == K_KP_MINUS) && KM_CTRL)
{
if (con_textsize.integer > 1)
Cvar_SetValueQuick(&con_textsize, con_textsize.integer - 1);
return;
}
// text zoom reset
- if (key == '0' || key == K_KP_INS)
+ if ((key == '0' || key == K_KP_INS) && KM_CTRL)
{
- 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;
}
}
if (key == K_HOME || key == K_KP_HOME)
{
- if (keydown[K_CTRL])
+ if (KM_CTRL)
+ {
con_backscroll = CON_TEXTSIZE;
- else
+ return;
+ }
+ if (KM_NONE)
+ {
key_linepos = 1;
- return;
+ return;
+ }
}
if (key == K_END || key == K_KP_END)
{
- if (keydown[K_CTRL])
+ if (KM_CTRL)
+ {
con_backscroll = 0;
- else
+ return;
+ }
+ if (KM_NONE)
+ {
key_linepos = (int)strlen(key_line);
- return;
+ return;
+ }
}
+add_char:
+
// non printable
if (unicode < 32)
return;
unsigned int chat_bufferlen = 0;
static void
-Key_Message (int key, int ascii)
+Key_Message (cmd_state_t *cmd, int key, int ascii)
{
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, true); // 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(vabuf, sizeof(vabuf), "%s %s", chat_mode ? "say_team" : "say ", chat_buffer));
}
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;
}
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");
}
char tinystr[2];
const char *p;
+ // Override default binds
+ FS_Printf(f, "unbindall\n");
+
for (j = 0; j < MAX_BINDMAPS; j++)
{
for (i = 0; i < (int)(sizeof(keybindings[0])/sizeof(keybindings[0][0])); i++)
//
// 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);
}
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;
{
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;
#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:
{
// button commands add keynum as a parm
if (bind[0] == '+')
- Cbuf_AddText (va(vabuf, sizeof(vabuf), "%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(vabuf, sizeof(vabuf), "-%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;
}
if (COM_CheckParm ("-noconsole"))
return; // only allow the key bind to turn off console
- Key_Console (key, ascii);
+ Key_Console (cmd, key, ascii);
return;
}
{
if (down && con_closeontoggleconsole.integer && bind && !strncmp(bind, "toggleconsole", strlen("toggleconsole")) && ascii != STRING_COLOR_TAG)
{
- Cbuf_AddText("toggleconsole\n"); // Deferred to next frame so we're not sending the text event to the console.
+ 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;
}
{
case key_message:
if (down)
- Key_Message (key, ascii);
+ Key_Message (cmd, key, ascii);
break;
case key_menu:
case key_menu_grabbed:
{
// button commands add keynum as a parm
if (bind[0] == '+')
- Cbuf_AddText (va(vabuf, sizeof(vabuf), "%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(vabuf, sizeof(vabuf), "-%s %i\n", bind + 1, key));
+ Cbuf_AddText(cmd, va(vabuf, sizeof(vabuf), "-%s %i\n", bind + 1, key));
}
break;
default:
// 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
projects / xonotic / darkplaces.git / blobdiff