aboutsummaryrefslogtreecommitdiff
path: root/system/keymaps
diff options
context:
space:
mode:
authorMateusz Lewicki <mateuszalewicki@gmail.com>2015-01-13 21:45:06 +0100
committerMateusz Lewicki <mateuszalewicki@gmail.com>2015-03-10 21:07:43 +0100
commitdd65df5708988eb557e4e3aea8d6402dd35099b1 (patch)
treea7046316f8f70353bedb17476ae08f6d2d6f12f6 /system/keymaps
parentc667724cc703292773a5dab25e2ebe2478bb7ccb (diff)
panning with gamepad in slideshow fixed
It is now possible to pann zoomed pictures using analog axis. Input from several axes is handled at the same time. A side-effect of this is possibility to pan images diagonally.
Diffstat (limited to 'system/keymaps')
-rw-r--r--system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml9
-rw-r--r--system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml4
2 files changed, 7 insertions, 6 deletions
diff --git a/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml b/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
index 3248d5e21a..f559b0edc6 100644
--- a/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
+++ b/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
@@ -80,6 +80,7 @@
<name>Logitech Gamepad F310</name>
<name>Logitech Gamepad F510</name>
<name>Logitech Gamepad F710</name>
+ <name>Generic X-Box pad</name>
<name>Logitech Chillstream Controller</name>
<name>Mad Catz Wired Xbox 360 Controller</name>
<name>Mad Catz Street Fighter IV FightStick SE</name>
@@ -454,8 +455,8 @@
<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="1">AnalogMoveX</axis>
+ <axis id="2">AnalogMoveY</axis>
<axis id="3" limit="+1">ZoomOut</axis>
<axis id="3" limit="-1">ZoomIn</axis>
<hat id="1" position="up">ZoomIn</hat>
@@ -473,8 +474,8 @@
<button id="13">NextPicture</button>
<button id="14">ZoomIn</button>
<button id="15">ZoomOut</button>
- <axis id="1">AnalogMove</axis>
- <axis id="2">AnalogMove</axis>
+ <axis id="1">AnalogMoveX</axis>
+ <axis id="2">AnalogMoveY</axis>
<axis id="3">ZoomOut</axis>
<axis id="6">ZoomIn</axis>
<hat id="1" position="up">ZoomIn</hat>
diff --git a/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml b/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml
index 0ae2cb3ef1..5d65a8555e 100644
--- a/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml
+++ b/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml
@@ -268,8 +268,8 @@
<button id="13">ZoomNormal</button>
<button id="11">Rotate</button>
<button id="12">CodecInfo</button>
- <axis id="1">AnalogMove</axis>
- <axis id="2">AnalogMove</axis>
+ <axis id="1">AnalogMoveX</axis>
+ <axis id="2">AnalogMoveY</axis>
<axis id="13">ZoomOut</axis>
<axis id="14">ZoomIn</axis>
<button id="5">ZoomIn</button>