Cleanups and documentation.

This commit is contained in:
Merlijn Wajer 2012-12-11 20:45:07 +01:00
parent b188ac05d3
commit cb688ebc3a
2 changed files with 48 additions and 54 deletions

View File

@ -31,8 +31,13 @@
* Set the key mappings here.
*
* Macros that make sense here:
* - KEYMAP(<in_key>, <out_key>, <out_type>, <device>, <val>)
*
* - KEYMAP(in_type, in_key, out_key, out_type, device, in_device, val) \
* - in_type: Key type of input key
* - in_key: Keycode of input key
* - out_key: Key code of output key
* - device: output device
* - in_device: Device to accept keys from. -1 for all devices.
* - val: function or statement applied to value.
*
* Notes:
* - To expose a joystick device, expose the BTN_JOYSTICK ``button'' with
@ -41,14 +46,6 @@
* JOYSTICK_ADD_KEY
*
* ----------------------------------------------------------------------------
*
* TODO:
* - For KEYMAPs, add parameter that species the INPUT_PATH to map from
* - Add support for multiple INPUT_PATH
* - Figure out more details. There's probably a lot missing.
* - Remove EV_KEY constraint in map.c and use it as arg to KEY_MAP
*
* ----------------------------------------------------------------------------
*/
#include "config_functions.h"
@ -66,7 +63,7 @@
/* Set up amount of input devices here */
#define INPUT_DEVICE_COUNT 2
#define INPUT_DEVICE_ANY 0
#define INPUT_DEVICE_ANY -1
#endif
@ -158,36 +155,36 @@ JOYSTICK_ADD_KEY(BTN_3, UI_SET_KEYBIT, 1)
LEGAL_VALUE(e.value == 1 || e.value == 0,
/* HAT */
KEYMAP(EV_KEY, KEY_UP, ABS_HAT0Y, EV_ABS, 0, -1, -)
KEYMAP(EV_KEY, KEY_DOWN, ABS_HAT0Y, EV_ABS, 0, -1, +)
KEYMAP(EV_KEY, KEY_LEFT, ABS_HAT0X, EV_ABS, 0, -1, -)
KEYMAP(EV_KEY, KEY_RIGHT, ABS_HAT0X, EV_ABS, 0, -1, +)
KEYMAP(EV_KEY, KEY_UP, ABS_HAT0Y, EV_ABS, 0, INPUT_DEVICE_ANY, -)
KEYMAP(EV_KEY, KEY_DOWN, ABS_HAT0Y, EV_ABS, 0, INPUT_DEVICE_ANY, +)
KEYMAP(EV_KEY, KEY_LEFT, ABS_HAT0X, EV_ABS, 0, INPUT_DEVICE_ANY, -)
KEYMAP(EV_KEY, KEY_RIGHT, ABS_HAT0X, EV_ABS, 0, INPUT_DEVICE_ANY, +)
/* Red buttons */
KEYMAP(EV_KEY, KEY_LEFTCTRL, BTN_0, EV_KEY, 0, -1, +)
KEYMAP(EV_KEY, KEY_LEFTALT, BTN_1, EV_KEY, 0, -1, +)
KEYMAP(EV_KEY, KEY_SPACE, BTN_2, EV_KEY, 0, -1, +)
KEYMAP(EV_KEY, KEY_LEFTCTRL, BTN_0, EV_KEY, 0, INPUT_DEVICE_ANY, +)
KEYMAP(EV_KEY, KEY_LEFTALT, BTN_1, EV_KEY, 0, INPUT_DEVICE_ANY, +)
KEYMAP(EV_KEY, KEY_SPACE, BTN_2, EV_KEY, 0, INPUT_DEVICE_ANY, +)
/* Yellow button */
KEYMAP(EV_KEY, KEY_1, BTN_3, EV_KEY, 0, -1, +)
KEYMAP(EV_KEY, KEY_1, BTN_3, EV_KEY, 0, INPUT_DEVICE_ANY, +)
)
/* Second joystick */
LEGAL_VALUE(e.value == 1 || e.value == 0,
/* HAT */
KEYMAP(EV_KEY, KEY_R, ABS_HAT0Y, EV_ABS, 1, -1, -)
KEYMAP(EV_KEY, KEY_F, ABS_HAT0Y, EV_ABS, 1, -1, +)
KEYMAP(EV_KEY, KEY_D, ABS_HAT0X, EV_ABS, 1, -1, -)
KEYMAP(EV_KEY, KEY_G, ABS_HAT0X, EV_ABS, 1, -1, +)
KEYMAP(EV_KEY, KEY_R, ABS_HAT0Y, EV_ABS, 1, INPUT_DEVICE_ANY, -)
KEYMAP(EV_KEY, KEY_F, ABS_HAT0Y, EV_ABS, 1, INPUT_DEVICE_ANY, +)
KEYMAP(EV_KEY, KEY_D, ABS_HAT0X, EV_ABS, 1, INPUT_DEVICE_ANY, -)
KEYMAP(EV_KEY, KEY_G, ABS_HAT0X, EV_ABS, 1, INPUT_DEVICE_ANY, +)
/* Red buttons */
KEYMAP(EV_KEY, KEY_A, BTN_0, EV_KEY, 1, -1, +)
KEYMAP(EV_KEY, KEY_S, BTN_1, EV_KEY, 1, -1, +)
KEYMAP(EV_KEY, KEY_Q, BTN_2, EV_KEY, 1, -1, +)
KEYMAP(EV_KEY, KEY_A, BTN_0, EV_KEY, 1, INPUT_DEVICE_ANY, +)
KEYMAP(EV_KEY, KEY_S, BTN_1, EV_KEY, 1, INPUT_DEVICE_ANY, +)
KEYMAP(EV_KEY, KEY_Q, BTN_2, EV_KEY, 1, INPUT_DEVICE_ANY, +)
/* Yellow button */
KEYMAP(EV_KEY, KEY_2, BTN_3, EV_KEY, 1, -1, +)
KEYMAP(EV_KEY, KEY_2, BTN_3, EV_KEY, 1, INPUT_DEVICE_ANY, +)
)
#endif

