Improved keymap for XBOX 360 Wireless controller

1 files changed, 270 insertions, 72 deletions

diff --git a/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml b/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
index 8b2214420c..01cb2841f9 100644
--- a/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
+++ b/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
@@ -4,17 +4,18 @@
 <!-- used in the current window's section.  Note that there is only handling                       -->
 <!-- for a single action per button at this stage.                                                 -->
 
-<!-- The format of a mapping is:                 -->
-<!--    <device name="name">                     -->
-<!--      <button id="x">action</button>         -->
-<!--      <axis id="x" limit="y">action</axis>   -->
-<!--    </device>                                -->
+<!-- The format of a mapping is:                                -->
+<!--    <device name="name">                                    -->
+<!--      <button id="x">action</button>                        -->
+<!--      <axis id="x" limit="y">action</axis>                  -->
+<!--      <hat id="1" position="left">action</hat>              -->
+<!--    </device>                                               -->
 
 <!-- Note that the action can be a built-in function.           -->
 <!-- eg <button id="x">XBMC.ActivateWindow(Home)</button>       -->
 <!-- would automatically go to Home on the press of button 'x'. -->
 
-<!-- Joystick Name: Xbox 360 Wireless Receiver -->
+<!-- Joystick Name: Xbox 360 Wireless Receiver                  -->
 
 <!-- Button Mappings:                    -->
 <!--                                     -->
@@ -47,6 +48,17 @@
 <!-- 5               Right Stick U/D  -->
 <!-- 6               Right Trigger    -->
 
+<!-- Hat Mappings for some drivers:   -->
+<!--                                  -->
+<!-- ID  Position    Button           -->
+<!--                                  -->
+<!-- 1   up          D-Pad Up         -->
+<!-- 1   down        D-Pad Down       -->
+<!-- 1   left        D-Pad Left       -->
+<!-- 1   right       D-Pad Right      -->
+
+
+
 <keymap>
   <global>
     <joystick name="Xbox 360 Wireless Receiver">
@@ -55,32 +67,43 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
+      <!-- A selects. B goes back. X gets context menu. Y goes fullscreen and back. -->
       <button id="1">Select</button>
       <button id="2">Back</button>
-      <button id="3">FullScreen</button>
-      <button id="4">ContextMenu</button>
-      <button id="5">Info</button>
-      <button id="6">Highlight</button>
-      <button id="7">XBMC.ActivateWindow(shutdownmenu)</button>
+      <button id="3">ContextMenu</button>
+      <button id="4">FullScreen</button>
+      <!--Left Shoulder Queues videos. Right shoulder displays the current queue. -->
+      <button id="5">Queue</button>
+      <button id="6">Playlist</button>
+      <button id="7">PreviousMenu</button>
       <button id="8">XBMC.ActivateWindow(Home)</button>
+      <!-- Left stick click activates the shutdown menu. -->
+      <button id="9">XBMC.ActivateWindow(ShutdownMenu)</button>
+      <button id="10">XBMC.ActivateWindow(PlayerControls)</button>
       <button id="11">Up</button>
       <button id="12">Down</button>
       <button id="13">Left</button>
       <button id="14">Right</button>
       <button id="15">PreviousMenu</button>
-      <axis id="1" limit="-1">AnalogRewind</axis>
-      <axis id="1" limit="+1">AnalogFastForward</axis>
-      <axis id="2" limit="-1">ScrollUp</axis>
-      <axis id="2" limit="+1">ScrollDown</axis>
-      <axis id="3" limit="0">previousscene</axis>
-      <axis id="4" limit="-1">AnalogSeekBack</axis>
-      <axis id="4" limit="+1">AnalogSeekForward</axis>
+      <axis id="1" limit="-1">AnalogSeekBack</axis>
+      <axis id="1" limit="+1">AnalogSeekForward</axis>
+      <axis id="2" limit="-1">AnalogSeekForward</axis>
+      <axis id="2" limit="+1">AnalogSeekBack</axis>
+      <axis id="3" limit="+1">ScrollUp</axis>
+      <axis id="3" limit="-1">ScrollDown</axis>
+      <!-- Push up on the right stick for volueme up. Push down for volume down. -->
       <axis id="5" limit="-1">VolumeUp</axis>
       <axis id="5" limit="+1">VolumeDown</axis>
