*/
#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
*/
-#define MAX_INPUTLINE 256
-int edit_line = 31;
-int history_line = 31;
-char key_lines[32][MAX_INPUTLINE];
+char key_line[MAX_INPUTLINE];
int key_linepos;
-int key_insert = true; // insert key toggle (for editing)
-
+qboolean key_insert = true; // insert key toggle (for editing)
keydest_t key_dest;
int key_consoleactive;
+char *keybindings[MAX_BINDMAPS][MAX_KEYS];
+int history_line;
+int history_line_idx;
+char history_savedline[MAX_INPUTLINE];
-static int key_bmap, key_bmap2;
+static void Key_History_Init()
+{
+ qfile_t *historyfile = FS_OpenRealFile("dp_history.txt", "r", false);
+ if(historyfile)
+ {
+ char buf[MAX_INPUTLINE];
+ int bufpos;
+ int c;
+
+ *buf = ']';
+ bufpos = 1;
+ for(;;)
+ {
+ c = FS_Getc(historyfile);
+ if(c < 0 || c == 0 || c == '\r' || c == '\n')
+ {
+ if(bufpos > 1)
+ {
+ buf[bufpos] = 0;
+ Con_AddLine(buf, bufpos, CON_MASK_INPUT);
+ bufpos = 1;
+ }
+ if(c < 0)
+ break;
+ }
+ else
+ {
+ if(bufpos < MAX_INPUTLINE - 1)
+ buf[bufpos++] = c;
+ }
+ }
+
+ FS_Close(historyfile);
+ }
+
+ history_line = -1;
+}
+
+static void Key_History_Shutdown()
+{
+ // TODO write history to a file
+
+ qfile_t *historyfile = FS_OpenRealFile("dp_history.txt", "w", false);
+ if(historyfile)
+ {
+ int l = -1;
+ while((l = Con_FindNextLine(CON_MASK_INPUT, 0, l)) != -1)
+ FS_Printf(historyfile, "%s\n", Con_GetLine(l) + 1); // +1: skip the ]
+ FS_Close(historyfile);
+ }
+}
+
+static void Key_History_Push()
+{
+ int mask;
+
+ mask = CON_MASK_INPUT;
+ if(!key_line[1]) // empty?
+ mask = 0;
+ if(!strcmp(key_line, "]quit")) // putting these into the history just sucks
+ mask = 0;
+ Con_AddLine(key_line, strlen(key_line), mask);
+ Con_PrintNotToHistory(key_line); // don't mark empty lines as history
+ Con_PrintNotToHistory("\n");
+ history_line = -1;
+}
+
+static void Key_History_Up()
+{
+ int l;
+
+ if(history_line >= 0)
+ {
+ history_line = Con_GetLineByID(history_line_idx);
+ if(history_line == -1)
+ history_line = -2; // -2 means before first
+ }
+
+ // invalid history line? bad
+ if(history_line == -2)
+ return;
+
+ if(history_line == -1) // editing the "new" line
+ strlcpy(history_savedline, key_line, sizeof(history_savedline));
+ l = Con_FindPrevLine(CON_MASK_INPUT, 0, history_line);
+ if(l != -1)
+ {
+ history_line = l;
+ history_line_idx = Con_GetLineID(l);
+ strlcpy(key_line, Con_GetLine(history_line), sizeof(key_line));
+ }
+
+ key_linepos = strlen(key_line);
+}
+
+static void Key_History_Down()
+{
+ int l;
+
+ if(history_line >= 0)
+ {
+ history_line = Con_GetLineByID(history_line_idx);
+ if(history_line == -1)
+ history_line = -2; // -2 means before first
+ }
+
+ if(history_line == -1) // editing the "new" line
+ return;
+
+ // invalid history line? take the first line then
+ if(history_line == -2)
+ history_line = -1; // next Con_FindNextLine will fix it
-char *keybindings[8][1024];
-static qboolean consolekeys[1024]; // if true, can't be rebound while in
- // console
-static qboolean menubound[1024]; // if true, can't be rebound while in
- // menu
-static unsigned int key_repeats[1024]; // if > 1, it is autorepeating
-static qboolean keydown[1024];
+ l = Con_FindNextLine(CON_MASK_INPUT, 0, history_line);
+ if(l != -1)
+ {
+ history_line = l;
+ history_line_idx = Con_GetLineID(l);
+ strlcpy(key_line, Con_GetLine(history_line), sizeof(key_line));
+ }
+ else
+ {
+ history_line = -1;
+ strlcpy(key_line, history_savedline, sizeof(key_line));
+ }
+
+ key_linepos = strlen(key_line);
+}
+
+static int key_bmap, key_bmap2;
+static unsigned char keydown[MAX_KEYS]; // 0 = up, 1 = down, 2 = repeating
-typedef struct {
+typedef struct keyname_s
+{
const char *name;
int keynum;
-} keyname_t;
+}
+keyname_t;
static const keyname_t keynames[] = {
{"TAB", K_TAB},
{"ENTER", K_ENTER},
{"ESCAPE", K_ESCAPE},
{"SPACE", K_SPACE},
+
+ // spacer so it lines up with keys.h
+
{"BACKSPACE", K_BACKSPACE},
{"UPARROW", K_UPARROW},
{"DOWNARROW", K_DOWNARROW},
{"PAUSE", K_PAUSE},
- {"MWHEELUP", K_MWHEELUP},
- {"MWHEELDOWN", K_MWHEELDOWN},
-
- {"MOUSE1", K_MOUSE1},
- {"MOUSE2", K_MOUSE2},
- {"MOUSE3", K_MOUSE3},
- {"MOUSE4", K_MOUSE4},
- {"MOUSE5", K_MOUSE5},
- {"MOUSE6", K_MOUSE6},
- {"MOUSE7", K_MOUSE7},
- {"MOUSE8", K_MOUSE8},
- {"MOUSE9", K_MOUSE9},
- {"MOUSE10", K_MOUSE10},
- {"MOUSE11", K_MOUSE11},
- {"MOUSE12", K_MOUSE12},
- {"MOUSE13", K_MOUSE13},
- {"MOUSE14", K_MOUSE14},
- {"MOUSE15", K_MOUSE15},
- {"MOUSE16", K_MOUSE16},
-
{"NUMLOCK", K_NUMLOCK},
{"CAPSLOCK", K_CAPSLOCK},
{"SCROLLOCK", K_SCROLLOCK},
- {"KP_HOME", K_KP_HOME },
- {"KP_UPARROW", K_KP_UPARROW },
- {"KP_PGUP", K_KP_PGUP },
- {"KP_LEFTARROW", K_KP_LEFTARROW },
- {"KP_RIGHTARROW", K_KP_RIGHTARROW },
- {"KP_END", K_KP_END },
- {"KP_DOWNARROW", K_KP_DOWNARROW },
- {"KP_PGDN", K_KP_PGDN },
{"KP_INS", K_KP_INS },
- {"KP_DEL", K_KP_DEL },
- {"KP_SLASH", K_KP_SLASH },
-
{"KP_0", K_KP_0},
+ {"KP_END", K_KP_END },
{"KP_1", K_KP_1},
+ {"KP_DOWNARROW", K_KP_DOWNARROW },
{"KP_2", K_KP_2},
+ {"KP_PGDN", K_KP_PGDN },
{"KP_3", K_KP_3},
+ {"KP_LEFTARROW", K_KP_LEFTARROW },
{"KP_4", K_KP_4},
{"KP_5", K_KP_5},
+ {"KP_RIGHTARROW", K_KP_RIGHTARROW },
{"KP_6", K_KP_6},
+ {"KP_HOME", K_KP_HOME },
{"KP_7", K_KP_7},
+ {"KP_UPARROW", K_KP_UPARROW },
{"KP_8", K_KP_8},
+ {"KP_PGUP", K_KP_PGUP },
{"KP_9", K_KP_9},
+ {"KP_DEL", K_KP_DEL },
{"KP_PERIOD", K_KP_PERIOD},
+ {"KP_SLASH", K_KP_SLASH },
{"KP_DIVIDE", K_KP_DIVIDE},
{"KP_MULTIPLY", K_KP_MULTIPLY},
{"KP_MINUS", K_KP_MINUS},
{"KP_ENTER", K_KP_ENTER},
{"KP_EQUALS", K_KP_EQUALS},
+
+
+ {"MOUSE1", K_MOUSE1},
+
+ {"MOUSE2", K_MOUSE2},
+ {"MOUSE3", K_MOUSE3},
+ {"MWHEELUP", K_MWHEELUP},
+ {"MWHEELDOWN", K_MWHEELDOWN},
+ {"MOUSE4", K_MOUSE4},
+ {"MOUSE5", K_MOUSE5},
+ {"MOUSE6", K_MOUSE6},
+ {"MOUSE7", K_MOUSE7},
+ {"MOUSE8", K_MOUSE8},
+ {"MOUSE9", K_MOUSE9},
+ {"MOUSE10", K_MOUSE10},
+ {"MOUSE11", K_MOUSE11},
+ {"MOUSE12", K_MOUSE12},
+ {"MOUSE13", K_MOUSE13},
+ {"MOUSE14", K_MOUSE14},
+ {"MOUSE15", K_MOUSE15},
+ {"MOUSE16", K_MOUSE16},
+
+
+
+
{"JOY1", K_JOY1},
{"JOY2", K_JOY2},
{"JOY3", K_JOY3},
{"JOY15", K_JOY15},
{"JOY16", K_JOY16},
+
+
+
+
+
{"AUX1", K_AUX1},
{"AUX2", K_AUX2},
{"AUX3", K_AUX3},
{"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}
};
void
Key_ClearEditLine (int edit_line)
{
- memset (key_lines[edit_line], '\0', MAX_INPUTLINE);
- key_lines[edit_line][0] = ']';
+ memset (key_line, '\0', sizeof(key_line));
+ key_line[0] = ']';
key_linepos = 1;
}
====================
*/
static void
-Key_Console (int key, char ascii)
+Key_Console (int key, int ascii)
{
// LordHavoc: copied most of this from Q2 to improve keyboard handling
switch (key)
if ((toupper(key) == 'V' && keydown[K_CTRL]) || ((key == K_INS || key == K_KP_INS) && keydown[K_SHIFT]))
{
- char *cbd;
+ char *cbd, *p;
if ((cbd = Sys_GetClipboardData()) != 0)
{
int i;
+#if 1
+ p = cbd;
+ while (*p)
+ {
+ if (*p == '\n' || *p == '\r' || *p == '\b')
+ {
+ *p++ = 0;
+ break;
+ }
+ p++;
+ }
+#else
strtok(cbd, "\n\r\b");
- i = strlen(cbd);
+#endif
+ i = (int)strlen(cbd);
if (i + key_linepos >= MAX_INPUTLINE)
- i= MAX_INPUTLINE - key_linepos;
+ i= MAX_INPUTLINE - key_linepos - 1;
if (i > 0)
{
+ // terencehill: insert the clipboard text between the characters of the line
+ char *temp = Z_Malloc(MAX_INPUTLINE);
cbd[i]=0;
- strcat(key_lines[edit_line], cbd);
+ 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;
}
- free(cbd);
+ Z_Free(cbd);
}
return;
}
if (key == K_ENTER || key == K_KP_ENTER)
{
- Cbuf_AddText (key_lines[edit_line]+1); // skip the ]
+ Cbuf_AddText (key_line+1); // skip the ]
Cbuf_AddText ("\n");
- Con_Printf("%s\n",key_lines[edit_line]);
- // LordHavoc: redesigned edit_line/history_line
- edit_line = 31;
- history_line = edit_line;
- memmove(key_lines[0], key_lines[1], sizeof(key_lines[0]) * edit_line);
- key_lines[edit_line][0] = ']';
- key_lines[edit_line][1] = 0; // EvilTypeGuy: null terminate
+ Key_History_Push();
+ key_line[0] = ']';
+ key_line[1] = 0; // EvilTypeGuy: null terminate
key_linepos = 1;
// force an update, because the command may take some time
if (cls.state == ca_disconnected)
// Advanced Console Editing by Radix radix@planetquake.com
// Added/Modified by EvilTypeGuy eviltypeguy@qeradiant.com
+ // Enhanced by [515]
+ // Enhanced by terencehill
- // left arrow will just move left one without erasing, backspace will
- // actually erase charcter
+ // move cursor to the previous character
if (key == K_LEFTARROW || key == K_KP_LEFTARROW)
{
- if (key_linepos > 1)
+ if (key_linepos < 2)
+ return;
+ if(keydown[K_CTRL]) // move cursor to the previous word
+ {
+ int pos;
+ char k;
+ pos = key_linepos-1;
+ if(pos)
+ while(--pos)
+ {
+ k = key_line[pos];
+ if(k == '\"' || k == ';' || k == ' ' || k == '\'')
+ break;
+ }
+ key_linepos = pos + 1;
+ }
+ else if(keydown[K_SHIFT]) // move cursor to the previous character ignoring colors
+ {
+ int pos;
+ pos = key_linepos-1;
+ while (pos)
+ if(pos-1 > 0 && key_line[pos-1] == STRING_COLOR_TAG && isdigit(key_line[pos]))
+ pos-=2;
+ else if(pos-4 > 0 && key_line[pos-4] == STRING_COLOR_TAG && key_line[pos-3] == STRING_COLOR_RGB_TAG_CHAR
+ && isxdigit(key_line[pos-2]) && isxdigit(key_line[pos-1]) && isxdigit(key_line[pos]))
+ pos-=5;
+ else
+ {
+ pos--;
+ break;
+ }
+ key_linepos = pos + 1;
+ }
+ else
key_linepos--;
return;
}
{
if (key_linepos > 1)
{
- strcpy(key_lines[edit_line] + key_linepos - 1, key_lines[edit_line] + key_linepos);
+ strlcpy(key_line + key_linepos - 1, key_line + key_linepos, sizeof(key_line) + 1 - key_linepos);
key_linepos--;
}
return;
// delete char on cursor
if (key == K_DEL || key == K_KP_DEL)
{
- if ((size_t)key_linepos < 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_line);
+ if (key_linepos < (int)linelen)
+ memmove(key_line + key_linepos, key_line + key_linepos + 1, linelen - key_linepos);
return;
}
- // if we're at the end, get one character from previous line,
- // otherwise just go right one
+ // move cursor to the next character
if (key == K_RIGHTARROW || key == K_KP_RIGHTARROW)
{
- if ((size_t)key_linepos < strlen(key_lines[edit_line]))
+ if (key_linepos >= (int)strlen(key_line))
+ return;
+ if(keydown[K_CTRL]) // move cursor to the next word
+ {
+ int pos, len;
+ char k;
+ len = (int)strlen(key_line);
+ pos = key_linepos;
+ while(++pos < len)
+ {
+ k = key_line[pos];
+ if(k == '\"' || k == ';' || k == ' ' || k == '\'')
+ break;
+ }
+ key_linepos = pos;
+ }
+ else if(keydown[K_SHIFT]) // move cursor to the next character ignoring colors
+ {
+ int pos, len;
+ len = (int)strlen(key_line);
+ pos = key_linepos;
+ // check if there is a color tag right after the cursor
+ if (key_line[pos] == STRING_COLOR_TAG)
+ {
+ if(isdigit(key_line[pos+1]))
+ pos+=1;
+ else if(key_line[pos+1] == STRING_COLOR_RGB_TAG_CHAR && isxdigit(key_line[pos+2]) && isxdigit(key_line[pos+3]) && isxdigit(key_line[pos+4]))
+ pos+=4;
+ }
+ pos++;
+
+ // now go beyond all next consecutive color tags, if any
+ if(pos < len)
+ while (key_line[pos] == STRING_COLOR_TAG)
+ {
+ if(isdigit(key_line[pos+1]))
+ pos+=2;
+ else if(key_line[pos+1] == STRING_COLOR_RGB_TAG_CHAR && isxdigit(key_line[pos+2]) && isxdigit(key_line[pos+3]) && isxdigit(key_line[pos+4]))
+ pos+=5;
+ else
+ break;
+ }
+ key_linepos = pos;
+ }
+ else
key_linepos++;
-
return;
}
if (key == K_UPARROW || key == K_KP_UPARROW || (key == 'p' && keydown[K_CTRL]))
{
- if (history_line > 0 && key_lines[history_line-1][1])
- {
- history_line--;
- strcpy(key_lines[edit_line], key_lines[history_line]);
- key_linepos = strlen(key_lines[edit_line]);
- }
+ Key_History_Up();
return;
}
if (key == K_DOWNARROW || key == K_KP_DOWNARROW || (key == 'n' && keydown[K_CTRL]))
{
- history_line++;
- if (history_line >= edit_line)
- {
- history_line = edit_line;
- key_lines[edit_line][0] = ']';
- key_lines[edit_line][1] = 0;
- key_linepos = 1;
- }
- else
- {
- strcpy(key_lines[edit_line], key_lines[history_line]);
- key_linepos = strlen(key_lines[edit_line]);
- }
+ Key_History_Down();
return;
}
if (key == K_PGUP || key == K_KP_PGUP || key == K_MWHEELUP)
{
- con_backscroll += ((int) vid_conheight.integer >> 5);
- if (con_backscroll > con_totallines - (vid_conheight.integer>>3) - 1)
- con_backscroll = con_totallines - (vid_conheight.integer>>3) - 1;
+ if(keydown[K_CTRL])
+ {
+ con_backscroll += 3;
+ }
+ else
+ con_backscroll += ((int) vid_conheight.integer >> 5);
return;
}
if (key == K_PGDN || key == K_KP_PGDN || key == K_MWHEELDOWN)
{
- con_backscroll -= ((int) vid_conheight.integer >> 5);
- if (con_backscroll < 0)
- con_backscroll = 0;
+ if(keydown[K_CTRL])
+ {
+ con_backscroll -= 3;
+ }
+ else
+ con_backscroll -= ((int) vid_conheight.integer >> 5);
return;
}
if (key == K_HOME || key == K_KP_HOME)
{
- con_backscroll = con_totallines - (vid_conheight.integer>>3) - 1;
+ if (keydown[K_CTRL])
+ con_backscroll = INT_MAX;
+ else
+ key_linepos = 1;
return;
}
if (key == K_END || key == K_KP_END)
{
- con_backscroll = 0;
+ if (keydown[K_CTRL])
+ con_backscroll = 0;
+ else
+ key_linepos = (int)strlen(key_line);
return;
}
if (key_linepos < MAX_INPUTLINE-1)
{
int len;
- len = strlen(&key_lines[edit_line][key_linepos]);
+ len = (int)strlen(&key_line[key_linepos]);
// check insert mode, or always insert if at end of line
if (key_insert || len == 0)
{
// can't use strcpy to move string to right
len++;
- memmove(&key_lines[edit_line][key_linepos + 1], &key_lines[edit_line][key_linepos], len);
+ memmove(&key_line[key_linepos + 1], &key_line[key_linepos], len);
}
- key_lines[edit_line][key_linepos] = ascii;
+ key_line[key_linepos] = ascii;
key_linepos++;
}
}
//============================================================================
-qboolean chat_team;
+int chat_mode;
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)
+Key_Message (int key, int 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));
+ 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!
+ else
+ Cmd_ForwardStringToServer(va("%s %s", chat_mode ? "say_team" : "say ", chat_buffer));
key_dest = key_game;
chat_bufferlen = 0;
return;
}
+ // TODO add support for arrow keys and simple editing
+
if (key == K_ESCAPE) {
key_dest = key_game;
chat_bufferlen = 0;
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>";
}
void
Key_SetBinding (int keynum, int bindmap, const char *binding)
{
- char *new;
- int l;
+ char *newbinding;
+ size_t l;
- if (keynum == -1)
+ if (keynum == -1 || keynum >= MAX_KEYS)
return;
// free old bindings
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);
- new = Z_Malloc (l + 1);
- strcpy (new, binding);
- new[l] = 0;
- keybindings[bindmap][keynum] = new;
+ newbinding = (char *)Z_Malloc (l + 1);
+ memcpy (newbinding, binding, l + 1);
+ newbinding[l] = 0;
+ keybindings[bindmap][keynum] = newbinding;
}
static void
Key_In_Unbind_f (void)
{
int b, m;
+ char *errchar = NULL;
if (Cmd_Argc () != 3) {
Con_Print("in_unbind <bindmap> <key> : remove commands from a key\n");
return;
}
- m = strtol(Cmd_Argv (1), NULL, 0);
- if ((m < 0) || (m >= 8)) {
- Con_Printf("%d isn't a valid bindmap\n", m);
+ m = strtol(Cmd_Argv (1), &errchar, 0);
+ if ((m < 0) || (m >= 8) || (errchar && *errchar)) {
+ Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
return;
}
Key_In_Bind_f (void)
{
int i, c, b, m;
- char cmd[1024];
+ char cmd[MAX_INPUTLINE];
+ char *errchar = NULL;
c = Cmd_Argc ();
return;
}
- m = strtol(Cmd_Argv (1), NULL, 0);
- if ((m < 0) || (m >= 8)) {
- Con_Printf("%d isn't a valid bindmap\n", m);
+ m = strtol(Cmd_Argv (1), &errchar, 0);
+ if ((m < 0) || (m >= 8) || (errchar && *errchar)) {
+ Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
return;
}
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;
}
Key_In_Bindmap_f (void)
{
int m1, m2, c;
+ char *errchar = NULL;
c = Cmd_Argc ();
return;
}
- m1 = strtol(Cmd_Argv (1), NULL, 0);
- if ((m1 < 0) || (m1 >= 8)) {
- Con_Printf("%d isn't a valid bindmap\n", m1);
+ m1 = strtol(Cmd_Argv (1), &errchar, 0);
+ if ((m1 < 0) || (m1 >= 8) || (errchar && *errchar)) {
+ Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
return;
}
- m2 = strtol(Cmd_Argv (2), NULL, 0);
- if ((m2 < 0) || (m2 >= 8)) {
- Con_Printf("%d isn't a valid bindmap\n", m2);
+ m2 = strtol(Cmd_Argv (2), &errchar, 0);
+ if ((m2 < 0) || (m2 >= 8) || (errchar && *errchar)) {
+ Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(2));
return;
}
Key_SetBinding (i, j, "");
}
+static void
+Key_PrintBindList(int j)
+{
+ char bindbuf[MAX_INPUTLINE];
+ const char *p;
+ int i;
+
+ for (i = 0; i < (int)(sizeof(keybindings[0])/sizeof(keybindings[0][0])); i++)
+ {
+ p = keybindings[j][i];
+ if (p)
+ {
+ Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\");
+ if (j == 0)
+ Con_Printf("^2%s ^7= \"%s\"\n", Key_KeynumToString (i), bindbuf);
+ else
+ Con_Printf("^3bindmap %d: ^2%s ^7= \"%s\"\n", j, Key_KeynumToString (i), bindbuf);
+ }
+ }
+}
+
+static void
+Key_In_BindList_f (void)
+{
+ int m;
+ char *errchar = NULL;
+
+ if(Cmd_Argc() >= 2)
+ {
+ m = strtol(Cmd_Argv(1), &errchar, 0);
+ if ((m < 0) || (m >= 8) || (errchar && *errchar)) {
+ Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
+ return;
+ }
+ Key_PrintBindList(m);
+ }
+ else
+ {
+ for (m = 0; m < MAX_BINDMAPS; m++)
+ Key_PrintBindList(m);
+ }
+}
+
+static void
+Key_BindList_f (void)
+{
+ Key_PrintBindList(0);
+}
static void
Key_Bind_f (void)
{
int i, c, b;
- char cmd[1024];
+ char cmd[MAX_INPUTLINE];
c = Cmd_Argc ();
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;
}
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);
+ }
+ }
+ }
}
void
Key_Init (void)
{
- int i;
-
- for (i = 0; i < 32; i++) {
- key_lines[i][0] = ']';
- key_lines[i][1] = 0;
- }
+ Key_History_Init();
+ key_line[0] = ']';
+ key_line[1] = 0;
key_linepos = 1;
-//
-// init ascii characters in console mode
-//
- for (i = 32; i < 128; i++)
- consolekeys[i] = true;
- consolekeys[K_ENTER] = true; consolekeys[K_KP_ENTER] = true;
- consolekeys[K_TAB] = true;
- consolekeys[K_LEFTARROW] = true; consolekeys[K_KP_LEFTARROW] = true;
- consolekeys[K_RIGHTARROW] = true; consolekeys[K_KP_RIGHTARROW] = true;
- consolekeys[K_UPARROW] = true; consolekeys[K_KP_UPARROW] = true;
- consolekeys[K_DOWNARROW] = true; consolekeys[K_KP_DOWNARROW] = true;
- consolekeys[K_BACKSPACE] = true;
- consolekeys[K_DEL] = true; consolekeys[K_KP_DEL] = true;
- consolekeys[K_INS] = true; consolekeys[K_KP_INS] = true;
- consolekeys[K_HOME] = true; consolekeys[K_KP_HOME] = true;
- consolekeys[K_END] = true; consolekeys[K_KP_END] = true;
- consolekeys[K_PGUP] = true; consolekeys[K_KP_PGUP] = true;
- consolekeys[K_PGDN] = true; consolekeys[K_KP_PGDN] = true;
- consolekeys[K_SHIFT] = true;
- consolekeys[K_MWHEELUP] = true;
- consolekeys[K_MWHEELDOWN] = true;
- consolekeys[K_KP_PLUS] = true;
- consolekeys[K_KP_MINUS] = true;
- consolekeys[K_KP_DIVIDE] = true;
- consolekeys[K_KP_MULTIPLY] = true;
- consolekeys['`'] = false;
- consolekeys['~'] = false;
-
- menubound[K_ESCAPE] = true;
- for (i = 0; i < 12; i++)
- menubound[K_F1 + i] = true;
-
//
// 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_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 ("bind", Key_Bind_f);
- Cmd_AddCommand ("unbind", Key_Unbind_f);
- Cmd_AddCommand ("unbindall", Key_Unbindall_f);
+ 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)");
+
+ Cvar_RegisterVariable (&con_closeontoggleconsole);
}
+void
+Key_Shutdown (void)
+{
+ Key_History_Shutdown();
+}
+
+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];
+ return bind;
+}
+
+qboolean CL_VM_InputEvent (qboolean down, int key, int ascii);
/*
===================
Should NOT be called during an interrupt!
===================
*/
+static char tbl_keyascii[MAX_KEYS];
+static keydest_t tbl_keydest[MAX_KEYS];
+
void
-Key_Event (int key, char ascii, qboolean down)
+Key_Event (int key, int ascii, qboolean down)
{
-#if 1
-#define USERPLAYING() ( !key_consoleactive && key_dest == key_game && (cls.state == ca_connected && cls.signon == SIGNONS) )
const char *bind;
+ qboolean q;
+ keydest_t keydest = key_dest;
- // set key state
- keydown[ key ] = down;
+ if (key < 0 || key >= MAX_KEYS)
+ return;
// get key binding
- bind = keybindings[ key_bmap ][ key ];
- if( !bind ) {
- bind = keybindings[ key_bmap2 ][ key ];
- }
-
- // update key repeats
- if( down ) {
- key_repeats[ key ]++;
- if( key_repeats[ key ] > 1 ) {
- if( (key_consoleactive && !consolekeys[key]) || USERPLAYING() )
- return; // ignore most autorepeats
- }
- } else {
- key_repeats[ key ] = 0;
- }
-
- if( !down ) {
- if( bind && bind[ 0 ] == '+') {
- Cbuf_AddText( va( "-%s %i\n", bind + 1, key) );
- }
- } else {
- // handle ESCAPE specially, so unbinding wont help
- if( key == K_ESCAPE ) {
- // shift-escape is a safety measure for users who cant toggle the console otherwise
- if( keydown[K_SHIFT] ) {
- Con_ToggleConsole_f();
- return;
- }
- switch( key_dest ) {
- case key_message:
- Key_Message( key, ascii );
- break;
- case key_menu:
- MR_Keydown( key, ascii );
- break;
- case key_game:
- if (COM_CheckParm ("-demolooponly"))
- {
- CL_Disconnect ();
- return;
- }
- MR_ToggleMenu_f();
- break;
- default:
- Sys_Error( "Bad key_dest" );
- }
- return;
- }
+ bind = keybindings[key_bmap][key];
+ if (!bind)
+ bind = keybindings[key_bmap2][key];
- if( !(key_consoleactive && consolekeys[ key ]) && bind && !strncmp( bind, "toggleconsole", strlen( "toggleconsole" ) ) ) {
- Cbuf_AddText( bind );
- Cbuf_AddText( "\n" );
- if( ascii != STRING_COLOR_TAG ) {
- return;
- }
- } else {
- // during demo playback, all keys ingame bring up the main menu
- if( cls.demoplayback && !key_consoleactive && key_dest == key_game ) {
- if (!COM_CheckParm ("-demolooponly"))
- MR_ToggleMenu_f ();
- return;
- }
-
- // menu bind/function keys or normal binds
- if( (key_dest == key_menu && menubound[key]) || USERPLAYING() ) {
- if( bind ) {
- if( bind[0] == '+' ) { // button commands add keynum as a parm
- Cbuf_AddText( va( "%s %i\n", bind, key ) );
- } else {
- Cbuf_AddText( bind );
- Cbuf_AddText( "\n" );
- }
- }
- return;
- }
- }
+ 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 : "");
- // either console or game state key functions
- if( key_consoleactive ) {
- Key_Console( key, ascii );
+ if(key_consoleactive)
+ keydest = key_console;
+
+ 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);
+ if(keydown[key] == 1) {
+ tbl_keyascii[key] = ascii;
+ tbl_keydest[key] = keydest;
} else {
- switch (key_dest) {
- case key_message:
- Key_Message( key, ascii );
- break;
- case key_menu:
- MR_Keydown( key, ascii );
- break;
- case key_game:
- // unbound key
- break;
- default:
- Sys_Error( "Bad key_dest" );
- }
+ ascii = tbl_keyascii[key];
+ keydest = tbl_keydest[key];
}
}
-#else
- const char *kb;
- char cmd[1024];
-
- keydown[key] = down;
-
- if (!down)
- key_repeats[key] = 0;
-
- key_lastpress = key;
- key_count++;
- if (key_count <= 0) {
- return; // just catching keys for Con_NotifyBox
- }
-
- // update auto-repeat status
- if (down) {
- key_repeats[key]++;
- if (key_repeats[key] > 1) {
- if ((key_consoleactive && !consolekeys[key]) ||
- (!key_consoleactive && key_dest == key_game &&
- (cls.state == ca_connected && cls.signon == SIGNONS)))
- return; // ignore most autorepeats
- }
+ else
+ {
+ // clear repeat count now that the key is released
+ keydown[key] = 0;
+ keydest = tbl_keydest[key];
+ ascii = tbl_keyascii[key];
}
- if (key == K_CTRL)
- ctrl_down = down;
-
- //
- // handle escape specially, so the user can never unbind it
+ 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
+ // situation).
//
- if (key == K_ESCAPE) {
- if (!down)
+ // this also means that toggling the console on/off does not lose the old
+ // key_dest state
+
+ // specially handle escape (togglemenu) and shift-escape (toggleconsole)
+ // engine bindings, these are not handled as normal binds so that the user
+ // can recover from a completely empty bindmap
+ if (key == K_ESCAPE)
+ {
+ // ignore key repeats on escape
+ if (keydown[key] > 1)
return;
- // ctrl-escape is a safety measure
- if (ctrl_down)
+
+ // escape does these things:
+ // key_consoleactive - close console
+ // key_message - abort messagemode
+ // key_menu - go to parent menu (or key_game)
+ // key_game - open menu
+
+ // in all modes shift-escape toggles console
+ if (keydown[K_SHIFT])
{
- Con_ToggleConsole_f ();
+ if(down)
+ {
+ Con_ToggleConsole_f ();
+ tbl_keydest[key] = key_void; // esc release should go nowhere (especially not to key_menu or key_game)
+ }
return;
}
- switch (key_dest) {
+
+ switch (keydest)
+ {
+ case key_console:
+ if(down)
+ {
+ if(key_consoleactive & KEY_CONSOLEACTIVE_FORCED)
+ {
+ key_consoleactive &= ~KEY_CONSOLEACTIVE_USER;
+ MR_ToggleMenu_f ();
+ }
+ else
+ Con_ToggleConsole_f();
+ }
+ break;
+
case key_message:
- Key_Message (key, ascii);
+ if (down)
+ Key_Message (key, ascii); // that'll close the message input
break;
+
case key_menu:
- MR_Keydown (key, ascii);
+ case key_menu_grabbed:
+ MR_KeyEvent (key, ascii, down);
break;
+
case key_game:
- MR_ToggleMenu_f ();
+ // 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);
+ if (!q && down)
+ MR_ToggleMenu_f ();
break;
+
default:
- if(UI_Callback_IsSlotUsed(key_dest - 3))
- UI_Callback_KeyDown (key, ascii);
- else
- Sys_Error ("Bad key_dest");
+ Con_Printf ("Key_Event: Bad key_dest\n");
}
return;
}
- if (down)
+ // send function keydowns to interpreter no matter what mode is (unless the menu has specifically grabbed the keyboard, for rebinding keys)
+ if (keydest != key_menu_grabbed)
+ if (key >= K_F1 && key <= K_F12)
{
- if (!(kb = keybindings[key_bmap][key]))
- kb = keybindings[key_bmap2][key];
- if (kb && !strncmp(kb, "toggleconsole", strlen("toggleconsole")))
+ if (bind)
{
- Cbuf_AddText (kb);
- Cbuf_AddText ("\n");
- return;
+ if(keydown[key] == 1 && down)
+ {
+ // button commands add keynum as a parm
+ if (bind[0] == '+')
+ Cbuf_AddText (va("%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));
}
+ return;
}
- if (key_consoleactive && consolekeys[key] && down)
- Key_Console (key, ascii);
- else
+ // send input to console if it wants it
+ if (keydest == key_console)
{
- //
- // key up events only generate commands if the game key binding is a button
- // command (leading + sign). These will occur even in console mode, to
- // keep the character from continuing an action started before a console
- // switch. Button commands include the kenum as a parameter, so multiple
- // downs can be matched with ups
- //
- if (!down) {
- if (!(kb = keybindings[key_bmap][key]))
- kb = keybindings[key_bmap2][key];
-
- if (kb && kb[0] == '+') {
- dpsnprintf (cmd, sizeof(cmd), "-%s %i\n", kb + 1, key);
- Cbuf_AddText (cmd);
- }
+ if (!down)
return;
- }
-
- //
- // during demo playback, most keys bring up the main menu
- //
- if (cls.demoplayback && down && consolekeys[key] && key_dest == key_game) {
- MR_ToggleMenu_f ();
+ // 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)
+ {
+ Con_ToggleConsole_f ();
return;
}
+ Key_Console (key, ascii);
+ return;
+ }
- //
- // if not a consolekey, send to the interpreter no matter what mode is
- //
- if ((key_dest == key_menu && menubound[key])
- || (key_consoleactive && !consolekeys[key])
- || (key_dest == key_game &&
- ((cls.state == ca_connected) || !consolekeys[key]))) {
- if (!(kb = keybindings[key_bmap][key]))
- kb = keybindings[key_bmap2][key];
- if (kb) {
- if (kb[0] == '+') { // button commands add keynum as a parm
- dpsnprintf (cmd, sizeof(cmd), "%s %i\n", kb, key);
- Cbuf_AddText (cmd);
- } else {
- Cbuf_AddText (kb);
- Cbuf_AddText ("\n");
- }
- }
+ // handle toggleconsole in menu too
+ if (keydest == key_menu)
+ {
+ if (down && con_closeontoggleconsole.integer && bind && !strncmp(bind, "toggleconsole", strlen("toggleconsole")) && ascii != STRING_COLOR_TAG)
+ {
+ Con_ToggleConsole_f ();
+ tbl_keydest[key] = key_void; // key release should go nowhere (especially not to key_menu or key_game)
return;
}
+ }
- if (!down)
- return; // other systems only care about key
- // down events
+ // 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;
+ }
- switch (key_dest) {
- case key_message:
+ // anything else is a key press into the game, chat line, or menu
+ switch (keydest)
+ {
+ case key_message:
+ if (down)
Key_Message (key, ascii);
- break;
- case key_menu:
- MR_Keydown (key, ascii);
- break;
- case key_game:
- Key_Console (key, ascii);
- break;
- default:
- if(UI_Callback_IsSlotUsed(key_dest - 3))
- UI_Callback_KeyDown (key, ascii);
- else
- Sys_Error ("Bad key_dest");
- }
+ break;
+ case key_menu:
+ case key_menu_grabbed:
+ MR_KeyEvent (key, ascii, down);
+ break;
+ case key_game:
+ q = CL_VM_InputEvent(down, key, ascii);
+ // ignore key repeats on binds and only send the bind if the event hasnt been already processed by csqc
+ if (!q && bind)
+ {
+ if(keydown[key] == 1 && down)
+ {
+ // button commands add keynum as a parm
+ if (bind[0] == '+')
+ Cbuf_AddText (va("%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));
+ }
+ break;
+ default:
+ Con_Printf ("Key_Event: Bad key_dest\n");
}
-#endif
}
/*
void
Key_ClearStates (void)
{
- int i;
-
- for (i = 0; i < (int)(sizeof(keydown)/sizeof(keydown[0])); i++)
- {
- keydown[i] = false;
- key_repeats[i] = 0;
- }
+ memset(keydown, 0, sizeof(keydown));
}
projects / xonotic / darkplaces.git / blobdiff