kodi: add PR7916

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2015-10-23 11:20:21 +02:00
parent 2b6087dcc4
commit a73b4fc677

View File

@ -0,0 +1,83 @@
From 85e12bd9bf7bd61a9411bae415b679c9c3e54c7e Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Fri, 28 Aug 2015 19:50:39 +0300
Subject: [PATCH 1/2] [input] added KEY_MENU to linux input
---
xbmc/input/linux/LinuxInputDevices.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/xbmc/input/linux/LinuxInputDevices.cpp b/xbmc/input/linux/LinuxInputDevices.cpp
index 2610825..0b9a2c7 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 },
From 50e216d48b6550a75d1573453bf4ed880953aa18 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Fri, 28 Aug 2015 20:11:20 +0300
Subject: [PATCH 2/2] [keymap] improve 'menu' keymaps
---
system/keymaps/keyboard.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml
index e258295..7310072 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>