[PATCH v2 5/7] xkeyboard-config: Evdev rules for Apple Aluminium Keyboards

[Damien Ciabrini]

Rule in base.m_g for the Aluminium keyboard geometries

Rule in base.m_t for enabling macintosh keypad (number first)

Rules in base.ml_s and base.ml1_s for ANSI, ISO and JIS keyboards
  . Rules for both $macvendorlayouts and other layouts
  . Special rules to enable dual layout (us+jp) for JIS

Rules in evdev.m_k and evdev.m_s to support EISU and KANA keys

Signed-off-by: Damien Ciabrini <damien.ciabrini at gmail.com>
---
Updated patch to reflect updates in Patch v2 1/7 (geometry names), and Patch v2 3/7 (symbol names)

This patch also adds a line in base.m_t to use mac keypad for aluminium keyboards

 rules/base.m_g.part   |    1 +
 rules/base.m_t.part   |    1 +
 rules/base.ml1_s.part |    3 +++
 rules/base.ml_s.part  |    4 ++++
 rules/evdev.m_k.part  |    1 +
 rules/evdev.m_s.part  |    1 +
 6 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/rules/base.m_g.part b/rules/base.m_g.part
index 2ee139d..c76a55e 100644
--- a/rules/base.m_g.part
+++ b/rules/base.m_g.part
@@ -17,6 +17,7 @@
  $tmgeometries	=	typematrix(%m)
   winbook	=	winbook(XP5)
   pc98		=	nec(pc98)
+ $applealu	=	macintosh(%m)
  $macbooks      =       macintosh(%m)
  $macs		=	macintosh(macintosh)
   hhk		=	hhk(basic)
diff --git a/rules/base.m_t.part b/rules/base.m_t.part
index d67750c..9669d6b 100644
--- a/rules/base.m_t.part
+++ b/rules/base.m_t.part
@@ -1,3 +1,4 @@
   $macs		=	complete+numpad(mac)
+  $applealu	=	complete+numpad(mac)
   $nokiamodels	=	complete+nokia
   *		=	complete
diff --git a/rules/base.ml1_s.part b/rules/base.ml1_s.part
index 6d5f570..20b4276 100644
--- a/rules/base.ml1_s.part
+++ b/rules/base.ml1_s.part
@@ -5,6 +5,9 @@
   macintosh_old	us			=	macintosh_vndr/us(oldmac)
   macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
   macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l[1]%(v[1])
+  applealu_jis	us			=	macintosh_vndr/apple(alukbd)+macintosh_vndr/jp(usmac)
+ $applealu	$macvendorlayouts	=	macintosh_vndr/apple(alukbd)+macintosh_vndr/%l[1]%(v[1])
+ $applealu	*			=	macintosh_vndr/apple(alukbd)+%l[1]%(v[1])
  $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l[1]%(v[1])
   nokiarx51	cz(qwerty)		=	nokia_vndr/rx-51(common)+nokia_vndr/rx-51(cz_qwerty)
   nokiarx51	*			=	nokia_vndr/rx-51(common)+nokia_vndr/rx-51(%l[1]%_v[1])
diff --git a/rules/base.ml_s.part b/rules/base.ml_s.part
index 1c16b6b..77b7db0 100644
--- a/rules/base.ml_s.part
+++ b/rules/base.ml_s.part
@@ -19,6 +19,10 @@
   macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l%(v)
   macintosh_old	$nonlatin		=	macintosh_vndr/us(oldmac)+%l%(v):2
   macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l%(v)
+  applealu_jis	jp			=	macintosh_vndr/apple(alukbd)+macintosh_vndr/jp(usmac)+macintosh_vndr/jp(mac):2
+  applealu_jis	*			=	macintosh_vndr/apple(alukbd)+%l%(v)+macintosh_vndr/jp(mac):2
+ $applealu	$macvendorlayouts	=	macintosh_vndr/apple(alukbd)+macintosh_vndr/%l%(v)
+ $applealu	*			=	macintosh_vndr/apple(alukbd)+%l%(v)
  $macs		en_US			=	pc+macintosh_vndr/us(extended)
  $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l%(v)
   nokiarx44	*			=	nokia_vndr/rx-44(%l)
diff --git a/rules/evdev.m_k.part b/rules/evdev.m_k.part
index 8fa8f8d..8106754 100644
--- a/rules/evdev.m_k.part
+++ b/rules/evdev.m_k.part
@@ -1,2 +1,3 @@
   pc98		=	evdev(pc98)
+  applealu_jis	=	evdev+macintosh(jisevdev)
   *		=	evdev
diff --git a/rules/evdev.m_s.part b/rules/evdev.m_s.part
index 516c976..5a6416b 100644
--- a/rules/evdev.m_s.part
+++ b/rules/evdev.m_s.part
@@ -1,2 +1,3 @@
   $evdevkbds    =   +inet(evdev)+inet(%m)
+  applealu_jis  =   +inet(evdev)+macintosh_vndr/jp(alujiskeys)
   *             =   +inet(evdev)
-- 
1.6.5