debian/patches/117_aluminium_symbols.patch

   1 commit f3296f32344340a63f1714df5a9f5f32adec2615
   2 Author: Damien Ciabrini <damien.ciabrini@gmail.com>
   3 Date:   Thu Dec 24 16:20:37 2009 +0100
   4
   5     xkeyboard-config: Symbols for Apple Aluminium keyboards
   6
   7     Symbols common to ANSI, ISO and JIS keyboards
   8     New jp file for JIS keyboard to override usual jp mapping (including EISU and KANA keys)
   9     Duplicate jp layout available in symbol/jp, via the "mac" variant
  10
  11     Signed-off-by: Damien Ciabrini <damien.ciabrini@gmail.com>
  12
  13 diff --git a/rules/base.xml.in b/rules/base.xml.in
  14 index e472d72..8dde521 100644
  15 --- a/rules/base.xml.in
  16 +++ b/rules/base.xml.in
  17 @@ -2888,6 +2888,12 @@
  18              <_description>OADG 109A</_description>
  19            </configItem>
  20         </variant>
  21 +        <variant>
  22 +          <configItem>
  23 +            <name>mac</name>
  24 +            <description>Macintosh</description>
  25 +          </configItem>
  26 +        </variant>
  27        </variantList>
  28      </layout>
  29      <layout>
  30 diff --git a/symbols/jp b/symbols/jp
  31 index 694090c..68ffff7 100644
  32 --- a/symbols/jp
  33 +++ b/symbols/jp
  34 @@ -211,3 +211,12 @@ xkb_symbols "nicola_f_bs" {
  35      key <AC12> { [ Escape               ] };
  36      key <AB11> { [ at, grave            ] };
  37  };
  38 +
  39 +// Copied from macintosh_vndr/jp
  40 +partial alphanumeric_keys
  41 +xkb_symbols "mac" {
  42 +    name[Group1]       = "Japan - Macintosh";
  43 +    include "jp(kana)"
  44 +
  45 +    replace key <CAPS> { [ Caps_Lock ] };
  46 +};
  47 diff --git a/symbols/macintosh_vndr/Makefile.am b/symbols/macintosh_vndr/Makefile.am
  48 index 8a4ca9f..f39662e 100644
  49 --- a/symbols/macintosh_vndr/Makefile.am
  50 +++ b/symbols/macintosh_vndr/Makefile.am
  51 @@ -3,6 +3,6 @@ symbolsdir = $(xkb_base)/symbols/macintosh_vndr
  52  dist_symbols_DATA = \
  53  apple ch de dk \
  54  fi fr \
  55 -gb is it \
  56 +gb is it jp \
  57  latam nl no pt \
  58  se us
  59 diff --git a/symbols/macintosh_vndr/apple b/symbols/macintosh_vndr/apple
  60 index 3887caf..e6ab89f 100644
  61 --- a/symbols/macintosh_vndr/apple
  62 +++ b/symbols/macintosh_vndr/apple
  63 @@ -52,3 +52,76 @@ xkb_symbols "laptop_bad_switch" {
  64      // Kept for backward compatibility
  65      include "macintosh_vndr/apple(laptop)"
  66  };
  67 +
  68 +// Long Aluminium Keyboards
  69 +partial function_keys
  70 +xkb_symbols "alukbd" {
  71 +    // The base is a inet PC keyboard
  72 +    include "pc"
  73 +
  74 +    // Additional Fxx keys
  75 +    key <FK13> { [ F13 ] };
  76 +    key <FK14> { [ F14 ] };
  77 +    key <FK15> { [ F15 ] };
  78 +    key <FK16> { [ F16 ] };
  79 +    key <FK17> { [ F17 ] };
  80 +    key <FK18> { [ F18 ] };
  81 +    key <FK19> { [ F19 ] };
  82 +
  83 +    // On aluminium keyboards, Num_Lock is replace by Clear
  84 +    replace key <NMLK> { [ XF86Clear ] };
  85 +    // CAPS key is always Caps_Lock, even for JIS keyboards
  86 +    replace key <CAPS> { [ Caps_Lock ] };
  87 +
  88 +    // F1..F12 are multimedia keys when used with the 'Fn' key
  89 +    // Make those multimedia actions available via ISO_Level3_Shift too,
  90 +    // it is useful when the Fn key is remapped to something else (e.g. Insert)
  91 +    key <FK01> {
  92 +      type= "FOUR_LEVEL_X",
  93 +      symbols[Group1]= [ NoSymbol, XF86KbdBrightnessDown, NoSymbol, XF86_Switch_VT_1 ]
  94 +    };
  95 +    key <FK02> {
  96 +      type= "FOUR_LEVEL_X",
  97 +      symbols[Group1]= [ NoSymbol, XF86KbdBrightnessUp, NoSymbol, XF86_Switch_VT_2 ]
  98 +    };
  99 +    key <FK03> {
 100 +      type= "FOUR_LEVEL_X",
 101 +      symbols[Group1]= [ NoSymbol, NoSymbol, NoSymbol, XF86_Switch_VT_3 ]
 102 +    };
 103 +    key <FK04> {
 104 +      type= "FOUR_LEVEL_X",
 105 +      symbols[Group1]= [ NoSymbol, NoSymbol, NoSymbol, XF86_Switch_VT_4 ]
 106 +    };
 107 +    key <FK05> {
 108 +      type= "FOUR_LEVEL_X",
 109 +      symbols[Group1]= [ NoSymbol, NoSymbol, NoSymbol, XF86_Switch_VT_5 ]
 110 +    };
 111 +    key <FK06> {
 112 +      type= "FOUR_LEVEL_X",
 113 +      symbols[Group1]= [ NoSymbol, NoSymbol, NoSymbol, XF86_Switch_VT_6 ]
 114 +    };
 115 +    key <FK07> {
 116 +      type= "FOUR_LEVEL_X",
 117 +      symbols[Group1]= [ NoSymbol, XF86AudioPrev, NoSymbol, XF86_Switch_VT_7 ]
 118 +    };
 119 +    key <FK08> {
 120 +      type= "FOUR_LEVEL_X",
 121 +      symbols[Group1]= [ NoSymbol, XF86AudioPlay, NoSymbol, XF86_Switch_VT_8 ]
 122 +    };
 123 +    key <FK09> {
 124 +      type= "FOUR_LEVEL_X",
 125 +      symbols[Group1]= [ NoSymbol, XF86AudioNext, NoSymbol, XF86_Switch_VT_9 ]
 126 +    };
 127 +    key <FK10> {
 128 +      type= "FOUR_LEVEL_X",
 129 +      symbols[Group1]= [ NoSymbol, XF86AudioMute, NoSymbol, XF86_Switch_VT_10 ]
 130 +    };
 131 +    key <FK11> {
 132 +      type= "FOUR_LEVEL_X",
 133 +      symbols[Group1]= [ NoSymbol, XF86AudioLowerVolume, NoSymbol, XF86_Switch_VT_11 ]
 134 +    };
 135 +    key <FK12> {
 136 +      type= "FOUR_LEVEL_X",
 137 +      symbols[Group1]= [ NoSymbol, XF86AudioRaiseVolume, NoSymbol, XF86_Switch_VT_12 ]
 138 +    };
 139 +};
 140 diff --git a/symbols/macintosh_vndr/jp b/symbols/macintosh_vndr/jp
 141 new file mode 100644
 142 index 0000000..331257a
 143 --- /dev/null
 144 +++ b/symbols/macintosh_vndr/jp
 145 @@ -0,0 +1,35 @@
 146 +// JIS symbol mapping for Apple Aluminium Keyboard
 147 +// (Damien Ciabrini <damien.ciabrini@gmail.com>)
 148 +//
 149 +// The JIS version of the Aluminium Keyboard is made of
 150 +//   QWERTY-like map for the latin part
 151 +//   PC98-like map for the kana part
 152 +//   EISU and KANA keys found on other Apple keyboards
 153 +
 154 +partial default alphanumeric_keys
 155 +xkb_symbols "usmac" {
 156 +    name[Group1]       = "Japan - Macintosh, US map";
 157 +    include "jp(common)"
 158 +
 159 +    key <JPCM> { [ KP_Separator ] };
 160 +    key <AE13> { [ yen, bar    ] };
 161 +    replace key <AE10> { [ 0           ] };
 162 +    replace key <AB11> { [ underscore  ] };
 163 +    replace key <CAPS> { [ Caps_Lock ] };
 164 +};
 165 +
 166 +partial alphanumeric_keys
 167 +xkb_symbols "mac" {
 168 +    name[Group1]       = "Japan - Macintosh";
 169 +    include "jp(kana)"
 170 +
 171 +    replace key <CAPS> { [ Caps_Lock ] };
 172 +};
 173 +
 174 +partial alphanumeric_keys
 175 +xkb_symbols "alujiskeys" {
 176 +    // On JIS USB keyboard, EISU and KANA replace Hangul and Hanja
 177 +    // see keycodes macintosh(jisevdev)
 178 +    replace key <HJCV> { [ Hiragana_Katakana ] };
 179 +    replace key <HNGL> { [ Eisu_toggle ] };
 180 +};