← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xkeyboard-config/trusty-proposed

« back to all changes in this revision

Viewing changes to symbols/macintosh_vndr/apple

  • Committer: Bazaar Package Importer
  • Author(s): Bryce Harrington
  • Date: 2011-02-01 11:57:39 UTC
  • mfrom: (12.2.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20110201115739-6kl4l72rx5l7zjc0
Tags: 2.1-1ubuntu1
https://launchpad.net/bugs/588918
https://launchpad.net/bugs/575660
https://launchpad.net/bugs/672881
https://launchpad.net/bugs/393887
https://launchpad.net/bugs/696232
https://launchpad.net/bugs/359719
https://launchpad.net/bugs/592448
* Merge from debian of 2.1 release.
  - Fixes Ubuntu bugs:
    + Sindhi keyboard layout (locale: sd_PK, sd_IN) (LP: #588918)
    + Fix conflict between Mali and Malayalam layouts (LP: #575660)
    + Support for Philippines "National Keyboard Layout" (LP: #672881)
    + Support for Kinesis keyboard geometry (LP: #393887)
    + Support for Apple Aluminium keyboards (LP: #696232)
    + Support for abnt2 keyboard, thinkpad variant for Lenovo 3000 v100
      laptops (LP: #359719)
    + Fix CapsLock misspelling (LP: #592448)
  - Remaining Ubuntu changes:
    + xkb-data-i18n.install, xkb-data.install, rules: Split out
      xkb-data-i18n to be used by console-setup.
    + rules: Generate pot file for translations during build
    + 104_macbook_expose_and_dashboard.patch: Add keycode definitions
        required for Apples Expose & Dashboard keys (F3/F4).
    + 105_intelligent_keyboard.patch: Add support for the Intelligent
      Keyboard K04
    + 107_lao.patch: New keyboard layout for Lao, implemented as
      an alternative to the default one.
    + 108_taiwan.patch: New keyboard layouts for Taiwan.
* Drop 102_mac_aliases.patch: This appears to have some side effects,
  and the patch was not taken by upstream because it was an incomplete
  fix.  Reopens bug 327963
* Drop patches included in the new upstream release:
    - 106_fixspell3d.patch: upstream
    - 109_mali.patch: upstream
    - 110_variants-cleanup.patch
    - 111_il-missing-symbol.patch
    - 112_zero-with-spacing.patch
    - 113_cz-dvorak-ucw.patch
    - 114_ejn_4_level.patch
    - 115_aluminium_geometries.patch
    - 116_aluminium_keycodes.patch
    - 117_aluminium_symbols.patch
    - 118_aluminium_aliases.patch
    - 119_aluminium_pc_compat.patch
    - 120_aluminium_rules.patch
    - 121_tamil_chars.patch
    - 122_olpc-azerty.patch
    - 123_fix_i18n.patch
    - 124_serbian_ru_level3.patch
    - 125_mapping_tools_launch5_menukb.patch
    - 126_swahili_arabic.patch
    - 127_restore_gb_colemak.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
symbols/macintosh_vndr/apple
52
52
    // Kept for backward compatibility
53
53
    include "macintosh_vndr/apple(laptop)"
54
54
};
 
55
 
 
56
// Long Aluminium Keyboards
 
57
partial function_keys
 
58
xkb_symbols "alukbd" {
 
59
    // The base is a inet PC keyboard
 
60
    include "pc"
 
61
 
 
62
    // Additional Fxx keys
 
63
    key <FK13> { [ F13 ] };
 
64
    key <FK14> { [ F14 ] };
 
65
    key <FK15> { [ F15 ] };
 
66
    key <FK16> { [ F16 ] };
 
67
    key <FK17> { [ F17 ] };
 
68
    key <FK18> { [ F18 ] };
 
69
    key <FK19> { [ F19 ] };
 
70
 
 
71
    // On aluminium keyboards, Num_Lock is replace by Clear
 
72
    replace key <NMLK> { [ XF86Clear ] };
 
73
    // CAPS key is always Caps_Lock, even for JIS keyboards
 
74
    replace key <CAPS> { [ Caps_Lock ] };
 
75
 
 
76
    // F1..F12 are multimedia keys when used with the 'Fn' key
 
77
    // Make those multimedia actions available via ISO_Level3_Shift too,
 
78
    // it is useful when the Fn key is remapped to something else (e.g. Insert)
 
79
    key <FK01> {
 
80
      type= "FOUR_LEVEL_X",
 
81
      symbols[Group1]= [ NoSymbol, XF86KbdBrightnessDown, NoSymbol, XF86_Switch_VT_1 ]
 
82
    };
 
83
    key <FK02> {
 
84
      type= "FOUR_LEVEL_X",
 
85
      symbols[Group1]= [ NoSymbol, XF86KbdBrightnessUp, NoSymbol, XF86_Switch_VT_2 ]
 
86
    };
 
87
    key <FK03> {
 
88
      type= "FOUR_LEVEL_X",
 
89
      symbols[Group1]= [ NoSymbol, NoSymbol, NoSymbol, XF86_Switch_VT_3 ]
 
90
    };
 
91
    key <FK04> {
 
92
      type= "FOUR_LEVEL_X",
 
93
      symbols[Group1]= [ NoSymbol, NoSymbol, NoSymbol, XF86_Switch_VT_4 ]
 
94
    };
 
95
    key <FK05> {
 
96
      type= "FOUR_LEVEL_X",
 
97
      symbols[Group1]= [ NoSymbol, NoSymbol, NoSymbol, XF86_Switch_VT_5 ]
 
98
    };
 
99
    key <FK06> {
 
100
      type= "FOUR_LEVEL_X",
 
101
      symbols[Group1]= [ NoSymbol, NoSymbol, NoSymbol, XF86_Switch_VT_6 ]
 
102
    };
 
103
    key <FK07> {
 
104
      type= "FOUR_LEVEL_X",
 
105
      symbols[Group1]= [ NoSymbol, XF86AudioPrev, NoSymbol, XF86_Switch_VT_7 ]
 
106
    };
 
107
    key <FK08> {
 
108
      type= "FOUR_LEVEL_X",
 
109
      symbols[Group1]= [ NoSymbol, XF86AudioPlay, NoSymbol, XF86_Switch_VT_8 ]
 
110
    };
 
111
    key <FK09> {
 
112
      type= "FOUR_LEVEL_X",
 
113
      symbols[Group1]= [ NoSymbol, XF86AudioNext, NoSymbol, XF86_Switch_VT_9 ]
 
114
    };
 
115
    key <FK10> {
 
116
      type= "FOUR_LEVEL_X",
 
117
      symbols[Group1]= [ NoSymbol, XF86AudioMute, NoSymbol, XF86_Switch_VT_10 ]
 
118
    };
 
119
    key <FK11> {
 
120
      type= "FOUR_LEVEL_X",
 
121
      symbols[Group1]= [ NoSymbol, XF86AudioLowerVolume, NoSymbol, XF86_Switch_VT_11 ]
 
122
    };
 
123
    key <FK12> {
 
124
      type= "FOUR_LEVEL_X",
 
125
      symbols[Group1]= [ NoSymbol, XF86AudioRaiseVolume, NoSymbol, XF86_Switch_VT_12 ]
 
126
    };
 
127
};
 
128
 
 
129
// Aluminium Keyboard: make F13, F14, F15 PC-ish (Print, Scroll_Lock, Pause)
 
130
partial function_keys keypad_keys
 
131
xkb_symbols "alupckeys" {
 
132
    key <FK13> {
 
133
      type= "PC_ALT_LEVEL2",
 
134
      symbols[Group1]= [ Print, Sys_Req ]
 
135
    };
 
136
    key <FK14> { [ Scroll_Lock ] };
 
137
    key <FK15> {
 
138
      type= "PC_CONTROL_LEVEL2",
 
139
      symbols[Group1]= [ Pause, Break ]
 
140
    };
 
141
    override key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
 
142
};