From 7ec1fd3d3ea3ef253c6f37bbf3b6610520d9202f Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 16 Jan 2004 17:31:38 +0000 Subject: [PATCH] Support binding F11 and F12 keys to commands. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11794 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Gui/wm/wskeys.h | 2 ++ Gui/wm/wsmkeys.h | 1 + input/input.c | 2 ++ libvo/vo_sdl.c | 2 ++ libvo/wskeys.h | 2 ++ libvo/x11_common.c | 2 ++ 6 files changed, 11 insertions(+) diff --git a/Gui/wm/wskeys.h b/Gui/wm/wskeys.h index e0a3ff0fd8..bea9ae3baa 100644 --- a/Gui/wm/wskeys.h +++ b/Gui/wm/wskeys.h @@ -104,6 +104,8 @@ #define wsF8 0xc5 + 256 #define wsF9 0xc6 + 256 #define wsF10 0xc7 + 256 +#define wsF11 0xc8 + 256 +#define wsF12 0xc9 + 256 #define wsInsert 0x63 + 256 #define wsDelete 0xff + 256 #define wsHome 0x50 + 256 diff --git a/Gui/wm/wsmkeys.h b/Gui/wm/wsmkeys.h index ae2b5d1d93..6fadb18428 100644 --- a/Gui/wm/wsmkeys.h +++ b/Gui/wm/wsmkeys.h @@ -28,6 +28,7 @@ TwsKeyNames wsKeyNames[ wsKeyNumber ] = { wsF1, "F1" }, { wsF2, "F2" }, { wsF3, "F3" }, { wsF4, "F4" }, { wsF5, "F5" }, { wsF6, "F6" }, { wsF7, "F7" }, { wsF8, "F8" }, { wsF9, "F9" }, { wsF10, "F10" }, + { wsF11, "F11" }, { wsF12, "F12" }, { wsEnter, "Enter" }, { wsTab, "Tab" }, { wsSpace, "Space" }, { wsInsert, "Insert" }, { wsDelete, "Delete" }, { wsHome, "Home" }, diff --git a/input/input.c b/input/input.c index 1c873462c4..9e3cd021eb 100644 --- a/input/input.c +++ b/input/input.c @@ -166,6 +166,8 @@ static mp_key_name_t key_names[] = { { KEY_F+8, "F8" }, { KEY_F+9, "F9" }, { KEY_F+10, "F10" }, + { KEY_F+11, "F11" }, + { KEY_F+12, "F12" }, { KEY_KP0, "KP0" }, { KEY_KP1, "KP1" }, { KEY_KP2, "KP2" }, diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c index 477bcb040e..55814bfd19 100644 --- a/libvo/vo_sdl.c +++ b/libvo/vo_sdl.c @@ -1271,6 +1271,8 @@ static void check_events (void) case SDLK_F8: mplayer_put_key(KEY_F+8);break; case SDLK_F9: mplayer_put_key(KEY_F+9);break; case SDLK_F10: mplayer_put_key(KEY_F+10);break; + case SDLK_F11: mplayer_put_key(KEY_F+11);break; + case SDLK_F12: mplayer_put_key(KEY_F+12);break; /*case SDLK_o: mplayer_put_key('o');break; case SDLK_SPACE: mplayer_put_key(' ');break; case SDLK_p: mplayer_put_key('p');break;*/ diff --git a/libvo/wskeys.h b/libvo/wskeys.h index 6faef6dac4..0da269fb0f 100644 --- a/libvo/wskeys.h +++ b/libvo/wskeys.h @@ -114,6 +114,8 @@ #define wsF8 0xc5 + 256 #define wsF9 0xc6 + 256 #define wsF10 0xc7 + 256 +#define wsF11 0xc8 + 256 +#define wsF12 0xc9 + 256 #define wsInsert 0x63 + 256 #define wsDelete 0xff + 256 #define wsHome 0x50 + 256 diff --git a/libvo/x11_common.c b/libvo/x11_common.c index c12d05dc8b..ab40c596d7 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -479,6 +479,8 @@ void vo_x11_putkey(int key){ case wsF8: mplayer_put_key(KEY_F+8); break; case wsF9: mplayer_put_key(KEY_F+9); break; case wsF10: mplayer_put_key(KEY_F+10); break; + case wsF11: mplayer_put_key(KEY_F+11); break; + case wsF12: mplayer_put_key(KEY_F+12); break; case wsq: case wsQ: mplayer_put_key('q'); break; case wsp: