xkbdesc/rules HDR, 1.8, 1.9 Makefile.am, 1.21, 1.22 base.m_k.part,
1.8, 1.9 base.xml.in, 1.150, 1.151
Sergey V. Oudaltsov
xlibs-commit at pdx.freedesktop.org
Mon Sep 18 07:17:03 PDT 2006
Committed by: svu
Update of /cvs/xlibs/xkbdesc/rules
In directory kemper:/tmp/cvs-serv18406/rules
Modified Files:
HDR Makefile.am base.m_k.part base.xml.in
Log Message:
splitting good and bad apple keycodes, b.fd.o#8242
Index: HDR
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/HDR,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- HDR 17 Oct 2005 00:34:24 -0000 1.8
+++ HDR 18 Sep 2006 14:17:00 -0000 1.9
@@ -1,6 +1,7 @@
! model = keycodes
! layout[1] = keycodes
! layout = keycodes
+! option = keycodes
! model = geometry
! model layout variant = symbols
! model layout = symbols
Index: Makefile.am
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Makefile.am 4 Mar 2006 18:07:46 -0000 1.21
+++ Makefile.am 18 Sep 2006 14:17:00 -0000 1.22
@@ -23,7 +23,8 @@
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 \
Index: base.m_k.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.m_k.part,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- base.m_k.part 4 Sep 2006 21:23:22 -0000 1.8
+++ base.m_k.part 18 Sep 2006 14:17:00 -0000 1.9
@@ -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
Index: base.xml.in
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.xml.in,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- base.xml.in 18 Sep 2006 13:25:31 -0000 1.150
+++ base.xml.in 18 Sep 2006 14:17:00 -0000 1.151
@@ -3178,6 +3178,12 @@
<_description>Special keys (Ctrl+Alt+<key>) 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 -->
More information about the xlibs-commit
mailing list