-      <axis id="6" limit="0">nextscene</axis>
+      <axis id="4" limit="-1">VolumeDown</axis>
+      <axis id="4" limit="+1">VolumeUp</axis>
+      <hat id="1" position="up">Up</hat>
+      <hat id="1" position="down">Down</hat>
+      <hat id="1" position="left">Left</hat>
+      <hat id="1" position="right">Right</hat>
     </joystick>
   </global>
   <Home>
@@ -90,6 +113,7 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
@@ -103,6 +127,7 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
@@ -116,11 +141,11 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
-      <button id="2">Back</button>
-      <button id="3">Delete</button>
+      <button id="5">Delete</button>
     </joystick>
   </MyMusicPlaylist>
   <MyMusicFiles>
@@ -130,11 +155,10 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
-      <button id="3">Playlist</button>
-      <button id="5">Queue</button>
     </joystick>
   </MyMusicFiles>
   <MyMusicLibrary>
@@ -144,11 +168,10 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
-      <button id="3">Playlist</button>
-      <button id="6">Queue</button>
     </joystick>
   </MyMusicLibrary>
   <FullscreenVideo>
@@ -158,21 +181,40 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
+      <!--
+            A pauses and starts the video.
+            B stops the video.
+            X opens the onscreen display.
+            Y switches in and out of full screen
+            -->
       <button id="1">Pause</button>
       <button id="2">Stop</button>
-      <button id="3">CodecInfo</button>
-      <button id="4">OSD</button>
+      <button id="3">OSD</button>
+      <!--
+            Left shoulder changes aspect ratio.
+            Right shoulder displays info.
+            Right stick also opens the onscreen display.
+            -->
       <button id="5">AspectRatio</button>
       <button id="6">Info</button>
+      <button id="7">SmallStepBack</button>
+      <button id="8">CodecInfo</button>
+      <button id="10">OSD</button>
       <button id="11">BigStepForward</button>
       <button id="12">BigStepBack</button>
       <button id="13">StepBack</button>
       <button id="14">StepForward</button>
-      <axis limit="0" id="3">AnalogRewind</axis>
-      <axis limit="0" id="6">AnalogFastForward</axis>
+      <!-- D-pad does what you'd expect. Triggers fast forward and rewind. Left stick scans forward and back. -->
+      <axis id="3" limit="+1">AnalogRewind</axis>
+      <axis id="3" limit="-1">AnalogFastForward</axis>
+      <hat id="1" position="up">BigStepForward</hat>
+      <hat id="1" position="down">BigStepBack</hat>
+      <hat id="1" position="left">StepBack</hat>
+      <hat id="1" position="right">StepForward</hat>
     </joystick>
   </FullscreenVideo>
   <FullscreenLiveTV>
@@ -182,6 +224,7 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
@@ -189,6 +232,10 @@
       <button id="12">ChannelDown</button>
       <button id="13">PreviousChannelGroup</button>
       <button id="14">NextChannelGroup</button>
+      <hat id="1" position="up">ChannelUp</hat>
+      <hat id="1" position="down">ChannelDown</hat>
+      <hat id="1" position="left">PreviousChannelGroup</hat>
+      <hat id="1" position="right">NextChannelGroup</hat>
     </joystick>
   </FullscreenLiveTV>
   <FullscreenInfo>
@@ -198,14 +245,16 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
-      <button id="2">Back</button>
-      <button id="3">CodecInfo</button>
-      <button id="4">OSD</button>
-      <axis limit="0" id="3">AnalogRewind</axis>
-      <axis limit="0" id="6">AnalogFastForward</axis>
+      <button id="2">Close</button>
+      <button id="3">OSD</button>
+      <button id="6">Close</button>
+      <button id="10">OSD</button>
+      <axis id="3" limit="+1">AnalogRewind</axis>
+      <axis id="3" limit="-1">AnalogFastForward</axis>
     </joystick>
   </FullscreenInfo>
   <PlayerControls>
