Skip to content

Commit

Permalink
Merge pull request xbmc#10347 from NedScott/misc-keymap
Browse files Browse the repository at this point in the history 
Miscellaneous keymap cleanup
  • Loading branch information
@MartijnKaijser
MartijnKaijser committed Sep 22, 2016
2 parents fb04fdf + 9719da3 commit 779579c
Show file tree
Hide file tree
Showing 8 changed files with 274 additions and 179 deletions.
65 changes: 36 additions & 29 deletions system/keymaps/customcontroller.AppleRemote.xml
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- 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 id=""#>xbmc action</button> -->
<!-- </device> -->

<!-- To map keys from other remotes using the RCA protocol, you may add <customcontroller name="AppleRemote"> blocks -->
<!-- In this case, the tags used are <button id=""#> where # is the original button code (OBC) of the key -->
<!-- You set it up by adding a <customcontroller name="AppleRemote"> block to the window or <global> section: -->
<!-- <customcontroller name="AppleRemote"> -->
<!-- <button id="45">Stop</button> -->
<!-- </customcontroller> -->

<!-- Note that the action can be a built-in function. -->
<!-- eg <button id="6">ActivateWindow(Favourites)</button> -->
<!-- would bring up Favourites when the button with the id of 6 is press. In this case, "Menu" -->

<!-- -->
<!-- Button Ids: -->
<!-- 'id' is the button ID used by SDL. The key ids recognized from your remote appears -->
<!-- in /var/log/syslog on the ATV2 for each button pressed and when debug mode is enabled -->
<!-- Use your log to discover and map custom buttons to actions. -->

<!-- This file contains the mapping of keys to actions within Kodi. -->
<!-- -->
<!-- The format is: -->
<!-- <window> -->
<!-- <device> -->
<!-- <button>action</button> -->
<!-- </device> -->
<!-- </window> -->
<!-- -->
<!-- The <global> section is a fall through - they will only be used if the button is -->
<!-- not used in the current window's section. -->
<!-- -->
<!-- Actions can be built-in functions. -->
<!-- eg <button id="6">ActivateWindow(Music)</button> -->
<!-- would automatically go to Music on the press of the "Menu" button. -->
<!-- -->
<!-- -->
<!-- An empty action removes the corresponding mapping from default and parent keymaps. -->
<!-- This is different from a "noop" action, which disables a button. -->
<!-- -->
<!-- More documentation on keymaps can be found on http://kodi.wiki/view/keymaps -->
<!-- -->
<!-- To map keys from other remotes using the RCA protocol, you may add -->
<!-- <customcontroller name="AppleRemote"> blocks. -->
<!-- In this case, the tags used are <button id=""#> where # is the original button code -->
<!-- (OBC) of the key. -->
<!-- You set it up by adding a <customcontroller name="AppleRemote"> block to the window -->
<!-- or <global> section: -->
<!-- <customcontroller name="AppleRemote"> -->
<!-- <button id="45">Stop</button> -->
<!-- </customcontroller> -->
<!-- -->
<!-- Button Ids: -->
<!-- 'id' is the button ID used by SDL. The key ids recognized from your remote appears -->
<!-- in the log file for each button pressed and when debug mode is enabled. -->
<!-- Use your log to discover and map custom buttons to actions. -->
<keymap>
<global>
<customcontroller name="AppleRemote">
Expand Down
80 changes: 40 additions & 40 deletions system/keymaps/customcontroller.Harmony.xml
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- 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</key> -->
<!-- </device> -->

<!-- To map keys from other remotes using the RCA protocol, you may add <customcontroller name="Harmony"> blocks -->
<!-- In this case, the tags used are <button id=""#> where # is the original button code (OBC) of the key -->
<!-- You set it up by adding a <customcontroller name="Harmony"> block to the window or <global> section: -->
<!-- <customcontroller name="Harmony"> -->
<!-- <button id="45">Stop</button> -->
<!-- </customcontroller> -->

