From 0f834b91a4768673833ab4917e87d86c237bb1a6 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 23 Mar 2012 10:05:55 +0100 Subject: libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update 23 Mar 2012 --- .../xkeyboard-config/symbols/macintosh_vndr/us | 296 ++++++++++----------- 1 file changed, 148 insertions(+), 148 deletions(-) (limited to 'xorg-server/xkeyboard-config/symbols/macintosh_vndr') diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us index 6da1c67bf..36f4429cc 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us @@ -1,148 +1,148 @@ -// symbols definition for a Macintosh "Extended" keyboard - -xkb_symbols "extended" { - - name[Group1]= "USA"; - key { [ Escape ] }; - - // Alphanumeric section - key { [ quoteleft, asciitilde ] }; - key { [ 1, exclam ] }; - key { [ 2, at ] }; - key { [ 3, numbersign ] }; - key { [ 4, dollar ] }; - key { [ 5, percent ] }; - key { [ 6, asciicircum ] }; - key { [ 7, ampersand ] }; - key { [ 8, asterisk ] }; - key { [ 9, parenleft ] }; - key { [ 0, parenright ] }; - key { [ minus, underscore ] }; - key { [ equal, plus ] }; - - key { [ q, Q ] }; - key { [ w, W ] }; - key { [ e, E ] }; - key { [ r, R ] }; - key { [ t, T ] }; - key { [ y, Y ] }; - key { [ u, U ] }; - key { [ i, I ] }; - key { [ o, O ] }; - key { [ p, P ] }; - key { [ bracketleft, braceleft ] }; - key { [ bracketright, braceright ] }; - key { [ backslash, bar ] }; - - key { [ a, A ] }; - key { [ s, S ] }; - key { [ d, D ] }; - key { [ f, F ] }; - key { [ g, G ] }; - key { [ h, H ] }; - key { [ j, J ] }; - key { [ k, K ] }; - key { [ l, L ] }; - key { [ semicolon, colon ] }; - key { [ quoteright, quotedbl ] }; - - key { [ z, Z ] }; - key { [ x, X ] }; - key { [ c, C ] }; - key { [ v, V ] }; - key { [ b, B ] }; - key { [ n, N ] }; - key { [ m, M ] }; - key { [ comma, less ] }; - key { [ period, greater ] }; - key { [ slash, question ] }; - - key { [ space ] }; - // End alphanumeric section - - - include "eurosign(e)" - include "keypad" - - key { [ equal ] }; -}; - -hidden -xkb_symbols "oldmac" { - - include "macintosh_vndr/us(extended)" - - // Begin "Function" section - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ F9 ] }; - key { [ F10 ] }; - key { [ F11 ] }; - key { [ F12 ] }; - key { [ Print ] }; - key { [ Scroll_Lock ] }; - key { [ Pause ] }; - // End "Function" section - - // Begin "Editing" section - key { [ Insert ] }; - key { [ Home ] }; - key { [ Prior ] }; - key { [ Delete ] }; - key { [ End ] }; - key { [ Next ] }; - - key { [ Up ] }; - key { [ Left ] }; - key { [ Down ] }; - key { [ Right ] }; - // End "Editing" section - - key { [ BackSpace ] }; - key { [ Tab, ISO_Left_Tab ] }; - key { [ Return ] }; - key { [ Caps_Lock ] }; - key { [ Num_Lock, Pointer_EnableKeys ] }; - - // Begin "Modifier" section - key { [ Shift_L ] }; - key { [ Shift_R ] }; - key { [ Control_L ] }; - key { [ Control_R ] }; - key { [ Alt_L, Meta_L ] }; - key { [ Alt_R, Meta_R ] }; - key { [ Super_L ] }; - key { [ Super_R ] }; - // End "Modifier" section - - // begin modifier mappings - modifier_map Shift { Shift_L, Shift_R }; - modifier_map Lock { Caps_Lock, ISO_Lock }; - modifier_map Control{ Control_L, Control_R }; - modifier_map Mod2 { Num_Lock }; - - // Fake keys for virtual<->real modifiers mapping - key { [ ISO_Level3_Shift ] }; - key { [ Mode_switch ] }; - modifier_map Mod5 { , }; - - key { [ NoSymbol, Alt_L ] }; - modifier_map Mod1 { , }; - - key { [ NoSymbol, Meta_L ] }; - modifier_map Mod1 { }; - - key { [ NoSymbol, Super_L ] }; - modifier_map Mod4 { }; - - key { [ NoSymbol, Hyper_L ] }; - modifier_map Mod4 { }; - // end modifier mappings - -}; +// symbols definition for a Macintosh "Extended" keyboard + +xkb_symbols "extended" { + + name[Group1]= "USA"; + key { [ Escape ] }; + + // Alphanumeric section + key { [ quoteleft, asciitilde ] }; + key { [ 1, exclam ] }; + key { [ 2, at ] }; + key { [ 3, numbersign ] }; + key { [ 4, dollar ] }; + key { [ 5, percent ] }; + key { [ 6, asciicircum ] }; + key { [ 7, ampersand ] }; + key { [ 8, asterisk ] }; + key { [ 9, parenleft ] }; + key { [ 0, parenright ] }; + key { [ minus, underscore ] }; + key { [ equal, plus ] }; + + key { [ q, Q ] }; + key { [ w, W ] }; + key { [ e, E ] }; + key { [ r, R ] }; + key { [ t, T ] }; + key { [ y, Y ] }; + key { [ u, U ] }; + key { [ i, I ] }; + key { [ o, O ] }; + key { [ p, P ] }; + key { [ bracketleft, braceleft ] }; + key { [ bracketright, braceright ] }; + key { [ backslash, bar ] }; + + key { [ a, A ] }; + key { [ s, S ] }; + key { [ d, D ] }; + key { [ f, F ] }; + key { [ g, G ] }; + key { [ h, H ] }; + key { [ j, J ] }; + key { [ k, K ] }; + key { [ l, L ] }; + key { [ semicolon, colon ] }; + key { [ quoteright, quotedbl ] }; + + key { [ z, Z ] }; + key { [ x, X ] }; + key { [ c, C ] }; + key { [ v, V ] }; + key { [ b, B ] }; + key { [ n, N ] }; + key { [ m, M ] }; + key { [ comma, less ] }; + key { [ period, greater ] }; + key { [ slash, question ] }; + + key { [ space ] }; + // End alphanumeric section + + + include "eurosign(e)" + include "keypad" + + key { [ equal ] }; +}; + +hidden +xkb_symbols "oldmac" { + + include "macintosh_vndr/us(extended)" + + // Begin "Function" section + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F10 ] }; + key { [ F11 ] }; + key { [ F12 ] }; + key { [ Print ] }; + key { [ Scroll_Lock ] }; + key { [ Pause ] }; + // End "Function" section + + // Begin "Editing" section + key { [ Insert ] }; + key { [ Home ] }; + key { [ Prior ] }; + key { [ Delete ] }; + key { [ End ] }; + key { [ Next ] }; + + key { [ Up ] }; + key { [ Left ] }; + key { [ Down ] }; + key { [ Right ] }; + // End "Editing" section + + key { [ BackSpace ] }; + key { [ Tab, ISO_Left_Tab ] }; + key { [ Return ] }; + key { [ Caps_Lock ] }; + key { [ Num_Lock, Pointer_EnableKeys ] }; + + // Begin "Modifier" section + key { [ Shift_L ] }; + key { [ Shift_R ] }; + key { [ Control_L ] }; + key { [ Control_R ] }; + key { [ Alt_L, Meta_L ] }; + key { [ Alt_R, Meta_R ] }; + key { [ Super_L ] }; + key { [ Super_R ] }; + // End "Modifier" section + + // begin modifier mappings + modifier_map Shift { Shift_L, Shift_R }; + modifier_map Lock { Caps_Lock }; + modifier_map Control{ Control_L, Control_R }; + modifier_map Mod2 { Num_Lock }; + + // Fake keys for virtual<->real modifiers mapping + key { [ ISO_Level3_Shift ] }; + key { [ Mode_switch ] }; + modifier_map Mod5 { , }; + + key { [ NoSymbol, Alt_L ] }; + modifier_map Mod1 { , }; + + key { [ NoSymbol, Meta_L ] }; + modifier_map Mod1 { }; + + key { [ NoSymbol, Super_L ] }; + modifier_map Mod4 { }; + + key { [ NoSymbol, Hyper_L ] }; + modifier_map Mod4 { }; + // end modifier mappings + +}; -- cgit v1.2.3