@@ -215,10 +264,13 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
-      <button id="2">Back</button>
+      <button id="3">Close</button>
+      <button id="9">Close</button>
+      <button id="10">Close</button>
     </joystick>
   </PlayerControls>
   <Visualisation>
@@ -228,21 +280,26 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
       <button id="1">Pause</button>
       <button id="2">Stop</button>
-      <button id="3">CodecInfo</button>
-      <button id="4">XBMC.ActivateWindow(MusicOSD)</button>
+      <button id="3">XBMC.ActivateWindow(MusicOSD)</button>
       <button id="5">XBMC.ActivateWindow(VisualisationPresetList)</button>
       <button id="6">Info</button>
+      <button id="10">XBMC.ActivateWindow(MusicOSD)</button>
       <button id="11">SkipNext</button>
       <button id="12">SkipPrevious</button>
       <button id="13">PreviousPreset</button>
       <button id="14">NextPreset</button>
-      <axis limit="0" id="3">AnalogRewind</axis>
-      <axis limit="0" id="6">AnalogFastForward</axis>
+      <axis id="3" limit="+1">AnalogRewind</axis>
+      <axis id="3" limit="-1">AnalogFastForward</axis>
+      <hat id="1" position="up">SkipNext</hat>
+      <hat id="1" position="down">SkipPrevious</hat>
+      <hat id="1" position="left">PreviousPreset</hat>
+      <hat id="1" position="right">NextPreset</hat>
     </joystick>
   </Visualisation>
   <MusicOSD>
@@ -252,12 +309,13 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
-      <button id="2">Back</button>
-      <button id="3">CodecInfo</button>
+      <button id="3">Close</button>
       <button id="6">Info</button>
+      <button id="10">Close</button>
     </joystick>
   </MusicOSD>
   <VisualisationSettings>
@@ -267,10 +325,11 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
-      <button id="2">Back</button>
+      <button id="2">Close</button>
     </joystick>
   </VisualisationSettings>
   <VisualisationPresetList>
@@ -280,10 +339,11 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
-      <button id="2">Back</button>
+      <button id="2">Close</button>
     </joystick>
   </VisualisationPresetList>
   <SlideShow>
@@ -293,19 +353,27 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
       <button id="1">Pause</button>
       <button id="2">Stop</button>
-      <button id="3">CodecInfo</button>
       <button id="4">ZoomNormal</button>
       <button id="5">Rotate</button>
-      <button id="6">Info</button>
+      <button id="6">CodecInfo</button>
       <button id="11">ZoomIn</button>
       <button id="12">ZoomOut</button>
       <button id="13">PreviousPicture</button>
       <button id="14">NextPicture</button>
+      <axis id="1">AnalogMove</axis>
+      <axis id="2">AnalogMove</axis>
+      <axis id="3" limit="+1">ZoomOut</axis>
+      <axis id="3" limit="-1">ZoomIn</axis>
+      <hat id="1" position="up">ZoomIn</hat>
+      <hat id="1" position="down">ZoomOut</hat>
+      <hat id="1" position="left">PreviousPicture</hat>
+      <hat id="1" position="right">NextPicture</hat>
     </joystick>
   </SlideShow>
   <ScreenCalibration>
@@ -315,12 +383,13 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
       <button id="3">ResetCalibration</button>
-      <button id="11">NextResolution</button>
-      <button id="14">NextCalibration</button>
+      <button id="5">NextResolution</button>
+      <button id="6">NextCalibration</button>
     </joystick>
   </ScreenCalibration>
   <GUICalibration>
@@ -330,12 +399,13 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
       <button id="3">ResetCalibration</button>
-      <button id="11">NextResolution</button>
-      <button id="14">NextCalibration</button>
+      <button id="5">NextResolution</button>
+      <button id="6">NextCalibration</button>
     </joystick>
   </GUICalibration>
   <VideoOSD>
@@ -345,10 +415,12 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
-      <button id="2">Back</button>
+      <button id="3">Close</button>
+      <button id="10">Close</button>
     </joystick>
   </VideoOSD>
   <VideoMenu>
