Skip to content
This repository
Browse code

Merge pull request #1916 from da-anda/keymap-xbox360w2

[keymap] fix broken linux support for the XBOX360 controller
  • Loading branch information...
commit 0224f17b9d90fb2b6ed31acc78da8c460b6826d6 2 parents 45fad54 + 9c71e0c
davilla authored December 10, 2012
715  system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
... ...
@@ -1,5 +1,6 @@
1 1
 <!-- This file contains the mappings for a Microsoft Xbox 360 Controller to actions within XBMC    -->
2  
-
  2
+<!-- The drivers for Linux and Windows do not always match. Mappings for Win32 will be presented   -->
  3
+<!-- first, with Linux alts second.                                                                -->
3 4
 <!-- The <global> section is a fall through - they will only be used if the button is not          -->
4 5
 <!-- used in the current window's section.  Note that there is only handling                       -->
5 6
 <!-- for a single action per button at this stage.                                                 -->
@@ -17,25 +18,36 @@
17 18
 
18 19
 <!-- Joystick Name: Xbox 360 Wireless Receiver                  -->
19 20
 
20  
-<!-- Button Mappings:                    -->
21  
-<!--                                     -->
22  
-<!-- ID              Button              -->
23  
-<!--                                     -->
24  
-<!-- 1               A                   -->
25  
-<!-- 2               B                   -->
26  
-<!-- 3               X                   -->
27  
-<!-- 4               Y                   -->
28  
-<!-- 5               LB                  -->
29  
-<!-- 6               RB                  -->
30  
-<!-- 7               Start               -->
31  
-<!-- 8               Guide               -->
32  
-<!-- 9               Left Stick Button   -->
33  
-<!-- 10              Right Stick Button  -->
34  
-<!-- 11              D-Pad Up            -->
35  
-<!-- 12              D-Pad Down          -->
36  
-<!-- 13              D-Pad Left          -->
37  
-<!-- 14              D-Pad Right         -->
38  
-<!-- 15              Back                -->
  21
+<!-- Button Mappings in Windows:               -->
  22
+<!--                                           -->
  23
+<!-- ID              Button                    -->
  24
+<!--                                           -->
  25
+<!-- 1               A                         -->
  26
+<!-- 2               B                         -->
  27
+<!-- 3               X                         -->
  28
+<!-- 4               Y                         -->
  29
+<!-- 5               Left Sholder              -->
  30
+<!-- 6               Right Sholder             -->
  31
+<!-- 7               Back                      -->
  32
+<!-- 8               Start                     -->
  33
+<!-- 9               Left Stick Button         -->
  34
+<!-- 10              Right Stick Button        -->
  35
+<!-- 11              D-Pad Up                  -->
  36
+<!-- 12              D-Pad Down                -->
  37
+<!-- 13              D-Pad Left                -->
  38
+<!-- 14              D-Pad Right               -->
  39
+<!-- 15              Back                      -->
  40
+
  41
+<!-- Linux alterations for default Xpad Driver -->
  42
+<!-- 8               Does not map              -->
  43
+<!-- 9               Guide                     -->
  44
+<!-- 10              Left Stick Button         -->
  45
+<!-- 11              Right Stick Button        -->
  46
+<!-- 12              D-Pad Left                -->
  47
+<!-- 13              D-Pad Right               -->
  48
+<!-- 14              D-Pad Up                  -->
  49
+<!-- 15              D-Pad Down                -->
  50
+<!--                 Triggers do no map!       -->
39 51
 
40 52
 <!-- Axis Mappings:                   -->
41 53
 <!--                                  -->
@@ -61,8 +73,7 @@
61 73
 
62 74
 <keymap>
63 75
   <global>
64  
-    <joystick name="Xbox 360 Wireless Receiver">
65  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  76
+    <joystick name="Controller (Gamepad for Xbox 360)">
66 77
       <altname>Controller (XBOX 360 For Windows)</altname>
67 78
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
68 79
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -105,10 +116,48 @@
105 116
       <hat id="1" position="left">Left</hat>
106 117
       <hat id="1" position="right">Right</hat>
107 118
     </joystick>
  119
+    <joystick name="Microsoft X-Box 360 pad">
  120
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  121
+      <altname>Generic X-Box pad</altname>
  122
+      <altname>Logitech Chillstream Controller</altname>
  123
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  124
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  125
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  126
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  127
+      <altname>Xbox 360 Wireless Receiver</altname>
  128
+      <button id="1">Select</button>
  129
+      <button id="2">Back</button>
  130
+      <button id="3">ContextMenu</button>
  131
+      <button id="4">FullScreen</button>
  132
+      <button id="5">Queue</button>
  133
+      <button id="6">Playlist</button>
  134
+      <button id="7">PreviousMenu</button>
  135
+      <button id="8">XBMC.ActivateWindow(Home)</button>
  136
+      <button id="9">XBMC.ActivateWindow(Home)</button>
  137
+      <button id="10">XBMC.ActivateWindow(ShutdownMenu)</button>
  138
+      <button id="11">XBMC.ActivateWindow(PlayerControls)</button>
  139
+      <button id="12">Left</button>
  140
+      <button id="13">Right</button>
  141
+      <button id="14">Up</button>
  142
+      <button id="15">Down</button>
  143
+      <axis id="1" limit="-1">AnalogSeekBack</axis>
  144
