====================
*/
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
- while (*cbd)
+ p = cbd;
+ while (*p)
{
- if (*cbd == '\n' || *cbd == '\r' || *cbd == '\b')
+ if (*p == '\n' || *p == '\r' || *p == '\b')
{
- *cbd++ = 0;
+ *p++ = 0;
break;
}
- cbd++;
+ p++;
}
#else
strtok(cbd, "\n\r\b");
//============================================================================
-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 || 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;
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 (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 0
- 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;
- }
- }
-#endif
-
+ 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;
+ 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:
// 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");
}
}
// send function keydowns to interpreter no matter what mode is (unless the menu has specifically grabbed the keyboard, for rebinding keys)
- if (key_dest != key_menu_grabbed)
- if (key >= K_F1 && key <= K_F12 && down)
+ 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;
}
-
- // FIXME: actually the up-bind should only be called if the button was actually pressed while key_dest == key_game [12/17/2007 Black]
- // especially CL_VM_InputEvent should be able to prevent it from being called (to intercept the binds)
- // 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 && bind && bind[0] == '+')
- Cbuf_AddText(va("-%s %i\n", bind + 1, key));
+ // 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)
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 && keydown[key] == 1 && down)
+ 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:
projects / xonotic / darkplaces.git / blobdiff