qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 15:22:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

move the special keys out of the way of ascii codes (unless they represent

Browse source 
ascii codes (eg, K_ENTER)) and remove the magic number for the number of keys.
This commit is contained in:
Bill Currie 2001-07-17 15:51:56 +00:00
parent af366764de
commit bab80a0648
3 changed files with 28 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/QF/keys.h
View file

@ -44,7 +44,7 @@ typedef enum {
K_BACKSPACE = 127, K_BACKSPACE = 127,
K_CAPSLOCK, K_CAPSLOCK = 256,
K_PRNTSCR, K_PRNTSCR,
K_SCRLCK, K_SCRLCK,
K_PAUSE, K_PAUSE,
@ -105,7 +105,7 @@ typedef enum {
// //
// mouse buttons generate virtual keys // mouse buttons generate virtual keys
// //
K_MOUSE1 = 200, K_MOUSE1,
K_MOUSE2, K_MOUSE2,
K_MOUSE3, K_MOUSE3,
@ -157,7 +157,10 @@ typedef enum {
// JACK: Intellimouse(c) Mouse Wheel Support // JACK: Intellimouse(c) Mouse Wheel Support
K_MWHEELUP, K_MWHEELUP,
K_MWHEELDOWN K_MWHEELDOWN,
// keys count
K_NUM_KEYS,
} keynum_t; } keynum_t;
typedef struct typedef struct
@ -171,8 +174,8 @@ typedef struct
typedef enum {key_game, key_console, key_message, key_menu, key_none} keydest_t; typedef enum {key_game, key_console, key_message, key_menu, key_none} keydest_t;
extern keydest_t key_dest; extern keydest_t key_dest;
extern char *keybindings[256]; extern char *keybindings[K_NUM_KEYS];
extern int key_repeats[256]; extern int key_repeats[K_NUM_KEYS];
extern int key_lastpress; extern int key_lastpress;
extern char chat_buffer[]; extern char chat_buffer[];

20
nq/source/keys.c
View file

@ -67,12 +67,12 @@ int history_line = 0;
keydest_t key_dest = key_console; keydest_t key_dest = key_console;
char *keybindings[256]; char *keybindings[K_NUM_KEYS];
qboolean consolekeys[256]; // if true, can't be rebound while in console qboolean consolekeys[K_NUM_KEYS]; // if true, can't be rebound while in console
qboolean menubound[256]; // if true, can't be rebound while in menu qboolean menubound[K_NUM_KEYS]; // if true, can't be rebound while in menu
int keyshift[256]; // key to map to if shift held down in console int keyshift[K_NUM_KEYS]; // key to map to if shift held down in console
int key_repeats[256]; // if > 1, it is autorepeating int key_repeats[K_NUM_KEYS]; // if > 1, it is autorepeating
qboolean keydown[256]; qboolean keydown[K_NUM_KEYS];
typedef struct { typedef struct {
char *name; char *name;
@ -562,7 +562,7 @@ Key_Unbindall_f (void)
{ {
int i; int i;
for (i = 0; i < 256; i++) for (i = 0; i < K_NUM_KEYS; i++)
if (keybindings[i]) if (keybindings[i])
Key_SetBinding (i, ""); Key_SetBinding (i, "");
} }
@ -615,7 +615,7 @@ Key_WriteBindings (VFile *f)
{ {
int i; int i;
for (i = 0; i < 256; i++) for (i = 0; i < K_NUM_KEYS; i++)
if (keybindings[i]) if (keybindings[i])
Qprintf (f, "bind \"%s\" \"%s\"\n", Key_KeynumToString (i), Qprintf (f, "bind \"%s\" \"%s\"\n", Key_KeynumToString (i),
keybindings[i]); keybindings[i]);
@ -655,7 +655,7 @@ Key_Init (void)
consolekeys['`'] = false; consolekeys['`'] = false;
consolekeys['~'] = false; consolekeys['~'] = false;
for (i = 0; i < 256; i++) for (i = 0; i < K_NUM_KEYS; i++)
keyshift[i] = i; keyshift[i] = i;
for (i = 'a'; i <= 'z'; i++) for (i = 'a'; i <= 'z'; i++)
keyshift[i] = i - 'a' + 'A'; keyshift[i] = i - 'a' + 'A';
@ -860,7 +860,7 @@ Key_ClearStates (void)
{ {
int i; int i;
for (i = 0; i < 256; i++) { for (i = 0; i < K_NUM_KEYS; i++) {
if (keydown[i]) if (keydown[i])
Key_Event (i, 0, false); Key_Event (i, 0, false);
key_repeats[i] = false; key_repeats[i] = false;

20
qw/source/keys.c
View file

@ -68,12 +68,12 @@ int history_line = 0;
keydest_t key_dest = key_console; keydest_t key_dest = key_console;
char *keybindings[256]; char *keybindings[K_NUM_KEYS];
qboolean consolekeys[256]; // if true, can't be rebound while in console qboolean consolekeys[K_NUM_KEYS]; // if true, can't be rebound while in console
qboolean menubound[256]; // if true, can't be rebound while in menu qboolean menubound[K_NUM_KEYS]; // if true, can't be rebound while in menu
int keyshift[256]; // key to map to if shift held down in console int keyshift[K_NUM_KEYS]; // key to map to if shift held down in console
int key_repeats[256]; // if > 1, it is autorepeating int key_repeats[K_NUM_KEYS]; // if > 1, it is autorepeating
qboolean keydown[256]; qboolean keydown[K_NUM_KEYS];
typedef struct { typedef struct {
char *name; char *name;
@ -563,7 +563,7 @@ Key_Unbindall_f (void)
{ {
int i; int i;
for (i = 0; i < 256; i++) for (i = 0; i < K_NUM_KEYS; i++)
if (keybindings[i]) if (keybindings[i])
Key_SetBinding (i, ""); Key_SetBinding (i, "");
} }
@ -616,7 +616,7 @@ Key_WriteBindings (VFile *f)
{ {
int i; int i;
for (i = 0; i < 256; i++) for (i = 0; i < K_NUM_KEYS; i++)
if (keybindings[i]) if (keybindings[i])
Qprintf (f, "bind \"%s\" \"%s\"\n", Key_KeynumToString (i), Qprintf (f, "bind \"%s\" \"%s\"\n", Key_KeynumToString (i),
keybindings[i]); keybindings[i]);
@ -656,7 +656,7 @@ Key_Init (void)
consolekeys['`'] = false; consolekeys['`'] = false;
consolekeys['~'] = false; consolekeys['~'] = false;
for (i = 0; i < 256; i++) for (i = 0; i < K_NUM_KEYS; i++)
keyshift[i] = i; keyshift[i] = i;
for (i = 'a'; i <= 'z'; i++) for (i = 'a'; i <= 'z'; i++)
keyshift[i] = i - 'a' + 'A'; keyshift[i] = i - 'a' + 'A';
@ -861,7 +861,7 @@ Key_ClearStates (void)
{ {
int i; int i;
for (i = 0; i < 256; i++) { for (i = 0; i < K_NUM_KEYS; i++) {
if (keydown[i]) if (keydown[i])
Key_Event (i, 0, false); Key_Event (i, 0, false);
key_repeats[i] = false; key_repeats[i] = false;