diff options
| author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-29 16:35:53 +0000 |
|---|---|---|
| committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-29 16:35:53 +0000 |
| commit | 659b06b76921aee488742d3f58ead41af0cac045 (patch) | |
| tree | 919bfbd31a74b4205d916797f0d7ebcbda1abaae /Gui | |
| parent | 4c4a168a0140156f02354efc4befd0b833b20f9f (diff) | |
| download | mpv-659b06b76921aee488742d3f58ead41af0cac045.tar.bz2 mpv-659b06b76921aee488742d3f58ead41af0cac045.tar.xz | |
add XF86 multimedia key cucc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4410 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
| -rw-r--r-- | Gui/mplayer/mw.h | 15 | ||||
| -rw-r--r-- | Gui/wm/wskeys.h | 13 | ||||
| -rw-r--r-- | Gui/wm/wsmkeys.h | 9 |
3 files changed, 34 insertions, 3 deletions
diff --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h index 3ec603d624..e9db758027 100644 --- a/Gui/mplayer/mw.h +++ b/Gui/mplayer/mw.h @@ -583,6 +583,7 @@ int keyPressed = 0; void mplMainKeyHandle( int State,int Type,int Key ) { int msg = evNone; + if ( Type != wsKeyPressed ) return; switch ( Key ) { case '.': @@ -612,9 +613,19 @@ void mplMainKeyHandle( int State,int Type,int Key ) case wsS: msg=evStop; break; case wsp: case wsP: msg=evPlayList; break; - default: if ( Type == wsKeyPressed ) vo_x11_putkey( Key ); return; + + case wsXF86LowerVolume: msg=evDecVolume; break; + case wsXF86RaiseVolume: msg=evIncVolume; break; + case wsXF86Mute: msg=evMute; break; + case wsXF86Play: msg=evPlaySwitchToPause; break; + case wsXF86Stop: msg=evStop; break; + case wsXF86Prev: msg=evPrev; break; + case wsXF86Next: msg=evNext; break; + case wsXF86Media: msg=evLoad; break; + + default: vo_x11_putkey( Key ); return; } - if ( ( msg != evNone )&&( Type == wsKeyPressed ) ) + if ( msg != evNone ) { mplMsgHandle( msg,0 ); // mplMainRender=1; diff --git a/Gui/wm/wskeys.h b/Gui/wm/wskeys.h index 3a932969e1..baa2732c16 100644 --- a/Gui/wm/wskeys.h +++ b/Gui/wm/wskeys.h @@ -126,7 +126,18 @@ #define wsGrayUp 0xb8 + 256 #define wsGrayPageUp 0xb9 + 256 -#define wsKeyNumber 116 +//Keys for multimedia keyboard + +#define wsXF86LowerVolume 0x11 + 256 +#define wsXF86RaiseVolume 0x13 + 256 +#define wsXF86Mute 0x12 + 256 +#define wsXF86Play 0x14 + 256 +#define wsXF86Stop 0x15 + 256 +#define wsXF86Prev 0x16 + 256 +#define wsXF86Next 0x17 + 256 +#define wsXF86Media 0x32 + 256 + +#define wsKeyNumber 124 typedef struct { diff --git a/Gui/wm/wsmkeys.h b/Gui/wm/wsmkeys.h index 3b3528a9b8..23f4477565 100644 --- a/Gui/wm/wsmkeys.h +++ b/Gui/wm/wsmkeys.h @@ -48,5 +48,14 @@ TwsKeyNames wsKeyNames[ wsKeyNumber ] = { wsGrayRight, "GrayRight" }, { wsGrayHome, "GrayHome" }, { wsGrayUp, "GrayUp" }, { wsGrayPageUp, "GrayPageUp" }, + { wsXF86LowerVolume, "XF86LowerVolume" }, + { wsXF86RaiseVolume, "XF86RaiseVolume" }, + { wsXF86Mute, "XF86Mute" }, + { wsXF86Play, "XF86Play" }, + { wsXF86Stop, "XF86Stop" }, + { wsXF86Prev, "XF86Prev" }, + { wsXF86Next, "XF86Next" }, + { wsXF86Media, "XF86Media" }, + { wsKeyNone, "None" } }; |