qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2025-01-31 20:50:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Backported and merged the qw_client/keys.c to uquake.

Browse source 
Added support for the KP_* keysyms..
This commit is contained in:
Zephaniah E. Hull 2000-01-04 01:53:31 +00:00
parent 3e71009f2a
commit 6006adda7c
4 changed files with 115 additions and 775 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
qw_client/keys.c → common/keys.c
View file

@ -312,28 +312,48 @@ void Key_Console (int key)
case K_MWHEELUP:
case KP_PGUP:
case K_PGUP:
#ifdef QUAKEWORLD
con->display -= 2;
#else
con_backscroll += 2;
if (con_backscroll > con_totallines - (vid.height>>3) - 1)
con_backscroll = con_totallines - (vid.height>>3) - 1;
#endif
return;
break;
case K_MWHEELDOWN:
case KP_PGDN:
case K_PGDN:
#ifdef QUAKEWORLD
con->display += 2;
if (con->display > con->current)
con->display = con->current;
#else
con_backscroll -= 2;
if (con_backscroll < 0)
con_backscroll = 0;
#endif
return;
break;
case KP_HOME:
case K_HOME:
#ifdef QUAKEWORLD
con->display = con->current - con_totallines + 10;
#else
con_backscroll = con_totallines - (vid.height>>3) - 1;
#endif
return;
break;
case KP_END:
case K_END:
#ifdef QUAKEWORLD
con->display = con->current;
#else
con_backscroll = 0;
#endif
return;
break;
@ -814,7 +834,13 @@ void Key_Event (int key, qboolean down)
//
if ( (key_dest == key_menu && menubound[key])
|| (key_dest == key_console && !consolekeys[key])
|| (key_dest == key_game && ( cls.state == ca_active || !consolekeys[key] ) ) )
|| (key_dest == key_game && (
#ifdef QUAKEWORLD
(cls.state == ca_active)
#else
!con_forcedup
#endif
|| !consolekeys[key] ) ) )
{
kb = keybindings[key];
if (kb)

6
uquake/console.c
View file

@ -122,12 +122,12 @@ void Con_ClearNotify (void)
Con_MessageMode_f
================
*/
extern qboolean team_message;
extern qboolean chat_team;
void Con_MessageMode_f (void)
{
key_dest = key_message;
team_message = false;
chat_team = false;
}
@ -139,7 +139,7 @@ Con_MessageMode2_f
void Con_MessageMode2_f (void)
{
key_dest = key_message;
team_message = true;
chat_team = true;
}

759
uquake/keys.c
View file

@ -1,759 +0,0 @@
/*
Copyright (C) 1996-1997 Id Software, Inc.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "quakedef.h"
/*
key up events are sent even if in console mode
*/
#define MAXCMDLINE 256
char key_lines[32][MAXCMDLINE];
int key_linepos;
int shift_down=false;
int key_lastpress;
int edit_line=0;
int history_line=0;
keydest_t key_dest;
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];
typedef struct
{
char *name;
int keynum;
} keyname_t;
keyname_t keynames[] =
{
{"TAB", K_TAB},
{"ENTER", K_ENTER},
{"ESCAPE", K_ESCAPE},
{"SPACE", K_SPACE},
{"BACKSPACE", K_BACKSPACE},
{"UPARROW", K_UPARROW},
{"DOWNARROW", K_DOWNARROW},
{"LEFTARROW", K_LEFTARROW},
{"RIGHTARROW", K_RIGHTARROW},
{"ALT", K_ALT},
{"CTRL", K_CTRL},
{"SHIFT", K_SHIFT},
{"F1", K_F1},
{"F2", K_F2},
{"F3", K_F3},
{"F4", K_F4},
{"F5", K_F5},
{"F6", K_F6},
{"F7", K_F7},
{"F8", K_F8},
{"F9", K_F9},
{"F10", K_F10},
{"F11", K_F11},
{"F12", K_F12},
{"INS", K_INS},
{"DEL", K_DEL},
{"PGDN", K_PGDN},
{"PGUP", K_PGUP},
{"HOME", K_HOME},
{"END", K_END},
{"MOUSE1", K_MOUSE1},
{"MOUSE2", K_MOUSE2},
{"MOUSE3", K_MOUSE3},
{"JOY1", K_JOY1},
{"JOY2", K_JOY2},
{"JOY3", K_JOY3},
{"JOY4", K_JOY4},
{"AUX1", K_AUX1},
{"AUX2", K_AUX2},
{"AUX3", K_AUX3},
{"AUX4", K_AUX4},
{"AUX5", K_AUX5},
{"AUX6", K_AUX6},
{"AUX7", K_AUX7},
{"AUX8", K_AUX8},
{"AUX9", K_AUX9},
{"AUX10", K_AUX10},
{"AUX11", K_AUX11},
{"AUX12", K_AUX12},
{"AUX13", K_AUX13},
{"AUX14", K_AUX14},
{"AUX15", K_AUX15},
{"AUX16", K_AUX16},
{"AUX17", K_AUX17},
{"AUX18", K_AUX18},
{"AUX19", K_AUX19},
{"AUX20", K_AUX20},
{"AUX21", K_AUX21},
{"AUX22", K_AUX22},
{"AUX23", K_AUX23},
{"AUX24", K_AUX24},
{"AUX25", K_AUX25},
{"AUX26", K_AUX26},
{"AUX27", K_AUX27},
{"AUX28", K_AUX28},
{"AUX29", K_AUX29},
{"AUX30", K_AUX30},
{"AUX31", K_AUX31},
{"AUX32", K_AUX32},
{"PAUSE", K_PAUSE},
{"MWHEELUP", K_MWHEELUP},
{"MWHEELDOWN", K_MWHEELDOWN},
{"SEMICOLON", ';'}, // because a raw semicolon seperates commands
{NULL,0}
};
/*
==============================================================================
LINE TYPING INTO THE CONSOLE
==============================================================================
*/
/*
====================
Key_Console
Interactive line editing and console scrollback
====================
*/
void Key_Console (int key)
{
char *cmd;
if (key == K_ENTER)
{
Cbuf_AddText (key_lines[edit_line]+1); // skip the >
Cbuf_AddText ("\n");
Con_Printf ("%s\n",key_lines[edit_line]);
edit_line = (edit_line + 1) & 31;
history_line = edit_line;
key_lines[edit_line][0] = ']';
key_linepos = 1;
if (cls.state == ca_disconnected)
SCR_UpdateScreen (); // force an update, because the command
// may take some time
return;
}
if (key == K_TAB)
{ // command completion
cmd = Cmd_CompleteCommand (key_lines[edit_line]+1);
if (!cmd)
cmd = Cvar_CompleteVariable (key_lines[edit_line]+1);
if (cmd)
{
Q_strcpy (key_lines[edit_line]+1, cmd);
key_linepos = Q_strlen(cmd)+1;
key_lines[edit_line][key_linepos] = ' ';
key_linepos++;
key_lines[edit_line][key_linepos] = 0;
return;
}
}
if (key == K_BACKSPACE || key == K_LEFTARROW)
{
if (key_linepos > 1)
key_linepos--;
return;
}
if (key == K_UPARROW)
{
do
{
history_line = (history_line - 1) & 31;
} while (history_line != edit_line
&& !key_lines[history_line][1]);
if (history_line == edit_line)
history_line = (edit_line+1)&31;
Q_strcpy(key_lines[edit_line], key_lines[history_line]);
key_linepos = Q_strlen(key_lines[edit_line]);
return;
}
if (key == K_DOWNARROW)
{
if (history_line == edit_line) return;
do
{
history_line = (history_line + 1) & 31;
}
while (history_line != edit_line
&& !key_lines[history_line][1]);
if (history_line == edit_line)
{
key_lines[edit_line][0] = ']';
key_linepos = 1;
}
else
{
Q_strcpy(key_lines[edit_line], key_lines[history_line]);
key_linepos = Q_strlen(key_lines[edit_line]);
}
return;
}
if (key == K_PGUP || key==K_MWHEELUP)
{
con_backscroll += 2;
if (con_backscroll > con_totallines - (vid.height>>3) - 1)
con_backscroll = con_totallines - (vid.height>>3) - 1;
return;
}
if (key == K_PGDN || key==K_MWHEELDOWN)
{
con_backscroll -= 2;
if (con_backscroll < 0)
con_backscroll = 0;
return;
}
if (key == K_HOME)
{
con_backscroll = con_totallines - (vid.height>>3) - 1;
return;
}
if (key == K_END)
{
con_backscroll = 0;
return;
}
if (key < 32 || key > 127)
return; // non printable
if (key_linepos < MAXCMDLINE-1)
{
key_lines[edit_line][key_linepos] = key;
key_linepos++;
key_lines[edit_line][key_linepos] = 0;
}
}
//============================================================================
char chat_buffer[32];
qboolean team_message = false;
void Key_Message (int key)
{
static int chat_bufferlen = 0;
if (key == K_ENTER)
{
if (team_message)
Cbuf_AddText ("say_team \"");
else
Cbuf_AddText ("say \"");
Cbuf_AddText(chat_buffer);
Cbuf_AddText("\"\n");
key_dest = key_game;
chat_bufferlen = 0;
chat_buffer[0] = 0;
return;
}
if (key == K_ESCAPE)
{
key_dest = key_game;
chat_bufferlen = 0;
chat_buffer[0] = 0;
return;
}
if (key < 32 || key > 127)
return; // non printable
if (key == K_BACKSPACE)
{
if (chat_bufferlen)
{
chat_bufferlen--;
chat_buffer[chat_bufferlen] = 0;
}
return;
}
if (chat_bufferlen == 31)
return; // all full
chat_buffer[chat_bufferlen++] = key;
chat_buffer[chat_bufferlen] = 0;
}
//============================================================================
/*
===================
Key_StringToKeynum
Returns a key number to be used to index keybindings[] by looking at
the given string. Single ascii characters return themselves, while
the K_* names are matched up.
===================
*/
int Key_StringToKeynum (char *str)
{
keyname_t *kn;
if (!str || !str[0])
return -1;
if (!str[1])
return str[0];
for (kn=keynames ; kn->name ; kn++)
{
if (!Q_strcasecmp(str,kn->name))
return kn->keynum;
}
return -1;
}
/*
===================
Key_KeynumToString
Returns a string (either a single ascii char, or a K_* name) for the
given keynum.
FIXME: handle quote special (general escape sequence?)
===================
*/
char *Key_KeynumToString (int keynum)
{
keyname_t *kn;
static char tinystr[2];
if (keynum == -1)
return "<KEY NOT FOUND>";
if (keynum > 32 && keynum < 127)
{ // printable ascii
tinystr[0] = keynum;
tinystr[1] = 0;
return tinystr;
}
for (kn=keynames ; kn->name ; kn++)
if (keynum == kn->keynum)
return kn->name;
return "<UNKNOWN KEYNUM>";
}
/*
===================
Key_SetBinding
===================
*/
void Key_SetBinding (int keynum, char *binding)
{
char *new;
int l;
if (keynum == -1)
return;
// free old bindings
if (keybindings[keynum])
{
Z_Free (keybindings[keynum]);
keybindings[keynum] = NULL;
}
// allocate memory for new binding
l = Q_strlen (binding);
new = Z_Malloc (l+1);
Q_strcpy (new, binding);
new[l] = 0;
keybindings[keynum] = new;
}
/*
===================
Key_Unbind_f
===================
*/
void Key_Unbind_f (void)
{
int b;
if (Cmd_Argc() != 2)
{
Con_Printf ("unbind <key> : remove commands from a key\n");
return;
}
b = Key_StringToKeynum (Cmd_Argv(1));
if (b==-1)
{
Con_Printf ("\"%s\" isn't a valid key\n", Cmd_Argv(1));
return;
}
Key_SetBinding (b, "");
}
void Key_Unbindall_f (void)
{
int i;
for (i=0 ; i<256 ; i++)
if (keybindings[i])
Key_SetBinding (i, "");
}
/*
===================
Key_Bind_f
===================
*/
void Key_Bind_f (void)
{
int i, c, b;
char cmd[1024];
c = Cmd_Argc();
if (c != 2 && c != 3)
{
Con_Printf ("bind <key> [command] : attach a command to a key\n");
return;
}
b = Key_StringToKeynum (Cmd_Argv(1));
if (b==-1)
{
Con_Printf ("\"%s\" isn't a valid key\n", Cmd_Argv(1));
return;
}
if (c == 2)
{
if (keybindings[b])
Con_Printf ("\"%s\" = \"%s\"\n", Cmd_Argv(1), keybindings[b] );
else
Con_Printf ("\"%s\" is not bound\n", Cmd_Argv(1) );
return;
}
// copy the rest of the command line
cmd[0] = 0; // start out with a null string
for (i=2 ; i< c ; i++)
{
if (i > 2)
strcat (cmd, " ");
strcat (cmd, Cmd_Argv(i));
}
Key_SetBinding (b, cmd);
}
/*
============
Key_WriteBindings
Writes lines containing "bind key value"
============
*/
void Key_WriteBindings (FILE *f)
{
int i;
for (i=0 ; i<256 ; i++)
if (keybindings[i])
if (*keybindings[i])
fprintf (f, "bind \"%s\" \"%s\"\n", Key_KeynumToString(i), keybindings[i]);
}
/*
===================
Key_Init
===================
*/
void Key_Init (void)
{
int i;
for (i=0 ; i<32 ; i++)
{
key_lines[i][0] = ']';
key_lines[i][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_TAB] = true;
consolekeys[K_LEFTARROW] = true;
consolekeys[K_RIGHTARROW] = true;
consolekeys[K_UPARROW] = true;
consolekeys[K_DOWNARROW] = true;
consolekeys[K_BACKSPACE] = true;
consolekeys[K_PGUP] = true;
consolekeys[K_PGDN] = true;
consolekeys[K_SHIFT] = true;
consolekeys[K_MWHEELUP] = true;
consolekeys[K_MWHEELDOWN] = true;
consolekeys['`'] = false;
consolekeys['~'] = false;
for (i=0 ; i<256 ; i++)
keyshift[i] = i;
for (i='a' ; i<='z' ; i++)
keyshift[i] = i - 'a' + 'A';
keyshift['1'] = '!';
keyshift['2'] = '@';
keyshift['3'] = '#';
keyshift['4'] = '$';
keyshift['5'] = '%';
keyshift['6'] = '^';
keyshift['7'] = '&';
keyshift['8'] = '*';
keyshift['9'] = '(';
keyshift['0'] = ')';
keyshift['-'] = '_';
keyshift['='] = '+';
keyshift[','] = '<';
keyshift['.'] = '>';
keyshift['/'] = '?';
keyshift[';'] = ':';
keyshift['\''] = '"';
keyshift['['] = '{';
keyshift[']'] = '}';
keyshift['`'] = '~';
keyshift['\\'] = '|';
menubound[K_ESCAPE] = true;
for (i=0 ; i<12 ; i++)
menubound[K_F1+i] = true;
//
// register our functions
//
Cmd_AddCommand ("bind",Key_Bind_f);
Cmd_AddCommand ("unbind",Key_Unbind_f);
Cmd_AddCommand ("unbindall",Key_Unbindall_f);
}
/*
===================
Key_Event
Called by the system between frames for both key up and key down events
Should NOT be called during an interrupt!
===================
*/
void Key_Event (int key, qboolean down)
{
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 != 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) );
}
if (key == K_SHIFT)
shift_down = down;
//
// handle escape specialy, so the user can never unbind it
//
if (key == K_ESCAPE)
{
if (!down)
return;
switch (key_dest)
{
case key_message:
Key_Message (key);
break;
case key_menu:
M_Keydown (key);
break;
case key_game:
case key_console:
M_ToggleMenu_f ();
break;
default:
Sys_Error ("Bad key_dest");
}
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 kenum as a parameter, so multiple
// downs can be matched with ups
//
if (!down)
{
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;
}
//
// 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 (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;
}
if (!down)
return; // other systems only care about key down events
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");
}
}
/*
===================
Key_ClearStates
===================
*/
void Key_ClearStates (void)
{
int i;
for (i=0 ; i<256 ; i++)
{
keydown[i] = false;
key_repeats[i] = 0;
}
}

97
uquake/menu.c
View file

@ -316,18 +316,21 @@ void M_Main_Key (int key)
CL_NextDemo ();
break;
case KP_DOWNARROW:
case K_DOWNARROW:
S_LocalSound ("misc/menu1.wav");
if (++m_main_cursor >= MAIN_ITEMS)
m_main_cursor = 0;
break;
case KP_UPARROW:
case K_UPARROW:
S_LocalSound ("misc/menu1.wav");
if (--m_main_cursor < 0)
m_main_cursor = MAIN_ITEMS - 1;
break;
case KP_ENTER:
case K_ENTER:
m_entersound = true;
@ -395,18 +398,21 @@ void M_SinglePlayer_Key (int key)
M_Menu_Main_f ();
break;
case KP_DOWNARROW:
case K_DOWNARROW:
S_LocalSound ("misc/menu1.wav");
if (++m_singleplayer_cursor >= SINGLEPLAYER_ITEMS)
m_singleplayer_cursor = 0;
break;
case KP_UPARROW:
case K_UPARROW:
S_LocalSound ("misc/menu1.wav");
if (--m_singleplayer_cursor < 0)
m_singleplayer_cursor = SINGLEPLAYER_ITEMS - 1;
break;
case KP_ENTER:
case K_ENTER:
m_entersound = true;
@ -535,6 +541,7 @@ void M_Load_Key (int k)
M_Menu_SinglePlayer_f ();
break;
case KP_ENTER:
case K_ENTER:
S_LocalSound ("misc/menu2.wav");
if (!loadable[load_cursor])
@ -550,7 +557,9 @@ void M_Load_Key (int k)
Cbuf_AddText (va ("load s%i\n", load_cursor) );
return;
case KP_UPARROW:
case K_UPARROW:
case KP_LEFTARROW:
case K_LEFTARROW:
S_LocalSound ("misc/menu1.wav");
load_cursor--;
@ -558,7 +567,9 @@ void M_Load_Key (int k)
load_cursor = MAX_SAVEGAMES-1;
break;
case KP_DOWNARROW:
case K_DOWNARROW:
case KP_RIGHTARROW:
case K_RIGHTARROW:
S_LocalSound ("misc/menu1.wav");
load_cursor++;
@ -577,13 +588,16 @@ void M_Save_Key (int k)
M_Menu_SinglePlayer_f ();
break;
case KP_ENTER:
case K_ENTER:
m_state = m_none;
key_dest = key_game;
Cbuf_AddText (va("save s%i\n", load_cursor));
return;
case KP_UPARROW:
case K_UPARROW:
case KP_LEFTARROW:
case K_LEFTARROW:
S_LocalSound ("misc/menu1.wav");
load_cursor--;
@ -591,7 +605,9 @@ void M_Save_Key (int k)
load_cursor = MAX_SAVEGAMES-1;
break;
case KP_DOWNARROW:
case K_DOWNARROW:
case KP_RIGHTARROW:
case K_RIGHTARROW:
S_LocalSound ("misc/menu1.wav");
load_cursor++;
@ -644,18 +660,21 @@ void M_MultiPlayer_Key (int key)
M_Menu_Main_f ();
break;
case KP_DOWNARROW:
case K_DOWNARROW:
S_LocalSound ("misc/menu1.wav");
if (++m_multiplayer_cursor >= MULTIPLAYER_ITEMS)
m_multiplayer_cursor = 0;
break;
case KP_UPARROW:
case K_UPARROW:
S_LocalSound ("misc/menu1.wav");
if (--m_multiplayer_cursor < 0)
m_multiplayer_cursor = MULTIPLAYER_ITEMS - 1;
break;
case KP_ENTER:
case K_ENTER:
m_entersound = true;
switch (m_multiplayer_cursor)
@ -752,6 +771,7 @@ void M_Setup_Key (int k)
M_Menu_MultiPlayer_f ();
break;
case KP_UPARROW:
case K_UPARROW:
S_LocalSound ("misc/menu1.wav");
setup_cursor--;
@ -759,6 +779,7 @@ void M_Setup_Key (int k)
setup_cursor = NUM_SETUP_CMDS-1;
break;
case KP_DOWNARROW:
case K_DOWNARROW:
S_LocalSound ("misc/menu1.wav");
setup_cursor++;
@ -766,6 +787,7 @@ void M_Setup_Key (int k)
setup_cursor = 0;
break;
case KP_LEFTARROW:
case K_LEFTARROW:
if (setup_cursor < 2)
return;
@ -775,6 +797,7 @@ void M_Setup_Key (int k)
if (setup_cursor == 3)
setup_bottom = setup_bottom - 1;
break;
case KP_RIGHTARROW:
case K_RIGHTARROW:
if (setup_cursor < 2)
return;
@ -786,6 +809,7 @@ forward:
setup_bottom = setup_bottom + 1;
break;
case KP_ENTER:
case K_ENTER:
if (setup_cursor == 0 || setup_cursor == 1)
return;
@ -984,18 +1008,21 @@ again:
M_Menu_MultiPlayer_f ();
break;
case KP_DOWNARROW:
case K_DOWNARROW:
S_LocalSound ("misc/menu1.wav");
if (++m_net_cursor >= m_net_items)
m_net_cursor = 0;
break;
case KP_UPARROW:
case K_UPARROW:
S_LocalSound ("misc/menu1.wav");
if (--m_net_cursor < 0)
m_net_cursor = m_net_items - 1;
break;
case KP_ENTER:
case K_ENTER:
m_entersound = true;
@ -1244,6 +1271,7 @@ void M_Options_Key (int k)
M_Menu_Main_f ();
break;
case KP_ENTER:
case K_ENTER:
m_entersound = true;
switch (options_cursor)
@ -1267,6 +1295,7 @@ void M_Options_Key (int k)
}
return;
case KP_UPARROW:
case K_UPARROW:
S_LocalSound ("misc/menu1.wav");
options_cursor--;
@ -1274,6 +1303,7 @@ void M_Options_Key (int k)
options_cursor = OPTIONS_ITEMS-1;
break;
case KP_DOWNARROW:
case K_DOWNARROW:
S_LocalSound ("misc/menu1.wav");
options_cursor++;
@ -1281,10 +1311,12 @@ void M_Options_Key (int k)
options_cursor = 0;
break;
case KP_LEFTARROW:
case K_LEFTARROW:
M_AdjustSliders (-1);
break;
case KP_RIGHTARROW:
case K_RIGHTARROW:
M_AdjustSliders (1);
break;
@ -1292,19 +1324,27 @@ void M_Options_Key (int k)
if (options_cursor == 12 && vid_menudrawfn == NULL)
{
if (k == K_UPARROW)
options_cursor = 11;
else
options_cursor = 0;
switch (k) {
case KP_UPARROW:
case K_UPARROW:
options_cursor = 11;
break;
default:
options_cursor = 0;
}
}
#ifdef _WIN32
if ((options_cursor == 13) && (modestate != MS_WINDOWED))
{
if (k == K_UPARROW)
options_cursor = 12;
else
options_cursor = 0;
switch (k) {
case KP_UPARROW:
case K_UPARROW:
options_cursor = 12;
break;
default:
options_cursor = 0;
}
}
#endif
}
@ -1471,6 +1511,8 @@ void M_Keys_Key (int k)
M_Menu_Options_f ();
break;
case KP_LEFTARROW:
case KP_UPARROW:
case K_LEFTARROW:
case K_UPARROW:
S_LocalSound ("misc/menu1.wav");
@ -1479,6 +1521,8 @@ void M_Keys_Key (int k)
keys_cursor = NUMCOMMANDS-1;
break;
case KP_DOWNARROW:
case KP_RIGHTARROW:
case K_DOWNARROW:
case K_RIGHTARROW:
S_LocalSound ("misc/menu1.wav");
@ -1487,6 +1531,7 @@ void M_Keys_Key (int k)
keys_cursor = 0;
break;
case KP_ENTER: // go into bind mode
case K_ENTER: // go into bind mode
M_FindKeysForCommand (bindnames[keys_cursor][0], keys);
S_LocalSound ("misc/menu2.wav");
@ -1496,7 +1541,8 @@ void M_Keys_Key (int k)
break;
case K_BACKSPACE: // delete bindings
case K_DEL: // delete bindings
case KP_DEL: // delete bindings
case K_DEL: // delete bindings
S_LocalSound ("misc/menu2.wav");
M_UnbindCommand (bindnames[keys_cursor][0]);
break;
@ -1556,6 +1602,8 @@ void M_Help_Key (int key)
M_Menu_Main_f ();
break;
case KP_UPARROW:
case KP_RIGHTARROW:
case K_UPARROW:
case K_RIGHTARROW:
m_entersound = true;
@ -1563,6 +1611,8 @@ void M_Help_Key (int key)
help_page = 0;
break;
case KP_DOWNARROW:
case KP_LEFTARROW:
case K_DOWNARROW:
case K_LEFTARROW:
m_entersound = true;
@ -1848,6 +1898,7 @@ void M_SerialConfig_Key (int key)
M_Menu_Net_f ();
break;
case KP_UPARROW:
case K_UPARROW:
S_LocalSound ("misc/menu1.wav");
serialConfig_cursor--;
@ -1855,6 +1906,7 @@ void M_SerialConfig_Key (int key)
serialConfig_cursor = NUM_SERIALCONFIG_CMDS-1;
break;
case KP_DOWNARROW:
case K_DOWNARROW:
S_LocalSound ("misc/menu1.wav");
serialConfig_cursor++;
@ -1862,6 +1914,7 @@ void M_SerialConfig_Key (int key)
serialConfig_cursor = 0;
break;
case KP_LEFTARROW:
case K_LEFTARROW:
if (serialConfig_cursor > 2)
break;
@ -1893,6 +1946,7 @@ void M_SerialConfig_Key (int key)
break;
case KP_RIGHTARROW:
case K_RIGHTARROW:
if (serialConfig_cursor > 2)
break;
@ -1925,6 +1979,7 @@ forward:
break;
case KP_ENTER:
case K_ENTER:
if (serialConfig_cursor < 3)
goto forward;
@ -1990,14 +2045,14 @@ forward:
}
if (DirectConfig && (serialConfig_cursor == 3 || serialConfig_cursor == 4)) {
if (key == K_UPARROW)
if ((key == K_UPARROW) || (key == KP_UPARROW))
serialConfig_cursor = 2;
else
serialConfig_cursor = 5;
}
if (SerialConfig && StartingGame && serialConfig_cursor == 4) {
if (key == K_UPARROW)
if ((key == K_UPARROW) || (key == KP_UPARROW))
serialConfig_cursor = 3;
else
serialConfig_cursor = 5;
@ -2076,6 +2131,7 @@ void M_ModemConfig_Key (int key)
M_Menu_SerialConfig_f ();
break;
case KP_UPARROW:
case K_UPARROW:
S_LocalSound ("misc/menu1.wav");
modemConfig_cursor--;
@ -2083,6 +2139,7 @@ void M_ModemConfig_Key (int key)
modemConfig_cursor = NUM_MODEMCONFIG_CMDS-1;
break;
case KP_DOWNARROW:
case K_DOWNARROW:
S_LocalSound ("misc/menu1.wav");
modemConfig_cursor++;
@ -2090,6 +2147,8 @@ void M_ModemConfig_Key (int key)
modemConfig_cursor = 0;
break;
case KP_LEFTARROW:
case KP_RIGHTARROW:
case K_LEFTARROW:
case K_RIGHTARROW:
if (modemConfig_cursor == 0)
@ -2102,6 +2161,7 @@ void M_ModemConfig_Key (int key)
}
break;
case KP_ENTER:
case K_ENTER:
if (modemConfig_cursor == 0)
{
@ -2278,6 +2338,7 @@ void M_LanConfig_Key (int key)
M_Menu_Net_f ();
break;
case KP_UPARROW:
case K_UPARROW:
S_LocalSound ("misc/menu1.wav");
lanConfig_cursor--;
@ -2285,6 +2346,7 @@ void M_LanConfig_Key (int key)
lanConfig_cursor = NUM_LANCONFIG_CMDS-1;
break;
case KP_DOWNARROW:
case K_DOWNARROW:
S_LocalSound ("misc/menu1.wav");
lanConfig_cursor++;
@ -2292,6 +2354,7 @@ void M_LanConfig_Key (int key)
lanConfig_cursor = 0;
break;
case KP_ENTER:
case K_ENTER:
if (lanConfig_cursor == 0)
break;
@ -2365,7 +2428,7 @@ void M_LanConfig_Key (int key)
}
if (StartingGame && lanConfig_cursor == 2) {
if (key == K_UPARROW)
if ((key == K_UPARROW) || (key == KP_UPARROW))
lanConfig_cursor = 1;
else
lanConfig_cursor = 0;
@ -2781,6 +2844,7 @@ void M_GameOptions_Key (int key)
M_Menu_Net_f ();
break;
case KP_UPARROW:
case K_UPARROW:
S_LocalSound ("misc/menu1.wav");
gameoptions_cursor--;
@ -2788,6 +2852,7 @@ void M_GameOptions_Key (int key)
gameoptions_cursor = NUM_GAMEOPTIONS-1;
break;
case KP_DOWNARROW:
case K_DOWNARROW:
S_LocalSound ("misc/menu1.wav");
gameoptions_cursor++;
@ -2795,6 +2860,7 @@ void M_GameOptions_Key (int key)
gameoptions_cursor = 0;
break;
case KP_LEFTARROW:
case K_LEFTARROW:
if (gameoptions_cursor == 0)
break;
@ -2802,6 +2868,7 @@ void M_GameOptions_Key (int key)
M_NetStart_Change (-1);
break;
case KP_RIGHTARROW:
case K_RIGHTARROW:
if (gameoptions_cursor == 0)
break;
@ -2809,6 +2876,7 @@ void M_GameOptions_Key (int key)
M_NetStart_Change (1);
break;
case KP_ENTER:
case K_ENTER:
S_LocalSound ("misc/menu2.wav");
if (gameoptions_cursor == 0)
@ -2965,6 +3033,8 @@ void M_ServerList_Key (int k)
M_Menu_Search_f ();
break;
case KP_UPARROW:
case KP_LEFTARROW:
case K_UPARROW:
case K_LEFTARROW:
S_LocalSound ("misc/menu1.wav");
@ -2973,6 +3043,8 @@ void M_ServerList_Key (int k)
slist_cursor = hostCacheCount - 1;
break;
case KP_DOWNARROW:
case KP_RIGHTARROW:
case K_DOWNARROW:
case K_RIGHTARROW:
S_LocalSound ("misc/menu1.wav");
@ -2981,6 +3053,7 @@ void M_ServerList_Key (int k)
slist_cursor = 0;
break;
case KP_ENTER:
case K_ENTER:
S_LocalSound ("misc/menu2.wav");
m_return_state = m_state;