View File

@ -31,8 +31,13 @@
* Set the key mappings here.
*
* Macros that make sense here:
* - KEYMAP(<in_key>, <out_key>, <out_type>, <device>, <val>)
*
* - KEYMAP(in_type, in_key, out_key, out_type, device, in_device, val) \
* - in_type: Key type of input key
* - in_key: Keycode of input key
* - out_key: Key code of output key
* - device: output device
* - in_device: Device to accept keys from. -1 for all devices.
* - val: function or statement applied to value.
*
* Notes:
* - To expose a joystick device, expose the BTN_JOYSTICK ``button'' with
@ -41,14 +46,6 @@
* JOYSTICK_ADD_KEY
*
* ----------------------------------------------------------------------------
*
* TODO:
* - For KEYMAPs, add parameter that species the INPUT_PATH to map from
* - Add support for multiple INPUT_PATH
* - Figure out more details. There's probably a lot missing.
* - Remove EV_KEY constraint in map.c and use it as arg to KEY_MAP
*
* ----------------------------------------------------------------------------
*/
#include "config_functions.h"
@ -66,7 +63,7 @@
/* Set up amount of input devices here */
#define INPUT_DEVICE_COUNT 2
#define INPUT_DEVICE_ANY 0
#define INPUT_DEVICE_ANY -1
#endif
@ -158,36 +155,36 @@ JOYSTICK_ADD_KEY(BTN_3, UI_SET_KEYBIT, 1)
LEGAL_VALUE(e.value == 1 || e.value == 0,
/* HAT */
KEYMAP(EV_KEY, KEY_UP, ABS_HAT0Y, EV_ABS, 0, -1, -)
KEYMAP(EV_KEY, KEY_DOWN, ABS_HAT0Y, EV_ABS, 0, -1, +)
KEYMAP(EV_KEY, KEY_LEFT, ABS_HAT0X, EV_ABS, 0, -1, -)
KEYMAP(EV_KEY, KEY_RIGHT, ABS_HAT0X, EV_ABS, 0, -1, +)
KEYMAP(EV_KEY, KEY_UP, ABS_HAT0Y, EV_ABS, 0, INPUT_DEVICE_ANY, -)
KEYMAP(EV_KEY, KEY_DOWN, ABS_HAT0Y, EV_ABS, 0, INPUT_DEVICE_ANY, +)
KEYMAP(EV_KEY, KEY_LEFT, ABS_HAT0X, EV_ABS, 0, INPUT_DEVICE_ANY, -)
KEYMAP(EV_KEY, KEY_RIGHT, ABS_HAT0X, EV_ABS, 0, INPUT_DEVICE_ANY, +)
/* Red buttons */
KEYMAP(EV_KEY, KEY_LEFTCTRL, BTN_0, EV_KEY, 0, -1, +)
KEYMAP(EV_KEY, KEY_LEFTALT, BTN_1, EV_KEY, 0, -1, +)
KEYMAP(EV_KEY, KEY_SPACE, BTN_2, EV_KEY, 0, -1, +)
KEYMAP(EV_KEY, KEY_LEFTCTRL, BTN_0, EV_KEY, 0, INPUT_DEVICE_ANY, +)
KEYMAP(EV_KEY, KEY_LEFTALT, BTN_1, EV_KEY, 0, INPUT_DEVICE_ANY, +)
KEYMAP(EV_KEY, KEY_SPACE, BTN_2, EV_KEY, 0, INPUT_DEVICE_ANY, +)
/* Yellow button */
KEYMAP(EV_KEY, KEY_1, BTN_3, EV_KEY, 0, -1, +)
KEYMAP(EV_KEY, KEY_1, BTN_3, EV_KEY, 0, INPUT_DEVICE_ANY, +)
)
/* Second joystick */
LEGAL_VALUE(e.value == 1 || e.value == 0,
/* HAT */
KEYMAP(EV_KEY, KEY_R, ABS_HAT0Y, EV_ABS, 1, -1, -)
KEYMAP(EV_KEY, KEY_F, ABS_HAT0Y, EV_ABS, 1, -1, +)
KEYMAP(EV_KEY, KEY_D, ABS_HAT0X, EV_ABS, 1, -1, -)
KEYMAP(EV_KEY, KEY_G, ABS_HAT0X, EV_ABS, 1, -1, +)
KEYMAP(EV_KEY, KEY_R, ABS_HAT0Y, EV_ABS, 1, INPUT_DEVICE_ANY, -)
KEYMAP(EV_KEY, KEY_F, ABS_HAT0Y, EV_ABS, 1, INPUT_DEVICE_ANY, +)
KEYMAP(EV_KEY, KEY_D, ABS_HAT0X, EV_ABS, 1, INPUT_DEVICE_ANY, -)
KEYMAP(EV_KEY, KEY_G, ABS_HAT0X, EV_ABS, 1, INPUT_DEVICE_ANY, +)
/* Red buttons */
KEYMAP(EV_KEY, KEY_A, BTN_0, EV_KEY, 1, -1, +)
KEYMAP(EV_KEY, KEY_S, BTN_1, EV_KEY, 1, -1, +)
KEYMAP(EV_KEY, KEY_Q, BTN_2, EV_KEY, 1, -1, +)
KEYMAP(EV_KEY, KEY_A, BTN_0, EV_KEY, 1, INPUT_DEVICE_ANY, +)
KEYMAP(EV_KEY, KEY_S, BTN_1, EV_KEY, 1, INPUT_DEVICE_ANY, +)
KEYMAP(EV_KEY, KEY_Q, BTN_2, EV_KEY, 1, INPUT_DEVICE_ANY, +)
/* Yellow button */
KEYMAP(EV_KEY, KEY_2, BTN_3, EV_KEY, 1, -1, +)
KEYMAP(EV_KEY, KEY_2, BTN_3, EV_KEY, 1, INPUT_DEVICE_ANY, +)
)
#endif