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 /libvo | |
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 'libvo')
-rw-r--r-- | libvo/osx_common.c | 2 | ||||
-rw-r--r-- | libvo/sdl_common.c | 3 | ||||
-rw-r--r-- | libvo/vo_aa.c | 2 | ||||
-rw-r--r-- | libvo/vo_caca.c | 2 | ||||
-rw-r--r-- | libvo/vo_corevideo.m | 4 | ||||
-rw-r--r-- | libvo/vo_dfbmga.c | 3 | ||||
-rw-r--r-- | libvo/vo_directfb2.c | 3 | ||||
-rw-r--r-- | libvo/vo_directx.c | 3 | ||||
-rw-r--r-- | libvo/vo_ggi.c | 4 | ||||
-rw-r--r-- | libvo/vo_kva.c | 3 | ||||
-rw-r--r-- | libvo/vo_quartz.c | 4 | ||||
-rw-r--r-- | libvo/w32_common.c | 3 | ||||
-rw-r--r-- | libvo/x11_common.c | 3 |
13 files changed, 13 insertions, 26 deletions
diff --git a/libvo/osx_common.c b/libvo/osx_common.c index 315f4dbd13..52b8d89aaa 100644 --- a/libvo/osx_common.c +++ b/libvo/osx_common.c @@ -23,7 +23,7 @@ #include "osx_common.h" #include "old_vo_defines.h" #include "video_out.h" -#include "osdep/keycodes.h" +#include "input/keycodes.h" #include "input/input.h" /* diff --git a/libvo/sdl_common.c b/libvo/sdl_common.c index 42156d0cd3..32c95ef4c8 100644 --- a/libvo/sdl_common.c +++ b/libvo/sdl_common.c @@ -22,9 +22,8 @@ #include "old_vo_defines.h" #include "mp_msg.h" #include "mp_fifo.h" -#include "osdep/keycodes.h" +#include "input/keycodes.h" #include "input/input.h" -#include "input/mouse.h" #include "video_out.h" static int old_w; diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c index 99e313d399..cfe0b10e71 100644 --- a/libvo/vo_aa.c +++ b/libvo/vo_aa.c @@ -42,7 +42,7 @@ #include "sub/font_load.h" #include "sub/sub.h" -#include "osdep/keycodes.h" +#include "input/keycodes.h" #include <aalib.h> #include "subopt-helper.h" #include "mp_msg.h" diff --git a/libvo/vo_caca.c b/libvo/vo_caca.c index 2a5ebad4e7..74352397b3 100644 --- a/libvo/vo_caca.c +++ b/libvo/vo_caca.c @@ -37,7 +37,7 @@ #include "video_out_internal.h" #include "sub/sub.h" -#include "osdep/keycodes.h" +#include "input/keycodes.h" #include "mp_msg.h" #include "mp_fifo.h" diff --git a/libvo/vo_corevideo.m b/libvo/vo_corevideo.m index 23ef30d832..3b83051eb7 100644 --- a/libvo/vo_corevideo.m +++ b/libvo/vo_corevideo.m @@ -44,9 +44,7 @@ #include "subopt-helper.h" #include "input/input.h" -#include "input/mouse.h" - -#include "osdep/keycodes.h" +#include "input/keycodes.h" #include "osx_common.h" //Cocoa diff --git a/libvo/vo_dfbmga.c b/libvo/vo_dfbmga.c index b83f3c5e52..76ae4a46f9 100644 --- a/libvo/vo_dfbmga.c +++ b/libvo/vo_dfbmga.c @@ -35,6 +35,7 @@ #include "mp_msg.h" #include "aspect.h" #include "mp_fifo.h" +#include "input/keycodes.h" static const vo_info_t info = { "DirectFB / Matrox G200/G400/G450/G550", @@ -1435,8 +1436,6 @@ control( uint32_t request, void *data) return VO_NOTIMPL; } -#include "osdep/keycodes.h" - static void check_events( void ) { diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c index c011d20225..de44b2ea51 100644 --- a/libvo/vo_directfb2.c +++ b/libvo/vo_directfb2.c @@ -38,6 +38,7 @@ #include "aspect.h" #include "subopt-helper.h" #include "mp_fifo.h" +#include "input/keycodes.h" // triple buffering #define TRIPLE 1 @@ -848,8 +849,6 @@ static int config(uint32_t s_width, uint32_t s_height, uint32_t d_width, return 0; } -#include "osdep/keycodes.h" - static void check_events(void) { diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c index 494d6c8424..6df766cc4a 100644 --- a/libvo/vo_directx.c +++ b/libvo/vo_directx.c @@ -31,8 +31,7 @@ #include "video_out_internal.h" #include "fastmemcpy.h" #include "input/input.h" -#include "osdep/keycodes.h" -#include "input/mouse.h" +#include "input/keycodes.h" #include "mp_msg.h" #include "aspect.h" #include "geometry.h" diff --git a/libvo/vo_ggi.c b/libvo/vo_ggi.c index b80e87ed3a..b994dce81f 100644 --- a/libvo/vo_ggi.c +++ b/libvo/vo_ggi.c @@ -42,6 +42,7 @@ #include "video_out_internal.h" #include "mp_fifo.h" +#include "input/keycodes.h" #include <ggi/ggi.h> @@ -486,9 +487,6 @@ static int control(uint32_t request, void *data) return VO_NOTIMPL; } -/* EVENT handling */ -#include "osdep/keycodes.h" - static void check_events(void) { struct timeval tv = {0, 0}; diff --git a/libvo/vo_kva.c b/libvo/vo_kva.c index 155a779e4e..878911c438 100644 --- a/libvo/vo_kva.c +++ b/libvo/vo_kva.c @@ -43,9 +43,8 @@ #include "fastmemcpy.h" #include "mp_fifo.h" -#include "osdep/keycodes.h" +#include "input/keycodes.h" #include "input/input.h" -#include "input/mouse.h" #include "subopt-helper.h" #include "sub/sub.h" diff --git a/libvo/vo_quartz.c b/libvo/vo_quartz.c index 65797c988b..9098598aa8 100644 --- a/libvo/vo_quartz.c +++ b/libvo/vo_quartz.c @@ -51,7 +51,7 @@ #include "sub/sub.h" #include "input/input.h" -#include "input/mouse.h" +#include "input/keycodes.h" #include "osx_common.h" @@ -141,8 +141,6 @@ enum kPanScanCmd = 10 }; -#include "osdep/keycodes.h" - //PROTOTYPE///////////////////////////////////////////////////////////////// static OSStatus KeyEventHandler(EventHandlerCallRef nextHandler, EventRef event, void *userData); static OSStatus MouseEventHandler(EventHandlerCallRef nextHandler, EventRef event, void *userData); diff --git a/libvo/w32_common.c b/libvo/w32_common.c index 7cf374f717..9b89602f40 100644 --- a/libvo/w32_common.c +++ b/libvo/w32_common.c @@ -23,9 +23,8 @@ // To get "#define vo_ontop global_vo->opts->vo_ontop" etc #include "old_vo_defines.h" -#include "osdep/keycodes.h" +#include "input/keycodes.h" #include "input/input.h" -#include "input/mouse.h" #include "mp_msg.h" #include "video_out.h" #include "aspect.h" diff --git a/libvo/x11_common.c b/libvo/x11_common.c index df35932504..12fc661dee 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -74,7 +74,7 @@ #endif #include "input/input.h" -#include "input/mouse.h" +#include "input/keycodes.h" #define WIN_LAYER_ONBOTTOM 2 #define WIN_LAYER_NORMAL 4 @@ -528,7 +528,6 @@ void vo_uninit(struct vo_x11_state *x11) talloc_free(x11); } -#include "osdep/keycodes.h" #include "wskeys.h" #ifdef XF86XK_AudioPause |