From bd81af89b3080963ed75ae17f48b1d7457350cda Mon Sep 17 00:00:00 2001 From: marha Date: Sat, 27 Mar 2010 10:20:34 +0000 Subject: xkeyboard-config git update 27-3-2010 --- xorg-server/xkbdata.src/keycodes/macintosh | 398 +++++++++++++++-------------- 1 file changed, 211 insertions(+), 187 deletions(-) (limited to 'xorg-server/xkbdata.src/keycodes') diff --git a/xorg-server/xkbdata.src/keycodes/macintosh b/xorg-server/xkbdata.src/keycodes/macintosh index d41ac4bcb..5b0a2614a 100644 --- a/xorg-server/xkbdata.src/keycodes/macintosh +++ b/xorg-server/xkbdata.src/keycodes/macintosh @@ -1,187 +1,211 @@ -// $XConsortium: macintosh /main/10 1996/01/24 12:17:35 kaleb $ -// -//Copyright (c) 1996 X Consortium -// -//Permission is hereby granted, free of charge, to any person obtaining -//a copy of this software and associated documentation files (the -//"Software"), to deal in the Software without restriction, including -//without limitation the rights to use, copy, modify, merge, publish, -//distribute, sublicense, and/or sell copies of the Software, and to -//permit persons to whom the Software is furnished to do so, subject to -//the following conditions: -// -//The above copyright notice and this permission notice shall be -//included in all copies or substantial portions of the Software. -// -//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -//IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR -//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -//OTHER DEALINGS IN THE SOFTWARE. -// -//Except as contained in this notice, the name of the X Consortium shall -//not be used in advertising or otherwise to promote the sale, use or -//other dealings in this Software without prior written authorization -//from the X Consortium. -// -// $XFree86: xc/programs/xkbcomp/keycodes/macintosh,v 1.4 2001/10/02 19:57:00 alanh Exp $ -// -default xkb_keycodes "macintosh" { - include "xfree86" - - = 182; - = 183; - = 184; - = 157; - -}; - -xkb_keycodes "old" { - - minimum= 8; - maximum= 255; - - = 61; - = 58; - = 26; - = 27; - = 28; - = 29; - = 31; - = 30; - = 34; - = 36; - = 33; - = 37; - = 35; - = 32; - = 59; - - = 56; - = 20; - = 21; - = 22; - = 23; - = 25; - = 24; - = 40; - = 42; - = 39; - = 43; - = 41; - = 38; - = 50; - - = 65; - = 8; - = 9; - = 10; - = 11; - = 13; - = 12; - = 46; - = 48; - = 45; - = 49; - = 47; - = 44; - - = 18; - = 14; - = 15; - = 16; - = 17; - = 19; - = 53; - = 54; - = 51; - = 55; - = 52; - - = 57; - - = 62; // Left Control - = 63; // Left Option - = 64; // Left Shift - = 66; // Left Command -// = 131; // Right Shift -// = 132; // Right Command -// = 133; // Right Control -// = 134; // Right Option - - = 130; - = 128; - = 107; - = 126; - = 104; - = 105; - = 106; - = 108; - = 109; - = 117; - = 111; - = 119; - - = 113; - = 115; - = 121; - - = 122; - = 123; - = 124; - = 125; - = 127; - = 129; - - = 70; - = 67; - = 69; - = 68; - - = 79; - = 89; - = 83; - = 75; - - = 97; - = 99; - = 100; - = 86; - - = 94; - = 95; - = 96; - = 77; - - = 91; - = 92; - = 93; - = 84; - - = 90; - = 73; - - indicator 3 = "Scroll Lock"; - indicator 2 = "Num Lock"; - indicator 1 = "Caps Lock"; - - alias = ; -}; - -xkb_keycodes "hhk" { - include "macintosh" - - = 51; - - = 49; - = 131; - = 129; - = 208; - - = 111; - = 78; - = 110; -}; - +// $XConsortium: macintosh /main/10 1996/01/24 12:17:35 kaleb $ +// +//Copyright (c) 1996 X Consortium +// +//Permission is hereby granted, free of charge, to any person obtaining +//a copy of this software and associated documentation files (the +//"Software"), to deal in the Software without restriction, including +//without limitation the rights to use, copy, modify, merge, publish, +//distribute, sublicense, and/or sell copies of the Software, and to +//permit persons to whom the Software is furnished to do so, subject to +//the following conditions: +// +//The above copyright notice and this permission notice shall be +//included in all copies or substantial portions of the Software. +// +//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +//IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR +//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +//OTHER DEALINGS IN THE SOFTWARE. +// +//Except as contained in this notice, the name of the X Consortium shall +//not be used in advertising or otherwise to promote the sale, use or +//other dealings in this Software without prior written authorization +//from the X Consortium. +// +// $XFree86: xc/programs/xkbcomp/keycodes/macintosh,v 1.4 2001/10/02 19:57:00 alanh Exp $ +// +default xkb_keycodes "macintosh" { + include "xfree86" + + = 182; + = 183; + = 184; + = 157; + +}; + +xkb_keycodes "old" { + + minimum= 8; + maximum= 255; + + = 61; + = 58; + = 26; + = 27; + = 28; + = 29; + = 31; + = 30; + = 34; + = 36; + = 33; + = 37; + = 35; + = 32; + = 59; + + = 56; + = 20; + = 21; + = 22; + = 23; + = 25; + = 24; + = 40; + = 42; + = 39; + = 43; + = 41; + = 38; + = 50; + + = 65; + = 8; + = 9; + = 10; + = 11; + = 13; + = 12; + = 46; + = 48; + = 45; + = 49; + = 47; + = 44; + + = 18; + = 14; + = 15; + = 16; + = 17; + = 19; + = 53; + = 54; + = 51; + = 55; + = 52; + + = 57; + + = 62; // Left Control + = 63; // Left Option + = 64; // Left Shift + = 66; // Left Command +// = 131; // Right Shift +// = 132; // Right Command +// = 133; // Right Control +// = 134; // Right Option + + = 130; + = 128; + = 107; + = 126; + = 104; + = 105; + = 106; + = 108; + = 109; + = 117; + = 111; + = 119; + + = 113; + = 115; + = 121; + + = 122; + = 123; + = 124; + = 125; + = 127; + = 129; + + = 70; + = 67; + = 69; + = 68; + + = 79; + = 89; + = 83; + = 75; + + = 97; + = 99; + = 100; + = 86; + + = 94; + = 95; + = 96; + = 77; + + = 91; + = 92; + = 93; + = 84; + + = 90; + = 73; + + indicator 3 = "Scroll Lock"; + indicator 2 = "Num Lock"; + indicator 1 = "Caps Lock"; + + alias = ; +}; + +xkb_keycodes "hhk" { + include "macintosh" + + = 51; + + = 49; + = 131; + = 129; + = 208; + + = 111; + = 78; + = 110; +}; + +// Aluminium Keyboards +xkb_keycodes "alukbd" { + include "xfree86" + + // Fkeys missing in xfree86 keycodes + = 129; + = 130; + + // Eject key that matches the geometry definition + alias = ; + + // Japanese keypad separator (KPSP in base, JPCM in evdev) + alias = ; +}; + +// Aluminium Keyboards JIS +// As of HID Usage Table v1.11, it seems there are no usages +// for keys EISU or KANA. JIS Aluminium Keyboards overcome +// this by outputting usages of keys Hanja and Hangul +xkb_keycodes "jisevdev" { + alias = ; // Switch to kana mode + alias = ; // Switch to alphanumeric mode +}; + -- cgit v1.2.3