#include "quakedef.h"
#include "cl_video.h"
-cvar_t con_closeontoggleconsole = {CVAR_SAVE, "con_closeontoggleconsole","0", "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"};
/*
key up events are sent even if in console mode
{"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}
};
====================
*/
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");
+#endif
i = (int)strlen(cbd);
if (i + key_linepos >= MAX_INPUTLINE)
i= MAX_INPUTLINE - key_linepos;
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;
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;
return;
}
if (key == K_HOME || key == K_KP_HOME)
{
if (keydown[K_CTRL])
- con_backscroll = con_totallines - (vid_conheight.integer>>3) - 1;
+ con_backscroll = INT_MAX;
else
key_linepos = 1;
return;
//============================================================================
-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>";
}
Z_Free (keybindings[bindmap][keynum]);
keybindings[bindmap][keynum] = NULL;
}
+ if(!binding[0]) // make "" binds be removed --blub
+ return;
// allocate memory for new binding
l = strlen (binding);
newbinding = (char *)Z_Malloc (l + 1);
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);
+ }
+ }
+ }
}
return bind;
}
-qboolean CL_VM_InputEvent (qboolean pressed, int key);
+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)
{
const char *bind;
qboolean q;
+ keydest_t keydest = key_dest;
if (key < 0 || key >= MAX_KEYS)
return;
if (!bind)
bind = keybindings[key_bmap2][key];
- if(key_dest == key_game)
- {
- q = CL_VM_InputEvent(!down, key);
- if(q)
- {
- if (down)
- keydown[key] = min(keydown[key] + 1, 2);
- else
- keydown[key] = 0;
- 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 : "");
+ 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 {
+ ascii = tbl_keyascii[key];
+ keydest = tbl_keydest[key];
+ }
}
else
{
// clear repeat count now that the key is released
keydown[key] = 0;
- // 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 (bind && bind[0] == '+')
- Cbuf_AddText(va("-%s %i\n", bind + 1, key));
+ keydest = tbl_keydest[key];
+ ascii = tbl_keyascii[key];
}
+ 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
// ignore key repeats on escape
if (keydown[key] > 1)
return;
+
// 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 (((key_consoleactive & KEY_CONSOLEACTIVE_USER) || keydown[K_SHIFT]) && down)
+ 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:
if (down)
- Key_Message (key, ascii);
+ Key_Message (key, ascii); // that'll close the message input
break;
+
case key_menu:
+ case key_menu_grabbed:
MR_KeyEvent (key, ascii, down);
break;
+
case key_game:
- if (down)
+ // 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:
Con_Printf ("Key_Event: Bad key_dest\n");
}
return;
}
- // send function keydowns to interpreter no matter what mode is
- if (key >= K_F1 && key <= K_F12 && 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)
{
- // ignore key repeats on F1-F12 binds
- if (keydown[key] > 1)
- return;
if (bind)
{
- // button commands add keynum as a parm
- if (bind[0] == '+')
- Cbuf_AddText (va("%s %i\n", bind, key));
- else
+ if(keydown[key] == 1 && down)
{
- Cbuf_AddText (bind);
- Cbuf_AddText ("\n");
- }
+ // 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 0
- // ignore binds (other than the above escape/F1-F12 keys) while in console
- if (key_consoleactive && down)
-#else
- // respond to toggleconsole binds while in console unless the pressed key
- // happens to be the color prefix character (such as on German keyboards)
- if (key_consoleactive && down && (!con_closeontoggleconsole.integer || !bind || strncmp(bind, "toggleconsole", strlen("toggleconsole")) || ascii == STRING_COLOR_TAG))
-#endif
+ // send input to console if it wants it
+ if (keydest == key_console)
{
+ if (!down)
+ 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)
+ {
+ Con_ToggleConsole_f ();
+ return;
+ }
Key_Console (key, ascii);
return;
}
+ // 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;
+ }
+ }
+
// ignore binds while a video is played, let the video system handle the key event
if (cl_videoplaying)
{
}
// anything else is a key press into the game, chat line, or menu
- switch (key_dest)
+ switch (keydest)
{
case key_message:
if (down)
Key_Message (key, ascii);
break;
case key_menu:
+ case key_menu_grabbed:
MR_KeyEvent (key, ascii, down);
break;
case key_game:
- // ignore key repeats on binds
- if (bind && keydown[key] == 1 && down)
+ 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)
{
- // button commands add keynum as a parm
- if (bind[0] == '+')
- Cbuf_AddText (va("%s %i\n", bind, key));
- else
+ if(keydown[key] == 1 && down)
{
- Cbuf_AddText (bind);
- Cbuf_AddText ("\n");
- }
+ // 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: