Merge remote-tracking branch 'origin/master'

This commit is contained in:
Merlijn Wajer 2013-02-09 13:39:53 +01:00
commit 33a3cd1dc2
7 changed files with 390 additions and 82 deletions

View File

@ -9,7 +9,7 @@ default: map
def_keys.h:
echo '#include <linux/input.h>' | gcc -E -dM - | grep '#define KEY_' | cut -f2 -d" " | sed 's/KEY_.*/DEF_KEY(&)/' > def_keys.h
map: map.c def_keys.h config.h
map: map.c def_keys.h config.h config_functions.h
$(CC) map.c $(CFLAGS) -o map
clean:

35
README
View File

@ -1,6 +1,33 @@
uinput-mapper maps input devices to new virtual input devices.
uinput-mapper maps input devices to new virtual input devices, using (as implied
by the name /dev/uinput[1]).
Work in progress, but we are getting a point where it is starting to be
useful.
Configuration is done in the C language (preprocessor mostly) to keep things
simple and clean.
See confs/techinc-arcade.h for an example config.
Comments, feedback, success stories, bugs and rants all welcome.
[1] Or /dev/input/uinput depending on the OS.
= Building =
Simply:
make
to build the program. But you probably want to configure it first.
= Configuration =
Configuration is done in the C preprocessor (and just C), recompile if you make
changes. Symlink "config.h" to an configuration file in confs/ (or just create
it). The example config confs/techinc-arcade.h is documented and should
(hopefully) be clear enough.
Mind you that invalid configurations can lead to compile-time and run-time
errors.
= Bugs =
None that I am aware of, but if you find some please drop me a mail at
http://wizzup.org.

View File