@@ -358,12 +430,12 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
       <button id="2">Stop</button>
-      <button id="3">CodecInfo</button>
-      <button id="4">OSD</button>
+      <button id="3">OSD</button>
       <button id="5">AspectRatio</button>
       <button id="6">Info</button>
     </joystick>
@@ -375,11 +447,12 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
-      <button id="2">Back</button>
       <button id="5">AspectRatio</button>
+      <button id="3">Close</button>
     </joystick>
   </OSDVideoSettings>
   <OSDAudioSettings>
@@ -389,11 +462,12 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
-      <button id="2">Back</button>
       <button id="5">AspectRatio</button>
+      <button id="3">Close</button>
     </joystick>
   </OSDAudioSettings>
   <VideoBookmarks>
@@ -403,11 +477,11 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
-      <button id="2">Back</button>
-      <button id="3">Delete</button>
+      <button id="5">Delete</button>
     </joystick>
   </VideoBookmarks>
   <MyVideoLibrary>
@@ -417,10 +491,10 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
-      <button id="3">Delete</button>
     </joystick>
   </MyVideoLibrary>
   <MyVideoFiles>
@@ -430,11 +504,10 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
-      <button id="3">Playlist</button>
-      <button id="6">Queue</button>
     </joystick>
   </MyVideoFiles>
   <MyVideoPlaylist>
@@ -444,10 +517,10 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
-      <button id="3">Back</button>
       <button id="5">Delete</button>
     </joystick>
   </MyVideoPlaylist>
@@ -458,13 +531,16 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
-      <button id="3">Shift</button>
-      <button id="4">Enter</button>
-      <button id="6">Symbols</button>
-      <button id="15">BackSpace</button>
+      <button id="2">BackSpace</button>
+      <button id="4">Symbols</button>
+      <button id="5">Shift</button>
+      <button id="9">Enter</button>
+      <axis id="3" limit="+1">CursorLeft</axis>
+      <axis id="3" limit="-1">CursorRight</axis>
     </joystick>
   </VirtualKeyboard>
   <ContextMenu>
@@ -474,10 +550,12 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
-      <button id="2">Back</button>
+      <button id="2">Close</button>
+      <button id="6">Close</button>
     </joystick>
   </ContextMenu>
   <Scripts>
@@ -487,12 +565,126 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
-      <button id="3">XBMC.ActivateWindow(ScriptsDebugInfo)</button>
+      <button id="3">Info</button>
     </joystick>
   </Scripts>