+      <axis id="1" limit="+1">AnalogSeekForward</axis>
  145
+      <axis id="2" limit="-1">AnalogSeekForward</axis>
  146
+      <axis id="2" limit="+1">AnalogSeekBack</axis>
  147
+      <axis id="4" limit="-1">VolumeDown</axis>
  148
+      <axis id="4" limit="+1">VolumeUp</axis>
  149
+      <axis id="5" limit="-1">VolumeUp</axis>
  150
+      <axis id="5" limit="+1">VolumeDown</axis> <!--
  151
+      <axis id="6" limit="-1">ScrollUp</axis>
  152
+      <axis id="6" limit="+1">ScrollDown</axis> -->
  153
+      <hat id="1" position="up">Up</hat>
  154
+      <hat id="1" position="down">Down</hat>
  155
+      <hat id="1" position="left">Left</hat>
  156
+      <hat id="1" position="right">Right</hat>
  157
+    </joystick>
108 158
   </global>
109 159
   <Home>
110  
-    <joystick name="Xbox 360 Wireless Receiver">
111  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  160
+    <joystick name="Controller (Gamepad for Xbox 360)">
112 161
       <altname>Controller (XBOX 360 For Windows)</altname>
113 162
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
114 163
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -119,10 +168,20 @@
119 168
       <altname>Xbox wireless receiver for windows (Controller)</altname>
120 169
       <button id="8">XBMC.Skin.ToggleSetting(HomeViewToggle)</button>
121 170
     </joystick>
  171
+    <joystick name="Microsoft X-Box 360 pad">
  172
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  173
+      <altname>Generic X-Box pad</altname>
  174
+      <altname>Logitech Chillstream Controller</altname>
  175
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  176
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  177
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  178
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  179
+      <altname>Xbox 360 Wireless Receiver</altname>
  180
+      <button id="8">XBMC.Skin.ToggleSetting(HomeViewToggle)</button>
  181
+    </joystick>
122 182
   </Home>
123 183
   <MyFiles>
124  
-    <joystick name="Xbox 360 Wireless Receiver">
125  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  184
+    <joystick name="Controller (Gamepad for Xbox 360)">
126 185
       <altname>Controller (XBOX 360 For Windows)</altname>
127 186
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
128 187
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -133,10 +192,20 @@
133 192
       <altname>Xbox wireless receiver for windows (Controller)</altname>
134 193
       <button id="6">Highlight</button>
135 194
     </joystick>
  195
+    <joystick name="Microsoft X-Box 360 pad">
  196
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  197
+      <altname>Generic X-Box pad</altname>
  198
+      <altname>Logitech Chillstream Controller</altname>
  199
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  200
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  201
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  202
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  203
+      <altname>Xbox 360 Wireless Receiver</altname>
  204
+      <button id="6">Highlight</button>
  205
+    </joystick>
136 206
   </MyFiles>
137 207
   <MyMusicPlaylist>
138  
-    <joystick name="Xbox 360 Wireless Receiver">
139  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  208
+    <joystick name="Controller (Gamepad for Xbox 360)">
140 209
       <altname>Controller (XBOX 360 For Windows)</altname>
141 210
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
142 211
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -147,36 +216,25 @@
147 216
       <altname>Xbox wireless receiver for windows (Controller)</altname>
148 217
       <button id="5">Delete</button>
149 218
     </joystick>
  219
+    <joystick name="Microsoft X-Box 360 pad">
  220
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  221
+      <altname>Generic X-Box pad</altname>
  222
+      <altname>Logitech Chillstream Controller</altname>
  223
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  224
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  225
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  226
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  227
+      <altname>Xbox 360 Wireless Receiver</altname>
  228
+      <button id="5">Delete</button>
  229
+    </joystick>
150 230
   </MyMusicPlaylist>
151 231
   <MyMusicFiles>
152  
-    <joystick name="Xbox 360 Wireless Receiver">
153  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
154  
-      <altname>Controller (XBOX 360 For Windows)</altname>
155  
-      <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
156  
-      <altname>Controller (Xbox wireless receiver for windows)</altname>
157  
-      <altname>XBOX 360 For Windows (Controller)</altname>
158  
-      <altname>Xbox 360 Wireless Controller</altname>
159  
-      <altname>XBOX 360 For Windows</altname>
160  
-      <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
161  
-      <altname>Xbox wireless receiver for windows (Controller)</altname>
162  
-    </joystick>
163 232
   </MyMusicFiles>
164 233
   <MyMusicLibrary>
165  
-    <joystick name="Xbox 360 Wireless Receiver">
166  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
167  
-      <altname>Controller (XBOX 360 For Windows)</altname>
168  
-      <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
169  
-      <altname>Controller (Xbox wireless receiver for windows)</altname>
170  
-      <altname>XBOX 360 For Windows (Controller)</altname>
171  
-      <altname>Xbox 360 Wireless Controller</altname>
172  
-      <altname>XBOX 360 For Windows</altname>
173  
-      <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
174  
-      <altname>Xbox wireless receiver for windows (Controller)</altname>
175  
-    </joystick>
176 234
   </MyMusicLibrary>
177 235
   <FullscreenVideo>
178  
-    <joystick name="Xbox 360 Wireless Receiver">
179  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  236
+    <joystick name="Controller (Gamepad for Xbox 360)">
  237
+      
180 238
       <altname>Controller (XBOX 360 For Windows)</altname>
