summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorsvu <svu>2006-09-18 14:17:00 +0000
committersvu <svu>2006-09-18 14:17:00 +0000
commitae94b73c0ccc11a18b6288e9787c73e5c795d076 (patch)
tree28044e9fdf21405325e0b6cfeefc943b90cfae30 /rules
parentb034eded33d6b78737425e390083964e9dc2767f (diff)
downloadxkeyboard-config-ae94b73c0ccc11a18b6288e9787c73e5c795d076.tar.gz
splitting good and bad apple keycodes, b.fd.o#8242
Diffstat (limited to 'rules')
-rw-r--r--rules/HDR1
-rw-r--r--rules/Makefile.am3
-rw-r--r--rules/base.m_k.part5
-rw-r--r--rules/base.xml.in6
4 files changed, 11 insertions, 4 deletions
diff --git a/rules/HDR b/rules/HDR
index c7e0a61..e844454 100644
--- a/rules/HDR
+++ b/rules/HDR
@@ -1,6 +1,7 @@
! model = keycodes
! layout[1] = keycodes
! layout = keycodes
+! option = keycodes
! model = geometry
! model layout variant = symbols
! model layout = symbols
diff --git a/rules/Makefile.am b/rules/Makefile.am
index 8c0f8f5..da50ccb 100644
--- a/rules/Makefile.am
+++ b/rules/Makefile.am
@@ -23,7 +23,8 @@ endif
if USE_COMPAT_RULES
base_parts = base.hdr.part base.lists.part \
compat/base.lists.part \
-HDR base.m_k.part HDR base.l1_k.part HDR base.l_k.part \
+HDR base.m_k.part HDR base.l1_k.part \
+HDR base.l_k.part HDR base.o_k.part \
HDR base.m_g.part \
HDR compat/base.mlv_s.part base.mlv_s.part \
HDR compat/base.ml_s.part base.ml_s.part \
diff --git a/rules/base.m_k.part b/rules/base.m_k.part
index 6d4fd6e..8f7b4e0 100644
--- a/rules/base.m_k.part
+++ b/rules/base.m_k.part
@@ -2,13 +2,12 @@
ataritt = ataritt(de)
sun4 = sun(type4_euro)
sun5 = sun(type5_euro)
- macintosh_old = macintosh(old)
- macintosh = macintosh
powerpcps2 = powerpcps2
pc98 = xfree98(pc98)
abnt2 = xfree86(abnt2)
jp106 = xfree86(jp106)
evdev = evdev
- $macbooks = macintosh(macbook)
+ macintosh_old = macintosh(old)
+ $macbooks = macintosh+macintosh(badmap)
$macs = macintosh
* = xfree86
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 4e1f900..c7d0c0c 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -3178,6 +3178,12 @@
<_description>Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server.</_description>
</configItem>
</option>
+ <option>
+ <configItem>
+ <name>apple:badmap</name>
+ <_description>Swap keycodes of two keys when Mac keboards are misdetected by kernel.</_description>
+ </configItem>
+ </option>
</group>
<group allowMultipleSelection="true">
<!-- Special shortcuts for the Euro character -->