merged: r32098 - r32101

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@32104 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

4 files changed, 204 insertions, 2 deletions

diff --git a/system/Lircmap.xml b/system/Lircmap.xml
index 61d8945af8..e0781ce982 100644
--- a/system/Lircmap.xml
+++ b/system/Lircmap.xml
@@ -57,7 +57,7 @@
 		<green>Green</green>
 		<yellow>Yellow</yellow>
 		<blue>Blue</blue>
-                <teletext>Teletext</teletext>
+		<teletext>Teletext</teletext>
 	</remote>
 	
 	<remote device="XboxDVDDongle">
@@ -362,4 +362,48 @@
 		<recordedtv>recordlist</recordedtv>
 		<title>teletext</title>
 	</remote>
+
+	<remote device="linux-input-layer">
+		<left>KEY_LEFT</left>
+		<right>KEY_RIGHT</right>
+		<up>KEY_UP</up>
+		<down>KEY_DOWN</down>
+		<select>KEY_ENTER</select>
+		<start>KEY_SELECT</start>
+		<back>KEY_EXIT</back>
+		<record>KEY_RECORD</record>
+		<play>KEY_PLAY</play>
+		<pause>KEY_PAUSE</pause>
+		<stop>KEY_STOP</stop>
+		<forward>KEY_FASTFORWARD</forward>
+		<reverse>KEY_REWIND</reverse>
+		<volumeplus>KEY_VOLUMEUP</volumeplus>
+		<volumeminus>KEY_VOLUMEDOWN</volumeminus>
+		<channelplus>KEY_CHANNELUP</channelplus>
+		<channelminus>KEY_CHANNELDOWN</channelminus>
+		<skipplus>KEY_NEXTSONG</skipplus>
+		<skipminus>KEY_PREVIOUSSONG</skipminus>
+		<title>KEY_TEXT</title>
+		<subtitle>KEY_SUBTITLE</subtitle>
+		<mute>KEY_MUTE</mute>
+		<power>KEY_POWER</power>
+		<myvideo>KEY_VIDEO</myvideo>
+		<mymusic>KEY_AUDIO</mymusic>
+		<mypictures>KEY_MHP</mypictures>
+		<mytv>KEY_TV</mytv>
+		<one>KEY_1</one>
+		<two>KEY_2</two>
+		<three>KEY_3</three>
+		<four>KEY_4</four>
+		<five>KEY_5</five>
+		<six>KEY_6</six>
+		<seven>KEY_7</seven>
+		<eight>KEY_8</eight>
+		<nine>KEY_9</nine>
+		<zero>KEY_0</zero>
+		<red>KEY_RED</red>
+		<green>KEY_GREEN</green>
+		<yellow>KEY_YELLOW</yellow>
+		<blue>KEY_BLUE</blue>
+	</remote>
 </lircmap>