181 239
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
182 240
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -216,10 +274,39 @@
216 274
       <hat id="1" position="left">StepBack</hat>
217 275
       <hat id="1" position="right">StepForward</hat>
218 276
     </joystick>
  277
+    <joystick name="Microsoft X-Box 360 pad">
  278
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  279
+      <altname>Generic X-Box pad</altname>
  280
+      <altname>Logitech Chillstream Controller</altname>
  281
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  282
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  283
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  284
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  285
+      <altname>Xbox 360 Wireless Receiver</altname>
  286
+      <button id="1">Pause</button>
  287
+      <button id="2">Stop</button>
  288
+      <button id="3">OSD</button>
  289
+      <button id="5">AspectRatio</button>
  290
+      <button id="6">Info</button>
  291
+      <button id="7">SmallStepBack</button>
  292
+      <button id="8">CodecInfo</button>
  293
+      <button id="9">XBMC.ActivateWindow(Home)</button>  <!-- guide -->
  294
+      <button id="10">XBMC.ActivateWindow(ShutdownMenu)</button>  <!-- left stick -->
  295
+      <button id="11">OSD</button>  <!-- right stick -->
  296
+      <button id="12">StepBack</button>
  297
+      <button id="13">StepForward</button>
  298
+      <button id="14">BigStepForward</button>
  299
+      <button id="15">BigStepBack</button> <!--
  300
+      <axis id="6" limit="-1">AnalogRewind</axis>
  301
+      <axis id="6" limit="+1">AnalogFastForward</axis> -->
  302
+      <hat id="1" position="up">BigStepForward</hat>
  303
+      <hat id="1" position="down">BigStepBack</hat>
  304
+      <hat id="1" position="left">StepBack</hat>
  305
+      <hat id="1" position="right">StepForward</hat>
  306
+    </joystick>
219 307
   </FullscreenVideo>
220 308
   <FullscreenLiveTV>
221  
-    <joystick name="Xbox 360 Wireless Receiver">
222  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  309
+    <joystick name="Controller (Gamepad for Xbox 360)">
223 310
       <altname>Controller (XBOX 360 For Windows)</altname>
224 311
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
225 312
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -237,10 +324,27 @@
237 324
       <hat id="1" position="left">PreviousChannelGroup</hat>
238 325
       <hat id="1" position="right">NextChannelGroup</hat>
239 326
     </joystick>
  327
+    <joystick name="Microsoft X-Box 360 pad">
  328
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  329
+      <altname>Generic X-Box pad</altname>
  330
+      <altname>Logitech Chillstream Controller</altname>
  331
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  332
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  333
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  334
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  335
+      <altname>Xbox 360 Wireless Receiver</altname>
  336
+      <button id="12">PreviousChannelGroup</button>
  337
+      <button id="13">NextChannelGroup</button>
  338
+      <button id="14">ChannelUp</button>
  339
+      <button id="15">ChannelDown</button>
  340
+      <hat id="1" position="up">ChannelUp</hat>
  341
+      <hat id="1" position="down">ChannelDown</hat>
  342
+      <hat id="1" position="left">PreviousChannelGroup</hat>
  343
+      <hat id="1" position="right">NextChannelGroup</hat>
  344
+    </joystick>
240 345
   </FullscreenLiveTV>
241 346
   <FullscreenInfo>
242  
-    <joystick name="Xbox 360 Wireless Receiver">
243  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  347
+    <joystick name="Controller (Gamepad for Xbox 360)">
244 348
       <altname>Controller (XBOX 360 For Windows)</altname>
245 349
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
246 350
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -256,10 +360,25 @@
256 360
       <axis id="3" limit="+1">AnalogRewind</axis>
257 361
       <axis id="3" limit="-1">AnalogFastForward</axis>
258 362
     </joystick>
  363
+    <joystick name="Microsoft X-Box 360 pad">
  364
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  365
+      <altname>Generic X-Box pad</altname>
  366
+      <altname>Logitech Chillstream Controller</altname>
  367
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  368
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  369
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  370
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  371
+      <altname>Xbox 360 Wireless Receiver</altname>
  372
+      <button id="2">Close</button>
  373
+      <button id="3">OSD</button>
  374
+      <button id="6">Close</button>
  375
+      <button id="11">OSD</button> <!--
  376
+      <axis id="6" limit="+1">AnalogRewind</axis>
  377
+      <axis id="6" limit="-1">AnalogFastForward</axis> -->
  378
+    </joystick>
259 379
   </FullscreenInfo>
260 380
   <PlayerControls>
261  
-    <joystick name="Xbox 360 Wireless Receiver">
262  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  381
+    <joystick name="Controller (Gamepad for Xbox 360)">
263 382
       <altname>Controller (XBOX 360 For Windows)</altname>
264 383
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
265 384
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -272,10 +391,22 @@
272 391
       <button id="9">Close</button>
273 392
       <button id="10">Close</button>
274 393
     </joystick>
  394
+    <joystick name="Microsoft X-Box 360 pad">
  395
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  396
+      <altname>Generic X-Box pad</altname>
  397
+      <altname>Logitech Chillstream Controller</altname>
  398
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  399
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  400
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  401
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  402
+      <altname>Xbox 360 Wireless Receiver</altname>
  403
+      <button id="3">Close</button>
  404
+      <button id="10">Close</button>
  405
+      <button id="11">Close</button>
  406
