From 479a67a731be5a5e8035ea7acce0344c7c605814 Mon Sep 17 00:00:00 2001 From: Zaba999 Date: Mon, 10 Sep 2012 23:29:38 +0200 Subject: Merge with changes from Zaba999 fork. --- src/common/key.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/common/key.h') diff --git a/src/common/key.h b/src/common/key.h index de31c09..1d03a47 100644 --- a/src/common/key.h +++ b/src/common/key.h @@ -29,6 +29,7 @@ // If need arises, it can be changed to custom function or anything else #define KEY(x) SDLK_ ## x + // Key modifier defined as concatenation to KMOD_... // If need arises, it can be changed to custom function or anything else #define KEY_MOD(x) KMOD_ ## x -- cgit v1.2.3-1-g7c22 From 51884cef8e015bccbe1fa96dc56dc2f32439ccc5 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Wed, 19 Sep 2012 18:32:18 +0200 Subject: Input bindings rewrite - moved input bindings to CRobotMain - added virtual keymod and joystick button key presses - fixed putenv error; other minor fixes --- src/common/key.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'src/common/key.h') diff --git a/src/common/key.h b/src/common/key.h index 1d03a47..11076a3 100644 --- a/src/common/key.h +++ b/src/common/key.h @@ -33,3 +33,28 @@ // Key modifier defined as concatenation to KMOD_... // If need arises, it can be changed to custom function or anything else #define KEY_MOD(x) KMOD_ ## x + +/** + * \enum VirtualKmod + * \brief Virtual key codes generated on kmod presses + * + * These are provided here because left and right pair of keys generate different codes. + */ +enum VirtualKmod +{ + VIRTUAL_KMOD_CTRL = SDLK_LAST + 100, //! < control (left or right) + VIRTUAL_KMOD_SHIFT = SDLK_LAST + 101, //! < shift (left or right) + VIRTUAL_KMOD_ALT = SDLK_LAST + 102, //! < alt (left or right) + VIRTUAL_KMOD_META = SDLK_LAST + 103 //! < win key (left or right) +}; + +// Just syntax sugar +// So it is the same as other macros +#define VIRTUAL_KMOD(x) VIRTUAL_KMOD_ ## x + +// Virtual key code generated on joystick button presses +// num is number of joystick button +#define VIRTUAL_JOY(num) (SDLK_LAST + 200 + num) + +//! Special value for invalid key bindings +const unsigned int KEY_INVALID = SDLK_LAST + 1000; -- cgit v1.2.3-1-g7c22