diff --git a/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml b/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml
new file mode 100644
index 0000000000..50522fcaeb
--- /dev/null
+++ b/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml
@@ -0,0 +1,80 @@
+<!-- This file contains the mapping of keys (gamepad, remote, and keyboard) to actions within XBMC -->
+<!-- The <global> section is a fall through - they will only be used if the button is not          -->
+<!-- used in the current window's section.  Note that there is only handling                       -->
+<!-- for a single action per button at this stage.                                                 -->
+<!-- For joystick/gamepad configuration under linux/win32, see below as it differs from xbox       -->
+<!-- gamepads.                                                                                     -->
+
+<!-- The format is:                      -->
+<!--    <device>                         -->
+<!--      <button>action</button>        -->
+<!--    </device>                        -->
+
+<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
+<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
+<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
+<!--    <universalremote>             -->
+<!--       <obc45>Stop</obc45>         -->
+<!--    </universalremote>            -->
+<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
+
+<!-- Note that the action can be a built-in function.                 -->
+<!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
+<!-- would automatically go to My Music on the press of the B button. -->
+
+<!-- Joysticks / Gamepads:                                                                    -->
+<!--   See the sample PS3 controller configuration below for the format.                      -->
+<!--                                                                                          -->
+<!--  Joystick Name:                                                                          -->
+<!--   Do 'cat /proc/bus/input/devices' or see your xbmc log file  to find the names of       -->
+<!--   detected joysticks. The name used in the configuration should match the detected name. -->
+<!--                                                                                          -->
+<!--  Button Ids:                                                                             -->
+<!--   'id' is the button ID used by SDL. Joystick button ids of connected joysticks appear   -->
+<!--   in xbmc.log when they are pressed. Use your log to map custom buttons to actions.      -->
+<!--                                                                                          -->
+<!--  Axis Ids / Analog Controls                                                              -->
+<!--   Coming soon.                                                                           -->
+<keymap>
+  <global>
+    <!-- left analog is treated as hat when alien eyes are unlit-->
+    <!-- right analog is treated as buttons 1 to 4 in a counter -->
+    <!-- clockwise motion with 1 being on the left when eyes are unlit--> 
+    <joystick name="Alienware Alienware Dual Compatible Game Pad">
+      <button id="1">FullScreen</button> <!--square -->
+      <button id="2">Select</button>  <!--x --> 
+      <button id="3">ParentDir</button>   <!--circle --> 
+      <button id="4">Queue</button> <!-- tri -->
+      <button id="6">PreviousMenu</button> <!-- l1 -->
+      <button id="7"></button>  <!-- l2 -->      
+      <button id="11">Screenshot</button> <!-- l3 - left analog -->
+      <button id="5"></button>    <!-- r1 -->      
+      <button id="8"></button>  <!-- r2 -->
+      <button id="12">XBMC.ActivateWindow(ShutdownMenu)</button> <!-- R3 - right analog -->      
+      <button id="9"></button>  <!-- select -->      
+      <button id="10">XBMC.ActivateWindow(PlayerControls)</button>  <!-- start --> 
+      <!-- Left Analog Left and Right-->
+      <axis limit="-1" id="0">AnalogSeekBack</axis>        
+      <axis limit="+1" id="0">AnalogSeekForward</axis>
+      <!-- Left Analog Up and Down-->
+      <axis limit="+1" id="1">ScrollDown</axis>      
+      <axis limit="-1" id="1">ScrollUp</axis>z`
+        <!-- Right Analog Up and Down -->
+      <axis limit="-1" id="2">VolumeUp</axis>        
+      <axis limit="+1" id="2">VolumeDown</axis>
+      <!-- Left Analog Left and Right-->      
+      <axis limit="-1" id="3"></axis>      
+      <axis limit="+1" id="3"></axis>
+      <!-- Hat Axises, unused -->
+      <axis limit="+1" id="4">Right</axis>
+      <axis limit="-1" id="4">Left</axis>            
+      <axis limit="-1" id="5">Up</axis>
+      <axis limit="+1" id="5">Down</axis>
+      <!-- Hat  -->      
+      <hat id="1" position="left">Left</hat>
+      <hat id="1" position="right">Right</hat>
+      <hat id="1" position="up">Up</hat>
+      <hat id="1" position="down">Down</hat>
+    </joystick>
+  </global>
+</keymap>
diff --git a/system/keymaps/joystick.Interact.AxisPad.xml b/system/keymaps/joystick.Interact.AxisPad.xml
new file mode 100644
index 0000000000..f113ccd2d8
--- /dev/null
+++ b/system/keymaps/joystick.Interact.AxisPad.xml
@@ -0,0 +1,78 @@
+<!-- This file contains the mapping of keys (gamepad, remote, and keyboard) to actions within XBMC -->
+<!-- The <global> section is a fall through - they will only be used if the button is not          -->
+<!-- used in the current window's section.  Note that there is only handling                       -->
+<!-- for a single action per button at this stage.                                                 -->
+<!-- For joystick/gamepad configuration under linux/win32, see below as it differs from xbox       -->
+<!-- gamepads.                                                                                     -->
+
+<!-- The format is:                      -->
+<!--    <device>                         -->
+<!--      <button>action</button>        -->
+<!--    </device>                        -->
+
+<!-- To map keys from other remotes using the RCA protocol, you may add <universalremote> blocks -->
+<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
+<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
+<!--    <universalremote>             -->
+<!--       <obc45>Stop</obc45>         -->
+<!--    </universalremote>            -->
+<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
+
+<!-- Note that the action can be a built-in function.                 -->
+<!--  eg <B>XBMC.ActivateWindow(MyMusic)</B>                         -->
+<!-- would automatically go to My Music on the press of the B button. -->
+
+<!-- Joysticks / Gamepads:                                                                    -->
+<!--   See the sample PS3 controller configuration below for the format.                      -->
+<!--                                                                                          -->
+<!--  Joystick Name:                                                                          -->
+<!--   Do 'cat /proc/bus/input/devices' or see your xbmc log file  to find the names of       -->
+<!--   detected joysticks. The name used in the configuration should match the detected name. -->
+<!--                                                                                          -->
+<!--  Button Ids:                                                                             -->
+<!--   'id' is the button ID used by SDL. Joystick button ids of connected joysticks appear   -->
+<!--   in xbmc.log when they are pressed. Use your log to map custom buttons to actions.      -->
+<!--                                                                                          -->
+<!--  Axis Ids / Analog Controls                                                              -->
+<!--   Coming soon.                                                                           -->
+<keymap>
+  <global>
+    <joystick name="STD AxisPad">
+      <altname>Interact AxisPad</altname>
+      <button id="1">FullScreen</button> <!--square -->
+      <button id="3">Select</button>  <!--x --> 
+      <button id="4">ParentDir</button>   <!--circle --> 
+      <button id="2">Queue</button> <!-- tri -->
+      <button id="5">PreviousMenu</button> <!-- l1 -->
+      <button id="7"></button>  <!-- l2 -->      
+      <button id="9">Screenshot</button> <!-- l3 - left analog -->
+      <button id="6"></button>    <!-- r1 -->      
+      <button id="8"></button>  <!-- r2 -->
+      <button id="10">PreviousMenu</button> <!-- R3 - right analog -->      
+      <button id="11"></button>  <!-- select/Escape -->      
+      <button id="12">XBMC.ActivateWindow(PlayerControls)</button>  <!-- start/enter --> 
+      <button id="20"></button> <!-- Toggle Switch-->
+      <!-- Left Analog Left and Right-->
+      <axis limit="-1" id="0">AnalogSeekBack</axis>        
+      <axis limit="+1" id="0">AnalogSeekForward</axis>
+      <!-- Left Analog Up and Down-->
+      <axis limit="-1" id="1">ScrollUp</axis>
+      <axis limit="+1" id="1">ScrollDown</axis> 
+        <!-- Right Analog Up and Down -->
+      <axis limit="-1" id="2">VolumeUp</axis>        
+      <axis limit="+1" id="2">VolumeDown</axis>
+      <!-- Left Analog Left and Right-->      
+      <axis limit="-1" id="3"></axis>      
+      <axis limit="+1" id="3"></axis>
+      <!-- Hat Axises, unused -->
+      <axis limit="+1" id="4">Right</axis>
+      <axis limit="-1" id="4">Left</axis>            
+      <axis limit="-1" id="5">Up</axis>
+      <axis limit="+1" id="5">Down</axis>
+      <!-- Hat  -->      
+      <hat id="1" position="left">Left</hat>
+      <hat id="1" position="right">Right</hat>
+      <hat id="1" position="up">Up</hat>
+      <hat id="1" position="down">Down</hat>
+    </joystick>
+</keymap>
diff --git a/system/keymaps/remote.xml b/system/keymaps/remote.xml
index 242857727d..f7de5529b4 100644
--- a/system/keymaps/remote.xml
+++ b/system/keymaps/remote.xml
@@ -67,7 +67,7 @@
       <myvideo>XBMC.ActivateWindow(MyVideos)</myvideo>
       <mymusic>XBMC.ActivateWindow(MyMusic)</mymusic>
       <mypictures>XBMC.ActivateWindow(MyPictures)</mypictures>
-      <mytv>XBMC.ActivateWindow(Home)</mytv>
+      <mytv>XBMC.ActivateWindow(VideoLibrary,TvShows)</mytv>
       <red>XBMC.ActivateWindow(Home)</red>
       <green>XBMC.ActivateWindow(MyVideos)</green>
       <yellow>XBMC.ActivateWindow(MyMusic)</yellow>