+    </joystick>
275 407
   </PlayerControls>
276 408
   <Visualisation>
277  
-    <joystick name="Xbox 360 Wireless Receiver">
278  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  409
+    <joystick name="Controller (Gamepad for Xbox 360)">
279 410
       <altname>Controller (XBOX 360 For Windows)</altname>
280 411
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
281 412
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -301,10 +432,35 @@
301 432
       <hat id="1" position="left">PreviousPreset</hat>
302 433
       <hat id="1" position="right">NextPreset</hat>
303 434
     </joystick>
  435
+    <joystick name="Microsoft X-Box 360 pad">
  436
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  437
+      <altname>Generic X-Box pad</altname>
  438
+      <altname>Logitech Chillstream Controller</altname>
  439
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  440
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  441
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  442
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  443
+      <altname>Xbox 360 Wireless Receiver</altname>
  444
+      <button id="1">Pause</button>
  445
+      <button id="2">Stop</button>
  446
+      <button id="3">XBMC.ActivateWindow(MusicOSD)</button>
  447
+      <button id="5">XBMC.ActivateWindow(VisualisationPresetList)</button>
  448
+      <button id="6">Info</button>
  449
+      <button id="11">XBMC.ActivateWindow(MusicOSD)</button>
  450
+      <button id="12">PreviousPreset</button>
  451
+      <button id="13">NextPreset</button>
  452
+      <button id="14">SkipPrevious</button>
  453
+      <button id="15">SkipNext</button> <!--
  454
+      <axis id="6" limit="-1">AnalogRewind</axis>
  455
+      <axis id="6" limit="+1">AnalogFastForward</axis> -->
  456
+      <hat id="1" position="up">SkipNext</hat>
  457
+      <hat id="1" position="down">SkipPrevious</hat>
  458
+      <hat id="1" position="left">PreviousPreset</hat>
  459
+      <hat id="1" position="right">NextPreset</hat>
  460
+    </joystick>
304 461
   </Visualisation>
305 462
   <MusicOSD>
306  
-    <joystick name="Xbox 360 Wireless Receiver">
307  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  463
+    <joystick name="Controller (Gamepad for Xbox 360)">
308 464
       <altname>Controller (XBOX 360 For Windows)</altname>
309 465
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
310 466
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -317,10 +473,22 @@
317 473
       <button id="6">Info</button>
318 474
       <button id="10">Close</button>
319 475
     </joystick>
  476
+    <joystick name="Microsoft X-Box 360 pad">
  477
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  478
+      <altname>Generic X-Box pad</altname>
  479
+      <altname>Logitech Chillstream Controller</altname>
  480
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  481
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  482
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  483
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  484
+      <altname>Xbox 360 Wireless Receiver</altname>
  485
+      <button id="3">Close</button>
  486
+      <button id="6">Info</button>
  487
+      <button id="11">Close</button>
  488
+    </joystick>
320 489
   </MusicOSD>
321 490
   <VisualisationSettings>
322  
-    <joystick name="Xbox 360 Wireless Receiver">
323  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  491
+    <joystick name="Controller (Gamepad for Xbox 360)">
324 492
       <altname>Controller (XBOX 360 For Windows)</altname>
325 493
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
326 494
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -331,10 +499,20 @@
331 499
       <altname>Xbox wireless receiver for windows (Controller)</altname>
332 500
       <button id="2">Close</button>
333 501
     </joystick>
  502
+    <joystick name="Microsoft X-Box 360 pad">
  503
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  504
+      <altname>Generic X-Box pad</altname>
  505
+      <altname>Logitech Chillstream Controller</altname>
  506
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  507
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  508
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  509
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  510
+      <altname>Xbox 360 Wireless Receiver</altname>
  511
+      <button id="2">Close</button>
  512
+    </joystick>
334 513
   </VisualisationSettings>
335 514
   <VisualisationPresetList>
336  
-    <joystick name="Xbox 360 Wireless Receiver">
337  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  515
+    <joystick name="Controller (Gamepad for Xbox 360)">
338 516
       <altname>Controller (XBOX 360 For Windows)</altname>
339 517
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
340 518
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -345,10 +523,20 @@
345 523
       <altname>Xbox wireless receiver for windows (Controller)</altname>
346 524
       <button id="2">Close</button>
347 525
     </joystick>
  526
+    <joystick name="Microsoft X-Box 360 pad">
  527
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  528
+      <altname>Generic X-Box pad</altname>
  529
+      <altname>Logitech Chillstream Controller</altname>
  530
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  531
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  532
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  533
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  534
+      <altname>Xbox 360 Wireless Receiver</altname>
  535
+      <button id="2">Close</button>
  536
+    </joystick>
348 537
   </VisualisationPresetList>
349 538
   <SlideShow>
350  
-    <joystick name="Xbox 360 Wireless Receiver">
351  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  539
+    <joystick name="Controller (Gamepad for Xbox 360)">
352 540
       <altname>Controller (XBOX 360 For Windows)</altname>
353 541
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
354 542
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -375,10 +563,36 @@
375 563
       <hat id="1" position="left">PreviousPicture</hat>
376 564
       <hat id="1" position="right">NextPicture</hat>
377 565
     </joystick>
  566
+    <joystick name="Microsoft X-Box 360 pad">
  567
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  568
+      <altname>Generic X-Box pad</altname>
  569
