From a998728ea468a035b5ef6da797183e02a6266b1f Mon Sep 17 00:00:00 2001
Message-Id: <a998728ea468a035b5ef6da797183e02a6266b1f.1264205399.git.damien.ciabrini@gmail.com>
In-Reply-To: <cover.1264205399.git.damien.ciabrini@gmail.com>
References: <cover.1264205399.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: Compatibility options for Apple Aluminium Keyboards

XKB Options to make Aluminium Keyboard behave more like a PC keyboard
  . apple:alupcfkeys   - PC-like Fkeys (Print Screen, Scroll Lock...) instead of F13,F14,F15
  . apple:alupcnumlock - PC-like Numlock instead of Clear

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

diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index 47bfa00..3f0aa0b 100644
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -106,5 +106,7 @@
   esperanto:qwerty      =	+epo(qwerty)
   esperanto:dvorak      =	+epo(dvorak)
   terminate:ctrl_alt_bksp =	+terminate(ctrl_alt_bksp)
+  apple:alupcfkeys	=	+macintosh_vndr/apple(alupcfkeys)
+  apple:alupcnumlock	=	+macintosh_vndr/apple(alupcnumlock)
 
 
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 5fbe756..ed89d21 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -5052,6 +5052,18 @@
       </option>
       <option>
         <configItem>
+          <name>apple:alupcfkeys</name>
+          <description>Apple Aluminium Keyboard: enable Print, Scroll_Lock and Pause keys</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>apple:alupcnumlock</name>
+          <description>Apple Aluminium Keyboard: replace Clear key with 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..fdef9e5 100644
--- a/symbols/macintosh_vndr/apple
+++ b/symbols/macintosh_vndr/apple
@@ -125,3 +125,22 @@ 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
+xkb_symbols "alupcfkeys" {
+    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 ]
+    };
+};
+
+partial keypad_keys
+xkb_symbols "alupcnumlock" {
+    override key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
+};
-- 
1.6.5