aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Raue <stephan@openelec.tv>2015-11-20 10:54:34 +0100
committerStephan Raue <stephan@openelec.tv>2015-11-20 10:54:34 +0100
commit9066630c7e3a8388b18673ef9a7ae2929479cd09 (patch)
treebc90ee2b0bc9cd5398c1a2b3e9ed4504f3be02db
parentcc0dea22b08e085a31943f40a8f50cb4fa5a718b (diff)
[keyboard.xml] add KEY_TEXT keymapping (Text)
-rw-r--r--system/keymaps/keyboard.xml6
-rw-r--r--xbmc/input/XBMC_keysym.h1
-rw-r--r--xbmc/input/XBMC_keytable.cpp1
-rw-r--r--xbmc/input/XBMC_vkeys.h1
-rw-r--r--xbmc/input/linux/LinuxInputDevices.cpp1
5 files changed, 10 insertions, 0 deletions
diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml
index b538a3372e..022177cba5 100644
--- a/system/keymaps/keyboard.xml
+++ b/system/keymaps/keyboard.xml
@@ -316,6 +316,7 @@
<escape>Fullscreen</escape>
<c>Playlist</c>
<v>ActivateWindow(Teletext)</v>
+ <text>ActivateWindow(Teletext)</text>
<up mod="ctrl">SubtitleShiftUp</up>
<down mod="ctrl">SubtitleShiftDown</down>
<pageup>SkipNext</pageup>
@@ -364,6 +365,7 @@
<i>Info</i>
<p>ActivateWindow(VisualisationPresetList)</p>
<v>Addon.Default.OpenSettings(xbmc.player.musicviz)</v>
+ <text>Addon.Default.OpenSettings(xbmc.player.musicviz)</text>
<n>ActivateWindow(MusicPlaylist)</n>
<left>StepBack</left>
<right>StepForward</right>
@@ -388,6 +390,7 @@
<o>CodecInfo</o>
<p>ActivateWindow(VisualisationPresetList)</p>
<v>Addon.Default.OpenSettings(xbmc.player.musicviz)</v>
+ <text>Addon.Default.OpenSettings(xbmc.player.musicviz)</text>
<n>ActivateWindow(MusicPlaylist)</n>
</keyboard>
</MusicOSD>
@@ -402,6 +405,7 @@
<o>CodecInfo</o>
<p>ActivateWindow(VisualisationPresetList)</p>
<v>Back</v>
+ <text>Back</text>
<n>ActivateWindow(MusicPlaylist)</n>
</keyboard>
</VisualisationSettings>
@@ -416,6 +420,7 @@
<o>CodecInfo</o>
<p>Back</p>
<v>Back</v>
+ <text>Back</text>
<n>ActivateWindow(MusicPlaylist)</n>
</keyboard>
</VisualisationPresetList>
@@ -565,6 +570,7 @@
<Teletext>
<keyboard>
<v>Back</v>
+ <text>Back</text>
</keyboard>
</Teletext>
<Favourites>
diff --git a/xbmc/input/XBMC_keysym.h b/xbmc/input/XBMC_keysym.h
index f14712acaf..0879943c43 100644
--- a/xbmc/input/XBMC_keysym.h
+++ b/xbmc/input/XBMC_keysym.h
@@ -225,6 +225,7 @@ typedef enum {
XBMCK_YELLOW = 0x149,
XBMCK_BLUE = 0x14a,
XBMCK_ZOOM = 0x14b,
+ XBMCK_TEXT = 0x14c,
// Add any other keys here
diff --git a/xbmc/input/XBMC_keytable.cpp b/xbmc/input/XBMC_keytable.cpp
index 22942be084..4dea61c94b 100644
--- a/xbmc/input/XBMC_keytable.cpp
+++ b/xbmc/input/XBMC_keytable.cpp
@@ -239,6 +239,7 @@ static const XBMCKEYTABLE XBMCKeyTable[] =
, { XBMCK_YELLOW, 0, 0, XBMCVK_YELLOW, "yellow" }
, { XBMCK_BLUE, 0, 0, XBMCVK_BLUE, "blue" }
, { XBMCK_ZOOM, 0, 0, XBMCVK_ZOOM, "zoom" }
+, { XBMCK_TEXT, 0, 0, XBMCVK_TEXT, "text" }
};
static int XBMCKeyTableSize = sizeof(XBMCKeyTable)/sizeof(XBMCKEYTABLE);
diff --git a/xbmc/input/XBMC_vkeys.h b/xbmc/input/XBMC_vkeys.h
index ccec23a878..45ab72c6d5 100644
--- a/xbmc/input/XBMC_vkeys.h
+++ b/xbmc/input/XBMC_vkeys.h
@@ -217,6 +217,7 @@ typedef enum {
XBMCVK_YELLOW = 0xE5,
XBMCVK_BLUE = 0xE6,
XBMCVK_ZOOM = 0xE7,
+ XBMCVK_TEXT = 0xE8,
XBMCVK_LAST = 0xFF
} XBMCVKey;
diff --git a/xbmc/input/linux/LinuxInputDevices.cpp b/xbmc/input/linux/LinuxInputDevices.cpp
index c999e6993f..c3ab8834f1 100644
--- a/xbmc/input/linux/LinuxInputDevices.cpp
+++ b/xbmc/input/linux/LinuxInputDevices.cpp
@@ -256,6 +256,7 @@ KeyMap keyMap[] = {
{ KEY_QUESTION , XBMCK_HELP },
{ KEY_BACK , XBMCK_BACKSPACE },
{ KEY_ZOOM , XBMCK_ZOOM },
+ { KEY_TEXT , XBMCK_TEXT },
// The Little Black Box Remote Additions
{ 384 , XBMCK_LEFT }, // Red
{ 378 , XBMCK_RIGHT }, // Green