+      <altname>Logitech Chillstream Controller</altname>
  570
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  571
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  572
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  573
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  574
+      <altname>Xbox 360 Wireless Receiver</altname>
  575
+      <button id="1">Pause</button>
  576
+      <button id="2">Stop</button>
  577
+      <button id="4">ZoomNormal</button>
  578
+      <button id="5">Rotate</button>
  579
+      <button id="6">CodecInfo</button>
  580
+      <button id="12">PreviousPicture</button>
  581
+      <button id="13">NextPicture</button>
  582
+      <button id="14">ZoomIn</button>
  583
+      <button id="15">ZoomOut</button>
  584
+      <axis id="1">AnalogMove</axis>
  585
+      <axis id="2">AnalogMove</axis>  <!--
  586
+      <axis id="6" limit="+1">ZoomOut</axis>
  587
+      <axis id="6" limit="-1">ZoomIn</axis> -->
  588
+      <hat id="1" position="up">ZoomIn</hat>
  589
+      <hat id="1" position="down">ZoomOut</hat>
  590
+      <hat id="1" position="left">PreviousPicture</hat>
  591
+      <hat id="1" position="right">NextPicture</hat>
  592
+    </joystick>
378 593
   </SlideShow>
379 594
   <ScreenCalibration>
380  
-    <joystick name="Xbox 360 Wireless Receiver">
381  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  595
+    <joystick name="Controller (Gamepad for Xbox 360)">
382 596
       <altname>Controller (XBOX 360 For Windows)</altname>
383 597
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
384 598
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -391,10 +605,22 @@
391 605
       <button id="5">NextResolution</button>
392 606
       <button id="6">NextCalibration</button>
393 607
     </joystick>
  608
+    <joystick name="Microsoft X-Box 360 pad">
  609
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  610
+      <altname>Generic X-Box pad</altname>
  611
+      <altname>Logitech Chillstream Controller</altname>
  612
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  613
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  614
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  615
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  616
+      <altname>Xbox 360 Wireless Receiver</altname>
  617
+      <button id="3">ResetCalibration</button>
  618
+      <button id="5">NextResolution</button>
  619
+      <button id="6">NextCalibration</button>
  620
+    </joystick>
394 621
   </ScreenCalibration>
395 622
   <GUICalibration>
396  
-    <joystick name="Xbox 360 Wireless Receiver">
397  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  623
+    <joystick name="Controller (Gamepad for Xbox 360)">
398 624
       <altname>Controller (XBOX 360 For Windows)</altname>
399 625
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
400 626
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -407,10 +633,22 @@
407 633
       <button id="5">NextResolution</button>
408 634
       <button id="6">NextCalibration</button>
409 635
     </joystick>
  636
+    <joystick name="Microsoft X-Box 360 pad">
  637
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  638
+      <altname>Generic X-Box pad</altname>
  639
+      <altname>Logitech Chillstream Controller</altname>
  640
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  641
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  642
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  643
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  644
+      <altname>Xbox 360 Wireless Receiver</altname>
  645
+      <button id="3">ResetCalibration</button>
  646
+      <button id="5">NextResolution</button>
  647
+      <button id="6">NextCalibration</button>
  648
+    </joystick>
410 649
   </GUICalibration>
411 650
   <VideoOSD>
412  
-    <joystick name="Xbox 360 Wireless Receiver">
413  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  651
+    <joystick name="Controller (Gamepad for Xbox 360)">
414 652
       <altname>Controller (XBOX 360 For Windows)</altname>
415 653
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
416 654
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -422,10 +660,21 @@
422 660
       <button id="3">Close</button>
423 661
       <button id="10">Close</button>
424 662
     </joystick>
  663
+    <joystick name="Microsoft X-Box 360 pad">
  664
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  665
+      <altname>Generic X-Box pad</altname>
  666
+      <altname>Logitech Chillstream Controller</altname>
  667
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  668
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  669
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  670
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  671
+      <altname>Xbox 360 Wireless Receiver</altname>
  672
+      <button id="3">Close</button>
  673
+      <button id="11">Close</button>
  674
+    </joystick>
425 675
   </VideoOSD>
426 676
   <VideoMenu>
427  
-    <joystick name="Xbox 360 Wireless Receiver">
428  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  677
+    <joystick name="Controller (Gamepad for Xbox 360)">
429 678
       <altname>Controller (XBOX 360 For Windows)</altname>
430 679
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
431 680
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -439,10 +688,23 @@
439 688
       <button id="5">AspectRatio</button>
440 689
       <button id="6">Info</button>
441 690
     </joystick>
  691
+    <joystick name="Microsoft X-Box 360 pad">
  692
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  693
+      <altname>Generic X-Box pad</altname>
  694
+      <altname>Logitech Chillstream Controller</altname>
  695
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  696
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  697
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  698
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  699
+      <altname>Xbox 360 Wireless Receiver</altname>
  700
+      <button id="2">Stop</button>
  701
+      <button id="3">OSD</button>
  702
+      <button id="5">AspectRatio</button>
  703
+      <button id="6">Info</button>
  704
+    </joystick>
442 705
   </VideoMenu>
443 706
   <OSDVideoSettings>
444  
-    <joystick name="Xbox 360 Wireless Receiver">
445  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  707
+    <joystick name="Controller (Gamepad for Xbox 360)">
446 708
       <altname>Controller (XBOX 360 For Windows)</altname>
