*/
-#define MAXCMDLINE 256
-char key_lines[32][MAXCMDLINE];
-int key_linepos;
-int shift_down = false;
-int key_lastpress;
-int key_insert; // insert key toggle (for editing)
+#define MAXCMDLINE 256
+char key_lines[32][MAXCMDLINE];
+int key_linepos;
+int shift_down = false;
+int key_lastpress;
+int key_insert; // insert key toggle (for editing)
-int edit_line = 0;
-int history_line = 0;
+int edit_line = 0;
+int history_line = 0;
-keydest_t key_dest;
+int key_consoleactive;
+keydest_t key_dest;
-int key_count; // incremented every key event
+int key_count; // incremented every key event
-char *keybindings[256];
-qboolean consolekeys[256]; // if true, can't be rebound while in console
-qboolean menubound[256]; // if true, can't be rebound while in menu
-int keyshift[256]; // key to map to if shift held down in console
-int key_repeats[256]; // if > 1, it is autorepeating
-qboolean keydown[256];
+char *keybindings[256];
+qboolean consolekeys[256]; // if true, can't be rebound while in console
+qboolean menubound[256]; // if true, can't be rebound while in menu
+int keyshift[256]; // key to map to if shift held down in console
+int key_repeats[256]; // if > 1, it is autorepeating
+qboolean keydown[256];
typedef struct
{
- char *name;
- int keynum;
+ char *name;
+ int keynum;
} keyname_t;
keyname_t keynames[] =
if (key == K_DEL) // delete char on cursor
{
- if (key_linepos < strlen(key_lines[edit_line]))
+ if ((size_t)key_linepos < strlen(key_lines[edit_line]))
strcpy(key_lines[edit_line] + key_linepos, key_lines[edit_line] + key_linepos + 1);
return;
}
// otherwise just go right one
if (key == K_RIGHTARROW)
{
- if (strlen(key_lines[edit_line]) == key_linepos)
+ if (strlen(key_lines[edit_line]) == (size_t)key_linepos)
{
- if (strlen(key_lines[(edit_line + 31) & 31]) <= key_linepos)
+ if (strlen(key_lines[(edit_line + 31) & 31]) <= (size_t)key_linepos)
return; // no character to get
key_lines[edit_line][key_linepos] = key_lines[(edit_line + 31) & 31][key_linepos];
if (key == K_PGUP || key==K_MWHEELUP)
{
- con_backscroll += 2;
+ con_backscroll += ((int) scr_conlines >> 4);
if (con_backscroll > con_totallines - (vid.conheight>>3) - 1)
con_backscroll = con_totallines - (vid.conheight>>3) - 1;
return;
if (key == K_PGDN || key==K_MWHEELDOWN)
{
- con_backscroll -= 2;
+ con_backscroll -= ((int) scr_conlines >> 4);
if (con_backscroll < 0)
con_backscroll = 0;
return;
con_backscroll = 0;
return;
}
-
+
if (key < 32 || key > 127)
return; // non printable
-
+
if (key_linepos < MAXCMDLINE-1)
the K_* names are matched up.
===================
*/
-int Key_StringToKeynum (char *str)
+int Key_StringToKeynum (const char *str)
{
- keyname_t *kn;
+ keyname_t *kn;
if (!str || !str[0])
return -1;
return str[0];
for (kn=keynames ; kn->name ; kn++)
- {
if (!Q_strcasecmp(str,kn->name))
return kn->keynum;
- }
return -1;
}
*/
char *Key_KeynumToString (int keynum)
{
- keyname_t *kn;
- static char tinystr[2];
+ keyname_t *kn;
+ static char tinystr[2];
if (keynum == -1)
return "<KEY NOT FOUND>";
tinystr[1] = 0;
return tinystr;
}
-
+
for (kn=keynames ; kn->name ; kn++)
if (keynum == kn->keynum)
return kn->name;
char *new;
int l;
- if (keynum == -1)
+ if (keynum < 0 || keynum >= 256)
return;
// free old bindings
key_repeats[key]++;
if (key != K_BACKSPACE && key != K_PAUSE && key_repeats[key] > 1)
return; // ignore most autorepeats
-
+
if (key >= 200 && !keybindings[key])
Con_Printf ("%s is unbound, hit F4 to set.\n", Key_KeynumToString (key) );
}
M_Keydown (key);
break;
case key_game:
- case key_console:
M_ToggleMenu_f ();
break;
default:
return;
}
-//
-// 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 keynum as a parameter, so multiple
-// downs can be matched with ups
-//
- if (!down)
+ // LordHavoc: hack to make toggleconsole always work
+ if (down)
{
kb = keybindings[key];
- if (kb && kb[0] == '+')
+ if (kb && !strncmp(kb, "toggleconsole", strlen("toggleconsole")))
{
- sprintf (cmd, "-%s %i\n", kb+1, key);
- Cbuf_AddText (cmd);
+ Cbuf_AddText (kb);
+ Cbuf_AddText ("\n");
+ return;
}
- if (keyshift[key] != key)
+ }
+
+ if (key_consoleactive && consolekeys[key])
+ {
+ // console only wants key down events
+ if (!down)
+ return;
+
+ // FIXME: this does not support non-QWERTY keyboards
+ if (shift_down)
+ key = keyshift[key];
+
+ Key_Console (key);
+ }
+ else
+ {
+ //
+ // 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 keynum as a parameter, so multiple
+ // downs can be matched with ups
+ //
+ if (!down)
{
- kb = keybindings[keyshift[key]];
+ kb = keybindings[key];
if (kb && kb[0] == '+')
{
sprintf (cmd, "-%s %i\n", kb+1, key);
Cbuf_AddText (cmd);
}
+ if (keyshift[key] != key)
+ {
+ kb = keybindings[keyshift[key]];
+ if (kb && kb[0] == '+')
+ {
+ sprintf (cmd, "-%s %i\n", kb+1, key);
+ Cbuf_AddText (cmd);
+ }
+ }
+ return;
}
- return;
- }
-//
-// during demo playback, most keys bring up the main menu
-//
- if (cls.demoplayback && down && consolekeys[key] && key_dest == key_game)
- {
- M_ToggleMenu_f ();
- return;
- }
+ //
+ // during demo playback, most keys bring up the main menu
+ //
+ if (cls.demoplayback && down && consolekeys[key] && key_dest == key_game)
+ {
+ M_ToggleMenu_f ();
+ return;
+ }
-//
-// if not a consolekey, send to the interpreter no matter what mode is
-//
- if ( (key_dest == key_menu && menubound[key])
- || (key_dest == key_console && !consolekeys[key])
- || (key_dest == key_game && ( !con_forcedup || !consolekeys[key] ) ) )
- {
- kb = keybindings[key];
- if (kb)
+ //
+ // if not a consolekey, send to the interpreter no matter what mode is
+ //
+ //if ((key_dest == key_console && !consolekeys[key])
+ if ((key_consoleactive && !consolekeys[key])
+ || (key_dest == key_menu && menubound[key])
+ || key_dest == key_game)
{
- if (kb[0] == '+')
- { // button commands add keynum as a parm
- sprintf (cmd, "%s %i\n", kb, key);
- Cbuf_AddText (cmd);
- }
- else
+ kb = keybindings[key];
+ if (kb)
{
- Cbuf_AddText (kb);
- Cbuf_AddText ("\n");
+ if (kb[0] == '+')
+ { // button commands add keynum as a parm
+ sprintf (cmd, "%s %i\n", kb, key);
+ Cbuf_AddText (cmd);
+ }
+ else
+ {
+ Cbuf_AddText (kb);
+ Cbuf_AddText ("\n");
+ }
}
+ return;
}
- return;
- }
- if (!down)
- return; // other systems only care about key down events
+ if (!down)
+ return; // other systems only care about key down events
- if (shift_down)
- {
- key = keyshift[key];
- }
+ // FIXME: this does not support non-QWERTY keyboards
+ if (shift_down)
+ key = keyshift[key];
- switch (key_dest)
- {
- case key_message:
- Key_Message (key);
- break;
- case key_menu:
- M_Keydown (key);
- break;
-
- case key_game:
- case key_console:
- Key_Console (key);
- break;
- default:
- Sys_Error ("Bad key_dest");
+ switch (key_dest)
+ {
+ case key_message:
+ Key_Message (key);
+ break;
+ case key_menu:
+ M_Keydown (key);
+ break;
+
+ case key_game:
+ //case key_console:
+ Key_Console (key);
+ break;
+ default:
+ Sys_Error ("Bad key_dest");
+ }
}
}
*/
void Key_ClearStates (void)
{
- int i;
+ int i;
- for (i=0 ; i<256 ; i++)
+ for (i = 0;i < 256;i++)
{
keydown[i] = false;
key_repeats[i] = 0;