From 23cb82907220d0c2724a0ec92bde437cbcd67d6a Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Mon, 25 Apr 2011 09:43:59 +0300 Subject: 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 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. --- libmenu/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmenu/menu.c') diff --git a/libmenu/menu.c b/libmenu/menu.c index f537cd1671..111d535372 100644 --- a/libmenu/menu.c +++ b/libmenu/menu.c @@ -28,7 +28,7 @@ #include "libvo/osd.h" #include "sub/font_load.h" #include "sub/sub.h" -#include "osdep/keycodes.h" +#include "input/keycodes.h" #include "asxparser.h" #include "stream/stream.h" #include "input/input.h" -- cgit v1.2.3