<!-- Note that the action can be a built-in function. -->
<!-- eg <B>ActivateWindow(Music)</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 key 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. -->
<!-- This file contains the mapping of keys to actions within Kodi. -->
<!-- -->
<!-- The format is: -->
<!-- <window> -->
<!-- <device> -->
<!-- <button>action</button> -->
<!-- </device> -->
<!-- </window> -->
<!-- -->
<!-- The <global> section is a fall through - they will only be used if the button is -->
<!-- not used in the current window's section. -->
<!-- -->
<!-- Actions can be built-in functions. -->
<!-- eg <button id="6">ActivateWindow(Music)</button> -->
<!-- would automatically go to Music on the press of the "Menu" button. -->
<!-- -->
<!-- -->
<!-- An empty action removes the corresponding mapping from default and parent keymaps. -->
<!-- This is different from a "noop" action, which disables a button. -->
<!-- -->
<!-- More documentation on keymaps can be found on http://kodi.wiki/view/keymaps -->
<!-- -->
<!-- To map keys from other remotes using the RCA protocol, you may add -->
<!-- <customcontroller name="Harmony"> blocks. -->
<!-- In this case, the tags used are <button id=""#> where # is the original button code -->
<!-- (OBC) of the key. -->
<!-- You set it up by adding a <customcontroller name="Harmony"> block to the window -->
<!-- or <global> section: -->
<!-- <customcontroller name="Harmony"> -->
<!-- <button id="45">Stop</button> -->
<!-- </customcontroller> -->
<!-- -->
<!-- Button Ids: -->
<!-- 'id' is the button ID used by SDL. The key ids recognized from your remote appears -->
<!-- in the log file for each button pressed and when debug mode is enabled. -->
<!-- Use your log to discover and map custom buttons to actions. -->
<keymap>
<global>
<customcontroller name="Harmony">
Expand Down Expand Up @@ -126,13 +126,13 @@
<!-- * clear --> <button id="145">Delete</button>
</customcontroller>
</FileManager>
<MyMusicPlaylist>
<MusicPlaylist>
<customcontroller name="Harmony">
<!-- * clear --> <button id="145">Delete</button>
<!-- Channel Up --> <button id="171">MoveItemUp</button>
<!-- Channel Down --> <button id="172">MoveItemDown</button>
</customcontroller>
</MyMusicPlaylist>
</MusicPlaylist>
<Music>
<customcontroller name="Harmony">
<!-- 1 --> <button id="111">number1</button>
Expand Down Expand Up @@ -289,13 +289,13 @@
<!-- 9 --> <button id="143">JumpSMS9</button>
</customcontroller>
</Videos>
<MyVideoPlaylist>
<VideoPlaylist>
<customcontroller name="Harmony">
<!-- * clear --> <button id="145">Delete</button>
<!-- Channel Up --> <button id="171">MoveItemUp</button>
<!-- Channel Down --> <button id="172">MoveItemDown</button>
</customcontroller>
</MyVideoPlaylist>
</VideoPlaylist>
<VirtualKeyboard>
<customcontroller name="Harmony">
<!-- Prev --> <button id="132">BackSpace</button>
Expand Down
70 changes: 27 additions & 43 deletions system/keymaps/gamepad.xml
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- 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> -->

<!-- Note that the action can be a built-in function. -->
<!-- eg <B>ActivateWindow(Music)</B> -->
<!-- would automatically go to My Music on the press of the B button. -->
<!-- An empty action removes the corresponding mapping from the default keymap -->

<!-- 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. -->
<!-- This file contains the mapping of keys to actions within Kodi. -->
<!-- -->
<!-- The format is: -->
<!-- <window> -->
<!-- <device> -->
<!-- <button>action</button> -->
<!-- </device> -->
<!-- </window> -->
<!-- -->
<!-- The <global> section is a fall through - they will only be used if the button is -->
<!-- not used in the current window's section. -->
<!-- -->
<!-- Actions can be built-in functions. -->
<!-- eg <B>ActivateWindow(Music)</B> -->
<!-- would automatically go to Music on the press of the B button. -->
<!-- -->
<!-- -->
<!-- An empty action removes the corresponding mapping from default and parent keymaps. -->
<!-- This is different from a "noop" action, which disables a button. -->
<!-- -->
<!-- More documentation on keymaps can be found on http://kodi.wiki/view/keymaps -->
<keymap>
<global>
<gamepad>
Expand Down Expand Up @@ -66,17 +50,17 @@
<Y>Highlight</Y>
</gamepad>
</FileManager>
<MyMusicPlaylist>
<MusicPlaylist>
<gamepad>
<Y>Delete</Y>
<black>Back</black>
</gamepad>
</MyMusicPlaylist>
<MyMusicPlaylistEditor>
</MusicPlaylist>
<MusicPlaylistEditor>
<gamepad>
<Y>Queue</Y>
</gamepad>
</MyMusicPlaylistEditor>
</MusicPlaylistEditor>
<Music>
<gamepad>
<Y>Queue</Y>
Expand Down Expand Up @@ -260,12 +244,12 @@
<black>Delete</black>
</gamepad>
</Videos>
<MyVideoPlaylist>
<VideoPlaylist>
<gamepad>
<Y>Delete</Y>
<black>Back</black>
</gamepad>
</MyVideoPlaylist>
</VideoPlaylist>
<VirtualKeyboard>
<gamepad>
<start>Enter</start>
Expand Down
Loading

0 comments on commit 779579c

Please sign in to comment.