From 9f986778bd4393c5a9108426969d45aa7f10f334 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 19 Oct 2011 10:44:43 +0200 Subject: libX11 libXext libXft mesa libxcb mkfontscale pixman xserver xkeyboard-config git update 19 oct 2011 --- xorg-server/xkeyboard-config/symbols/gb | 2 + .../xkeyboard-config/symbols/macintosh_vndr/apple | 282 ++++++++++----------- 2 files changed, 143 insertions(+), 141 deletions(-) (limited to 'xorg-server/xkeyboard-config/symbols') diff --git a/xorg-server/xkeyboard-config/symbols/gb b/xorg-server/xkeyboard-config/symbols/gb index d460d3d61..58e966fc7 100644 --- a/xorg-server/xkeyboard-config/symbols/gb +++ b/xorg-server/xkeyboard-config/symbols/gb @@ -169,10 +169,12 @@ xkb_symbols "mac" { key { [ 2, at, EuroSign ] }; key { [ 3, sterling, numbersign ] }; + key { [ grave, asciitilde ] }; // End alphanumeric section include "level3(ralt_switch)" + include "level3(enter_switch)" }; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/apple b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/apple index cbbf110d3..551eabc33 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/apple +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/apple @@ -1,141 +1,141 @@ -// -// Keyboard modification for Apple keyboards -// - -partial default modifier_keys -xkb_symbols "extended" { - - key { [ KP_Equal ] }; - -// The key in the PC's Insert position is sometimes engraved Help (at least -// in Switzerland and Great Britain), with Insert sometimes above. But in the -// US and Canada, it remains Insert. So this should probably be an XkbOption, -// but I have to do more research. -// Perhaps Help should be the primary symbol with Insert in the 1st shift-level -// key { [ Help, Insert ] }; -// The keys next to F12, labeled F13, F14, & F15 generate codes that XFree86 -// claims not to generate. I think they should be equivalent to the PC keys -// Print Screen / SysRq, Scroll Lock, and Pause. Linux kernel bug? -// key { [ F13 ] }; // should be keycode 93 or -// key { [ F13 ] }; // should be keycode 118 -// key { [ F14 ] }; // should be keycode 123 or -// key { [ F14 ] }; // should be keycode 119 -// key { [ F15 ] }; // should be keycode 127 or -// key { [ F15 ] }; // should be keycode 120 -}; - -partial modifier_keys -xkb_symbols "laptop" { - - include "macintosh_vndr/apple(extended)" - - // The real numlock key on the iBook (shared with F5) works internally to - // the keyboard. It illuminates the Num_Lock led and locks the fn-key to - // type only the keypad keys on the letter keys (U=4, I=5, O=6, P=*, etc.). - // The key in the Num_lock position is engraved with Clear. - override key { [ Clear ] }; - // The key engraved Delete sends BKSP. To get Delete, use Shift-Delete - override key { [ BackSpace, Delete ] }; - // These keyboards only generate a when pressing fn+Alt. This makes - // it impossible to get to the third shift level on keys that are on - // the fn-keypad, so use the Enter key (right of ) for Mode_switch, - // and use fn+Enter (Apple's code for Menu) for KP_Enter. - replace key { [ ISO_Level3_Shift ] }; - modifier_map Mod5 { ISO_Level3_Shift }; - // Linux kernel bug with Menu on macs means this doesn't work yet -// replace key { [ KP_Enter ] }; // should be keycode 117 -}; - -partial modifier_keys -xkb_symbols "laptop_bad_switch" { - // Kept for backward compatibility - include "macintosh_vndr/apple(laptop)" -}; - -// Long Aluminium Keyboards -partial function_keys -xkb_symbols "alukbd" { - // The base is a inet PC keyboard - include "pc" - - // Additional Fxx keys - key { [ F13 ] }; - key { [ F14 ] }; - key { [ F15 ] }; - key { [ F16 ] }; - key { [ F17 ] }; - key { [ F18 ] }; - key { [ F19 ] }; - - // On aluminium keyboards, Num_Lock is replace by Clear - replace key { [ XF86Clear ] }; - // CAPS key is always Caps_Lock, even for JIS keyboards - replace key { [ Caps_Lock ] }; - - // F1..F12 are multimedia keys when used with the 'Fn' key - // Make those multimedia actions available via ISO_Level3_Shift too, - // it is useful when the Fn key is remapped to something else (e.g. Insert) - key { - type= "FOUR_LEVEL_X", - symbols[Group1]= [ NoSymbol, XF86KbdBrightnessDown, NoSymbol, XF86_Switch_VT_1 ] - }; - key { - type= "FOUR_LEVEL_X", - symbols[Group1]= [ NoSymbol, XF86KbdBrightnessUp, NoSymbol, XF86_Switch_VT_2 ] - }; - key { - type= "FOUR_LEVEL_X", - symbols[Group1]= [ NoSymbol, NoSymbol, NoSymbol, XF86_Switch_VT_3 ] - }; - key { - type= "FOUR_LEVEL_X", - symbols[Group1]= [ NoSymbol, NoSymbol, NoSymbol, XF86_Switch_VT_4 ] - }; - key { - type= "FOUR_LEVEL_X", - symbols[Group1]= [ NoSymbol, NoSymbol, NoSymbol, XF86_Switch_VT_5 ] - }; - key { - type= "FOUR_LEVEL_X", - symbols[Group1]= [ NoSymbol, NoSymbol, NoSymbol, XF86_Switch_VT_6 ] - }; - key { - type= "FOUR_LEVEL_X", - symbols[Group1]= [ NoSymbol, XF86AudioPrev, NoSymbol, XF86_Switch_VT_7 ] - }; - key { - type= "FOUR_LEVEL_X", - symbols[Group1]= [ NoSymbol, XF86AudioPlay, NoSymbol, XF86_Switch_VT_8 ] - }; - key { - type= "FOUR_LEVEL_X", - symbols[Group1]= [ NoSymbol, XF86AudioNext, NoSymbol, XF86_Switch_VT_9 ] - }; - key { - type= "FOUR_LEVEL_X", - symbols[Group1]= [ NoSymbol, XF86AudioMute, NoSymbol, XF86_Switch_VT_10 ] - }; - key { - type= "FOUR_LEVEL_X", - symbols[Group1]= [ NoSymbol, XF86AudioLowerVolume, NoSymbol, XF86_Switch_VT_11 ] - }; - key { - type= "FOUR_LEVEL_X", - symbols[Group1]= [ NoSymbol, XF86AudioRaiseVolume, NoSymbol, XF86_Switch_VT_12 ] - }; -}; - -// Aluminium Keyboard: make F13, F14, F15 PC-ish (Print, Scroll_Lock, Pause) -partial function_keys keypad_keys -xkb_symbols "alupckeys" { - key { - type= "PC_ALT_LEVEL2", - symbols[Group1]= [ Print, Sys_Req ] - }; - key { [ Scroll_Lock ] }; - key { - type= "PC_CONTROL_LEVEL2", - symbols[Group1]= [ Pause, Break ] - }; - override key { [ Num_Lock, Pointer_EnableKeys ] }; -}; +// +// Keyboard modification for Apple keyboards +// + +partial default modifier_keys +xkb_symbols "extended" { + + key { [ KP_Equal ] }; + +// The key in the PC's Insert position is sometimes engraved Help (at least +// in Switzerland and Great Britain), with Insert sometimes above. But in the +// US and Canada, it remains Insert. So this should probably be an XkbOption, +// but I have to do more research. +// Perhaps Help should be the primary symbol with Insert in the 1st shift-level +// key { [ Help, Insert ] }; +// The keys next to F12, labeled F13, F14, & F15 generate codes that XFree86 +// claims not to generate. I think they should be equivalent to the PC keys +// Print Screen / SysRq, Scroll Lock, and Pause. Linux kernel bug? +// key { [ F13 ] }; // should be keycode 93 or +// key { [ F13 ] }; // should be keycode 118 +// key { [ F14 ] }; // should be keycode 123 or +// key { [ F14 ] }; // should be keycode 119 +// key { [ F15 ] }; // should be keycode 127 or +// key { [ F15 ] }; // should be keycode 120 +}; + +partial modifier_keys +xkb_symbols "laptop" { + + include "macintosh_vndr/apple(extended)" + + // The real numlock key on the iBook (shared with F5) works internally to + // the keyboard. It illuminates the Num_Lock led and locks the fn-key to + // type only the keypad keys on the letter keys (U=4, I=5, O=6, P=*, etc.). + // The key in the Num_lock position is engraved with Clear. + override key { [ Clear ] }; + // The key engraved Delete sends BKSP. To get Delete, use Shift-Delete + override key { [ BackSpace, Delete ] }; + // These keyboards only generate a when pressing fn+Alt. This makes + // it impossible to get to the third shift level on keys that are on + // the fn-keypad, so use the Enter key (right of ) for Mode_switch, + // and use fn+Enter (Apple's code for Menu) for KP_Enter. + replace key { [ ISO_Level3_Shift ] }; + modifier_map Mod5 { ISO_Level3_Shift }; + // Linux kernel bug with Menu on macs means this doesn't work yet +// replace key { [ KP_Enter ] }; // should be keycode 117 +}; + +partial modifier_keys +xkb_symbols "laptop_bad_switch" { + // Kept for backward compatibility + include "macintosh_vndr/apple(laptop)" +}; + +// Long Aluminium Keyboards +partial function_keys +xkb_symbols "alukbd" { + // The base is a inet PC keyboard + include "pc" + + // Additional Fxx keys + key { [ F13 ] }; + key { [ F14 ] }; + key { [ F15 ] }; + key { [ F16 ] }; + key { [ F17 ] }; + key { [ F18 ] }; + key { [ F19 ] }; + + // On aluminium keyboards, Num_Lock is replace by Clear + replace key { [ Clear ] }; + // CAPS key is always Caps_Lock, even for JIS keyboards + replace key { [ Caps_Lock ] }; + + // F1..F12 are multimedia keys when used with the 'Fn' key + // Make those multimedia actions available via ISO_Level3_Shift too, + // it is useful when the Fn key is remapped to something else (e.g. Insert) + key { + type= "FOUR_LEVEL_X", + symbols[Group1]= [ NoSymbol, XF86KbdBrightnessDown, NoSymbol, XF86_Switch_VT_1 ] + }; + key { + type= "FOUR_LEVEL_X", + symbols[Group1]= [ NoSymbol, XF86KbdBrightnessUp, NoSymbol, XF86_Switch_VT_2 ] + }; + key { + type= "FOUR_LEVEL_X", + symbols[Group1]= [ NoSymbol, NoSymbol, NoSymbol, XF86_Switch_VT_3 ] + }; + key { + type= "FOUR_LEVEL_X", + symbols[Group1]= [ NoSymbol, NoSymbol, NoSymbol, XF86_Switch_VT_4 ] + }; + key { + type= "FOUR_LEVEL_X", + symbols[Group1]= [ NoSymbol, NoSymbol, NoSymbol, XF86_Switch_VT_5 ] + }; + key { + type= "FOUR_LEVEL_X", + symbols[Group1]= [ NoSymbol, NoSymbol, NoSymbol, XF86_Switch_VT_6 ] + }; + key { + type= "FOUR_LEVEL_X", + symbols[Group1]= [ NoSymbol, XF86AudioPrev, NoSymbol, XF86_Switch_VT_7 ] + }; + key { + type= "FOUR_LEVEL_X", + symbols[Group1]= [ NoSymbol, XF86AudioPlay, NoSymbol, XF86_Switch_VT_8 ] + }; + key { + type= "FOUR_LEVEL_X", + symbols[Group1]= [ NoSymbol, XF86AudioNext, NoSymbol, XF86_Switch_VT_9 ] + }; + key { + type= "FOUR_LEVEL_X", + symbols[Group1]= [ NoSymbol, XF86AudioMute, NoSymbol, XF86_Switch_VT_10 ] + }; + key { + type= "FOUR_LEVEL_X", + symbols[Group1]= [ NoSymbol, XF86AudioLowerVolume, NoSymbol, XF86_Switch_VT_11 ] + }; + key { + type= "FOUR_LEVEL_X", + symbols[Group1]= [ NoSymbol, XF86AudioRaiseVolume, NoSymbol, XF86_Switch_VT_12 ] + }; +}; + +// Aluminium Keyboard: make F13, F14, F15 PC-ish (Print, Scroll_Lock, Pause) +partial function_keys keypad_keys +xkb_symbols "alupckeys" { + key { + type= "PC_ALT_LEVEL2", + symbols[Group1]= [ Print, Sys_Req ] + }; + key { [ Scroll_Lock ] }; + key { + type= "PC_CONTROL_LEVEL2", + symbols[Group1]= [ Pause, Break ] + }; + override key { [ Num_Lock, Pointer_EnableKeys ] }; +}; -- cgit v1.2.3