447 709
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
448 710
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -454,10 +716,21 @@
454 716
       <button id="5">AspectRatio</button>
455 717
       <button id="3">Close</button>
456 718
     </joystick>
  719
+    <joystick name="Microsoft X-Box 360 pad">
  720
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  721
+      <altname>Generic X-Box pad</altname>
  722
+      <altname>Logitech Chillstream Controller</altname>
  723
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  724
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  725
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  726
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  727
+      <altname>Xbox 360 Wireless Receiver</altname>
  728
+      <button id="5">AspectRatio</button>
  729
+      <button id="3">Close</button>
  730
+    </joystick>
457 731
   </OSDVideoSettings>
458 732
   <OSDAudioSettings>
459  
-    <joystick name="Xbox 360 Wireless Receiver">
460  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  733
+    <joystick name="Controller (Gamepad for Xbox 360)">
461 734
       <altname>Controller (XBOX 360 For Windows)</altname>
462 735
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
463 736
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -469,10 +742,21 @@
469 742
       <button id="5">AspectRatio</button>
470 743
       <button id="3">Close</button>
471 744
     </joystick>
  745
+    <joystick name="Microsoft X-Box 360 pad">
  746
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  747
+      <altname>Generic X-Box pad</altname>
  748
+      <altname>Logitech Chillstream Controller</altname>
  749
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  750
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  751
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  752
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  753
+      <altname>Xbox 360 Wireless Receiver</altname>
  754
+      <button id="5">AspectRatio</button>
  755
+      <button id="3">Close</button>
  756
+    </joystick>
472 757
   </OSDAudioSettings>
473 758
   <VideoBookmarks>
474  
-    <joystick name="Xbox 360 Wireless Receiver">
475  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  759
+    <joystick name="Controller (Gamepad for Xbox 360)">
476 760
       <altname>Controller (XBOX 360 For Windows)</altname>
477 761
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
478 762
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -483,36 +767,24 @@
483 767
       <altname>Xbox wireless receiver for windows (Controller)</altname>
484 768
       <button id="5">Delete</button>
485 769
     </joystick>
  770
+    <joystick name="Microsoft X-Box 360 pad">
  771
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  772
+      <altname>Generic X-Box pad</altname>
  773
+      <altname>Logitech Chillstream Controller</altname>
  774
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  775
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  776
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  777
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  778
+      <altname>Xbox 360 Wireless Receiver</altname>
  779
+      <button id="5">Delete</button>
  780
+    </joystick>
486 781
   </VideoBookmarks>
487 782
   <MyVideoLibrary>
488  
-    <joystick name="Xbox 360 Wireless Receiver">
489  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
490  
-      <altname>Controller (XBOX 360 For Windows)</altname>
491  
-      <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
492  
-      <altname>Controller (Xbox wireless receiver for windows)</altname>
493  
-      <altname>XBOX 360 For Windows (Controller)</altname>
494  
-      <altname>Xbox 360 Wireless Controller</altname>
495  
-      <altname>XBOX 360 For Windows</altname>
496  
-      <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
497  
-      <altname>Xbox wireless receiver for windows (Controller)</altname>
498  
-    </joystick>
499 783
   </MyVideoLibrary>
500 784
   <MyVideoFiles>
501  
-    <joystick name="Xbox 360 Wireless Receiver">
502  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
503  
-      <altname>Controller (XBOX 360 For Windows)</altname>
504  
-      <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
505  
-      <altname>Controller (Xbox wireless receiver for windows)</altname>
506  
-      <altname>XBOX 360 For Windows (Controller)</altname>
507  
-      <altname>Xbox 360 Wireless Controller</altname>
508  
-      <altname>XBOX 360 For Windows</altname>
509  
-      <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
510  
-      <altname>Xbox wireless receiver for windows (Controller)</altname>
511  
-    </joystick>
512 785
   </MyVideoFiles>
513 786
   <MyVideoPlaylist>
514  
-    <joystick name="Xbox 360 Wireless Receiver">
515  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  787
+    <joystick name="Controller (Gamepad for Xbox 360)">
516 788
       <altname>Controller (XBOX 360 For Windows)</altname>
517 789
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
518 790
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -523,10 +795,20 @@
523 795
       <altname>Xbox wireless receiver for windows (Controller)</altname>
524 796
       <button id="5">Delete</button>
525 797
     </joystick>
  798
+    <joystick name="Microsoft X-Box 360 pad">
  799
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  800
+      <altname>Generic X-Box pad</altname>
  801
+      <altname>Logitech Chillstream Controller</altname>
  802
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  803
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  804
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  805
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  806
+      <altname>Xbox 360 Wireless Receiver</altname>
  807
+      <button id="5">Delete</button>
  808
+    </joystick>
526 809
   </MyVideoPlaylist>
527 810
   <VirtualKeyboard>
528  
-    <joystick name="Xbox 360 Wireless Receiver">
529  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  811
+    <joystick name="Controller (Gamepad for Xbox 360)">
530 812
       <altname>Controller (XBOX 360 For Windows)</altname>
531 813
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
532 814
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -542,10 +824,25 @@
542 824
       <axis id="3" limit="+1">CursorLeft</axis>
543 825
       <axis id="3" limit="-1">CursorRight</axis>
544 826
     </joystick>
  827
+    <joystick name="Microsoft X-Box 360 pad">
  828
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  829
+      <altname>Generic X-Box pad</altname>
  830
