Joysticks: Update joystick.xml

1 files changed, 110 insertions, 46 deletions

diff --git a/system/keymaps/joystick.xml b/system/keymaps/joystick.xml
index 8da8d9d97a..f28bae0f60 100644
--- a/system/keymaps/joystick.xml
+++ b/system/keymaps/joystick.xml
@@ -1,34 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This file contains the mapping of keys to actions within Kodi.                       -->
-<!--                                                                                      -->
-<!-- The format is:                                                                       -->
-<!--  <window>                                                                            -->
-<!--    <device>                                                                          -->
-<!--      <button>action</button>                                                         -->
-<!--    </device>                                                                         -->
-<!--  </window>                                                                           -->
-<!--                                                                                      -->
-<!-- The <global> section is a fall through - they will only be used if the button is     -->
-<!-- not used in the current window's section.                                            -->
-<!--                                                                                      -->
-<!-- Actions can be built-in functions.                                                   -->
-<!--  eg <B>ActivateWindow(Music)</B>                                                     -->
-<!-- would automatically go to Music on the press of the B button.                        -->
-<!--                                                                                      -->
-<!--                                                                                      -->
-<!-- An empty action removes the corresponding mapping from default and parent keymaps.   -->
-<!-- This is different from a "noop" action, which disables a button.                     -->
-<!--                                                                                      -->
-<!-- More documentation on keymaps can be found on http://kodi.wiki/view/keymaps          -->
+<!-- This file contains the mapping of joystick buttons to actions within    -->
+<!-- Kodi.                                                                   -->
+<!--                                                                         -->
+<!-- The format is:                                                          -->
+<!--   <window>                                                              -->
+<!--     <joystick profile="game.controller.default">                        -->
+<!--       <button>action</button>                                           -->
+<!--     </joystick>                                                         -->
+<!--   </window>                                                             -->
+<!--                                                                         -->
+<!-- The <global> section is a fall through - they will only be used if the  -->
+<!-- button is not used in the current window's section.                     -->
+<!--                                                                         -->
+<!-- The "profile" attribute specifies the controller profile whose buttons  -->
+<!-- are being mapped. Currently, the default controller profile is used for -->
+<!-- every controller. In the future it may be possible to specify mappings  -->
+<!-- for the controller profile most similar to the user's physical          -->
+<!-- controller.                                                             -->
+<!--                                                                         -->
+<!-- Actions can be built-in functions.                                      -->
+<!--   eg <b>ActivateWindow(Music)</b>                                       -->
+<!-- would automatically go to Music on the press of the B button.           -->
+<!--                                                                         -->
+<!-- Buttons can be overloaded with hold durations, in miliseconds:          -->
+<!--   <joystick profile="game.controller.default">                          -->
+<!--     <a>Select</a>                                                       -->
+<!--     <a holdtime="500">ContextMenu</a>                                   -->
+<!--   </joystick>                                                           -->
+<!--                                                                         -->
+<!-- Buttons can be also require hotkeys to be pressed:                      -->
+<!--   <joystick profile="game.controller.default">                          -->
+<!--     <start hotkey="back">Stop</start>                                   -->
+<!--   </joystick>                                                           -->
+<!--                                                                         -->
+<!-- Due to limitations in the button mapper, buttons can be overloaded with -->
+<!-- different hold durations, but not different hotkeys for the same        -->
+<!-- duration.                                                               -->
+<!--                                                                         -->
+<!-- More documentation on keymaps can be found on                           -->
+<!-- http://kodi.wiki/view/keymaps                                           -->
+<!--                                                                         -->
 <keymap>
   <global>
     <joystick profile="game.controller.default">
       <a>Select</a>
+      <a holdtime="500">ContextMenu</a>
       <b>Back</b>
       <x>ContextMenu</x>
       <y>FullScreen</y>
       <start>ActivateWindow(PlayerControls)</start>
-      <back>PreviousMenu</back>
       <guide>ActivateWindow(Home)</guide>
       <up>Up</up>
       <down>Down</down>
@@ -40,14 +60,14 @@
       <righttrigger>ScrollDown</righttrigger>
       <leftbumper>ScrollUp</leftbumper>
       <rightbumper>ScrollDown</rightbumper>
-      <leftstickleft>Left</leftstickleft>
-      <leftstickright>Right</leftstickright>
-      <leftstickup>Up</leftstickup>
-      <leftstickdown>Down</leftstickdown>
-      <rightstickleft>VolumeDown</rightstickleft>
-      <rightstickright>VolumeUp</rightstickright>
-      <rightstickup>VolumeUp</rightstickup>
-      <rightstickdown>VolumeDown</rightstickdown>
+      <leftstick direction="left">Left</leftstick>
+      <leftstick direction="right">Right</leftstick>
+      <leftstick direction="up">Up</leftstick>
+      <leftstick direction="down">Down</leftstick>
+      <rightstick direction="left">VolumeDown</rightstick>
+      <rightstick direction="right">VolumeUp</rightstick>
+      <rightstick direction="up">VolumeUp</rightstick>
+      <rightstick direction="down">VolumeDown</rightstick>
     </joystick>
   </global>
   <FileManager>
@@ -69,8 +89,8 @@
       <x>OSD</x>
       <y>FullScreen</y>
       <start>Info</start>
-      <back>Seek(-7)</back>
-      <guide>ActivateWindow(Home)</guide>
+      <back>OSD</back>
+      <guide>OSD</guide>
       <up>ChapterOrBigStepForward</up>
       <down>ChapterOrBigStepBack</down>
       <right>StepForward</right>
@@ -81,23 +101,63 @@
       <righttrigger>AnalogFastForward</righttrigger>
       <leftbumper>AnalogRewind</leftbumper>
       <rightbumper>AnalogFastForward</rightbumper>
