summaryrefslogtreecommitdiffstats
path: root/input/appleir.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-04-25 09:43:59 +0300
committerUoti Urpala <uau@mplayer2.org>2011-05-02 00:43:31 +0300
commit23cb82907220d0c2724a0ec92bde437cbcd67d6a (patch)
tree1c1ea8667a2da5b6ddb5dd8e2f0c6f6558304ab5 /input/appleir.c
parent3e86228fad309b54869bf2a3314756933ba74e43 (diff)
downloadmpv-23cb82907220d0c2724a0ec92bde437cbcd67d6a.tar.bz2
mpv-23cb82907220d0c2724a0ec92bde437cbcd67d6a.tar.xz
input: move all key code lists to input/keycodes.h
Move the definitions of all special key codes (those not passed by ASCII value) to input/keycodes.h. Before they were spread between osdep/keycodes.h, input/joystick.h, input/mouse.h and input/ar.h, plus some special values in input.h. This was especially inconvenient as the codes had to be coordinated to not conflict between the files. The change requires a bit of ugliness as appleir.c includes <linux/input.h> which contains various conflicting KEY_* definitions. Work around this by adding a special preprocessor variable which can be used to avoid defining these in keycodes.h.
Diffstat (limited to 'input/appleir.c')
-rw-r--r--input/appleir.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/input/appleir.c b/input/appleir.c
index aca666110c..c64bc9648d 100644
--- a/input/appleir.c
+++ b/input/appleir.c
@@ -39,6 +39,10 @@
#include "mp_msg.h"
+// keycodes.h defines would conflict with linux/input.h ones
+#define AR_DEFINES_ONLY
+#include "keycodes.h"
+
#define EVDEV_MAX_EVENTS 32
/* ripped from AppleIR driver */