+      <altname>Logitech Chillstream Controller</altname>
  831
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  832
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  833
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  834
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  835
+      <altname>Xbox 360 Wireless Receiver</altname>
  836
+      <button id="2">BackSpace</button>
  837
+      <button id="4">Symbols</button>
  838
+      <button id="5">Shift</button>
  839
+      <button id="10">Enter</button><!--
  840
+      <axis id="6" limit="+1">CursorLeft</axis>
  841
+      <axis id="6" limit="-1">CursorRight</axis> -->
  842
+    </joystick>
545 843
   </VirtualKeyboard>
546 844
   <ContextMenu>
547  
-    <joystick name="Xbox 360 Wireless Receiver">
548  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  845
+    <joystick name="Controller (Gamepad for Xbox 360)">
549 846
       <altname>Controller (XBOX 360 For Windows)</altname>
550 847
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
551 848
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -557,10 +854,21 @@
557 854
       <button id="2">Close</button>
558 855
       <button id="6">Close</button>
559 856
     </joystick>
  857
+    <joystick name="Microsoft X-Box 360 pad">
  858
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  859
+      <altname>Generic X-Box pad</altname>
  860
+      <altname>Logitech Chillstream Controller</altname>
  861
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  862
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  863
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  864
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  865
+      <altname>Xbox 360 Wireless Receiver</altname>
  866
+      <button id="2">Close</button>
  867
+      <button id="6">Close</button>
  868
+    </joystick>
560 869
   </ContextMenu>
561 870
   <Scripts>
562  
-    <joystick name="Xbox 360 Wireless Receiver">
563  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  871
+    <joystick name="Controller (Gamepad for Xbox 360)">
564 872
       <altname>Controller (XBOX 360 For Windows)</altname>
565 873
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
566 874
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -571,10 +879,20 @@
571 879
       <altname>Xbox wireless receiver for windows (Controller)</altname>
572 880
       <button id="3">Info</button>
573 881
     </joystick>
  882
+    <joystick name="Microsoft X-Box 360 pad">
  883
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  884
+      <altname>Generic X-Box pad</altname>
  885
+      <altname>Logitech Chillstream Controller</altname>
  886
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  887
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  888
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  889
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  890
+      <altname>Xbox 360 Wireless Receiver</altname>
  891
+      <button id="3">Info</button>
  892
+    </joystick>
574 893
   </Scripts>
575 894
   <Settings>
576  
-    <joystick name="Xbox 360 Wireless Receiver">
577  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  895
+    <joystick name="Controller (Gamepad for Xbox 360)">
578 896
       <altname>Controller (XBOX 360 For Windows)</altname>
579 897
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
580 898
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -585,10 +903,20 @@
585 903
       <altname>Xbox wireless receiver for windows (Controller)</altname>
586 904
       <button id="2">PreviousMenu</button>
587 905
     </joystick>
  906
+    <joystick name="Microsoft X-Box 360 pad">
  907
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  908
+      <altname>Generic X-Box pad</altname>
  909
+      <altname>Logitech Chillstream Controller</altname>
  910
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  911
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  912
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  913
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  914
+      <altname>Xbox 360 Wireless Receiver</altname>
  915
+      <button id="2">PreviousMenu</button>
  916
+    </joystick>
588 917
   </Settings>
589 918
   <AddonInformation>
590  
-    <joystick name="Xbox 360 Wireless Receiver">
591  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  919
+    <joystick name="Controller (Gamepad for Xbox 360)">
592 920
       <altname>Controller (XBOX 360 For Windows)</altname>
593 921
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
594 922
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -599,10 +927,20 @@
599 927
       <altname>Xbox wireless receiver for windows (Controller)</altname>
600 928
       <button id="2">Close</button>
601 929
     </joystick>
  930
+    <joystick name="Microsoft X-Box 360 pad">
  931
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  932
+      <altname>Generic X-Box pad</altname>
  933
+      <altname>Logitech Chillstream Controller</altname>
  934
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  935
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  936
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  937
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  938
+      <altname>Xbox 360 Wireless Receiver</altname>
  939
+      <button id="2">Close</button>
  940
+    </joystick>
602 941
   </AddonInformation>
603 942
   <AddonSettings>
604  
-    <joystick name="Xbox 360 Wireless Receiver">
605  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  943
+    <joystick name="Controller (Gamepad for Xbox 360)">
606 944
       <altname>Controller (XBOX 360 For Windows)</altname>
607 945
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
608 946
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -613,10 +951,20 @@
613 951
       <altname>Xbox wireless receiver for windows (Controller)</altname>
614 952
       <button id="2">Close</button>
615 953
     </joystick>
  954
+    <joystick name="Microsoft X-Box 360 pad">
  955
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  956
+      <altname>Generic X-Box pad</altname>
  957
+      <altname>Logitech Chillstream Controller</altname>
  958
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  959
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  960
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  961
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  962
+      <altname>Xbox 360 Wireless Receiver</altname>
  963
+      <button id="2">Close</button>
  964
+    </joystick>
616 965
   </AddonSettings>
617 966
   <TextViewer>
618  
-    <joystick name="Xbox 360 Wireless Receiver">
619  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  967
+    <joystick name="Controller (Gamepad for Xbox 360)">
620 968
       <altname>Controller (XBOX 360 For Windows)</altname>
