From 3f56a2eb9e7e9c804d665d67cc9634b651522473 Mon Sep 17 00:00:00 2001
Message-Id: <3f56a2eb9e7e9c804d665d67cc9634b651522473.1265064333.git.damien.ciabrini@gmail.com>
In-Reply-To: <c2c0e314a181f25a53ab2b466260749f73a798d3.1265064332.git.damien.ciabrini@gmail.com>
References: <c2c0e314a181f25a53ab2b466260749f73a798d3.1265064332.git.damien.ciabrini@gmail.com>
From: Damien Ciabrini <damien.ciabrini@gmail.com>
Date: Tue, 12 Jan 2010 01:40:10 +0100
Subject: [PATCH 6/7] xkeyboard-config: PC compatibility option for Apple Aluminium Keyboards

Remap some keys to make Aluminium Keyboard behave more like a PC keyboard
  . Print_Screen, Scroll_Lock and Pause instead of F13,F14,F15
  . Numlock instead of Clear

Signed-off-by: Damien Ciabrini <damien.ciabrini@gmail.com>
---
 rules/base.o_s.part          |    1 +
 rules/base.xml.in            |    6 ++++++
 symbols/macintosh_vndr/apple |   15 +++++++++++++++
 3 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index 47bfa00..71524d1 100644
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -106,5 +106,6 @@
   esperanto:qwerty      =	+epo(qwerty)
   esperanto:dvorak      =	+epo(dvorak)
   terminate:ctrl_alt_bksp =	+terminate(ctrl_alt_bksp)
+  apple:alupckeys	=	+macintosh_vndr/apple(alupckeys)
 
 
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 5fbe756..07c969a 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -5052,6 +5052,12 @@
       </option>
       <option>
         <configItem>
+          <name>apple:alupckeys</name>
+          <description>Apple Aluminium Keyboard: emulate PC keys (Print, Scroll_Lock, Pause, NumLock)</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>shift:breaks_caps</name>
           <_description>Shift cancels CapsLock</_description>
         </configItem>
diff --git a/symbols/macintosh_vndr/apple b/symbols/macintosh_vndr/apple
index e6ab89f..c647ace 100644
--- a/symbols/macintosh_vndr/apple
+++ b/symbols/macintosh_vndr/apple
@@ -125,3 +125,18 @@ xkb_symbols "alukbd" {
       symbols[Group1]= [ NoSymbol, XF86AudioRaiseVolume, NoSymbol, XF86_Switch_VT_12 ]
     };
 };
+
+// Aluminium Keyboard: make F13, F14, F15 PC-ish (Print, Scroll_Lock, Pause)
+partial function_keys keypad_keys
+xkb_symbols "alupckeys" {
+    key <FK13> {
+      type= "PC_ALT_LEVEL2",
+      symbols[Group1]= [ Print, Sys_Req ]
+    };
+    key <FK14> { [ Scroll_Lock ] };
+    key <FK15> {
+      type= "PC_CONTROL_LEVEL2",
+      symbols[Group1]= [ Pause, Break ]
+    };
+    override key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
+};
-- 
1.6.5