1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
From 64387d5598e5c72a3d8fef0b31444c02df2f2cb2 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <kibi@debian.org>
Date: Tue, 23 Nov 2010 19:06:10 +0100
Subject: [PATCH] Revert "dropped goodmap and badmap for apple macbooks, needed only for old broken kernels, b.fd.o#9095"
Since kernels may not have a proper fix, keep those options available.
This reverts commit 222afd3220e9c920bef41bc2e95886c5d4414d5b.
Conflicts:
ChangeLog
Signed-off-by: Cyril Brulebois <kibi@debian.org>
---
keycodes/macintosh | 10 ++++++++++
rules/base.m_k.part | 1 +
rules/base.o_k.part | 2 ++
3 files changed, 13 insertions(+), 0 deletions(-)
--- a/keycodes/macintosh
+++ b/keycodes/macintosh
@@ -36,6 +36,16 @@ default xkb_keycodes "macintosh" {
};
+xkb_keycodes "badmap" {
+ <TLDE> = 94;
+ <LSGT> = 49;
+};
+
+xkb_keycodes "goodmap" {
+ <TLDE> = 49;
+ <LSGT> = 94;
+};
+
xkb_keycodes "old" {
minimum= 8;
--- a/rules/base.m_k.part
+++ b/rules/base.m_k.part
@@ -8,6 +8,7 @@
$applealu = macintosh(alukbd)
macintosh_hhk = macintosh(hhk)
macintosh_old = macintosh(old)
+ $macbooks = macintosh+macintosh(goodmap)
$macs = macintosh
thinkpadz60 = xfree86(thinkpadz60)
* = xfree86
--- a/rules/base.o_k.part
+++ b/rules/base.o_k.part
@@ -1 +1,3 @@
! option = keycodes
+ apple:badmap = +macintosh(badmap)
+ apple:goodmap = +macintosh(goodmap)
|