621 969
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
622 970
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -627,10 +975,20 @@
627 975
       <altname>Xbox wireless receiver for windows (Controller)</altname>
628 976
       <button id="2">Close</button>
629 977
     </joystick>
  978
+    <joystick name="Microsoft X-Box 360 pad">
  979
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  980
+      <altname>Generic X-Box pad</altname>
  981
+      <altname>Logitech Chillstream Controller</altname>
  982
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  983
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  984
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  985
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  986
+      <altname>Xbox 360 Wireless Receiver</altname>
  987
+      <button id="2">Close</button>
  988
+    </joystick>
630 989
   </TextViewer>
631 990
   <shutdownmenu>
632  
-    <joystick name="Xbox 360 Wireless Receiver">
633  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  991
+    <joystick name="Controller (Gamepad for Xbox 360)">
634 992
       <altname>Controller (XBOX 360 For Windows)</altname>
635 993
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
636 994
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -642,10 +1000,21 @@
642 1000
       <button id="2">PreviousMenu</button>
643 1001
       <button id="9">PreviousMenu</button>
644 1002
     </joystick>
  1003
+    <joystick name="Microsoft X-Box 360 pad">
  1004
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  1005
+      <altname>Generic X-Box pad</altname>
  1006
+      <altname>Logitech Chillstream Controller</altname>
  1007
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  1008
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  1009
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  1010
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  1011
+      <altname>Xbox 360 Wireless Receiver</altname>
  1012
+      <button id="2">PreviousMenu</button>
  1013
+      <button id="10">PreviousMenu</button>
  1014
+    </joystick>
645 1015
   </shutdownmenu>
646 1016
   <submenu>
647  
-    <joystick name="Xbox 360 Wireless Receiver">
648  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  1017
+    <joystick name="Controller (Gamepad for Xbox 360)">
649 1018
       <altname>Controller (XBOX 360 For Windows)</altname>
650 1019
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
651 1020
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -656,10 +1025,20 @@
656 1025
       <altname>Xbox wireless receiver for windows (Controller)</altname>
657 1026
       <button id="2">PreviousMenu</button>
658 1027
     </joystick>
  1028
+    <joystick name="Microsoft X-Box 360 pad">
  1029
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  1030
+      <altname>Generic X-Box pad</altname>
  1031
+      <altname>Logitech Chillstream Controller</altname>
  1032
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  1033
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  1034
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  1035
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  1036
+      <altname>Xbox 360 Wireless Receiver</altname>
  1037
+      <button id="2">PreviousMenu</button>
  1038
+    </joystick>
659 1039
   </submenu>
660 1040
   <MusicInformation>
661  
-    <joystick name="Xbox 360 Wireless Receiver">
662  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  1041
+    <joystick name="Controller (Gamepad for Xbox 360)">
663 1042
       <altname>Controller (XBOX 360 For Windows)</altname>
664 1043
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
665 1044
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -670,10 +1049,20 @@
670 1049
       <altname>Xbox wireless receiver for windows (Controller)</altname>
671 1050
       <button id="2">Close</button>
672 1051
     </joystick>
  1052
+    <joystick name="Microsoft X-Box 360 pad">
  1053
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  1054
+      <altname>Generic X-Box pad</altname>
  1055
+      <altname>Logitech Chillstream Controller</altname>
  1056
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  1057
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  1058
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  1059
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  1060
+      <altname>Xbox 360 Wireless Receiver</altname>
  1061
+      <button id="2">Close</button>
  1062
+    </joystick>
673 1063
   </MusicInformation>
674 1064
   <MovieInformation>
675  
-    <joystick name="Xbox 360 Wireless Receiver">
676  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  1065
+    <joystick name="Controller (Gamepad for Xbox 360)">
677 1066
       <altname>Controller (XBOX 360 For Windows)</altname>
678 1067
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
679 1068
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -684,10 +1073,20 @@
684 1073
       <altname>Xbox wireless receiver for windows (Controller)</altname>
685 1074
       <button id="2">Close</button>
686 1075
     </joystick>
  1076
+    <joystick name="Microsoft X-Box 360 pad">
  1077
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  1078
+      <altname>Generic X-Box pad</altname>
  1079
+      <altname>Logitech Chillstream Controller</altname>
  1080
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  1081
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  1082
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  1083
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  1084
+      <altname>Xbox 360 Wireless Receiver</altname>
  1085
+      <button id="2">Close</button>
  1086
+    </joystick>
687 1087
   </MovieInformation>
688 1088
   <NumericInput>
689  
-    <joystick name="Xbox 360 Wireless Receiver">
690  
-      <altname>Controller (Gamepad for Xbox 360)</altname>
  1089
+    <joystick name="Controller (Gamepad for Xbox 360)">
691 1090
       <altname>Controller (XBOX 360 For Windows)</altname>
692 1091
       <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
693 1092
       <altname>Controller (Xbox wireless receiver for windows)</altname>
@@ -699,10 +1098,21 @@
699 1098
       <button id="2">BackSpace</button>
700 1099
       <button id="9">Enter</button>
701 1100
     </joystick>
  1101
+    <joystick name="Microsoft X-Box 360 pad">
  1102
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
  1103
+      <altname>Generic X-Box pad</altname>
  1104
+      <altname>Logitech Chillstream Controller</altname>
  1105
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
  1106
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
  1107
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
  1108
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
  1109
+      <altname>Xbox 360 Wireless Receiver</altname>