summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsvu <svu>2007-08-29 22:19:38 +0000
committersvu <svu>2007-08-29 22:19:38 +0000
commite21ce6b0daaa701c019071308429c8a2f14b2937 (patch)
treefb513ea395030ce0dcde3edfc4f9db90a5a29453
parent65fba6dfe3435fc96401912e5c797989941a5f53 (diff)
macintosh_hhk model, b.fd.o#12091
-rw-r--r--ChangeLog3
-rw-r--r--keycodes/macintosh16
-rw-r--r--rules/base.m_k.part1
-rw-r--r--rules/base.xml.in7
4 files changed, 27 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 47b1b6e..852bf5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
https://bugs.freedesktop.org/show_bug.cgi?id=12202
* keycodes/xfree86, symbols/inet, symbols/pc: display switch &
backlight control, https://bugs.freedesktop.org/show_bug.cgi?id=12203
+ * keycodes/macintosh, rules/base.m_k.part, rules/base.xml.in: adding
+ macintosh_hhk model,
+ https://bugs.freedesktop.org/show_bug.cgi?id=12091
2007-08-28 Sergey Udaltsov
diff --git a/keycodes/macintosh b/keycodes/macintosh
index 7a7a62b..8f5418b 100644
--- a/keycodes/macintosh
+++ b/keycodes/macintosh
@@ -179,3 +179,19 @@ xkb_keycodes "old" {
alias <ALGR> = <RALT>;
};
+
+xkb_keycodes "hhk" {
+ include "macintosh"
+
+ <AC12> = 51;
+
+ <LWIN> = 49;
+ <EISU> = 131;
+ <KANA> = 129;
+ <RWIN> = 208;
+
+ <FK13> = 111;
+ <FK14> = 78;
+ <FK15> = 110;
+};
+
diff --git a/rules/base.m_k.part b/rules/base.m_k.part
index d537901..b401e89 100644
--- a/rules/base.m_k.part
+++ b/rules/base.m_k.part
@@ -6,6 +6,7 @@
abnt2 = xfree86(abnt2)
jp106 = xfree86(jp106)
evdev = evdev
+ macintosh_hhk = macintosh(hhk)
macintosh_old = macintosh(old)
$macbooks = macintosh+macintosh(badmap)
$macs = macintosh
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 90d9536..0e47f88 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -833,6 +833,13 @@
</model>
<model>
<configItem>
+ <name>macintosh_hhk</name>
+ <_description>Happy Hacking Keyboard for Mac</_description>
+ <vendor>Fujitsu</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>acer_c300</name>
<_description>Acer C300</_description>
<vendor>Acer</vendor>