From 38abdf41fe2be6b08e782d0e65375e084036fe9a Mon Sep 17 00:00:00 2001
From: John Rennie <john.rennie@ratsauce.co.uk>
Date: Wed, 11 May 2011 17:38:07 +0100
Subject: On a French keyboard backslash is alt gr 8. XBMC sees this as
 ctrl-alt-backslash.

---
 system/keymaps/keyboard.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'system')

diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml
index fff5c94659..f3008ad399 100644
--- a/system/keymaps/keyboard.xml
+++ b/system/keymaps/keyboard.xml
@@ -88,6 +88,8 @@
       <numpadeight>Number8</numpadeight>
       <numpadnine>Number9</numpadnine>
       <backslash>ToggleFullScreen</backslash>
+      <!-- On a French keyboard backslash is alt gr 8 -->
+      <backslash mod="ctrl,alt">ToggleFullScreen</backslash>
       <browser_home>XBMC.ActivateWindow(Home)</browser_home>
       <browser_favorites>ActivateWindow(Favourites)</browser_favorites>
       <browser_refresh/>
-- 
cgit v1.2.3


From 667c211ef207c1a3ea2617fd388169dd104248e9 Mon Sep 17 00:00:00 2001
From: John Rennie <john.rennie@ratsauce.co.uk>
Date: Wed, 11 May 2011 17:41:05 +0100
Subject: Tidy up multimedia key mappings. Add null mappings for unused
 multimedia keys as placeholders.

---
 system/keymaps/keyboard.xml | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'system')

diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml
index f3008ad399..c62918a473 100644
--- a/system/keymaps/keyboard.xml
+++ b/system/keymaps/keyboard.xml
@@ -90,25 +90,29 @@
       <backslash>ToggleFullScreen</backslash>
       <!-- On a French keyboard backslash is alt gr 8 -->
       <backslash mod="ctrl,alt">ToggleFullScreen</backslash>
-      <browser_home>XBMC.ActivateWindow(Home)</browser_home>
-      <browser_favorites>ActivateWindow(Favourites)</browser_favorites>
+      <home>FirstPage</home>
+      <end>LastPage</end>
+      <!-- Multimedia keyboard keys -->
+      <browser_back>ParentDir</browser_back>
+      <browser_forward/>
       <browser_refresh/>
+      <browser_stop/>
       <browser_search/>
-      <launch_app1_pc_icon>ActivateWindow(MyPrograms)</launch_app1_pc_icon>
-      <launch_media_select>XBMC.ActivateWindow(MyMusic)</launch_media_select>
-      <play_pause>Pause</play_pause>
-      <stop>Stop</stop>
-      <volume_up>VolumeUp</volume_up>
+      <browser_favorites>ActivateWindow(Favourites)</browser_favorites>
+      <browser_home>XBMC.ActivateWindow(Home)</browser_home>
       <volume_mute>Mute</volume_mute>
       <volume_down>VolumeDown</volume_down>
+      <volume_up>VolumeUp</volume_up>
       <next_track>SkipNext</next_track>
       <prev_track>SkipPrevious</prev_track>
+      <stop>Stop</stop>
+      <play_pause>Play</play_pause>
       <launch_mail></launch_mail>
-      <key id='61620'></key>      <!-- same as above, launch_mail, but using button code (based on vkey id) -->
-      <home>FirstPage</home>
-      <end>LastPage</end>
-      <key id='65446'>ParentDir</key>
-      <key id='65459'>Play</key>
+      <launch_media_select>XBMC.ActivateWindow(MyMusic)</launch_media_select>
+      <launch_app1_pc_icon>ActivateWindow(MyPrograms)</launch_app1_pc_icon>
+      <launch_app2_pc_icon>ActivateWindow(MyPrograms)</launch_app2_pc_icon>
+      <launch_file_browser/>
+      <launch_media_center/>
       <!-- ****************************************************** -->
       <!-- MS Media Center keyboard shortcuts sent by MCE remotes -->
       <!-- See http://msdn.microsoft.com/en-us/library/bb189249.aspx -->
-- 
cgit v1.2.3


From 33481d960173a8cac2b9f618960a818cb07e42ea Mon Sep 17 00:00:00 2001
From: John Rennie <john.rennie@ratsauce.co.uk>
Date: Thu, 12 May 2011 09:45:51 +0100
Subject: Correct misleading comment on the backslash key mapping in
 keyboard.xml

---
 system/keymaps/keyboard.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system')

diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml
index c62918a473..f6bb59e4fb 100644
--- a/system/keymaps/keyboard.xml
+++ b/system/keymaps/keyboard.xml
@@ -88,7 +88,7 @@
       <numpadeight>Number8</numpadeight>
       <numpadnine>Number9</numpadnine>
       <backslash>ToggleFullScreen</backslash>
-      <!-- On a French keyboard backslash is alt gr 8 -->
+      <!-- On some keyboards backslash is reached via AltGr -->
       <backslash mod="ctrl,alt">ToggleFullScreen</backslash>
       <home>FirstPage</home>
       <end>LastPage</end>
-- 
cgit v1.2.3


From f6a4a516e0c0a70689ca0355d28acb125f48413c Mon Sep 17 00:00:00 2001
From: John Rennie <john.rennie@ratsauce.co.uk>
Date: Fri, 13 May 2011 10:11:03 +0100
Subject: Remove superfluous ctrl-alt-backslash mapping from keyboard.xml

---
 system/keymaps/keyboard.xml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'system')

diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml
index f6bb59e4fb..45faa5b4a3 100644
--- a/system/keymaps/keyboard.xml
+++ b/system/keymaps/keyboard.xml
@@ -88,8 +88,6 @@
       <numpadeight>Number8</numpadeight>
       <numpadnine>Number9</numpadnine>
       <backslash>ToggleFullScreen</backslash>
-      <!-- On some keyboards backslash is reached via AltGr -->
-      <backslash mod="ctrl,alt">ToggleFullScreen</backslash>
       <home>FirstPage</home>
       <end>LastPage</end>
       <!-- Multimedia keyboard keys -->
-- 
cgit v1.2.3