From 871d0ee7c2427f6d8e7094a1d63d8c8971b6d06a Mon Sep 17 00:00:00 2001 From: divverent Date: Fri, 4 Jan 2008 12:35:35 +0000 Subject: [PATCH] make keys line up in keys.c and key.h for easier verifying git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7897 d7cf8633-e32d-0410-b094-e92efae38249 --- keys.c | 74 ++++++++++++++++++++++++++++++++++------------------------ keys.h | 2 ++ 2 files changed, 45 insertions(+), 31 deletions(-) diff --git a/keys.c b/keys.c index dd718225..36e317bb 100644 --- a/keys.c +++ b/keys.c @@ -53,6 +53,9 @@ static const keyname_t keynames[] = { {"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}, @@ -85,53 +88,32 @@ static const keyname_t keynames[] = { {"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}, @@ -139,6 +121,31 @@ static const keyname_t keynames[] = { {"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}, @@ -156,6 +163,11 @@ static const keyname_t keynames[] = { {"JOY15", K_JOY15}, {"JOY16", K_JOY16}, + + + + + {"AUX1", K_AUX1}, {"AUX2", K_AUX2}, {"AUX3", K_AUX3}, diff --git a/keys.h b/keys.h index 0d29ea2c..7b13635d 100644 --- a/keys.h +++ b/keys.h @@ -50,6 +50,7 @@ typedef enum keynum_e K_ALT, K_CTRL, K_SHIFT, + K_F1, K_F2, K_F3, @@ -62,6 +63,7 @@ typedef enum keynum_e K_F10, K_F11, K_F12, + K_INS, K_DEL, K_PGDN, -- 2.39.2