diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-04-25 09:43:59 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-05-02 00:43:31 +0300 |
| commit | 23cb82907220d0c2724a0ec92bde437cbcd67d6a (patch) | |
| tree | 1c1ea8667a2da5b6ddb5dd8e2f0c6f6558304ab5 /libmenu | |
| parent | 3e86228fad309b54869bf2a3314756933ba74e43 (diff) | |
| download | mpv-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 'libmenu')
| -rw-r--r-- | libmenu/menu.c | 2 | ||||
| -rw-r--r-- | libmenu/menu_console.c | 2 | ||||
| -rw-r--r-- | libmenu/menu_dvbin.c | 2 | ||||
| -rw-r--r-- | libmenu/menu_filesel.c | 2 | ||||
| -rw-r--r-- | libmenu/menu_list.c | 2 | ||||
| -rw-r--r-- | libmenu/menu_txt.c | 2 |
6 files changed, 6 insertions, 6 deletions
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" diff --git a/libmenu/menu_console.c b/libmenu/menu_console.c index eb8595e9ab..5e1687b823 100644 --- a/libmenu/menu_console.c +++ b/libmenu/menu_console.c @@ -39,7 +39,7 @@ #include "menu.h" #include "sub/font_load.h" -#include "osdep/keycodes.h" +#include "input/keycodes.h" #include "input/input.h" #include "osdep/timer.h" diff --git a/libmenu/menu_dvbin.c b/libmenu/menu_dvbin.c index 35ce114687..05dd5909cb 100644 --- a/libmenu/menu_dvbin.c +++ b/libmenu/menu_dvbin.c @@ -39,7 +39,7 @@ #include "menu.h" #include "menu_list.h" #include "input/input.h" -#include "osdep/keycodes.h" +#include "input/keycodes.h" #include "stream/dvbin.h" diff --git a/libmenu/menu_filesel.c b/libmenu/menu_filesel.c index 047ddaca97..306e3133ca 100644 --- a/libmenu/menu_filesel.c +++ b/libmenu/menu_filesel.c @@ -41,7 +41,7 @@ #include "menu.h" #include "menu_list.h" #include "input/input.h" -#include "osdep/keycodes.h" +#include "input/keycodes.h" #define MENU_KEEP_PATH "/tmp/mp_current_path" diff --git a/libmenu/menu_list.c b/libmenu/menu_list.c index 37f10d123e..85649e5f70 100644 --- a/libmenu/menu_list.c +++ b/libmenu/menu_list.c @@ -30,7 +30,7 @@ #include "menu.h" #include "sub/font_load.h" -#include "osdep/keycodes.h" +#include "input/keycodes.h" #define IMPL 1 #include "menu_list.h" diff --git a/libmenu/menu_txt.c b/libmenu/menu_txt.c index 0170320884..97a8f615c8 100644 --- a/libmenu/menu_txt.c +++ b/libmenu/menu_txt.c @@ -31,7 +31,7 @@ #include "menu.h" #include "sub/font_load.h" -#include "osdep/keycodes.h" +#include "input/keycodes.h" struct menu_priv_s { char** lines; |