@ -1,6 +1,15 @@
#ifndef H_CONFIG_FUNCTIONS
#define H_CONFIG_FUNCTIONS
#define ADD_INPUT_PATH(INPUT_PATH, NUM) \
/* Open input and uinput */ \
in[NUM] = open(INPUT_PATH, O_RDONLY); \
if(in[NUM] < 0) { \
perror("Could not open: " INPUT_PATH); \
return 1; \
}
#define JOYSTICK_SET_OPT(opt, bit, device) \
if (device == j) { \
if (ioctl(js[device], bit, opt) < 0) { \
@ -31,8 +40,8 @@
macro \
}
#define KEYMAP(in_type, in_key, out_key, out_type, device, val) \
if(e.type == in_type && e.code == in_key) {\
#define KEYMAP(in_type, in_key, out_key, out_type, device, in_device, val) \
if(e.type == in_type && e.code == in_key && (in_device == -1 || in_device == fdrr)) {\
je.type = out_type; \
je.code = out_key; \
je.value = val(e.value); \

View File

@ -6,11 +6,24 @@
/* Set up amount of joysticks here */
#define JOYCOUNT 1
/* Set up event to read from */
#define INPUT_PATH "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
/* Set up amount of input devices here */
#define INPUT_DEVICE_COUNT 1
#endif
/* -------------------------------------------------------------------------- */
/* ------------------- FIRST AND A HALF SECTION ----------------------------- */
/* -------------------------------------------------------------------------- */
#ifdef H_CONFIGURE_EVENTS
#ifndef H_CONFIGURE_EVENTS_SEEN
#define H_CONFIGURE_EVENTS_SEEN
ADD_INPUT_PATH("/dev/input/by-path/platform-i8042-serio-0-event-kbd", 0)
#endif
#endif
/* -------------------------------------------------------------------------- */
/* ----------------------------- SECOND SECTION ----------------------------- */
/* -------------------------------------------------------------------------- */
@ -44,11 +57,11 @@ JOYSTICK_ADD_KEY(REL_Y, UI_SET_RELBIT, 0)
#ifndef H_JOYMAP_SEEN
#define H_JOYMAP_SEEN
KEYMAP(EV_KEY, KEY_3, BTN_LEFT, EV_KEY, 0, +)
KEYMAP(EV_KEY, KEY_M, REL_X, EV_REL, 0, 10*)
KEYMAP(EV_KEY, KEY_N, REL_X, EV_REL, 0, -10*)
KEYMAP(EV_KEY, KEY_J, REL_Y, EV_REL, 0, 10*)
KEYMAP(EV_KEY, KEY_K, REL_Y, EV_REL, 0, -10*)
KEYMAP(EV_KEY, KEY_3, BTN_LEFT, EV_KEY, 0, -1, +)
KEYMAP(EV_KEY, KEY_M, REL_X, EV_REL, 0, -1, 10*)
KEYMAP(EV_KEY, KEY_N, REL_X, EV_REL, 0, -1, -10*)
KEYMAP(EV_KEY, KEY_J, REL_Y, EV_REL, 0, -1, 10*)
KEYMAP(EV_KEY, KEY_K, REL_Y, EV_REL, 0, -1, -10*)
#endif
#endif

191
confs/mulitput.h Normal file
View File

@ -0,0 +1,191 @@
/*
* Copyright Merlijn Wajer 2012
*
* This is the uinput-mapper configuration file.
*
* We are still working out all the details, but it basically boils down to the
* following: You write the configuration entirely in the C preprocessor by
* adding the right commands (macros) to the right sections.
*
*
* As of now, there are three sections:
*
* - GLOBAL_MAP;
* This is where you set the amount of devices to be emulated (currently
* called JOYCOUNT) and the INPUT_PATH.
*
* - CONFIGURE_JOYSTICKS:
* This is where you tell uinput-mapper what buttons your new joysticks (or
* other devices) should expose. Any button not exposed here will never be
* send.
*
* Macros that make sense to use here:
* - JOYSTICK_SET_OPT(<opt>, <bit>, <device>)
* - JOYSTICK_ADD_KEY(<key>, <bit to set>, <device>)
* - JOYSTICK_SET_LIM(<absmin|absmax>, <value>, <key>)
*
* JOYSTICK_SET_LIM is mostly used for ABS_HATs.
*
* - JOYMAP:
*
* Set the key mappings here.
*
* Macros that make sense here:
* - 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
* JOYSTICK_ADD_KEY
* - To expose a mouse device, expose (at least) the BTN_LEFT button with
* JOYSTICK_ADD_KEY
*
* ----------------------------------------------------------------------------
*/
#include "config_functions.h"
/* -------------------------------------------------------------------------- */
/* ----------------------------- FIRST SECTION ----------------------------- */
/* -------------------------------------------------------------------------- */
#ifndef H_GLOBAL_MAP
#define H_GLOBAL_MAP
/* Set up amount of joysticks here */
#define JOYCOUNT 2
/* Set up amount of input devices here */
#define INPUT_DEVICE_COUNT 2
#define INPUT_DEVICE_ANY -1
#endif
/* -------------------------------------------------------------------------- */
/* ------------------- FIRST AND A HALF SECTION ----------------------------- */
/* -------------------------------------------------------------------------- */
#ifdef H_CONFIGURE_EVENTS
#ifndef H_CONFIGURE_EVENTS_SEEN
#define H_CONFIGURE_EVENTS_SEEN
ADD_INPUT_PATH("/dev/input/event4", 0)
ADD_INPUT_PATH("/dev/input/event5", 1)
#endif
#endif
/* -------------------------------------------------------------------------- */
/* ----------------------------- SECOND SECTION ----------------------------- */
/* -------------------------------------------------------------------------- */
#ifdef H_CONFIGURE_JOYSTICKS
#ifndef H_CONFIGURE_JOYSTICKS_SEEN
#define H_CONFIGURE_JOYSTICKS_SEEN
/* Configure first joystick.
*
* Here we just tell the program what keys event we will expose and what
* keys we want to use.
*
* If a key is not enabled here, it will never be passed.
*/
/* We want to send ABS and KEY events */
JOYSTICK_SET_OPT(EV_ABS, UI_SET_EVBIT, 0)
JOYSTICK_SET_OPT(EV_KEY, UI_SET_EVBIT, 0)
/* Hats:
* We set the absmax and absmin; otherwise the hats make no sense.
*/
JOYSTICK_ADD_KEY(ABS_HAT0X, UI_SET_ABSBIT, 0)
JOYSTICK_SET_LIM(absmax, 1, ABS_HAT0X)
JOYSTICK_SET_LIM(absmin, -1, ABS_HAT0X)
JOYSTICK_ADD_KEY(ABS_HAT0Y, UI_SET_ABSBIT, 0)
JOYSTICK_SET_LIM(absmax, 1, ABS_HAT0Y)
JOYSTICK_SET_LIM(absmin, -1, ABS_HAT0Y)
/* XXX: ALWAYS SET BTN_JOYSTICK TO EXPOSE A JOYSTICK DEVICE */
JOYSTICK_ADD_KEY(BTN_JOYSTICK, UI_SET_KEYBIT, 0)
/* Buttons. */
JOYSTICK_ADD_KEY(BTN_0, UI_SET_KEYBIT, 0)
JOYSTICK_ADD_KEY(BTN_1, UI_SET_KEYBIT, 0)
JOYSTICK_ADD_KEY(BTN_2, UI_SET_KEYBIT, 0)
JOYSTICK_ADD_KEY(BTN_3, UI_SET_KEYBIT, 0)
/* Second joystick ; same comments as first one */
JOYSTICK_SET_OPT(EV_ABS, UI_SET_EVBIT, 1)
JOYSTICK_SET_OPT(EV_KEY, UI_SET_EVBIT, 1)
JOYSTICK_ADD_KEY(ABS_HAT0X, UI_SET_ABSBIT, 1)
JOYSTICK_SET_LIM(absmax, 1, ABS_HAT0X)
JOYSTICK_SET_LIM(absmin, -1, ABS_HAT0X)
JOYSTICK_ADD_KEY(ABS_HAT0Y, UI_SET_ABSBIT, 1)
JOYSTICK_SET_LIM(absmax, 1, ABS_HAT0X)
JOYSTICK_SET_LIM(absmin, -1, ABS_HAT0X)
JOYSTICK_ADD_KEY(BTN_JOYSTICK, UI_SET_KEYBIT, 1)
JOYSTICK_ADD_KEY(BTN_0, UI_SET_KEYBIT, 1)
JOYSTICK_ADD_KEY(BTN_1, UI_SET_KEYBIT, 1)
JOYSTICK_ADD_KEY(BTN_2, UI_SET_KEYBIT, 1)
JOYSTICK_ADD_KEY(BTN_3, UI_SET_KEYBIT, 1)
#endif
#endif
/* -------------------------------------------------------------------------- */
/* ----------------------------- THIRD SECTION ----------------------------- */
/* -------------------------------------------------------------------------- */
#ifdef H_JOYMAP
#ifndef H_JOYMAP_SEEN
#define H_JOYMAP_SEEN
/* First joystick */
LEGAL_VALUE(e.value == 1 || e.value == 0,
/* HAT */
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, 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, INPUT_DEVICE_ANY, +)
)
/* Second joystick */
LEGAL_VALUE(e.value == 1 || e.value == 0,
/* HAT */
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, 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, INPUT_DEVICE_ANY, +)
)
#endif
#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"
@ -63,9 +60,25 @@
/* Set up amount of joysticks here */
#define JOYCOUNT 2
/* Set up event to read from */
#define INPUT_PATH "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
/* Set up amount of input devices here */
#define INPUT_DEVICE_COUNT 2
#define INPUT_DEVICE_ANY -1
#endif
/* -------------------------------------------------------------------------- */
/* ------------------- FIRST AND A HALF SECTION ----------------------------- */
/* -------------------------------------------------------------------------- */
#ifdef H_CONFIGURE_EVENTS
#ifndef H_CONFIGURE_EVENTS_SEEN
#define H_CONFIGURE_EVENTS_SEEN
ADD_INPUT_PATH("/dev/input/by-id/usb-Cypress_I-PAC_Arcade_Control_Interface-event-kbd", 0)
ADD_INPUT_PATH("/dev/input/by-id/usb-Dell_Dell_USB_Keyboard-event-kbd", 1)
#endif
#endif
/* -------------------------------------------------------------------------- */
@ -142,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, -)
KEYMAP(EV_KEY, KEY_DOWN, ABS_HAT0Y, EV_ABS, 0, +)
KEYMAP(EV_KEY, KEY_LEFT, ABS_HAT0X, EV_ABS, 0, -)
KEYMAP(EV_KEY, KEY_RIGHT, ABS_HAT0X, EV_ABS, 0, +)
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, +)
KEYMAP(EV_KEY, KEY_LEFTALT, BTN_1, EV_KEY, 0, +)
KEYMAP(EV_KEY, KEY_SPACE, BTN_2, EV_KEY, 0, +)
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, +)
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, -)
KEYMAP(EV_KEY, KEY_F, ABS_HAT0Y, EV_ABS, 1, +)
KEYMAP(EV_KEY, KEY_D, ABS_HAT0X, EV_ABS, 1, -)
KEYMAP(EV_KEY, KEY_G, ABS_HAT0X, EV_ABS, 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, +)
KEYMAP(EV_KEY, KEY_S, BTN_1, EV_KEY, 1, +)
KEYMAP(EV_KEY, KEY_Q, BTN_2, EV_KEY, 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, +)
KEYMAP(EV_KEY, KEY_2, BTN_3, EV_KEY, 1, INPUT_DEVICE_ANY, +)
)
#endif