-      <leftstickleft>AnalogSeekBack</leftstickleft>
-      <leftstickright>AnalogSeekForward</leftstickright>
-      <leftstickup>AnalogSeekForward</leftstickup>
-      <leftstickdown>AnalogSeekBack</leftstickdown>
-      <rightstickleft>VolumeDown</rightstickleft>
-      <rightstickright>VolumeUp</rightstickright>
-      <rightstickup>VolumeUp</rightstickup>
-      <rightstickdown>VolumeDown</rightstickdown>
+      <leftstick direction="left">AnalogSeekBack</leftstick>
+      <leftstick direction="right">AnalogSeekForward</leftstick>
+      <leftstick direction="up">noop</leftstick>
+      <leftstick direction="down">noop</leftstick>
     </joystick>
   </FullscreenVideo>
   <FullscreenGame>
     <joystick profile="game.controller.default">
+      <start holdtime="1000">OSD</start>
       <guide>OSD</guide>
+      <!-- Give games access to volume controls -->
+      <rightstick direction="left" hotkey="back">VolumeDown</rightstick>
+      <rightstick direction="right" hotkey="back">VolumeUp</rightstick>
+      <rightstick direction="up" hotkey="back">VolumeUp</rightstick>
+      <rightstick direction="down" hotkey="back">VolumeDown</rightstick>
+      <!-- RetroPie hotkeys, ref: https://github.com/RetroPie/RetroPie-Setup/wiki/RetroArch-Configuration -->
+      <!--
+      <b hotkey="back">Player.Reset</b>
+      <x hotkey="back">OSD</x>
+      <start hotkey="back">Stop</start>
+      <rightbumper hotkey="back">Save</rightbumper>
+      <leftbumper hotkey="back">Load</leftbumper>
+      <righttrigger hotkey="back">AnalogFastForward</righttrigger>
+      <lefttrigger hotkey="back">AnalogRewind</lefttrigger>
+      <right hotkey="back">SaveSlotIncrease</right>
+      <left hotkey="back">SaveSlotDecrease</left>
+      -->
+      <!-- Hotkeys courtesy Julipo -->
+      <!--
+      <a hotkey="back">Screenshot</a>
+      <x hotkey="back">FullScreen</x>
+      <y hotkey="back">OSD</y>
+      <start hotkey="back">OSD</start>
+      <rightbumper hotkey="back">Save</rightbumper>
+      <leftbumper hotkey="back">Load</leftbumper>
+      <leftstick direction="left" hotkey="back">SaveSlotDecrease</leftstick>
+      <leftstick direction="right" hotkey="back">SaveSlotIncrease</leftstick>
+      -->
+      <!-- Merged -->
+      <a hotkey="back">Screenshot</a>
+      <b hotkey="back">PlayerControl(Reset)</b>
+      <x hotkey="back">OSD</x>
+      <y hotkey="back">FullScreen</y>
+      <start hotkey="back">Stop</start>
+      <rightbumper hotkey="back">Save</rightbumper>
+      <leftbumper hotkey="back">Load</leftbumper>
+      <righttrigger hotkey="back">AnalogFastForward</righttrigger>
+      <lefttrigger hotkey="back">AnalogRewind</lefttrigger>
+      <right hotkey="back">SaveSlotIncrease</right>
+      <left hotkey="back">SaveSlotDecrease</left>
+      <leftstick direction="left" hotkey="back">SaveSlotDecrease</leftstick>
+      <leftstick direction="right" hotkey="back">SaveSlotIncrease</leftstick>
     </joystick>
   </FullscreenGame>
   <FullscreenLiveTV>
     <joystick profile="game.controller.default">
+      <guide>OSD</guide>
       <up>ChannelUp</up>
       <down>ChannelDown</down>
       <left>StepBack</left>
@@ -106,6 +166,7 @@
   </FullscreenLiveTV>
   <FullscreenRadio>
     <joystick profile="game.controller.default">
+      <guide>OSD</guide>
       <up>ChannelUp</up>
       <down>ChannelDown</down>
       <left>StepBack</left>
@@ -146,8 +207,10 @@
       <righttrigger>AnalogFastForward</righttrigger>
       <leftbumper>AnalogRewind</leftbumper>
       <rightbumper>AnalogFastForward</rightbumper>
-      <leftstickleft>PreviousPreset</leftstickleft>
-      <leftstickright>NextPreset</leftstickright>
+      <leftstick direction="left">PreviousPreset</leftstick>
+      <leftstick direction="right">NextPreset</leftstick>
+      <leftstick direction="up">noop</leftstick>
+      <leftstick direction="down">noop</leftstick>
     </joystick>
   </Visualisation>
   <MusicOSD>
@@ -172,10 +235,10 @@
       <down>ZoomOut</down>
       <left>PreviousPicture</left>
       <right>NextPicture</right>
-      <leftstickleft>AnalogMoveX</leftstickleft>
-      <leftstickright>AnalogMoveX</leftstickright>
-      <leftstickup>AnalogMoveY</leftstickup>
-      <leftstickdown>AnalogMoveY</leftstickdown>
+      <leftstick direction="left">AnalogMoveX</leftstick>
+      <leftstick direction="right">AnalogMoveX</leftstick>
+      <leftstick direction="up">AnalogMoveY</leftstick>
+      <leftstick direction="down">AnalogMoveY</leftstick>
       <lefttrigger>ZoomOut</lefttrigger>
       <righttrigger>ZoomIn</righttrigger>
     </joystick>
@@ -233,6 +296,7 @@
   </VideoPlaylist>
   <VirtualKeyboard>
     <joystick profile="game.controller.default">
+      <a>Shift</a>
       <b>BackSpace</b>
       <y>Symbols</y>
       <leftbumper>Shift</leftbumper>