diff options
| author | Martijn Kaijser <martijn@xbmc.org> | 2015-09-01 08:09:39 +0200 |
|---|---|---|
| committer | Martijn Kaijser <martijn@xbmc.org> | 2015-09-01 08:09:39 +0200 |
| commit | 7ff50a238bd131c5381bef0113b9d49b115c32d1 (patch) | |
| tree | fbc51de381f060a1b3b205f3208c05d0966d2182 | |
| parent | 8890ef73c5b743c670f066f07bfc8a86a88915bf (diff) | |
| parent | 50e216d48b6550a75d1573453bf4ed880953aa18 (diff) | |
Merge pull request #7916 from stefansaraev/linuxkeymap
[keymap] improve handling of KEY_MENU
| -rw-r--r-- | system/keymaps/keyboard.xml | 6 | ||||
| -rw-r--r-- | xbmc/input/linux/LinuxInputDevices.cpp | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml index e258295348..7310072c40 100644 --- a/system/keymaps/keyboard.xml +++ b/system/keymaps/keyboard.xml @@ -266,6 +266,7 @@ <return>OSD</return> <enter>OSD</enter> <m>OSD</m> + <menu>OSD</menu> <i>Info</i> <o>CodecInfo</o> <z>AspectRatio</z> @@ -301,6 +302,7 @@ <i>Back</i> <d mod="ctrl">Back</d> <m>OSD</m> + <menu>OSD</menu> </keyboard> </FullscreenInfo> <PlayerControls> @@ -320,6 +322,7 @@ <return>OSD</return> <enter>OSD</enter> <m>OSD</m> + <menu>OSD</menu> <i>Info</i> <p>ActivateWindow(VisualisationPresetList)</p> <v>Addon.Default.OpenSettings(xbmc.player.musicviz)</v> @@ -342,6 +345,7 @@ <period>SkipNext</period> <comma>SkipPrevious</comma> <m>Back</m> + <menu>Back</menu> <i>Info</i> <o>CodecInfo</o> <p>ActivateWindow(VisualisationPresetList)</p> @@ -418,6 +422,7 @@ <VideoOSD> <keyboard> <m>Back</m> + <menu>Back</menu> <g mod="ctrl">Back</g> <!-- MCE Guide button --> <i>Info</i> <o>CodecInfo</o> @@ -428,6 +433,7 @@ <opensquarebracket>BigStepForward</opensquarebracket> <closesquarebracket>BigStepBack</closesquarebracket> <m>OSD</m> + <menu>OSD</menu> <i>Info</i> <o>CodecInfo</o> <z>AspectRatio</z> diff --git a/xbmc/input/linux/LinuxInputDevices.cpp b/xbmc/input/linux/LinuxInputDevices.cpp index 2610825d6e..0b9a2c736b 100644 --- a/xbmc/input/linux/LinuxInputDevices.cpp +++ b/xbmc/input/linux/LinuxInputDevices.cpp @@ -233,6 +233,7 @@ KeyMap keyMap[] = { { KEY_COMPOSE , XBMCK_LSUPER }, { KEY_STOP , XBMCK_MEDIA_STOP }, { KEY_HELP , XBMCK_HELP }, + { KEY_MENU , XBMCK_MENU }, { KEY_CLOSECD , XBMCK_EJECT }, { KEY_EJECTCD , XBMCK_EJECT }, { KEY_EJECTCLOSECD , XBMCK_EJECT }, |