95
map.c
View File

@ -25,9 +25,11 @@
#include <linux/input.h>
#include <linux/uinput.h>
#include "config.h"
#include <err.h>
#include <poll.h>
#include <errno.h>
#define UINPUT_PATH "/dev/uinput"
#include "config.h"
/* Reverse mapping, for later use */
static const struct _key_to_str {
@ -71,8 +73,9 @@ void free_js(int sig) {
}
int main(int argc, char** argv) {
int j, nowrite;
int in; /* fds */
int j, nowrite, rfds, fdrr = 0;
int in[INPUT_DEVICE_COUNT]; /* fds */
struct pollfd pin[INPUT_DEVICE_COUNT];
struct input_event e, je;
struct uinput_user_dev uidev;
@ -82,26 +85,34 @@ int main(int argc, char** argv) {
(void)get_key_num;
if(signal(SIGINT, free_js)) {
printf("SIGINT handler registration failed\n");
return 1;
/* Open required input devices */
#define H_CONFIGURE_EVENTS
#include "config.h"
/* Now setup poll structure */
for (j = 0; j < INPUT_DEVICE_COUNT; j++)
{
pin[j].fd = in[j];
pin[j].events = POLLIN;
}
/* Open input and uinput */
in = open(INPUT_PATH, O_RDONLY);
if(in < 0) {
perror("Could not open: " INPUT_PATH);
if(signal(SIGINT, free_js) == SIG_ERR) {
printf("SIGINT handler registration failed\n");
return 1;
}
for(j = 0; j < JOYCOUNT; j++) {
/* Memset because we are already setting the absmax/absmin */
memset(&uidev, '\0', sizeof(struct uinput_user_dev));
js[j] = open(UINPUT_PATH, O_WRONLY | O_NONBLOCK);
js[j] = open("/dev/uinput", O_WRONLY | O_NONBLOCK);
if (js[j] < 0) {
perror("Could not open:" UINPUT_PATH);
perror("(NOT FATAL YET) Could not open: /dev/uinput");
js[j] = open("/dev/input/uinput", O_WRONLY | O_NONBLOCK);
if (js[j] < 0) {
perror("(FATAL) Could not open: /dev/input/uinput");
return 1;
}
}
#define H_CONFIGURE_JOYSTICKS
#include "config.h"
@ -116,21 +127,58 @@ int main(int argc, char** argv) {
if (write(js[j], &uidev, sizeof(uidev)) < 0) {
perror("write");
return -1;
return EXIT_FAILURE;
}
if (ioctl(js[j], UI_DEV_CREATE)) {
perror("ioctl create");
return 1;
return EXIT_FAILURE;
}
}
/* Do it! */
while (1) {
if (read(in, &e, sizeof(struct input_event))) {
printf("Event: (Type: %d, Code: %d, Value %d)\n", e.type, e.code, e.value);
printf("Entering poll..\n");
/* Any data available? */
if ((rfds = poll(pin, INPUT_DEVICE_COUNT, -1)) < 0) {
/* Interrupted by signal */
if (errno == EINTR)
continue;
perror("poll");
return EXIT_FAILURE;
}
printf("Leaving poll..\n");
/* Round-robin check readers */
while (rfds) {
if (pin[fdrr].revents & POLLIN) {
printf("Device %d has input\n", fdrr);
/* XXX: Need checking for complete read? */
if (read(in[fdrr], &e, sizeof(struct input_event)) < 0) {
/* Interrupted by singal? Retry */
if (errno == EINTR)
continue;
#if 0
if (errno == EWOULDBLOCK || errno == EAGAIN) {
printf("poll tells us device %d is readable.. it is not\n", fdrr);
rfds -= 1;
fdrr = (fdrr + 1) % INPUT_DEVICE_COUNT;
continue;
}
#endif
err(EXIT_FAILURE, "reading input device nr. %d failed", fdrr);
}
printf("Event: (Type: %d, Code: %d, Value %d)\n", e.type, e.code, e.value);
} else {
/* Update poll read mechanism */
fdrr = (fdrr + 1) % INPUT_DEVICE_COUNT;
continue;
}
/* Now handle received event */
memset(&je, '\0', sizeof(struct input_event));
nowrite = 1;
j = 0;
@ -138,11 +186,15 @@ int main(int argc, char** argv) {
#define H_JOYMAP
#include "config.h"
/* Update poll read mechanism */
fdrr = (fdrr + 1) % INPUT_DEVICE_COUNT;
rfds -= 1;
if (nowrite == 0) {
printf("Writing %d to %d\n", e.code, j);
if(write(js[j], &je, sizeof(struct input_event)) < 0) {
perror("Event write event");
return -1;
return EXIT_FAILURE;
}
}
@ -157,10 +209,13 @@ int main(int argc, char** argv) {
if (write(js[j], &je, sizeof(struct input_event)) < 0) {
perror("SYN write event");
return -1;
}
return EXIT_FAILURE;
}
}
} /* End reader check loop */
} /* End main loop */
return 0;
}