+  <Settings>
+    <joystick name="Xbox 360 Wireless Receiver">
+      <altname>Controller (Gamepad for Xbox 360)</altname>
+      <altname>Controller (XBOX 360 For Windows)</altname>
+      <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
+      <altname>Controller (Xbox wireless receiver for windows)</altname>
+      <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
+      <altname>XBOX 360 For Windows</altname>
+      <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
+      <altname>Xbox wireless receiver for windows (Controller)</altname>
+      <button id="2">PreviousMenu</button>
+    </joystick>
+  </Settings>
+  <AddonInformation>
+    <joystick name="Xbox 360 Wireless Receiver">
+      <altname>Controller (Gamepad for Xbox 360)</altname>
+      <altname>Controller (XBOX 360 For Windows)</altname>
+      <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
+      <altname>Controller (Xbox wireless receiver for windows)</altname>
+      <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
+      <altname>XBOX 360 For Windows</altname>
+      <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
+      <altname>Xbox wireless receiver for windows (Controller)</altname>
+      <button id="2">Close</button>
+    </joystick>
+  </AddonInformation>
+  <AddonSettings>
+    <joystick name="Xbox 360 Wireless Receiver">
+      <altname>Controller (Gamepad for Xbox 360)</altname>
+      <altname>Controller (XBOX 360 For Windows)</altname>
+      <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
+      <altname>Controller (Xbox wireless receiver for windows)</altname>
+      <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
+      <altname>XBOX 360 For Windows</altname>
+      <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
+      <altname>Xbox wireless receiver for windows (Controller)</altname>
+      <button id="2">Close</button>
+    </joystick>
+  </AddonSettings>
+  <TextViewer>
+    <joystick name="Xbox 360 Wireless Receiver">
+      <altname>Controller (Gamepad for Xbox 360)</altname>
+      <altname>Controller (XBOX 360 For Windows)</altname>
+      <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
+      <altname>Controller (Xbox wireless receiver for windows)</altname>
+      <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
+      <altname>XBOX 360 For Windows</altname>
+      <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
+      <altname>Xbox wireless receiver for windows (Controller)</altname>
+      <button id="2">Close</button>
+    </joystick>
+  </TextViewer>
+  <shutdownmenu>
+    <joystick name="Xbox 360 Wireless Receiver">
+      <altname>Controller (Gamepad for Xbox 360)</altname>
+      <altname>Controller (XBOX 360 For Windows)</altname>
+      <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
+      <altname>Controller (Xbox wireless receiver for windows)</altname>
+      <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
+      <altname>XBOX 360 For Windows</altname>
+      <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
+      <altname>Xbox wireless receiver for windows (Controller)</altname>
+      <button id="2">PreviousMenu</button>
+      <button id="9">PreviousMenu</button>
+    </joystick>
+  </shutdownmenu>
+  <submenu>
+    <joystick name="Xbox 360 Wireless Receiver">
+      <altname>Controller (Gamepad for Xbox 360)</altname>
+      <altname>Controller (XBOX 360 For Windows)</altname>
+      <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
+      <altname>Controller (Xbox wireless receiver for windows)</altname>
+      <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
+      <altname>XBOX 360 For Windows</altname>
+      <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
+      <altname>Xbox wireless receiver for windows (Controller)</altname>
+      <button id="2">PreviousMenu</button>
+    </joystick>
+  </submenu>
+  <MusicInformation>
+    <joystick name="Xbox 360 Wireless Receiver">
+      <altname>Controller (Gamepad for Xbox 360)</altname>
+      <altname>Controller (XBOX 360 For Windows)</altname>
+      <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
+      <altname>Controller (Xbox wireless receiver for windows)</altname>
+      <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
+      <altname>XBOX 360 For Windows</altname>
+      <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
+      <altname>Xbox wireless receiver for windows (Controller)</altname>
+      <button id="2">Close</button>
+    </joystick>
+  </MusicInformation>
+  <MovieInformation>
+    <joystick name="Xbox 360 Wireless Receiver">
+      <altname>Controller (Gamepad for Xbox 360)</altname>
+      <altname>Controller (XBOX 360 For Windows)</altname>
+      <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
+      <altname>Controller (Xbox wireless receiver for windows)</altname>
+      <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
+      <altname>XBOX 360 For Windows</altname>
+      <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
+      <altname>Xbox wireless receiver for windows (Controller)</altname>
+      <button id="2">Close</button>
+    </joystick>
+  </MovieInformation>
   <NumericInput>
     <joystick name="Xbox 360 Wireless Receiver">
       <altname>Controller (Gamepad for Xbox 360)</altname>
@@ -500,11 +692,12 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
-      <button id="4">Enter</button>
-      <button id="15">BackSpace</button>
+      <button id="2">BackSpace</button>
+      <button id="9">Enter</button>
     </joystick>
   </NumericInput>
   <GamepadInput>
@@ -514,10 +707,11 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
-      <button id="2">Stop</button>
+      <button id="9">Stop</button>
     </joystick>
   </GamepadInput>
   <LockSettings>
@@ -527,10 +721,12 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
-      <button id="2">Back</button>
+      <button id="2">PreviousMenu</button>
+      <button id="9">Close</button>
     </joystick>
   </LockSettings>
   <ProfileSettings>
@@ -540,10 +736,12 @@
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
       <altname>Controller (Xbox wireless receiver for windows)</altname>
       <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
       <altname>XBOX 360 For Windows</altname>
       <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
       <altname>Xbox wireless receiver for windows (Controller)</altname>
-      <button id="2">Back</button>
+      <button id="2">PreviousMenu</button>
+      <button id="9">Close</button>
     </joystick>
   </ProfileSettings>
-</keymap>
+</keymap>
\ No newline at end of file