From 8a191c08ddda2e66fa26f148d6c21959bb08f923 Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 20 Feb 2011 12:29:25 +0000 Subject: xserver xkeyboard-config libX11 pixman mesa git update 2011 --- xorg-server/xkeyboard-config/keycodes/amiga | 456 +++-- xorg-server/xkeyboard-config/keycodes/ataritt | 240 ++- .../xkeyboard-config/keycodes/digital_vndr/lk | 541 +++--- .../xkeyboard-config/keycodes/digital_vndr/pc | 557 +++--- xorg-server/xkeyboard-config/keycodes/evdev | 627 +++---- xorg-server/xkeyboard-config/keycodes/fujitsu | 373 ++-- xorg-server/xkeyboard-config/keycodes/hp | 541 +++--- xorg-server/xkeyboard-config/keycodes/ibm | 301 ++-- xorg-server/xkeyboard-config/keycodes/macintosh | 3 - .../xkeyboard-config/keycodes/sgi_vndr/indigo | 279 ++- .../xkeyboard-config/keycodes/sgi_vndr/indy | 405 +++-- .../xkeyboard-config/keycodes/sgi_vndr/iris | 21 +- xorg-server/xkeyboard-config/keycodes/sony | 283 ++- xorg-server/xkeyboard-config/keycodes/sun | 1904 ++++++++++---------- xorg-server/xkeyboard-config/keycodes/xfree86 | 822 +++++---- xorg-server/xkeyboard-config/keycodes/xfree98 | 307 ++-- 16 files changed, 3810 insertions(+), 3850 deletions(-) (limited to 'xorg-server/xkeyboard-config/keycodes') diff --git a/xorg-server/xkeyboard-config/keycodes/amiga b/xorg-server/xkeyboard-config/keycodes/amiga index 7d2576701..f374ea658 100644 --- a/xorg-server/xkeyboard-config/keycodes/amiga +++ b/xorg-server/xkeyboard-config/keycodes/amiga @@ -1,231 +1,225 @@ -// $Xorg: amiga,v 1.3 2000/08/17 19:54:37 cpqbld Exp $ - - - -// $XFree86: xc/programs/xkbcomp/keycodes/amiga,v 3.2 1997/10/26 13:25:35 dawes Exp $ - -default xkb_keycodes "usa1" { - - minimum= 8; - maximum= 255; - - = 77; - = 88; - = 89; - = 90; - = 91; - = 92; - = 93; - = 94; - = 95; - = 96; - = 97; - - = 8; - = 9; - = 10; - = 11; - = 12; - = 13; - = 14; - = 15; - = 16; - = 17; - = 18; - = 19; - = 20; - = 21; - = 73; - - = 74; - = 24; - = 25; - = 26; - = 27; - = 28; - = 29; - = 30; - = 31; - = 32; - = 33; - = 34; - = 35; - = 76; - - = 107; - = 106; - = 40; - = 41; - = 42; - = 43; - = 44; - = 45; - = 46; - = 47; - = 48; - = 49; - = 50; - - = 104; - = 57; - = 58; - = 59; - = 60; - = 61; - = 62; - = 63; - = 64; - = 65; - = 66; - = 105; - - = 108; - = 110; - = 72; - = 111; - = 109; - - = 78; - = 103; - = 84; - = 87; - = 85; - = 86; - - = 98; - = 99; - = 100; - = 101; - - = 69; - = 70; - = 71; - = 82; - - = 53; - = 54; - = 55; - = 102; - - = 37; - = 38; - = 39; - - = 23; - = 68; - = 75; -}; - -xkb_keycodes "de" { - - minimum= 8; - maximum= 255; - - = 77; - = 88; - = 89; - = 90; - = 91; - = 92; - = 93; - = 94; - = 95; - = 96; - = 97; - - = 8; - = 9; - = 10; - = 11; - = 12; - = 13; - = 14; - = 15; - = 16; - = 17; - = 18; - = 19; - = 20; - = 21; - = 73; - - = 74; - = 24; - = 25; - = 26; - = 27; - = 28; - = 29; - = 30; - = 31; - = 32; - = 33; - = 34; - = 35; - = 76; - - = 107; - = 106; - = 40; - = 41; - = 42; - = 43; - = 44; - = 45; - = 46; - = 47; - = 48; - = 49; - = 50; - = 51; - - = 104; - = 56; - = 57; - = 58; - = 59; - = 60; - = 61; - = 62; - = 63; - = 64; - = 65; - = 66; - = 105; - - = 108; - = 110; - = 72; - = 111; - = 109; - - = 78; - = 103; - = 84; - = 87; - = 85; - = 86; - - = 98; - = 99; - = 100; - = 101; - - = 69; - = 70; - = 71; - = 82; - - = 53; - = 54; - = 55; - = 102; - - = 37; - = 38; - = 39; - - = 23; - = 68; - = 75; -}; +default xkb_keycodes "usa1" { + + minimum= 8; + maximum= 255; + + = 77; + = 88; + = 89; + = 90; + = 91; + = 92; + = 93; + = 94; + = 95; + = 96; + = 97; + + = 8; + = 9; + = 10; + = 11; + = 12; + = 13; + = 14; + = 15; + = 16; + = 17; + = 18; + = 19; + = 20; + = 21; + = 73; + + = 74; + = 24; + = 25; + = 26; + = 27; + = 28; + = 29; + = 30; + = 31; + = 32; + = 33; + = 34; + = 35; + = 76; + + = 107; + = 106; + = 40; + = 41; + = 42; + = 43; + = 44; + = 45; + = 46; + = 47; + = 48; + = 49; + = 50; + + = 104; + = 57; + = 58; + = 59; + = 60; + = 61; + = 62; + = 63; + = 64; + = 65; + = 66; + = 105; + + = 108; + = 110; + = 72; + = 111; + = 109; + + = 78; + = 103; + = 84; + = 87; + = 85; + = 86; + + = 98; + = 99; + = 100; + = 101; + + = 69; + = 70; + = 71; + = 82; + + = 53; + = 54; + = 55; + = 102; + + = 37; + = 38; + = 39; + + = 23; + = 68; + = 75; +}; + +xkb_keycodes "de" { + + minimum= 8; + maximum= 255; + + = 77; + = 88; + = 89; + = 90; + = 91; + = 92; + = 93; + = 94; + = 95; + = 96; + = 97; + + = 8; + = 9; + = 10; + = 11; + = 12; + = 13; + = 14; + = 15; + = 16; + = 17; + = 18; + = 19; + = 20; + = 21; + = 73; + + = 74; + = 24; + = 25; + = 26; + = 27; + = 28; + = 29; + = 30; + = 31; + = 32; + = 33; + = 34; + = 35; + = 76; + + = 107; + = 106; + = 40; + = 41; + = 42; + = 43; + = 44; + = 45; + = 46; + = 47; + = 48; + = 49; + = 50; + = 51; + + = 104; + = 56; + = 57; + = 58; + = 59; + = 60; + = 61; + = 62; + = 63; + = 64; + = 65; + = 66; + = 105; + + = 108; + = 110; + = 72; + = 111; + = 109; + + = 78; + = 103; + = 84; + = 87; + = 85; + = 86; + + = 98; + = 99; + = 100; + = 101; + + = 69; + = 70; + = 71; + = 82; + + = 53; + = 54; + = 55; + = 102; + + = 37; + = 38; + = 39; + + = 23; + = 68; + = 75; +}; diff --git a/xorg-server/xkeyboard-config/keycodes/ataritt b/xorg-server/xkeyboard-config/keycodes/ataritt index 7eae09f49..c6d31d3ae 100644 --- a/xorg-server/xkeyboard-config/keycodes/ataritt +++ b/xorg-server/xkeyboard-config/keycodes/ataritt @@ -1,123 +1,117 @@ -// $Xorg: ataritt,v 1.3 2000/08/17 19:54:37 cpqbld Exp $ - - - -// $XFree86: xc/programs/xkbcomp/keycodes/ataritt,v 3.1 1997/10/26 13:25:35 dawes Exp $ - -default xkb_keycodes "us" { - - minimum= 8; - maximum= 255; - - = 9; - = 10; - = 11; - = 12; - = 13; - = 14; - = 15; - = 16; - = 17; - = 18; - = 19; - = 20; - = 21; - = 49; - = 22; - - = 23; - = 24; - = 25; - = 26; - = 27; - = 28; - = 29; - = 30; - = 31; - = 32; - = 33; - = 34; - = 35; - = 36; - = 91; - - = 37; - = 38; - = 39; - = 40; - = 41; - = 42; - = 43; - = 44; - = 45; - = 46; - = 47; - = 48; - = 51; - - = 50; - = 52; - = 53; - = 54; - = 55; - = 56; - = 57; - = 58; - = 59; - = 60; - = 61; - = 62; - - = 64; - = 65; - = 66; - - = 67; - = 68; - = 69; - = 70; - = 71; - = 72; - = 73; - = 74; - = 75; - = 76; - - = 106; - = 105; - = 90; - = 79; - = 80; - = 83; - = 88; - = 85; - - = 107; - = 108; - = 109; - = 110; - - = 111; - = 112; - = 113; - = 82; - - = 114; - = 115; - = 116; - = 86; - - = 117; - = 118; - = 119; - - = 120; - = 121; - = 122; -}; - -xkb_keycodes "de" { - include "ataritt(us)" - - = 104; -}; +default xkb_keycodes "us" { + + minimum= 8; + maximum= 255; + + = 9; + = 10; + = 11; + = 12; + = 13; + = 14; + = 15; + = 16; + = 17; + = 18; + = 19; + = 20; + = 21; + = 49; + = 22; + + = 23; + = 24; + = 25; + = 26; + = 27; + = 28; + = 29; + = 30; + = 31; + = 32; + = 33; + = 34; + = 35; + = 36; + = 91; + + = 37; + = 38; + = 39; + = 40; + = 41; + = 42; + = 43; + = 44; + = 45; + = 46; + = 47; + = 48; + = 51; + + = 50; + = 52; + = 53; + = 54; + = 55; + = 56; + = 57; + = 58; + = 59; + = 60; + = 61; + = 62; + + = 64; + = 65; + = 66; + + = 67; + = 68; + = 69; + = 70; + = 71; + = 72; + = 73; + = 74; + = 75; + = 76; + + = 106; + = 105; + = 90; + = 79; + = 80; + = 83; + = 88; + = 85; + + = 107; + = 108; + = 109; + = 110; + + = 111; + = 112; + = 113; + = 82; + + = 114; + = 115; + = 116; + = 86; + + = 117; + = 118; + = 119; + + = 120; + = 121; + = 122; +}; + +xkb_keycodes "de" { + include "ataritt(us)" + + = 104; +}; diff --git a/xorg-server/xkeyboard-config/keycodes/digital_vndr/lk b/xorg-server/xkeyboard-config/keycodes/digital_vndr/lk index 8523b95dd..2c1421e88 100644 --- a/xorg-server/xkeyboard-config/keycodes/digital_vndr/lk +++ b/xorg-server/xkeyboard-config/keycodes/digital_vndr/lk @@ -1,271 +1,270 @@ -// $Xorg: lk,v 1.3 2000/08/17 19:54:38 cpqbld Exp $ -// -//Copyright (c) 1996 Digital Equipment Corporation -// -//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 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 DIGITAL EQUIPMENT CORPORATION 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 Digital Equipment -//Corporation shall not be used in advertising or otherwise to promote -//the sale, use or other dealings in this Software without prior written -//authorization from Digital Equipment Corporation. -// -// HISTORY -// Log -// Revision 1.2 1996/06/18 09:13:22 erik -// use flags correctly, assorted cleanups and consortium fixes -// -// Revision 1.1.6.2 1995/08/07 17:40:34 William_Walker -// Upgrade XKB to protocol 0.62 (dual submit from decx11) -// [1995/08/06 14:06:25 William_Walker] -// -// Revision 1.1.2.4 1995/08/05 15:25:55 William_Walker -// Upgrade to XKB protocol 0.62 -// [1995/08/05 14:39:58 William_Walker] -// -// Revision 1.1.2.3 1995/06/27 12:17:31 William_Walker -// Rename to ISO9995 compliant . -// [1995/06/26 20:24:04 William_Walker] -// -// Revision 1.1.2.2 1995/06/05 19:21:28 William_Walker -// New file. I love keymaps. -// [1995/06/05 18:07:29 William_Walker] -// -// EndLog -// -// @(#)RCSfile: lk Revision: /main/3 (DEC) Date: 1996/01/24 12:13:31 -// -xkb_keycodes "lk_common" { - // "Function" keys - = 86; - = 87; - = 88; - = 89; - = 90; - = 100; - = 101; - = 102; - = 103; - = 104; - = 113; - = 114; - - = 170; - = 167; - = 169; - = 168; - - // "Keypad" keys - = 157; - = 158; - = 159; - = 153; - = 154; - = 155; - = 150; - = 151; - = 152; - = 149; - = 146; - = 148; - - // "Alphanumeric" keys - = 191; - = 192; - = 197; - = 203; - = 208; - = 214; - = 219; - = 224; - = 229; - = 234; - = 239; - = 249; - = 245; - = 188; - - = 190; - = 193; - = 198; - = 204; - = 209; - = 215; - = 220; - = 225; - = 230; - = 235; - = 240; - = 250; - = 246; - = 189; - - = 175; - = 176; - = 194; - = 199; - = 205; - = 210; - = 216; - = 221; - = 226; - = 231; - = 236; - = 242; - = 251; - - = 174; - = 195; - = 200; - = 206; - = 211; - = 217; - = 222; - = 227; - = 232; - = 237; - = 243; - = 171; - - = 212; - - = 255; // Support R5 Lock Down Modifiers - - alias = ; -}; - -xkb_keycodes "lkx01" { - include "digital_vndr/lk(lk_common)" - = 201; - = 115; - = 116; - = 128; - = 129; - = 130; - = 131; - = 124; - = 125; - = 138; - = 139; - = 140; - = 141; - = 142; - = 143; - = 161; - = 162; - = 163; - = 164; - = 160; - = 156; - = 247; - = 177; -}; - -xkb_keycodes "lk201" { - include "digital_vndr/lk(lkx01)" - indicator 4 = "Scroll Lock"; - indicator 3 = "Caps Lock"; - indicator 2 = "Compose"; - indicator 1 = "Wait"; -}; - -xkb_keycodes "lk421" { - include "digital_vndr/lk(lkx01)" - = 172; - = 178; - = 173; -}; - -xkb_keycodes "lk401" { - include "digital_vndr/lk(lk421)" - indicator 4 = "Scroll Lock"; - indicator 3 = "Caps Lock"; -}; - -xkb_keycodes "lk44x" { - include "digital_vndr/lk(lk_common)" - = 85; - = 115; - = 116; - = 124; - = 138; - = 139; - = 140; - = 141; - = 142; - = 143; - = 161; - = 162; - = 163; - = 164; - = 156; - = 172; - = 178; - = 173; -}; - -xkb_keycodes "lk443" { - include "digital_vndr/lk(lk44x)" - = 247; - indicator 3 = "Caps Lock"; - indicator 4 = "Scroll Lock"; - indicator 5 = "Num Lock"; -}; - -xkb_keycodes "lk444" { - include "digital_vndr/lk(lk44x)" - = 201; - = 247; - indicator 3 = "Caps Lock"; - indicator 4 = "Scroll Lock"; - indicator 5 = "Num Lock"; -}; - -// LK201-LT = lk201 -// LK421-AJ = lk421 +AB11 -// LK421-JJ = lk421aj+MUHE+KANJ+HIRA -// LK401-AJ = lk401 -// LK401-BJ = lk401 +MUHE+KANJ+HIRA -// LK401-JJ = lk401bj+AB11 -// LK401-LT = lk401 -// LK441-LT = lk443 - -xkb_keycodes "lk421aj" { - include "digital_vndr/lk(lk421)" - = 252; -}; - -xkb_keycodes "lk421jj" { - include "digital_vndr/lk(lk421aj)" - = 94; - = 95; - = 97; -}; - -xkb_keycodes "lk401bj" { - include "digital_vndr/lk(lk401)" - = 94; - = 95; - = 97; -}; - -xkb_keycodes "lk401jj" { - include "digital_vndr/lk(lk401bj)" - = 252; -}; +// +//Copyright (c) 1996 Digital Equipment Corporation +// +//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 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 DIGITAL EQUIPMENT CORPORATION 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 Digital Equipment +//Corporation shall not be used in advertising or otherwise to promote +//the sale, use or other dealings in this Software without prior written +//authorization from Digital Equipment Corporation. +// +// HISTORY +// Log +// Revision 1.2 1996/06/18 09:13:22 erik +// use flags correctly, assorted cleanups and consortium fixes +// +// Revision 1.1.6.2 1995/08/07 17:40:34 William_Walker +// Upgrade XKB to protocol 0.62 (dual submit from decx11) +// [1995/08/06 14:06:25 William_Walker] +// +// Revision 1.1.2.4 1995/08/05 15:25:55 William_Walker +// Upgrade to XKB protocol 0.62 +// [1995/08/05 14:39:58 William_Walker] +// +// Revision 1.1.2.3 1995/06/27 12:17:31 William_Walker +// Rename to ISO9995 compliant . +// [1995/06/26 20:24:04 William_Walker] +// +// Revision 1.1.2.2 1995/06/05 19:21:28 William_Walker +// New file. I love keymaps. +// [1995/06/05 18:07:29 William_Walker] +// +// EndLog +// +// @(#)RCSfile: lk Revision: /main/3 (DEC) Date: 1996/01/24 12:13:31 +// +xkb_keycodes "lk_common" { + // "Function" keys + = 86; + = 87; + = 88; + = 89; + = 90; + = 100; + = 101; + = 102; + = 103; + = 104; + = 113; + = 114; + + = 170; + = 167; + = 169; + = 168; + + // "Keypad" keys + = 157; + = 158; + = 159; + = 153; + = 154; + = 155; + = 150; + = 151; + = 152; + = 149; + = 146; + = 148; + + // "Alphanumeric" keys + = 191; + = 192; + = 197; + = 203; + = 208; + = 214; + = 219; + = 224; + = 229; + = 234; + = 239; + = 249; + = 245; + = 188; + + = 190; + = 193; + = 198; + = 204; + = 209; + = 215; + = 220; + = 225; + = 230; + = 235; + = 240; + = 250; + = 246; + = 189; + + = 175; + = 176; + = 194; + = 199; + = 205; + = 210; + = 216; + = 221; + = 226; + = 231; + = 236; + = 242; + = 251; + + = 174; + = 195; + = 200; + = 206; + = 211; + = 217; + = 222; + = 227; + = 232; + = 237; + = 243; + = 171; + + = 212; + + = 255; // Support R5 Lock Down Modifiers + + alias = ; +}; + +xkb_keycodes "lkx01" { + include "digital_vndr/lk(lk_common)" + = 201; + = 115; + = 116; + = 128; + = 129; + = 130; + = 131; + = 124; + = 125; + = 138; + = 139; + = 140; + = 141; + = 142; + = 143; + = 161; + = 162; + = 163; + = 164; + = 160; + = 156; + = 247; + = 177; +}; + +xkb_keycodes "lk201" { + include "digital_vndr/lk(lkx01)" + indicator 4 = "Scroll Lock"; + indicator 3 = "Caps Lock"; + indicator 2 = "Compose"; + indicator 1 = "Wait"; +}; + +xkb_keycodes "lk421" { + include "digital_vndr/lk(lkx01)" + = 172; + = 178; + = 173; +}; + +xkb_keycodes "lk401" { + include "digital_vndr/lk(lk421)" + indicator 4 = "Scroll Lock"; + indicator 3 = "Caps Lock"; +}; + +xkb_keycodes "lk44x" { + include "digital_vndr/lk(lk_common)" + = 85; + = 115; + = 116; + = 124; + = 138; + = 139; + = 140; + = 141; + = 142; + = 143; + = 161; + = 162; + = 163; + = 164; + = 156; + = 172; + = 178; + = 173; +}; + +xkb_keycodes "lk443" { + include "digital_vndr/lk(lk44x)" + = 247; + indicator 3 = "Caps Lock"; + indicator 4 = "Scroll Lock"; + indicator 5 = "Num Lock"; +}; + +xkb_keycodes "lk444" { + include "digital_vndr/lk(lk44x)" + = 201; + = 247; + indicator 3 = "Caps Lock"; + indicator 4 = "Scroll Lock"; + indicator 5 = "Num Lock"; +}; + +// LK201-LT = lk201 +// LK421-AJ = lk421 +AB11 +// LK421-JJ = lk421aj+MUHE+KANJ+HIRA +// LK401-AJ = lk401 +// LK401-BJ = lk401 +MUHE+KANJ+HIRA +// LK401-JJ = lk401bj+AB11 +// LK401-LT = lk401 +// LK441-LT = lk443 + +xkb_keycodes "lk421aj" { + include "digital_vndr/lk(lk421)" + = 252; +}; + +xkb_keycodes "lk421jj" { + include "digital_vndr/lk(lk421aj)" + = 94; + = 95; + = 97; +}; + +xkb_keycodes "lk401bj" { + include "digital_vndr/lk(lk401)" + = 94; + = 95; + = 97; +}; + +xkb_keycodes "lk401jj" { + include "digital_vndr/lk(lk401bj)" + = 252; +}; diff --git a/xorg-server/xkeyboard-config/keycodes/digital_vndr/pc b/xorg-server/xkeyboard-config/keycodes/digital_vndr/pc index 511715627..8cf06f3f0 100644 --- a/xorg-server/xkeyboard-config/keycodes/digital_vndr/pc +++ b/xorg-server/xkeyboard-config/keycodes/digital_vndr/pc @@ -1,280 +1,277 @@ -// $Xorg: pc,v 1.3 2000/08/17 19:54:38 cpqbld Exp $ -// -//Copyright (c) 1996 Digital Equipment Corporation -// -//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 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 DIGITAL EQUIPMENT CORPORATION 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 Digital Equipment -//Corporation shall not be used in advertising or otherwise to promote -//the sale, use or other dealings in this Software without prior written -//authorization from Digital Equipment Corporation. -// -// HISTORY -// Log -// Revision 1.2 1996/06/18 09:13:25 erik -// use flags correctly, assorted cleanups and consortium fixes -// -// Revision 1.1.6.3 1995/10/25 21:00:14 William_Walker -// Add pc104-key support -// [1995/10/23 15:46:21 William_Walker] -// -// Revision 1.1.6.2 1995/08/07 17:40:37 William_Walker -// Upgrade XKB to protocol 0.62 (dual submit from decx11) -// [1995/08/06 14:06:28 William_Walker] -// -// Revision 1.1.2.4 1995/08/05 15:25:56 William_Walker -// Upgrade to XKB protocol 0.62 -// [1995/08/05 14:40:02 William_Walker] -// -// Revision 1.1.2.3 1995/06/27 12:17:32 William_Walker -// Rename to ISO9995 compliant . -// [1995/06/26 20:24:07 William_Walker] -// -// Revision 1.1.2.2 1995/06/05 19:21:31 William_Walker -// New file. I love keymaps. -// [1995/06/05 18:07:34 William_Walker] -// -// EndLog -// -// @(#)RCSfile: pc Revision: /main/3 (DEC) Date: 1996/01/24 12:13:36 -// -xkb_keycodes "pc_common" { - // "Function" keys - = 9; - = 15; - = 23; - = 31; - = 39; - = 47; - = 55; - = 63; - = 71; - = 79; - = 86; - = 94; - - // "Editing" keys - - = 99; - = 97; - = 96; - = 106; - - // "Keypad" keys - = 108; - = 117; - = 125; - - = 107; - = 115; - = 116; - - = 105; - = 114; - = 122; - = 121; - - = 112; - = 113; - - // "Alphanumeric" keys - = 22; - = 30; - = 38; - = 37; - = 46; - = 54; - = 61; - = 62; - = 70; - = 69; - = 78; - = 85; - = 102; - - = 13; - = 21; - = 29; - = 36; - = 45; - = 44; - = 53; - = 60; - = 67; - = 68; - = 77; - = 84; - = 91; - - = 20; - = 28; - = 27; - = 35; - = 43; - = 52; - = 51; - = 59; - = 66; - = 75; - = 76; - = 82; - = 90; - - = 18; - = 26; - = 34; - = 33; - = 42; - = 50; - = 49; - = 58; - = 65; - = 73; - = 74; - = 89; - - = 17; - = 25; - = 41; - = 57; - - = 255; // Support R5 Lock Down Modifiers - -}; - -xkb_keycodes "pc10x" { - include "digital_vndr/pc(pc_common)" - = 8; - = 14; - = 87; - = 95; - = 98; - = 103; - = 110; - = 111; - = 100; - = 101; - = 109; - = 118; - = 119; - = 126; - = 132; - = 124; - = 88; - - alias = ; - - indicator 3 = "Caps Lock"; - indicator 4 = "Scroll Lock"; -}; - -xkb_keycodes "pc101" { - include "digital_vndr/pc(pc10x)" - = 92; - indicator 5 = "Num Lock"; -}; - - -xkb_keycodes "pc102" { - include "digital_vndr/pc(pc10x)" - = 19; - = 83; - indicator 5 = "Num Lock"; -}; - -xkb_keycodes "pc104" { - include "digital_vndr/pc(pc101)" - = 139; - = 140; - = 141; -}; - -xkb_keycodes "lk411_common" { - include "digital_vndr/pc(pc_common)" - = 8; - = 14; - = 24; - = 10; - = 16; - = 87; - = 95; - = 98; - = 11; - = 12; - = 110; - = 103; - = 100; - = 101; - = 111; - = 109; - = 118; - = 119; - = 126; - = 132; - = 19; - = 124; - = 40; - = 88; - - alias = ; - - indicator 3 = "Caps Lock"; - indicator 4 = "Scroll Lock"; -}; - -xkb_keycodes "lk411" { - include "digital_vndr/pc(lk411_common)" - = 92; -}; - -xkb_keycodes "lk450" { - include "digital_vndr/pc(lk411)" - indicator 2 = "Compose"; - indicator 1 = "Wait"; -}; - -// Japanese variants -// -// PCXAJ-AA = pc+BKSL+AC12+AB11+MUHE+KANJ+HIRA+indicator -// LK411-AJ = lk411+MUHE+KANJ+HIRA -// LK411-JJ = lk411+BKSL+AZ01+MUHE+KANJ+HIRA -// LK411-LT = lk411 - -xkb_keycodes "pcxajaa" { - include "digital_vndr/pc(pc10x)" - = 93; - = 83; - = 81; - = 133; - = 134; - = 135; - indicator 5 = "Group 2"; -}; - -xkb_keycodes "lk411jj" { - include "digital_vndr/pc(lk411_common)" - = 81; - = 83; - = 133; - = 134; - = 135; -}; - - +// +//Copyright (c) 1996 Digital Equipment Corporation +// +//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 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 DIGITAL EQUIPMENT CORPORATION 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 Digital Equipment +//Corporation shall not be used in advertising or otherwise to promote +//the sale, use or other dealings in this Software without prior written +//authorization from Digital Equipment Corporation. +// +// HISTORY +// Log +// Revision 1.2 1996/06/18 09:13:25 erik +// use flags correctly, assorted cleanups and consortium fixes +// +// Revision 1.1.6.3 1995/10/25 21:00:14 William_Walker +// Add pc104-key support +// [1995/10/23 15:46:21 William_Walker] +// +// Revision 1.1.6.2 1995/08/07 17:40:37 William_Walker +// Upgrade XKB to protocol 0.62 (dual submit from decx11) +// [1995/08/06 14:06:28 William_Walker] +// +// Revision 1.1.2.4 1995/08/05 15:25:56 William_Walker +// Upgrade to XKB protocol 0.62 +// [1995/08/05 14:40:02 William_Walker] +// +// Revision 1.1.2.3 1995/06/27 12:17:32 William_Walker +// Rename to ISO9995 compliant . +// [1995/06/26 20:24:07 William_Walker] +// +// Revision 1.1.2.2 1995/06/05 19:21:31 William_Walker +// New file. I love keymaps. +// [1995/06/05 18:07:34 William_Walker] +// +// EndLog +// +// @(#)RCSfile: pc Revision: /main/3 (DEC) Date: 1996/01/24 12:13:36 +// +xkb_keycodes "pc_common" { + // "Function" keys + = 9; + = 15; + = 23; + = 31; + = 39; + = 47; + = 55; + = 63; + = 71; + = 79; + = 86; + = 94; + + // "Editing" keys + + = 99; + = 97; + = 96; + = 106; + + // "Keypad" keys + = 108; + = 117; + = 125; + + = 107; + = 115; + = 116; + + = 105; + = 114; + = 122; + = 121; + + = 112; + = 113; + + // "Alphanumeric" keys + = 22; + = 30; + = 38; + = 37; + = 46; + = 54; + = 61; + = 62; + = 70; + = 69; + = 78; + = 85; + = 102; + + = 13; + = 21; + = 29; + = 36; + = 45; + = 44; + = 53; + = 60; + = 67; + = 68; + = 77; + = 84; + = 91; + + = 20; + = 28; + = 27; + = 35; + = 43; + = 52; + = 51; + = 59; + = 66; + = 75; + = 76; + = 82; + = 90; + + = 18; + = 26; + = 34; + = 33; + = 42; + = 50; + = 49; + = 58; + = 65; + = 73; + = 74; + = 89; + + = 17; + = 25; + = 41; + = 57; + + = 255; // Support R5 Lock Down Modifiers + +}; + +xkb_keycodes "pc10x" { + include "digital_vndr/pc(pc_common)" + = 8; + = 14; + = 87; + = 95; + = 98; + = 103; + = 110; + = 111; + = 100; + = 101; + = 109; + = 118; + = 119; + = 126; + = 132; + = 124; + = 88; + + alias = ; + + indicator 3 = "Caps Lock"; + indicator 4 = "Scroll Lock"; +}; + +xkb_keycodes "pc101" { + include "digital_vndr/pc(pc10x)" + = 92; + indicator 5 = "Num Lock"; +}; + + +xkb_keycodes "pc102" { + include "digital_vndr/pc(pc10x)" + = 19; + = 83; + indicator 5 = "Num Lock"; +}; + +xkb_keycodes "pc104" { + include "digital_vndr/pc(pc101)" + = 139; + = 140; + = 141; +}; + +xkb_keycodes "lk411_common" { + include "digital_vndr/pc(pc_common)" + = 8; + = 14; + = 24; + = 10; + = 16; + = 87; + = 95; + = 98; + = 11; + = 12; + = 110; + = 103; + = 100; + = 101; + = 111; + = 109; + = 118; + = 119; + = 126; + = 132; + = 19; + = 124; + = 40; + = 88; + + alias = ; + + indicator 3 = "Caps Lock"; + indicator 4 = "Scroll Lock"; +}; + +xkb_keycodes "lk411" { + include "digital_vndr/pc(lk411_common)" + = 92; +}; + +xkb_keycodes "lk450" { + include "digital_vndr/pc(lk411)" + indicator 2 = "Compose"; + indicator 1 = "Wait"; +}; + +// Japanese variants +// +// PCXAJ-AA = pc+BKSL+AC12+AB11+MUHE+KANJ+HIRA+indicator +// LK411-AJ = lk411+MUHE+KANJ+HIRA +// LK411-JJ = lk411+BKSL+AZ01+MUHE+KANJ+HIRA +// LK411-LT = lk411 + +xkb_keycodes "pcxajaa" { + include "digital_vndr/pc(pc10x)" + = 93; + = 83; + = 81; + = 133; + = 134; + = 135; + indicator 5 = "Group 2"; +}; + +xkb_keycodes "lk411jj" { + include "digital_vndr/pc(lk411_common)" + = 81; + = 83; + = 133; + = 134; + = 135; +}; diff --git a/xorg-server/xkeyboard-config/keycodes/evdev b/xorg-server/xkeyboard-config/keycodes/evdev index d6963a2d5..de035c898 100644 --- a/xorg-server/xkeyboard-config/keycodes/evdev +++ b/xorg-server/xkeyboard-config/keycodes/evdev @@ -1,313 +1,314 @@ -// translation from evdev scancodes to something resembling xfree86 keycodes. - -default xkb_keycodes "evdev" { - minimum = 8; - maximum = 255; - - # Added for pc105 compatibility - = 94; - - = 49; - = 10; - = 11; - = 12; - = 13; - = 14; - = 15; - = 16; - = 17; - = 18; - = 19; - = 20; - = 21; - = 22; - - = 23; - = 24; - = 25; - = 26; - = 27; - = 28; - = 29; - = 30; - = 31; - = 32; - = 33; - = 34; - = 35; - = 51; - alias = ; - = 36; - - = 66; - = 38; - = 39; - = 40; - = 41; - = 42; - = 43; - = 44; - = 45; - = 46; - = 47; - = 48; - - = 50; - = 52; - = 53; - = 54; - = 55; - = 56; - = 57; - = 58; - = 59; - = 60; - = 61; - = 62; - - = 64; - = 37; - = 65; - = 105; - = 108; - // Microsoft keyboard extra keys - = 133; - = 134; - = 135; - alias = ; - - = 9; - = 67; - = 68; - = 69; - = 70; - = 71; - = 72; - = 73; - = 74; - = 75; - = 76; - = 95; - = 96; - - = 107; - // = 107; - = 78; - = 127; - // = 419; - - = 118; - = 110; - = 112; - = 119; - = 115; - = 117; - - = 111; - = 113; - = 116; - = 114; - - = 77; - = 106; - = 63; - = 82; - - = 79; - = 80; - = 81; - = 86; - - = 83; - = 84; - = 85; - - = 87; - = 88; - = 89; - = 104; - - = 90; - = 91; - = 125; - - = 191; - = 192; - = 193; - = 194; - = 195; - = 196; - = 197; - = 198; - = 199; - = 200; - = 201; - = 202; - - // Keys that are generated on Japanese keyboards - - // = 93; // Hankaku/Zenkakau toggle - not actually used - alias = ; - = 101; // Hiragana/Katakana toggle - = 97; // backslash/underscore - = 100; // Henkan - = 102; // Muhenkan - = 132; // Yen - = 98; // Katakana - = 99; // Hiragana - = 103; // KPJPComma - // = 97; // Romaji - - // Keys that are generated on Korean keyboards - - = 130; // Hangul Latin toggle - = 131; // Hangul to Hanja conversion - - // Solaris compatibility - - alias = ; - alias = ; - = 121; - = 122; - = 123; - = 124; - = 136; - = 137; - = 138; - = 139; - = 140; - = 141; - = 142; - = 143; - = 144; - = 145; - = 146; - - // Extended keys that may be generated on "Internet" keyboards. - // evdev has standardize names for these. - - = 109; // #define KEY_LINEFEED 101 - = 120; // #define KEY_MACRO 112 - = 126; // #define KEY_KPPLUSMINUS 118 - = 129; // #define KEY_KPCOMMA 121 - = 147; // #define KEY_MENU 139 - = 148; // #define KEY_CALC 140 - = 149; // #define KEY_SETUP 141 - = 150; // #define KEY_SLEEP 142 - = 151; // #define KEY_WAKEUP 143 - = 152; // #define KEY_FILE 144 - = 153; // #define KEY_SENDFILE 145 - = 154; // #define KEY_DELETEFILE 146 - = 155; // #define KEY_XFER 147 - = 156; // #define KEY_PROG1 148 - = 157; // #define KEY_PROG2 149 - = 158; // #define KEY_WWW 150 - = 159; // #define KEY_MSDOS 151 - = 160; // #define KEY_COFFEE 152 - = 161; // #define KEY_DIRECTION 153 - = 162; // #define KEY_CYCLEWINDOWS 154 - = 163; // #define KEY_MAIL 155 - = 164; // #define KEY_BOOKMARKS 156 - = 165; // #define KEY_COMPUTER 157 - = 166; // #define KEY_BACK 158 - = 167; // #define KEY_FORWARD 159 - = 168; // #define KEY_CLOSECD 160 - = 169; // #define KEY_EJECTCD 161 - = 170; // #define KEY_EJECTCLOSECD 162 - = 171; // #define KEY_NEXTSONG 163 - = 172; // #define KEY_PLAYPAUSE 164 - = 173; // #define KEY_PREVIOUSSONG 165 - = 174; // #define KEY_STOPCD 166 - = 175; // #define KEY_RECORD 167 - = 176; // #define KEY_REWIND 168 - = 177; // #define KEY_PHONE 169 - = 178; // #define KEY_ISO 170 - = 179; // #define KEY_CONFIG 171 - = 180; // #define KEY_HOMEPAGE 172 - = 181; // #define KEY_REFRESH 173 - = 182; // #define KEY_EXIT 174 - = 183; // #define KEY_MOVE 175 - = 184; // #define KEY_EDIT 176 - = 185; // #define KEY_SCROLLUP 177 - = 186; // #define KEY_SCROLLDOWN 178 - = 187; // #define KEY_KPLEFTPAREN 179 - = 188; // #define KEY_KPRIGHTPAREN 180 - = 189; // #define KEY_NEW 181 - = 190; // #define KEY_REDO 182 - = 208; // #define KEY_PLAYCD 200 - = 209; // #define KEY_PAUSECD 201 - = 210; // #define KEY_PROG3 202 - = 211; // #define KEY_PROG4 203 conflicts with AB11 - = 213; // #define KEY_SUSPEND 205 - = 214; // #define KEY_CLOSE 206 - = 215; // #define KEY_PLAY 207 - = 216; // #define KEY_FASTFORWARD 208 - = 217; // #define KEY_BASSBOOST 209 - = 218; // #define KEY_PRINT 210 - = 219; // #define KEY_HP 211 - = 220; // #define KEY_CAMERA 212 - = 221; // #define KEY_SOUND 213 - = 222; // #define KEY_QUESTION 214 - = 223; // #define KEY_EMAIL 215 - = 224; // #define KEY_CHAT 216 - = 225; // #define KEY_SEARCH 217 - = 226; // #define KEY_CONNECT 218 - = 227; // #define KEY_FINANCE 219 - = 228; // #define KEY_SPORT 220 - = 229; // #define KEY_SHOP 221 - = 230; // #define KEY_ALTERASE 222 - = 231; // #define KEY_CANCEL 223 - = 232; // #define KEY_BRIGHTNESSDOWN 224 - = 233; // #define KEY_BRIGHTNESSUP 225 - = 234; // #define KEY_MEDIA 226 - = 235; // #define KEY_SWITCHVIDEOMODE 227 - = 236; // #define KEY_KBDILLUMTOGGLE 228 - = 237; // #define KEY_KBDILLUMDOWN 229 - = 238; // #define KEY_KBDILLUMUP 230 - = 239; // #define KEY_SEND 231 - = 240; // #define KEY_REPLY 232 - = 241; // #define KEY_FORWARDMAIL 233 - = 242; // #define KEY_SAVE 234 - = 243; // #define KEY_DOCUMENTS 235 - = 244; // #define KEY_BATTERY 236 - = 245; // #define KEY_BLUETOOTH 237 - = 246; // #define KEY_WLAN 238 - = 247; // #define KEY_UWB 239 - = 248; // #define KEY_UNKNOWN 240 - = 249; // #define KEY_VIDEO_NEXT 241 - = 250; // #define KEY_VIDEO_PREV 242 - = 251; // #define KEY_BRIGHTNESS_CYCLE 243 - = 252; // #define KEY_BRIGHTNESS_ZERO 244 - = 253; // #define KEY_DISPLAY_OFF 245 - - // Fake keycodes for virtual keys - = 92; - = 203; - = 204; - = 205; - = 206; - = 207; - - indicator 1 = "Caps Lock"; - indicator 2 = "Num Lock"; - indicator 3 = "Scroll Lock"; - indicator 4 = "Compose"; - indicator 5 = "Kana"; - indicator 6 = "Sleep"; - indicator 7 = "Suspend"; - indicator 8 = "Mute"; - indicator 9 = "Misc"; - indicator 10 = "Mail"; - indicator 11 = "Charging"; - - alias = ; - - // For Brazilian ABNT2 - alias = ; -}; - -// PC98 -xkb_keycodes "pc98" { - include "evdev(evdev)" -}; - +// translation from evdev scancodes to something resembling xfree86 keycodes. + +default xkb_keycodes "evdev" { + minimum = 8; + maximum = 255; + + # Added for pc105 compatibility + = 94; + + = 49; + = 10; + = 11; + = 12; + = 13; + = 14; + = 15; + = 16; + = 17; + = 18; + = 19; + = 20; + = 21; + = 22; + + = 23; + = 24; + = 25; + = 26; + = 27; + = 28; + = 29; + = 30; + = 31; + = 32; + = 33; + = 34; + = 35; + = 51; + alias = ; + = 36; + + = 66; + = 38; + = 39; + = 40; + = 41; + = 42; + = 43; + = 44; + = 45; + = 46; + = 47; + = 48; + + = 50; + = 52; + = 53; + = 54; + = 55; + = 56; + = 57; + = 58; + = 59; + = 60; + = 61; + = 62; + + = 64; + = 37; + = 65; + = 105; + = 108; + // Microsoft keyboard extra keys + = 133; + = 134; + = 135; + alias = ; + + = 9; + = 67; + = 68; + = 69; + = 70; + = 71; + = 72; + = 73; + = 74; + = 75; + = 76; + = 95; + = 96; + + = 107; + // = 107; + = 78; + = 127; + // = 419; + + = 118; + = 110; + = 112; + = 119; + = 115; + = 117; + + = 111; + = 113; + = 116; + = 114; + + = 77; + = 106; + = 63; + = 82; + + = 79; + = 80; + = 81; + = 86; + + = 83; + = 84; + = 85; + + = 87; + = 88; + = 89; + = 104; + + = 90; + = 91; + = 125; + + = 191; + = 192; + = 193; + = 194; + = 195; + = 196; + = 197; + = 198; + = 199; + = 200; + = 201; + = 202; + + // Keys that are generated on Japanese keyboards + + // = 93; // Hankaku/Zenkakau toggle - not actually used + alias = ; + = 101; // Hiragana/Katakana toggle + = 97; // backslash/underscore + = 100; // Henkan + = 102; // Muhenkan + = 132; // Yen + = 98; // Katakana + = 99; // Hiragana + = 103; // KPJPComma + // = 97; // Romaji + + // Keys that are generated on Korean keyboards + + = 130; // Hangul Latin toggle + = 131; // Hangul to Hanja conversion + + // Solaris compatibility + + alias = ; + alias = ; + = 121; + = 122; + = 123; + = 124; + = 136; + = 137; + = 138; + = 139; + = 140; + = 141; + = 142; + = 143; + = 144; + = 145; + = 146; + + // Extended keys that may be generated on "Internet" keyboards. + // evdev has standardize names for these. + + = 109; // #define KEY_LINEFEED 101 + = 120; // #define KEY_MACRO 112 + = 126; // #define KEY_KPPLUSMINUS 118 + = 128; // #define KEY_SCALE 120 + = 129; // #define KEY_KPCOMMA 121 + = 147; // #define KEY_MENU 139 + = 148; // #define KEY_CALC 140 + = 149; // #define KEY_SETUP 141 + = 150; // #define KEY_SLEEP 142 + = 151; // #define KEY_WAKEUP 143 + = 152; // #define KEY_FILE 144 + = 153; // #define KEY_SENDFILE 145 + = 154; // #define KEY_DELETEFILE 146 + = 155; // #define KEY_XFER 147 + = 156; // #define KEY_PROG1 148 + = 157; // #define KEY_PROG2 149 + = 158; // #define KEY_WWW 150 + = 159; // #define KEY_MSDOS 151 + = 160; // #define KEY_COFFEE 152 + = 161; // #define KEY_DIRECTION 153 + = 162; // #define KEY_CYCLEWINDOWS 154 + = 163; // #define KEY_MAIL 155 + = 164; // #define KEY_BOOKMARKS 156 + = 165; // #define KEY_COMPUTER 157 + = 166; // #define KEY_BACK 158 + = 167; // #define KEY_FORWARD 159 + = 168; // #define KEY_CLOSECD 160 + = 169; // #define KEY_EJECTCD 161 + = 170; // #define KEY_EJECTCLOSECD 162 + = 171; // #define KEY_NEXTSONG 163 + = 172; // #define KEY_PLAYPAUSE 164 + = 173; // #define KEY_PREVIOUSSONG 165 + = 174; // #define KEY_STOPCD 166 + = 175; // #define KEY_RECORD 167 + = 176; // #define KEY_REWIND 168 + = 177; // #define KEY_PHONE 169 + = 178; // #define KEY_ISO 170 + = 179; // #define KEY_CONFIG 171 + = 180; // #define KEY_HOMEPAGE 172 + = 181; // #define KEY_REFRESH 173 + = 182; // #define KEY_EXIT 174 + = 183; // #define KEY_MOVE 175 + = 184; // #define KEY_EDIT 176 + = 185; // #define KEY_SCROLLUP 177 + = 186; // #define KEY_SCROLLDOWN 178 + = 187; // #define KEY_KPLEFTPAREN 179 + = 188; // #define KEY_KPRIGHTPAREN 180 + = 189; // #define KEY_NEW 181 + = 190; // #define KEY_REDO 182 + = 208; // #define KEY_PLAYCD 200 + = 209; // #define KEY_PAUSECD 201 + = 210; // #define KEY_PROG3 202 + = 211; // #define KEY_PROG4 203 conflicts with AB11 + = 212; // #define KEY_DASHBOARD 204 + = 213; // #define KEY_SUSPEND 205 + = 214; // #define KEY_CLOSE 206 + = 215; // #define KEY_PLAY 207 + = 216; // #define KEY_FASTFORWARD 208 + = 217; // #define KEY_BASSBOOST 209 + = 218; // #define KEY_PRINT 210 + = 219; // #define KEY_HP 211 + = 220; // #define KEY_CAMERA 212 + = 221; // #define KEY_SOUND 213 + = 222; // #define KEY_QUESTION 214 + = 223; // #define KEY_EMAIL 215 + = 224; // #define KEY_CHAT 216 + = 225; // #define KEY_SEARCH 217 + = 226; // #define KEY_CONNECT 218 + = 227; // #define KEY_FINANCE 219 + = 228; // #define KEY_SPORT 220 + = 229; // #define KEY_SHOP 221 + = 230; // #define KEY_ALTERASE 222 + = 231; // #define KEY_CANCEL 223 + = 232; // #define KEY_BRIGHTNESSDOWN 224 + = 233; // #define KEY_BRIGHTNESSUP 225 + = 234; // #define KEY_MEDIA 226 + = 235; // #define KEY_SWITCHVIDEOMODE 227 + = 236; // #define KEY_KBDILLUMTOGGLE 228 + = 237; // #define KEY_KBDILLUMDOWN 229 + = 238; // #define KEY_KBDILLUMUP 230 + = 239; // #define KEY_SEND 231 + = 240; // #define KEY_REPLY 232 + = 241; // #define KEY_FORWARDMAIL 233 + = 242; // #define KEY_SAVE 234 + = 243; // #define KEY_DOCUMENTS 235 + = 244; // #define KEY_BATTERY 236 + = 245; // #define KEY_BLUETOOTH 237 + = 246; // #define KEY_WLAN 238 + = 247; // #define KEY_UWB 239 + = 248; // #define KEY_UNKNOWN 240 + = 249; // #define KEY_VIDEO_NEXT 241 + = 250; // #define KEY_VIDEO_PREV 242 + = 251; // #define KEY_BRIGHTNESS_CYCLE 243 + = 252; // #define KEY_BRIGHTNESS_ZERO 244 + = 253; // #define KEY_DISPLAY_OFF 245 + + // Fake keycodes for virtual keys + = 92; + = 203; + = 204; + = 205; + = 206; + = 207; + + indicator 1 = "Caps Lock"; + indicator 2 = "Num Lock"; + indicator 3 = "Scroll Lock"; + indicator 4 = "Compose"; + indicator 5 = "Kana"; + indicator 6 = "Sleep"; + indicator 7 = "Suspend"; + indicator 8 = "Mute"; + indicator 9 = "Misc"; + indicator 10 = "Mail"; + indicator 11 = "Charging"; + + alias = ; + + // For Brazilian ABNT2 + alias = ; +}; + +// PC98 +xkb_keycodes "pc98" { + include "evdev(evdev)" +}; diff --git a/xorg-server/xkeyboard-config/keycodes/fujitsu b/xorg-server/xkeyboard-config/keycodes/fujitsu index c36a3a984..373621038 100644 --- a/xorg-server/xkeyboard-config/keycodes/fujitsu +++ b/xorg-server/xkeyboard-config/keycodes/fujitsu @@ -1,187 +1,186 @@ -// $Xorg: fujitsu,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $ -// -//Copyright 1996, 1998 The Open Group -// -//Permission to use, copy, modify, distribute, and sell this software and its -//documentation for any purpose is hereby granted without fee, provided that -//the above copyright notice appear in all copies and that both that -//copyright notice and this permission notice appear in supporting -//documentation. -// -//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 OPEN GROUP 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 Open Group 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 Open Group. -// -default xkb_keycodes "138" { - - minimum= 8; - maximum= 255; - - = 37; - = 38; - = 39; - = 40; - = 41; - = 42; - = 43; - = 44; - = 45; - = 46; - = 47; - = 48; - = 49; - = 50; - = 51; - - = 61; - = 62; - = 63; - = 64; - = 65; - = 66; - = 67; - = 68; - = 69; - = 70; - = 71; - = 72; - = 73; - - = 84; - = 85; - = 86; - = 87; - = 88; - = 89; - = 90; - = 91; - = 92; - = 93; - = 94; - = 95; - = 96; - = 97; - - = 107; - = 108; - = 109; - = 110; - = 111; - = 112; - = 113; - = 114; - = 115; - = 116; - = 117; - = 52; - = 118; - - = 127; - = 27; - = 128; - = 125; - = 129; - = 10; - = 130; - = 23; - = 75; - = 119; - = 56; - - = 13; - = 14; - = 16; - = 18; - = 20; - = 22; - = 24; - = 25; - = 26; - = 15; - = 17; - = 19; - = 137; - = 138; - = 139; - = 140; - = 141; - = 142; - = 143; - = 144; - = 145; - = 146; - = 147; - = 148; - = 153; - = 154; - = 155; - = 156; - = 149; - = 150; - = 151; - = 152; - - = 34; - = 59; - = 81; - = 105; - = 126; - - = 9; - = 30; - = 21; - = 29; - - = 82; - = 83; - = 12; - = 35; - = 32; - = 36; - = 28; - = 74; - = 60; - = 33; - = 103; - = 57; - = 80; - = 11; - - = 55; - = 54; - = 133; - = 79; - - = 76; - = 77; - = 78; - = 53; - - = 99; - = 100; - = 101; - = 58; - - = 120; - = 121; - = 122; - = 98; - - = 102; - = 31; - - = 123; - = 124; -}; +// +//Copyright 1996, 1998 The Open Group +// +//Permission to use, copy, modify, distribute, and sell this software and its +//documentation for any purpose is hereby granted without fee, provided that +//the above copyright notice appear in all copies and that both that +//copyright notice and this permission notice appear in supporting +//documentation. +// +//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 OPEN GROUP 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 Open Group 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 Open Group. +// +default xkb_keycodes "138" { + + minimum= 8; + maximum= 255; + + = 37; + = 38; + = 39; + = 40; + = 41; + = 42; + = 43; + = 44; + = 45; + = 46; + = 47; + = 48; + = 49; + = 50; + = 51; + + = 61; + = 62; + = 63; + = 64; + = 65; + = 66; + = 67; + = 68; + = 69; + = 70; + = 71; + = 72; + = 73; + + = 84; + = 85; + = 86; + = 87; + = 88; + = 89; + = 90; + = 91; + = 92; + = 93; + = 94; + = 95; + = 96; + = 97; + + = 107; + = 108; + = 109; + = 110; + = 111; + = 112; + = 113; + = 114; + = 115; + = 116; + = 117; + = 52; + = 118; + + = 127; + = 27; + = 128; + = 125; + = 129; + = 10; + = 130; + = 23; + = 75; + = 119; + = 56; + + = 13; + = 14; + = 16; + = 18; + = 20; + = 22; + = 24; + = 25; + = 26; + = 15; + = 17; + = 19; + = 137; + = 138; + = 139; + = 140; + = 141; + = 142; + = 143; + = 144; + = 145; + = 146; + = 147; + = 148; + = 153; + = 154; + = 155; + = 156; + = 149; + = 150; + = 151; + = 152; + + = 34; + = 59; + = 81; + = 105; + = 126; + + = 9; + = 30; + = 21; + = 29; + + = 82; + = 83; + = 12; + = 35; + = 32; + = 36; + = 28; + = 74; + = 60; + = 33; + = 103; + = 57; + = 80; + = 11; + + = 55; + = 54; + = 133; + = 79; + + = 76; + = 77; + = 78; + = 53; + + = 99; + = 100; + = 101; + = 58; + + = 120; + = 121; + = 122; + = 98; + + = 102; + = 31; + + = 123; + = 124; +}; diff --git a/xorg-server/xkeyboard-config/keycodes/hp b/xorg-server/xkeyboard-config/keycodes/hp index 0c98072d3..544389578 100644 --- a/xorg-server/xkeyboard-config/keycodes/hp +++ b/xorg-server/xkeyboard-config/keycodes/hp @@ -1,271 +1,270 @@ -// $Xorg: hp,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $ -// -//Copyright 1996, 1998 The Open Group -// -//Permission to use, copy, modify, distribute, and sell this software and its -//documentation for any purpose is hereby granted without fee, provided that -//the above copyright notice appear in all copies and that both that -//copyright notice and this permission notice appear in supporting -//documentation. -// -//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 OPEN GROUP 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 Open Group 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 Open Group. -// -default xkb_keycodes "hp-101" { - - = 23; - = 31; - = 39; - = 47; - = 46; - = 55; - = 63; - = 70; - = 71; - = 79; - = 78; - = 87; - = 94; - = 111; - - = 22; - = 30; - = 38; - = 45; - = 54; - = 53; - = 62; - = 69; - = 76; - = 77; - = 86; - = 93; - = 100; - = 101; - - = 29; - = 37; - = 36; - = 44; - = 52; - = 61; - = 60; - = 68; - = 75; - = 84; - = 85; - = 91; - = 99; - - = 27; - = 35; - = 43; - = 42; - = 51; - = 59; - = 58; - = 67; - = 74; - = 82; - = 83; - = 98; - - = 26; - = 34; - = 50; - = 66; - = 97; - - = 17; - = 16; - = 24; - = 32; - = 40; - = 48; - = 56; - = 64; - = 72; - = 80; - = 88; - = 95; - = 103; - - = 96; - = 104; - = 107; - - = 112; - = 119; - = 120; - = 109; - = 110; - = 118; - - = 108; - = 106; - = 105; - = 115; - - = 127; - = 128; - = 135; - = 141; - - = 117; - = 126; - = 134; - = 133; - - = 116; - = 124; - = 125; - - = 114; - = 123; - = 131; - = 130; - - = 121; - = 122; - - indicator 1 = "Caps Lock"; - indicator 2 = "Num Lock"; - indicator 3 = "Scroll Lock"; -}; - -xkb_keycodes "hil" { - - = 71; - = 70; - = 69; - = 68; - = 67; - = 66; - = 65; - = 64; - = 96; - = 97; - = 98; - = 99; - = 100; - = 101; - - = 63; - = 62; - = 61; - = 60; - = 59; - = 58; - = 57; - = 56; - = 104; - = 105; - = 106; - = 107; - = 108; - = 109; - - = 55; - = 53; - = 52; - = 51; - = 50; - = 49; - = 48; - = 112; - = 113; - = 114; - = 115; - = 116; - = 117; - - = 13; - = 36; - = 35; - = 34; - = 33; - = 32; - = 128; - = 120; - = 121; - = 122; - = 123; - = 12; - - = 14; - = 11; - = 129; - = 10; - = 87; - - = 39; - = 15; - = 86; - = 84; - = 83; - = 82; - = 81; - = 80; - = 88; - = 89; - = 90; - = 91; - = 92; - = 45; - = 41; - = 43; - = 47; - = 94; - = 95; - - = 102; - = 103; - = 110; - = 111; - - = 118; - = 119; - = 127; - = 125; - - = 134; - = 132; - = 133; - = 135; - - = 25; - = 29; - = 27; - = 31; - - = 21; - = 17; - = 19; - = 23; - - = 16; - = 18; - = 20; - = 22; - - = 24; - = 26; - = 28; - = 46; - - = 30; - = 44; -}; +// +//Copyright 1996, 1998 The Open Group +// +//Permission to use, copy, modify, distribute, and sell this software and its +//documentation for any purpose is hereby granted without fee, provided that +//the above copyright notice appear in all copies and that both that +//copyright notice and this permission notice appear in supporting +//documentation. +// +//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 OPEN GROUP 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 Open Group 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 Open Group. +// +default xkb_keycodes "hp-101" { + + = 23; + = 31; + = 39; + = 47; + = 46; + = 55; + = 63; + = 70; + = 71; + = 79; + = 78; + = 87; + = 94; + = 111; + + = 22; + = 30; + = 38; + = 45; + = 54; + = 53; + = 62; + = 69; + = 76; + = 77; + = 86; + = 93; + = 100; + = 101; + + = 29; + = 37; + = 36; + = 44; + = 52; + = 61; + = 60; + = 68; + = 75; + = 84; + = 85; + = 91; + = 99; + + = 27; + = 35; + = 43; + = 42; + = 51; + = 59; + = 58; + = 67; + = 74; + = 82; + = 83; + = 98; + + = 26; + = 34; + = 50; + = 66; + = 97; + + = 17; + = 16; + = 24; + = 32; + = 40; + = 48; + = 56; + = 64; + = 72; + = 80; + = 88; + = 95; + = 103; + + = 96; + = 104; + = 107; + + = 112; + = 119; + = 120; + = 109; + = 110; + = 118; + + = 108; + = 106; + = 105; + = 115; + + = 127; + = 128; + = 135; + = 141; + + = 117; + = 126; + = 134; + = 133; + + = 116; + = 124; + = 125; + + = 114; + = 123; + = 131; + = 130; + + = 121; + = 122; + + indicator 1 = "Caps Lock"; + indicator 2 = "Num Lock"; + indicator 3 = "Scroll Lock"; +}; + +xkb_keycodes "hil" { + + = 71; + = 70; + = 69; + = 68; + = 67; + = 66; + = 65; + = 64; + = 96; + = 97; + = 98; + = 99; + = 100; + = 101; + + = 63; + = 62; + = 61; + = 60; + = 59; + = 58; + = 57; + = 56; + = 104; + = 105; + = 106; + = 107; + = 108; + = 109; + + = 55; + = 53; + = 52; + = 51; + = 50; + = 49; + = 48; + = 112; + = 113; + = 114; + = 115; + = 116; + = 117; + + = 13; + = 36; + = 35; + = 34; + = 33; + = 32; + = 128; + = 120; + = 121; + = 122; + = 123; + = 12; + + = 14; + = 11; + = 129; + = 10; + = 87; + + = 39; + = 15; + = 86; + = 84; + = 83; + = 82; + = 81; + = 80; + = 88; + = 89; + = 90; + = 91; + = 92; + = 45; + = 41; + = 43; + = 47; + = 94; + = 95; + + = 102; + = 103; + = 110; + = 111; + + = 118; + = 119; + = 127; + = 125; + + = 134; + = 132; + = 133; + = 135; + + = 25; + = 29; + = 27; + = 31; + + = 21; + = 17; + = 19; + = 23; + + = 16; + = 18; + = 20; + = 22; + + = 24; + = 26; + = 28; + = 46; + + = 30; + = 44; +}; diff --git a/xorg-server/xkeyboard-config/keycodes/ibm b/xorg-server/xkeyboard-config/keycodes/ibm index 303d4b360..3ce84a70a 100644 --- a/xorg-server/xkeyboard-config/keycodes/ibm +++ b/xorg-server/xkeyboard-config/keycodes/ibm @@ -1,151 +1,150 @@ -// $Xorg: ibm,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $ -// -//Copyright 1996, 1998 The Open Group -// -//Permission to use, copy, modify, distribute, and sell this software and its -//documentation for any purpose is hereby granted without fee, provided that -//the above copyright notice appear in all copies and that both that -//copyright notice and this permission notice appear in supporting -//documentation. -// -//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 OPEN GROUP 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 Open Group 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 Open Group. -// -xkb_keycodes "rs6k-101" { - - = 9; - = 10; - = 11; - = 12; - = 13; - = 14; - = 15; - = 16; - = 17; - = 18; - = 19; - = 20; - = 21; - = 23; - - = 24; - = 25; - = 26; - = 27; - = 28; - = 29; - = 30; - = 31; - = 32; - = 33; - = 34; - = 35; - = 36; - = 37; - - = 38; - = 39; - = 40; - = 41; - = 42; - = 43; - = 44; - = 45; - = 46; - = 47; - = 48; - = 49; - = 51; - - = 52; - = 54; - = 55; - = 56; - = 57; - = 58; - = 59; - = 60; - = 61; - = 62; - = 63; - = 65; - - = 66; - = 68; - = 69; - = 70; - = 72; - - = 118; - = 120; - = 121; - = 122; - = 123; - = 124; - = 125; - = 126; - = 127; - = 128; - = 129; - = 130; - = 131; - - = 132; - = 133; - = 134; - - = 83; - = 88; - = 93; - = 84; - = 89; - = 94; - - = 91; - = 87; - = 92; - = 97; - - = 98; - = 103; - = 108; - = 113; - - = 99; - = 104; - = 109; - = 114; - - = 100; - = 105; - = 110; - - = 101; - = 106; - = 111; - = 116; - - = 107; - = 112; - - indicator 1 = "Caps Lock"; - indicator 2 = "Num Lock"; - indicator 3 = "Scroll Lock"; -}; -xkb_keycodes "rs6k-102" { - include "ibm(rs6k-101)" - = 53; -}; +// +//Copyright 1996, 1998 The Open Group +// +//Permission to use, copy, modify, distribute, and sell this software and its +//documentation for any purpose is hereby granted without fee, provided that +//the above copyright notice appear in all copies and that both that +//copyright notice and this permission notice appear in supporting +//documentation. +// +//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 OPEN GROUP 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 Open Group 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 Open Group. +// +xkb_keycodes "rs6k-101" { + + = 9; + = 10; + = 11; + = 12; + = 13; + = 14; + = 15; + = 16; + = 17; + = 18; + = 19; + = 20; + = 21; + = 23; + + = 24; + = 25; + = 26; + = 27; + = 28; + = 29; + = 30; + = 31; + = 32; + = 33; + = 34; + = 35; + = 36; + = 37; + + = 38; + = 39; + = 40; + = 41; + = 42; + = 43; + = 44; + = 45; + = 46; + = 47; + = 48; + = 49; + = 51; + + = 52; + = 54; + = 55; + = 56; + = 57; + = 58; + = 59; + = 60; + = 61; + = 62; + = 63; + = 65; + + = 66; + = 68; + = 69; + = 70; + = 72; + + = 118; + = 120; + = 121; + = 122; + = 123; + = 124; + = 125; + = 126; + = 127; + = 128; + = 129; + = 130; + = 131; + + = 132; + = 133; + = 134; + + = 83; + = 88; + = 93; + = 84; + = 89; + = 94; + + = 91; + = 87; + = 92; + = 97; + + = 98; + = 103; + = 108; + = 113; + + = 99; + = 104; + = 109; + = 114; + + = 100; + = 105; + = 110; + + = 101; + = 106; + = 111; + = 116; + + = 107; + = 112; + + indicator 1 = "Caps Lock"; + indicator 2 = "Num Lock"; + indicator 3 = "Scroll Lock"; +}; +xkb_keycodes "rs6k-102" { + include "ibm(rs6k-101)" + = 53; +}; diff --git a/xorg-server/xkeyboard-config/keycodes/macintosh b/xorg-server/xkeyboard-config/keycodes/macintosh index 5b0a2614a..a6e6ee061 100644 --- a/xorg-server/xkeyboard-config/keycodes/macintosh +++ b/xorg-server/xkeyboard-config/keycodes/macintosh @@ -1,4 +1,3 @@ -// $XConsortium: macintosh /main/10 1996/01/24 12:17:35 kaleb $ // //Copyright (c) 1996 X Consortium // @@ -26,7 +25,6 @@ //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" @@ -208,4 +206,3 @@ xkb_keycodes "jisevdev" { alias = ; // Switch to kana mode alias = ; // Switch to alphanumeric mode }; - diff --git a/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indigo b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indigo index 6605ade53..2f5f45bfc 100644 --- a/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indigo +++ b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indigo @@ -1,140 +1,139 @@ -// $Xorg: indigo,v 1.3 2000/08/17 19:54:39 cpqbld Exp $ -default xkb_keycodes "pc101" { - minimum= 8; - maximum= 255; - - = 62; - = 15; - = 21; - = 22; - = 29; - = 30; - = 37; - = 38; - = 45; - = 46; - = 53; - = 54; - = 61; - = 68; - - = 16; - = 17; - = 23; - = 24; - = 31; - = 32; - = 39; - = 40; - = 47; - = 48; - = 55; - = 56; - = 63; - = 58; - - = 11; - = 18; - = 19; - = 25; - = 26; - = 33; - = 34; - = 41; - = 42; - = 49; - = 50; - = 57; - - = 13; - = 27; - = 28; - = 35; - = 36; - = 43; - = 44; - = 51; - = 52; - = 59; - = 60; - = 12; - = 64; - - = 91; - = 10; - = 90; - = 93; - = 92; - - = 14; - = 94; - = 95; - = 96; - = 97; - = 98; - = 99; - = 100; - = 101; - = 102; - = 103; - = 104; - = 105; - - = 106; - = 107; - = 108; - - = 109; - = 110; - = 111; - = 69; - = 112; - = 113; - - = 88; - = 80; - = 81; - = 87; - - = 114; - = 115; - = 116; - = 83; - - = 74; - = 75; - = 82; - = 117; - - = 70; - = 76; - = 77; - - = 65; - = 71; - = 72; - = 89; - - = 66; - = 73; - - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - - virtual indicator 1 = "L1"; - virtual indicator 2 = "L2"; - virtual indicator 3 = "L3"; - virtual indicator 4 = "L4"; - indicator 5 = "Caps Lock"; - indicator 6 = "Num Lock"; - indicator 7 = "Scroll Lock"; -}; -xkb_keycodes "pc102" { - include "sgi_vndr/indigo(pc101)" - = 118; -}; +default xkb_keycodes "pc101" { + minimum= 8; + maximum= 255; + + = 62; + = 15; + = 21; + = 22; + = 29; + = 30; + = 37; + = 38; + = 45; + = 46; + = 53; + = 54; + = 61; + = 68; + + = 16; + = 17; + = 23; + = 24; + = 31; + = 32; + = 39; + = 40; + = 47; + = 48; + = 55; + = 56; + = 63; + = 58; + + = 11; + = 18; + = 19; + = 25; + = 26; + = 33; + = 34; + = 41; + = 42; + = 49; + = 50; + = 57; + + = 13; + = 27; + = 28; + = 35; + = 36; + = 43; + = 44; + = 51; + = 52; + = 59; + = 60; + = 12; + = 64; + + = 91; + = 10; + = 90; + = 93; + = 92; + + = 14; + = 94; + = 95; + = 96; + = 97; + = 98; + = 99; + = 100; + = 101; + = 102; + = 103; + = 104; + = 105; + + = 106; + = 107; + = 108; + + = 109; + = 110; + = 111; + = 69; + = 112; + = 113; + + = 88; + = 80; + = 81; + = 87; + + = 114; + = 115; + = 116; + = 83; + + = 74; + = 75; + = 82; + = 117; + + = 70; + = 76; + = 77; + + = 65; + = 71; + = 72; + = 89; + + = 66; + = 73; + + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + + virtual indicator 1 = "L1"; + virtual indicator 2 = "L2"; + virtual indicator 3 = "L3"; + virtual indicator 4 = "L4"; + indicator 5 = "Caps Lock"; + indicator 6 = "Num Lock"; + indicator 7 = "Scroll Lock"; +}; +xkb_keycodes "pc102" { + include "sgi_vndr/indigo(pc101)" + = 118; +}; diff --git a/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indy b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indy index e16a0cbc1..aab3749b5 100644 --- a/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indy +++ b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indy @@ -1,203 +1,202 @@ -// $Xorg: indy,v 1.3 2000/08/17 19:54:39 cpqbld Exp $ -default xkb_keycodes "universal" { - minimum= 8; - maximum= 255; - include "sgi_vndr/indy(pc105)" - alternate = 91; - alternate = 100; - alternate = 101; -}; -xkb_keycodes "pc101" { - minimum= 8; - maximum= 255; - - = 22; - = 30; - = 38; - = 46; - = 45; - = 54; - = 62; - = 69; - = 70; - = 78; - = 77; - = 86; - = 93; - = 110; - - = 21; - = 29; - = 37; - = 44; - = 53; - = 52; - = 61; - = 68; - = 75; - = 76; - = 85; - = 92; - = 99; - = 98; - - = 28; - = 36; - = 35; - = 43; - = 51; - = 60; - = 59; - = 67; - = 74; - = 83; - = 84; - = 90; - - = 26; - = 34; - = 42; - = 41; - = 50; - = 58; - = 57; - = 66; - = 73; - = 81; - = 82; - = 97; - = 100; - - = 33; - = 25; - = 49; - = 96; - = 65; - - = 16; - = 15; - = 23; - = 31; - = 39; - = 47; - = 55; - = 63; - = 71; - = 79; - = 87; - = 94; - = 102; - - = 95; - = 103; - = 106; - - = 111; - = 118; - = 119; - = 108; - = 109; - = 117; - - = 107; - = 105; - = 104; - = 114; - - = 126; - = 127; - = 134; - = 140; - - = 116; - = 125; - = 133; - = 132; - - = 115; - = 123; - = 124; - - = 113; - = 122; - = 130; - = 129; - - = 120; - = 121; - - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - - virtual indicator 1 = "L1"; - virtual indicator 2 = "L2"; - virtual indicator 3 = "L3"; - virtual indicator 4 = "L4"; - indicator 5 = "Caps Lock"; - indicator 6 = "Num Lock"; - indicator 7 = "Scroll Lock"; - -}; -xkb_keycodes "pc102" { - = 91; - = 27; - augment "sgi_vndr/indy(pc101)" - maximum= 255; - minimum= 8; -}; -xkb_keycodes "pc104" { - include "sgi_vndr/indy(pc101)" - minimum= 8; - maximum= 255; - - // These key names are here to support so-called "Windows95" - // keyboards like the Microsoft Natural keyboard. - = 147; - = 148; - = 149; -}; -xkb_keycodes "pc105" { - = 27; - augment "sgi_vndr/indy(pc104)" - minimum= 8; - maximum= 255; -}; -xkb_keycodes "jp106" { - = 22; - = 89; - = 91; - = 141; - = 142; - = 143; - alias = ; - alias = ; - alias = ; - augment "sgi_vndr/indy(pc101)" - minimum= 8; - maximum= 255; -}; -// can be combined with any other "indy" keycode -// description to add virtual keys which can be -// used to implement an overlay-based numeric -// keypad. -partial hidden xkb_keycodes "overlayKeypad" { - = 17; - = 18; - = 19; - = 146; - = 145; - = 144; - = 136; - = 137; - = 138; - = 135; - = 139; -}; -partial hidden xkb_keycodes "shiftLock" { - indicator 5 = "Shift Lock"; -}; +default xkb_keycodes "universal" { + minimum= 8; + maximum= 255; + include "sgi_vndr/indy(pc105)" + alternate = 91; + alternate = 100; + alternate = 101; +}; +xkb_keycodes "pc101" { + minimum= 8; + maximum= 255; + + = 22; + = 30; + = 38; + = 46; + = 45; + = 54; + = 62; + = 69; + = 70; + = 78; + = 77; + = 86; + = 93; + = 110; + + = 21; + = 29; + = 37; + = 44; + = 53; + = 52; + = 61; + = 68; + = 75; + = 76; + = 85; + = 92; + = 99; + = 98; + + = 28; + = 36; + = 35; + = 43; + = 51; + = 60; + = 59; + = 67; + = 74; + = 83; + = 84; + = 90; + + = 26; + = 34; + = 42; + = 41; + = 50; + = 58; + = 57; + = 66; + = 73; + = 81; + = 82; + = 97; + = 100; + + = 33; + = 25; + = 49; + = 96; + = 65; + + = 16; + = 15; + = 23; + = 31; + = 39; + = 47; + = 55; + = 63; + = 71; + = 79; + = 87; + = 94; + = 102; + + = 95; + = 103; + = 106; + + = 111; + = 118; + = 119; + = 108; + = 109; + = 117; + + = 107; + = 105; + = 104; + = 114; + + = 126; + = 127; + = 134; + = 140; + + = 116; + = 125; + = 133; + = 132; + + = 115; + = 123; + = 124; + + = 113; + = 122; + = 130; + = 129; + + = 120; + = 121; + + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + + virtual indicator 1 = "L1"; + virtual indicator 2 = "L2"; + virtual indicator 3 = "L3"; + virtual indicator 4 = "L4"; + indicator 5 = "Caps Lock"; + indicator 6 = "Num Lock"; + indicator 7 = "Scroll Lock"; + +}; +xkb_keycodes "pc102" { + = 91; + = 27; + augment "sgi_vndr/indy(pc101)" + maximum= 255; + minimum= 8; +}; +xkb_keycodes "pc104" { + include "sgi_vndr/indy(pc101)" + minimum= 8; + maximum= 255; + + // These key names are here to support so-called "Windows95" + // keyboards like the Microsoft Natural keyboard. + = 147; + = 148; + = 149; +}; +xkb_keycodes "pc105" { + = 27; + augment "sgi_vndr/indy(pc104)" + minimum= 8; + maximum= 255; +}; +xkb_keycodes "jp106" { + = 22; + = 89; + = 91; + = 141; + = 142; + = 143; + alias = ; + alias = ; + alias = ; + augment "sgi_vndr/indy(pc101)" + minimum= 8; + maximum= 255; +}; +// can be combined with any other "indy" keycode +// description to add virtual keys which can be +// used to implement an overlay-based numeric +// keypad. +partial hidden xkb_keycodes "overlayKeypad" { + = 17; + = 18; + = 19; + = 146; + = 145; + = 144; + = 136; + = 137; + = 138; + = 135; + = 139; +}; +partial hidden xkb_keycodes "shiftLock" { + indicator 5 = "Shift Lock"; +}; diff --git a/xorg-server/xkeyboard-config/keycodes/sgi_vndr/iris b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/iris index a4118a6b4..18068175d 100644 --- a/xorg-server/xkeyboard-config/keycodes/sgi_vndr/iris +++ b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/iris @@ -1,11 +1,10 @@ -// $Xorg: iris,v 1.3 2000/08/17 19:54:39 cpqbld Exp $ -default xkb_keycodes "iris" { - include "sgi_vndr/indigo(pc101)" - indicator 1 = "L1"; - indicator 2 = "L2"; - indicator 3 = "L3"; - indicator 4 = "L4"; - indicator 5 = "Caps Lock"; - indicator 6 = "Num Lock"; - indicator 7 = "Scroll Lock"; -}; +default xkb_keycodes "iris" { + include "sgi_vndr/indigo(pc101)" + indicator 1 = "L1"; + indicator 2 = "L2"; + indicator 3 = "L3"; + indicator 4 = "L4"; + indicator 5 = "Caps Lock"; + indicator 6 = "Num Lock"; + indicator 7 = "Scroll Lock"; +}; diff --git a/xorg-server/xkeyboard-config/keycodes/sony b/xorg-server/xkeyboard-config/keycodes/sony index 0e720b422..def1eaf6b 100644 --- a/xorg-server/xkeyboard-config/keycodes/sony +++ b/xorg-server/xkeyboard-config/keycodes/sony @@ -1,142 +1,141 @@ -// $Xorg: sony,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $ -// -//Copyright 1996, 1998 The Open Group -// -//Permission to use, copy, modify, distribute, and sell this software and its -//documentation for any purpose is hereby granted without fee, provided that -//the above copyright notice appear in all copies and that both that -//copyright notice and this permission notice appear in supporting -//documentation. -// -//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 OPEN GROUP 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 Open Group 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 Open Group. -// -xkb_keycodes "nwp5461" { - - = 18; - = 19; - = 20; - = 21; - = 22; - = 23; - = 24; - = 25; - = 26; - = 27; - = 28; - = 29; - = 30; - = 31; - = 32; - - = 33; - = 34; - = 35; - = 36; - = 37; - = 38; - = 39; - = 40; - = 41; - = 42; - = 43; - = 44; - = 45; - = 46; - - = 47; - = 48; - = 49; - = 50; - = 51; - = 52; - = 53; - = 54; - = 55; - = 56; - = 57; - = 58; - = 59; - = 60; - - = 61; - = 62; - = 63; - = 64; - = 65; - = 66; - = 67; - = 68; - = 69; - = 70; - = 71; - = 72; - = 73; - - = 74; - = 75; - = 76; - = 77; - = 78; - = 81; - - = 8; - = 9; - = 10; - = 11; - = 12; - = 13; - = 14; - = 15; - = 16; - = 17; - = 111; - = 112; - - = 113; - = 114; - = 115; - = 116; - = 117; - - = 109; - = 95; - = 98; - = 99; - = 100; - - = 107; - = 108; - = 89; - - = 82; - = 83; - = 84; - = 85; - - = 86; - = 87; - = 88; - = 93; - - = 90; - = 91; - = 92; - = 97; - - = 94; - = 96; -}; +// +//Copyright 1996, 1998 The Open Group +// +//Permission to use, copy, modify, distribute, and sell this software and its +//documentation for any purpose is hereby granted without fee, provided that +//the above copyright notice appear in all copies and that both that +//copyright notice and this permission notice appear in supporting +//documentation. +// +//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 OPEN GROUP 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 Open Group 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 Open Group. +// +xkb_keycodes "nwp5461" { + + = 18; + = 19; + = 20; + = 21; + = 22; + = 23; + = 24; + = 25; + = 26; + = 27; + = 28; + = 29; + = 30; + = 31; + = 32; + + = 33; + = 34; + = 35; + = 36; + = 37; + = 38; + = 39; + = 40; + = 41; + = 42; + = 43; + = 44; + = 45; + = 46; + + = 47; + = 48; + = 49; + = 50; + = 51; + = 52; + = 53; + = 54; + = 55; + = 56; + = 57; + = 58; + = 59; + = 60; + + = 61; + = 62; + = 63; + = 64; + = 65; + = 66; + = 67; + = 68; + = 69; + = 70; + = 71; + = 72; + = 73; + + = 74; + = 75; + = 76; + = 77; + = 78; + = 81; + + = 8; + = 9; + = 10; + = 11; + = 12; + = 13; + = 14; + = 15; + = 16; + = 17; + = 111; + = 112; + + = 113; + = 114; + = 115; + = 116; + = 117; + + = 109; + = 95; + = 98; + = 99; + = 100; + + = 107; + = 108; + = 89; + + = 82; + = 83; + = 84; + = 85; + + = 86; + = 87; + = 88; + = 93; + + = 90; + = 91; + = 92; + = 97; + + = 94; + = 96; +}; diff --git a/xorg-server/xkeyboard-config/keycodes/sun b/xorg-server/xkeyboard-config/keycodes/sun index a6ffdb39f..7cb38e304 100644 --- a/xorg-server/xkeyboard-config/keycodes/sun +++ b/xorg-server/xkeyboard-config/keycodes/sun @@ -1,954 +1,950 @@ -// $XdotOrg: $ -// $Xorg: sun,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $ -// -//Copyright 1996, 1998 The Open Group -// -//Permission to use, copy, modify, distribute, and sell this software and its -//documentation for any purpose is hereby granted without fee, provided that -//the above copyright notice appear in all copies and that both that -//copyright notice and this permission notice appear in supporting -//documentation. -// -//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 OPEN GROUP 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 Open Group 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 Open Group. -// -// --------------------------------------------------------------------------- -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. -// -// 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 (including the next -// paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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. -// -// --------------------------------------------------------------------------- -// -// $XFree86: xc/programs/xkbcomp/keycodes/sun,v 3.6 2003/08/09 14:30:48 pascal Exp $ -// - -default xkb_keycodes "type4" { - - minimum= 8; - maximum= 255; - - = 36; - = 37; - = 38; - = 39; - = 40; - = 41; - = 42; - = 43; - = 44; - = 45; - = 46; - = 47; - = 48; - = 49; - = 50; - - = 60; - = 61; - = 62; - = 63; - = 64; - = 65; - = 66; - = 67; - = 68; - = 69; - = 70; - = 71; - = 72; - = 73; - - = 83; - = 84; - = 85; - = 86; - = 87; - = 88; - = 89; - = 90; - = 91; - = 92; - = 93; - = 94; - = 95; - = 96; - - = 106; - = 107; - = 108; - = 109; - = 110; - = 111; - = 112; - = 113; - = 114; - = 115; - = 116; - = 117; - = 118; - - = 125; - = 126; - = 26; - = 127; - = 128; - = 129; - = 74; - = 20; - alias = ; - - = 12; - = 13; - = 15; - = 17; - = 19; - = 21; - = 23; - = 24; - = 25; - = 14; - = 16; - = 18; - - = 8; - = 10; - = 32; - = 33; - = 56; - = 58; - = 79; - = 80; - = 102; - = 104; - - = 29; - = 30; - = 28; - - = 105; - = 52; - = 53; - = 54; - = 78; - - = 75; - = 76; - = 77; - = 132; - - = 98; - = 99; - = 100; - - = 119; - = 120; - = 121; - = 97; - - = 101; - = 57; - indicator 4 = "Caps Lock"; - indicator 3 = "Compose"; - indicator 2 = "Scroll Lock"; - indicator 1 = "Num Lock"; -}; - -xkb_keycodes "type5" { - - minimum= 8; - maximum= 255; - - = 36; - = 37; - = 38; - = 39; - = 40; - = 41; - = 42; - = 43; - = 44; - = 45; - = 46; - = 47; - = 48; - = 49; - = 50; - - = 60; - = 61; - = 62; - = 63; - = 64; - = 65; - = 66; - = 67; - = 68; - = 69; - = 70; - = 71; - = 72; - = 73; - = 74; - = 20; - alias = ; - - = 83; - = 84; - = 85; - = 86; - = 87; - = 88; - = 89; - = 90; - = 91; - = 92; - = 93; - = 94; - = 95; - = 96; - - = 106; - = 107; - = 108; - = 109; - = 110; - = 111; - = 112; - = 113; - = 114; - = 115; - = 116; - = 117; - - = 26; - = 126; - = 127; - = 128; - = 129; - - = 12; - = 13; - = 15; - = 17; - = 19; - = 21; - = 23; - = 24; - = 25; - = 14; - = 16; - = 18; - = 8; - = 10; - = 32; - = 33; - = 56; - = 58; - = 79; - = 80; - = 102; - = 104; - - = 29; - = 30; - = 28; - - = 105; - = 53; - = 54; - = 78; - - = 75; - = 76; - = 77; - = 132; - - = 98; - = 99; - = 100; - - = 119; - = 120; - = 121; - = 97; - - = 101; - = 57; - - = 27; - = 31; - = 34; - = 35; - - = 51; - = 59; - = 81; - = 103; - = 130; - = 125; - - = 52; - = 9; - = 11; - = 55; - indicator 4 = "Caps Lock"; - indicator 3 = "Compose"; - indicator 2 = "Scroll Lock"; - indicator 1 = "Num Lock"; -}; - -xkb_keycodes "type4tuv" { - include "sun(type4)" - = 131; - = 22; -}; - -xkb_keycodes "type4_ca" { - include "sun(type4)" - = 131; -}; - -xkb_keycodes "type4_jp" { - include "sun(type4)" - = 122; - = 123; - = 124; - = 22; - alias = ; -}; - -xkb_keycodes "type4_euro" { - include "sun(type4)" - = 131; -}; - -xkb_keycodes "type5tuv" { - include "sun(type5)" - = 131; -}; - -xkb_keycodes "type5_jp" { - include "sun(type5)" - = 122; - = 123; - = 124; - = 118; -}; - -xkb_keycodes "type5_euro" { - include "sun(type5)" - = 131; -}; - -xkb_keycodes "type5hobo" { - - minimum= 8; - maximum= 255; - - = 36; - = 37; - = 38; - = 39; - = 40; - = 41; - = 42; - = 43; - = 44; - = 45; - = 46; - = 47; - = 48; - = 49; - = 50; - - = 60; - = 61; - = 62; - = 63; - = 64; - = 65; - = 66; - = 67; - = 68; - = 69; - = 70; - = 71; - = 72; - = 73; - = 74; - = 20; - alias = ; - - = 83; - = 84; - = 85; - = 86; - = 87; - = 88; - = 89; - = 90; - = 91; - = 92; - = 93; - = 94; - = 95; - = 96; - - = 106; - = 107; - = 108; - = 109; - = 110; - = 111; - = 112; - = 113; - = 114; - = 115; - = 116; - = 117; - - = 26; - = 126; - = 127; - = 128; - = 129; - - = 12; - = 13; - = 15; - = 17; - = 19; - = 21; - = 23; - = 24; - = 25; - = 14; - = 16; - = 18; - = 8; - = 10; - = 32; - = 33; - = 56; - = 58; - = 79; - = 80; - = 102; - = 104; - - = 29; - = 30; - = 28; - - = 105; -// = 53; -// = 54; -// = 78; - -// = 75; -// = 76; -// = 77; -// = 132; - -// = 98; -// = 99; -// = 100; - -// = 119; -// = 120; -// = 121; -// = 97; - -// = 101; -// = 57; - - = 27; - = 31; - = 34; - = 35; - - = 51; - = 59; - = 81; - = 103; - = 130; - = 125; - - = 52; - = 9; - = 11; - = 55; - indicator 4 = "Caps Lock"; - indicator 3 = "Compose"; - indicator 2 = "Scroll Lock"; - indicator 1 = "Num Lock"; -}; - -xkb_keycodes "type5tuvhobo" { - include "sun(type5hobo)" - = 131; - -}; - -xkb_keycodes "type5_jphobo" { - include "sun(type5hobo)" - = 122; - = 123; - = 124; - = 118; -}; - -xkb_keycodes "type6" { - include "sun(type5)" -}; - -xkb_keycodes "type6tuv" { - include "sun(type5tuv)" -}; - -xkb_keycodes "type6unix" { - include "sun(type5)" -}; - -xkb_keycodes "type6_jp" { - include "sun(type5_jp)" -}; - -xkb_keycodes "type6_euro" { - include "sun(type5_euro)" -}; - -// Even though this is labeled as _usb, I verified these keycodes as accurate -// on my type5 serial and type6 serial keyboards as well on linux-2.6 boxes. -// I'm not sure where the "type5" keycodes above are coming from... -xkb_keycodes "type6_usb" { - include "xfree86" - - = 232; - = 133; - = 134; - = 135; - = 140; - = 248; - = 191; - = 192; - = 122; - = 188; - - = 245; - - // The blank has keycode 239 on my type6 serial kb, but 134 on - // my type6 usb keyboard (same as ) - = 239; - - // AltGr + PrScr actually sends a different keycode - = 92; - - = 160; - = 174; - = 176; - = 222; - - indicator 4 = "Compose"; -}; - -xkb_keycodes "type6tuv_usb" { - include "sun(type6_usb)" - = 94; -// = 51; -}; - -xkb_keycodes "type6_jp_usb" { - include "sun(type6_usb)" - alias = ; // 123 - alias = ; // 139 - alias = ; // 138 - alias = ; // 129 - indicator 5 = "Kana"; -}; - -xkb_keycodes "type5_se" { - - minimum= 8; - maximum= 255; - - // Row G - = 125; - // - = 36; - // - = 12; - = 13; - = 15; - = 17; - // - = 19; - = 21; - = 23; - = 24; - // - = 25; - = 14; - = 16; - = 18; - // - = 29; - = 30; - = 28; - // - = 52; - = 9; - = 11; - = 55; - // End Row G - - // Row F - // - // End Row F - - // Row E - = 8; - = 10; - // - = 49; - alias = ; - = 37; - = 38; - = 39; - = 40; - = 41; - = 42; - = 43; - = 44; - = 45; - = 46; - = 47; - = 48; - = 50; - // - = 51; - = 59; - = 103; - // - = 105; - = 53; - = 54; - = 78; - //End Row E - - // Row D - = 32; - = 33; - // - = 60; - alias = ; - = 61; - = 62; - = 63; - = 64; - = 65; - = 66; - = 67; - = 68; - = 69; - = 70; - = 71; - = 72; - // - = 73; - = 81; - = 130; - // - = 75; - = 76; - = 77; - = 132; - // End Row D - - // Row C - = 56; - = 58; - // - = 126; - alias = ; - = 84; - = 85; - = 86; - = 87; - = 88; - = 89; - = 90; - = 91; - = 92; - = 93; - = 94; - = 95; - alias = ; - = 96; - // - = 98; - = 99; - = 100; - // End Row C - - // Row B - = 79; - = 80; - // - = 106; - = 131; - alias = ; - = 107; - = 108; - = 109; - = 110; - = 111; - = 112; - = 113; - = 114; - = 115; - = 116; - = 117; - // - = 27; - // - = 119; - = 120; - = 121; - = 97; - // End Row B - - // Row A - = 102; - = 104; - // - = 83; - = 26; - = 127; - = 128; - = 129; - = 74; - = 20; - alias = ; - // - = 31; - = 34; - = 35; - // - = 101; - = 57; - // End Row A - - indicator 4 = "Caps Lock"; - indicator 3 = "Compose"; - indicator 2 = "Scroll Lock"; - indicator 1 = "Num Lock"; -}; - -xkb_keycodes "type5c_se" { - include "sun(type5_se)" -}; - -xkb_keycodes "type4__se" { - - minimum= 8; - maximum= 255; - - // Row F - = 8; - = 10; - // - = 12; - = 13; - = 15; - = 17; - = 19; - = 21; - = 23; - = 24; - = 25; - = 14; - = 16; - = 18; - = 95; - alias = ; - = 22; - = 73; - // - = 28; - = 29; - = 30; - = 105; - // End Row F - - // Row E - = 32; - = 33; - // - = 36; - alias = ; - = 37; - = 38; - = 39; - = 40; - = 41; - = 42; - = 43; - = 44; - = 45; - = 46; - = 47; - = 48; - = 50; - // - = 52; - = 53; - = 54; - = 78; - // End Row E - - // Row D - = 56; - = 58; - // - = 60; - alias = ; - = 61; - = 62; - = 63; - = 64; - = 65; - = 66; - = 67; - = 68; - = 69; - = 70; - = 71; - = 72; - // - = 75; - = 76; - = 77; - = 132; - // End Row D - - // Row C - = 79; - = 80; - // - = 83; - // alias = ; - = 84; - = 85; - = 86; - = 87; - = 88; - = 89; - = 90; - = 91; - = 92; - = 93; - = 94; - = 49; - alias = ; - = 96; - // - = 98; - = 99; - = 100; - // End Row C - - // Row B - = 102; - = 104; - // - = 106; - = 131; - alias = ; - = 107; - = 108; - = 109; - = 110; - = 111; - = 112; - = 113; - = 114; - = 115; - = 116; - = 117; - = 118; - // - = 119; - = 120; - = 121; - = 97; - // End Row B - - // Row A - = 125; - // - = 126; - // alias = ; - = 26; - = 127; - = 128; - = 129; - = 74; - = 20; - alias = ; - // - = 101; - = 57; - // End Row A - - indicator 4 = "Caps Lock"; - indicator 3 = "Compose"; - indicator 2 = "Scroll Lock"; - indicator 1 = "Num Lock"; -}; - -xkb_keycodes "type4_se" { - - include "sun(type4__se)" - - alias = ; - alias = ; -}; - -xkb_keycodes "type4_se_swapctl" { - - include "sun(type4__se)" - - alias = ; - alias = ; -}; +// +//Copyright 1996, 1998 The Open Group +// +//Permission to use, copy, modify, distribute, and sell this software and its +//documentation for any purpose is hereby granted without fee, provided that +//the above copyright notice appear in all copies and that both that +//copyright notice and this permission notice appear in supporting +//documentation. +// +//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 OPEN GROUP 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 Open Group 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 Open Group. +// +// --------------------------------------------------------------------------- +// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// +// 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 (including the next +// paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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. +// +// --------------------------------------------------------------------------- +// + +default xkb_keycodes "type4" { + + minimum= 8; + maximum= 255; + + = 36; + = 37; + = 38; + = 39; + = 40; + = 41; + = 42; + = 43; + = 44; + = 45; + = 46; + = 47; + = 48; + = 49; + = 50; + + = 60; + = 61; + = 62; + = 63; + = 64; + = 65; + = 66; + = 67; + = 68; + = 69; + = 70; + = 71; + = 72; + = 73; + + = 83; + = 84; + = 85; + = 86; + = 87; + = 88; + = 89; + = 90; + = 91; + = 92; + = 93; + = 94; + = 95; + = 96; + + = 106; + = 107; + = 108; + = 109; + = 110; + = 111; + = 112; + = 113; + = 114; + = 115; + = 116; + = 117; + = 118; + + = 125; + = 126; + = 26; + = 127; + = 128; + = 129; + = 74; + = 20; + alias = ; + + = 12; + = 13; + = 15; + = 17; + = 19; + = 21; + = 23; + = 24; + = 25; + = 14; + = 16; + = 18; + + = 8; + = 10; + = 32; + = 33; + = 56; + = 58; + = 79; + = 80; + = 102; + = 104; + + = 29; + = 30; + = 28; + + = 105; + = 52; + = 53; + = 54; + = 78; + + = 75; + = 76; + = 77; + = 132; + + = 98; + = 99; + = 100; + + = 119; + = 120; + = 121; + = 97; + + = 101; + = 57; + indicator 4 = "Caps Lock"; + indicator 3 = "Compose"; + indicator 2 = "Scroll Lock"; + indicator 1 = "Num Lock"; +}; + +xkb_keycodes "type5" { + + minimum= 8; + maximum= 255; + + = 36; + = 37; + = 38; + = 39; + = 40; + = 41; + = 42; + = 43; + = 44; + = 45; + = 46; + = 47; + = 48; + = 49; + = 50; + + = 60; + = 61; + = 62; + = 63; + = 64; + = 65; + = 66; + = 67; + = 68; + = 69; + = 70; + = 71; + = 72; + = 73; + = 74; + = 20; + alias = ; + + = 83; + = 84; + = 85; + = 86; + = 87; + = 88; + = 89; + = 90; + = 91; + = 92; + = 93; + = 94; + = 95; + = 96; + + = 106; + = 107; + = 108; + = 109; + = 110; + = 111; + = 112; + = 113; + = 114; + = 115; + = 116; + = 117; + + = 26; + = 126; + = 127; + = 128; + = 129; + + = 12; + = 13; + = 15; + = 17; + = 19; + = 21; + = 23; + = 24; + = 25; + = 14; + = 16; + = 18; + = 8; + = 10; + = 32; + = 33; + = 56; + = 58; + = 79; + = 80; + = 102; + = 104; + + = 29; + = 30; + = 28; + + = 105; + = 53; + = 54; + = 78; + + = 75; + = 76; + = 77; + = 132; + + = 98; + = 99; + = 100; + + = 119; + = 120; + = 121; + = 97; + + = 101; + = 57; + + = 27; + = 31; + = 34; + = 35; + + = 51; + = 59; + = 81; + = 103; + = 130; + = 125; + + = 52; + = 9; + = 11; + = 55; + indicator 4 = "Caps Lock"; + indicator 3 = "Compose"; + indicator 2 = "Scroll Lock"; + indicator 1 = "Num Lock"; +}; + +xkb_keycodes "type4tuv" { + include "sun(type4)" + = 131; + = 22; +}; + +xkb_keycodes "type4_ca" { + include "sun(type4)" + = 131; +}; + +xkb_keycodes "type4_jp" { + include "sun(type4)" + = 122; + = 123; + = 124; + = 22; + alias = ; +}; + +xkb_keycodes "type4_euro" { + include "sun(type4)" + = 131; +}; + +xkb_keycodes "type5tuv" { + include "sun(type5)" + = 131; +}; + +xkb_keycodes "type5_jp" { + include "sun(type5)" + = 122; + = 123; + = 124; + = 118; +}; + +xkb_keycodes "type5_euro" { + include "sun(type5)" + = 131; +}; + +xkb_keycodes "type5hobo" { + + minimum= 8; + maximum= 255; + + = 36; + = 37; + = 38; + = 39; + = 40; + = 41; + = 42; + = 43; + = 44; + = 45; + = 46; + = 47; + = 48; + = 49; + = 50; + + = 60; + = 61; + = 62; + = 63; + = 64; + = 65; + = 66; + = 67; + = 68; + = 69; + = 70; + = 71; + = 72; + = 73; + = 74; + = 20; + alias = ; + + = 83; + = 84; + = 85; + = 86; + = 87; + = 88; + = 89; + = 90; + = 91; + = 92; + = 93; + = 94; + = 95; + = 96; + + = 106; + = 107; + = 108; + = 109; + = 110; + = 111; + = 112; + = 113; + = 114; + = 115; + = 116; + = 117; + + = 26; + = 126; + = 127; + = 128; + = 129; + + = 12; + = 13; + = 15; + = 17; + = 19; + = 21; + = 23; + = 24; + = 25; + = 14; + = 16; + = 18; + = 8; + = 10; + = 32; + = 33; + = 56; + = 58; + = 79; + = 80; + = 102; + = 104; + + = 29; + = 30; + = 28; + + = 105; +// = 53; +// = 54; +// = 78; + +// = 75; +// = 76; +// = 77; +// = 132; + +// = 98; +// = 99; +// = 100; + +// = 119; +// = 120; +// = 121; +// = 97; + +// = 101; +// = 57; + + = 27; + = 31; + = 34; + = 35; + + = 51; + = 59; + = 81; + = 103; + = 130; + = 125; + + = 52; + = 9; + = 11; + = 55; + indicator 4 = "Caps Lock"; + indicator 3 = "Compose"; + indicator 2 = "Scroll Lock"; + indicator 1 = "Num Lock"; +}; + +xkb_keycodes "type5tuvhobo" { + include "sun(type5hobo)" + = 131; + +}; + +xkb_keycodes "type5_jphobo" { + include "sun(type5hobo)" + = 122; + = 123; + = 124; + = 118; +}; + +xkb_keycodes "type6" { + include "sun(type5)" +}; + +xkb_keycodes "type6tuv" { + include "sun(type5tuv)" +}; + +xkb_keycodes "type6unix" { + include "sun(type5)" +}; + +xkb_keycodes "type6_jp" { + include "sun(type5_jp)" +}; + +xkb_keycodes "type6_euro" { + include "sun(type5_euro)" +}; + +// Even though this is labeled as _usb, I verified these keycodes as accurate +// on my type5 serial and type6 serial keyboards as well on linux-2.6 boxes. +// I'm not sure where the "type5" keycodes above are coming from... +xkb_keycodes "type6_usb" { + include "xfree86" + + = 232; + = 133; + = 134; + = 135; + = 140; + = 248; + = 191; + = 192; + = 122; + = 188; + + = 245; + + // The blank has keycode 239 on my type6 serial kb, but 134 on + // my type6 usb keyboard (same as ) + = 239; + + // AltGr + PrScr actually sends a different keycode + = 92; + + = 160; + = 174; + = 176; + = 222; + + indicator 4 = "Compose"; +}; + +xkb_keycodes "type6tuv_usb" { + include "sun(type6_usb)" + = 94; +// = 51; +}; + +xkb_keycodes "type6_jp_usb" { + include "sun(type6_usb)" + alias = ; // 123 + alias = ; // 139 + alias = ; // 138 + alias = ; // 129 + indicator 5 = "Kana"; +}; + +xkb_keycodes "type5_se" { + + minimum= 8; + maximum= 255; + + // Row G + = 125; + // + = 36; + // + = 12; + = 13; + = 15; + = 17; + // + = 19; + = 21; + = 23; + = 24; + // + = 25; + = 14; + = 16; + = 18; + // + = 29; + = 30; + = 28; + // + = 52; + = 9; + = 11; + = 55; + // End Row G + + // Row F + // + // End Row F + + // Row E + = 8; + = 10; + // + = 49; + alias = ; + = 37; + = 38; + = 39; + = 40; + = 41; + = 42; + = 43; + = 44; + = 45; + = 46; + = 47; + = 48; + = 50; + // + = 51; + = 59; + = 103; + // + = 105; + = 53; + = 54; + = 78; + //End Row E + + // Row D + = 32; + = 33; + // + = 60; + alias = ; + = 61; + = 62; + = 63; + = 64; + = 65; + = 66; + = 67; + = 68; + = 69; + = 70; + = 71; + = 72; + // + = 73; + = 81; + = 130; + // + = 75; + = 76; + = 77; + = 132; + // End Row D + + // Row C + = 56; + = 58; + // + = 126; + alias = ; + = 84; + = 85; + = 86; + = 87; + = 88; + = 89; + = 90; + = 91; + = 92; + = 93; + = 94; + = 95; + alias = ; + = 96; + // + = 98; + = 99; + = 100; + // End Row C + + // Row B + = 79; + = 80; + // + = 106; + = 131; + alias = ; + = 107; + = 108; + = 109; + = 110; + = 111; + = 112; + = 113; + = 114; + = 115; + = 116; + = 117; + // + = 27; + // + = 119; + = 120; + = 121; + = 97; + // End Row B + + // Row A + = 102; + = 104; + // + = 83; + = 26; + = 127; + = 128; + = 129; + = 74; + = 20; + alias = ; + // + = 31; + = 34; + = 35; + // + = 101; + = 57; + // End Row A + + indicator 4 = "Caps Lock"; + indicator 3 = "Compose"; + indicator 2 = "Scroll Lock"; + indicator 1 = "Num Lock"; +}; + +xkb_keycodes "type5c_se" { + include "sun(type5_se)" +}; + +xkb_keycodes "type4__se" { + + minimum= 8; + maximum= 255; + + // Row F + = 8; + = 10; + // + = 12; + = 13; + = 15; + = 17; + = 19; + = 21; + = 23; + = 24; + = 25; + = 14; + = 16; + = 18; + = 95; + alias = ; + = 22; + = 73; + // + = 28; + = 29; + = 30; + = 105; + // End Row F + + // Row E + = 32; + = 33; + // + = 36; + alias = ; + = 37; + = 38; + = 39; + = 40; + = 41; + = 42; + = 43; + = 44; + = 45; + = 46; + = 47; + = 48; + = 50; + // + = 52; + = 53; + = 54; + = 78; + // End Row E + + // Row D + = 56; + = 58; + // + = 60; + alias = ; + = 61; + = 62; + = 63; + = 64; + = 65; + = 66; + = 67; + = 68; + = 69; + = 70; + = 71; + = 72; + // + = 75; + = 76; + = 77; + = 132; + // End Row D + + // Row C + = 79; + = 80; + // + = 83; + // alias = ; + = 84; + = 85; + = 86; + = 87; + = 88; + = 89; + = 90; + = 91; + = 92; + = 93; + = 94; + = 49; + alias = ; + = 96; + // + = 98; + = 99; + = 100; + // End Row C + + // Row B + = 102; + = 104; + // + = 106; + = 131; + alias = ; + = 107; + = 108; + = 109; + = 110; + = 111; + = 112; + = 113; + = 114; + = 115; + = 116; + = 117; + = 118; + // + = 119; + = 120; + = 121; + = 97; + // End Row B + + // Row A + = 125; + // + = 126; + // alias = ; + = 26; + = 127; + = 128; + = 129; + = 74; + = 20; + alias = ; + // + = 101; + = 57; + // End Row A + + indicator 4 = "Caps Lock"; + indicator 3 = "Compose"; + indicator 2 = "Scroll Lock"; + indicator 1 = "Num Lock"; +}; + +xkb_keycodes "type4_se" { + + include "sun(type4__se)" + + alias = ; + alias = ; +}; + +xkb_keycodes "type4_se_swapctl" { + + include "sun(type4__se)" + + alias = ; + alias = ; +}; diff --git a/xorg-server/xkeyboard-config/keycodes/xfree86 b/xorg-server/xkeyboard-config/keycodes/xfree86 index bf91fa8ff..7d4813e89 100644 --- a/xorg-server/xkeyboard-config/keycodes/xfree86 +++ b/xorg-server/xkeyboard-config/keycodes/xfree86 @@ -1,415 +1,407 @@ -// $XdotOrg: xc/programs/xkbcomp/keycodes/xfree86,v 1.1.4.4 2004/03/05 13:41:30 eich Exp $ -// $Xorg: xfree86,v 1.3 2000/08/17 19:54:37 cpqbld Exp $ - - - - -// $XFree86: xc/programs/xkbcomp/keycodes/xfree86,v 3.28 2003/11/21 04:46:42 dawes Exp $ - -// "standard" XFree86 codes -// It seems that the "default" must be the first entry in the file. - -default xkb_keycodes "xfree86" { - include "xfree86(basic)" - = 51; - alias = ; - = 94; -}; - -xkb_keycodes "basic" { - - minimum= 8; - maximum= 255; - - = 49; - alias = ; // Some geometries use AE00 - = 10; - = 11; - = 12; - = 13; - = 14; - = 15; - = 16; - = 17; - = 18; - = 19; - = 20; - = 21; - = 22; - - = 23; - = 24; - = 25; - = 26; - = 27; - = 28; - = 29; - = 30; - = 31; - = 32; - = 33; - = 34; - = 35; - = 36; - - = 66; - = 38; - = 39; - = 40; - = 41; - = 42; - = 43; - = 44; - = 45; - = 46; - = 47; - = 48; - - = 50; - = 52; - = 53; - = 54; - = 55; - = 56; - = 57; - = 58; - = 59; - = 60; - = 61; - = 62; - - = 64; - = 37; - = 65; - = 109; - = 113; - // Microsoft keyboard extra keys - = 115; - = 116; - = 117; - - = 9; - = 67; - = 68; - = 69; - = 70; - = 71; - = 72; - = 73; - = 74; - = 75; - = 76; - = 95; - = 96; - - = 111; - = 92; - = 78; - = 110; - = 114; - - = 106; - = 97; - = 99; - = 107; - = 103; - = 105; - - = 98; - = 100; - = 104; - = 102; - - = 77; - = 112; - = 63; - = 82; - - = 79; - = 80; - = 81; - = 86; - - = 83; - = 84; - = 85; - - = 87; - = 88; - = 89; - = 108; - - = 90; - = 91; - = 126; - - = 118; - = 119; - = 120; - = 121; - = 122; - = 123; - - // Keys that are generated on Japanese keyboards - - alias = ; // Hankaku_Zenkaku toggle - = 208; // Hiragana_Katakana toggle - = 211; // backslash/underscore - = 129; // Henkan - = 131; // Muhenkan - = 133; // Yen - = 210; // Alphanumeric mode on macintosh - = 209; // Kana mode on macintosh - - // Keys that are generated on Korean keyboards - - alias = ; // Hangul Latin toggle - alias = ; // Hangul to Hanja conversion - - // Extended keys that may be generated on "Internet" keyboards. - // These are not standardised, hence the meaningless names. - // The entries commented out are never generated because the raw codes - // in those positions are already used for well-defined keys. - - alias = ; - = 130; - alias = ; - = 132; - alias = ; - = 134; - = 135; - = 136; - = 137; - = 138; - = 139; - = 140; - = 141; - = 142; - = 143; - = 144; - = 145; - = 146; - = 147; - = 148; - = 149; - = 150; - = 151; - = 152; - = 153; - = 154; - = 155; - // = 156; - // = 157; - = 158; - = 159; - = 160; - = 161; - = 162; - = 163; - = 164; - = 165; - = 166; - = 167; - = 168; - = 169; - // = 170; - = 171; - = 172; - = 173; - = 174; - = 175; - = 176; - = 177; - = 178; - = 179; - = 180; - // = 181; - // = 182; - // = 183; - // = 184; - = 185; - = 186; - = 187; - = 188; - // = 189; - // = 190; - // = 191; - // = 192; - // = 193; - = 194; - = 195; - = 196; - = 197; - // = 198; - // = 199; - // = 200; - // = 201; - = 202; - // = 203; - // = 204; - // = 205; - // = 206; - // = 207; - // = 208; - // = 209; - // = 210; - // = 211; - = 212; - = 213; - = 214; - = 215; - = 216; - = 217; - = 218; - // = 219; - // = 220; - // = 221; - = 222; - = 223; - = 224; - = 225; - = 226; - = 227; - = 228; - = 229; - = 230; - = 231; - = 232; - = 233; - = 234; - = 235; - = 236; - = 237; - = 238; - = 239; - = 240; - = 241; - = 242; - = 243; - = 244; - = 245; - = 246; - = 247; - = 248; - = 249; - = 250; - = 251; - = 252; - = 253; - = 254; - = 255; - - // MacBooks generate 0x65 for the lower brightness key - = 101; - - // Codes generated for scancodes 0x59-0x5f, 0x62-0x76 - = 157; // - = 170; // - = 181; // - alias = ; - = 182; // - = 183; // - = 184; // - = 189; // - = 190; // - = 191; // - = 192; // - = 193; // - = 198; // - = 199; // - = 200; // - = 201; // - = 203; // - = 204; // - = 205; // - = 206; // - = 207; // - alias = ; // - alias = ; // - alias = ; // - alias = ; // - = 219; // - = 220; // - = 221; // - - // Solaris compatibility - - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - - // Other codes never generated. The XFree86 ddx never generates - // these codes. - // Thus we can use them as fake keys - = 93; // - = 124; // - = 125; // - = 156; // - = 127; // - = 128; // - - indicator 1 = "Caps Lock"; - indicator 2 = "Num Lock"; - indicator 3 = "Scroll Lock"; - - alias = ; - - // For Brazilian ABNT2 - alias = ; -}; - -// What keyboard is this? - -xkb_keycodes "102" { - include "xfree86(xfree86)" - - // There will be warnings from xkbcomp because of multiple definitions. - - = 122; - = 123; - - = 121; - = 118; - - = 131; - = 135; - = 119; - = 129; - = 130; - = 134; - - = 128; - = 132; - = 120; - = 133; - - = 125; - - = 124; -}; - - -// IBM ThinkPad Z60m/Z60t/Z61m/Z61t -xkb_keycodes "thinkpadz60" { - include "xfree86(xfree86)" - = 227; -}; +// "standard" XFree86 codes +// It seems that the "default" must be the first entry in the file. + +default xkb_keycodes "xfree86" { + include "xfree86(basic)" + = 51; + alias = ; + = 94; +}; + +xkb_keycodes "basic" { + + minimum= 8; + maximum= 255; + + = 49; + alias = ; // Some geometries use AE00 + = 10; + = 11; + = 12; + = 13; + = 14; + = 15; + = 16; + = 17; + = 18; + = 19; + = 20; + = 21; + = 22; + + = 23; + = 24; + = 25; + = 26; + = 27; + = 28; + = 29; + = 30; + = 31; + = 32; + = 33; + = 34; + = 35; + = 36; + + = 66; + = 38; + = 39; + = 40; + = 41; + = 42; + = 43; + = 44; + = 45; + = 46; + = 47; + = 48; + + = 50; + = 52; + = 53; + = 54; + = 55; + = 56; + = 57; + = 58; + = 59; + = 60; + = 61; + = 62; + + = 64; + = 37; + = 65; + = 109; + = 113; + // Microsoft keyboard extra keys + = 115; + = 116; + = 117; + + = 9; + = 67; + = 68; + = 69; + = 70; + = 71; + = 72; + = 73; + = 74; + = 75; + = 76; + = 95; + = 96; + + = 111; + = 92; + = 78; + = 110; + = 114; + + = 106; + = 97; + = 99; + = 107; + = 103; + = 105; + + = 98; + = 100; + = 104; + = 102; + + = 77; + = 112; + = 63; + = 82; + + = 79; + = 80; + = 81; + = 86; + + = 83; + = 84; + = 85; + + = 87; + = 88; + = 89; + = 108; + + = 90; + = 91; + = 126; + + = 118; + = 119; + = 120; + = 121; + = 122; + = 123; + + // Keys that are generated on Japanese keyboards + + alias = ; // Hankaku_Zenkaku toggle + = 208; // Hiragana_Katakana toggle + = 211; // backslash/underscore + = 129; // Henkan + = 131; // Muhenkan + = 133; // Yen + = 210; // Alphanumeric mode on macintosh + = 209; // Kana mode on macintosh + + // Keys that are generated on Korean keyboards + + alias = ; // Hangul Latin toggle + alias = ; // Hangul to Hanja conversion + + // Extended keys that may be generated on "Internet" keyboards. + // These are not standardised, hence the meaningless names. + // The entries commented out are never generated because the raw codes + // in those positions are already used for well-defined keys. + + alias = ; + = 130; + alias = ; + = 132; + alias = ; + = 134; + = 135; + = 136; + = 137; + = 138; + = 139; + = 140; + = 141; + = 142; + = 143; + = 144; + = 145; + = 146; + = 147; + = 148; + = 149; + = 150; + = 151; + = 152; + = 153; + = 154; + = 155; + // = 156; + // = 157; + = 158; + = 159; + = 160; + = 161; + = 162; + = 163; + = 164; + = 165; + = 166; + = 167; + = 168; + = 169; + // = 170; + = 171; + = 172; + = 173; + = 174; + = 175; + = 176; + = 177; + = 178; + = 179; + = 180; + // = 181; + // = 182; + // = 183; + // = 184; + = 185; + = 186; + = 187; + = 188; + // = 189; + // = 190; + // = 191; + // = 192; + // = 193; + = 194; + = 195; + = 196; + = 197; + // = 198; + // = 199; + // = 200; + // = 201; + = 202; + // = 203; + // = 204; + // = 205; + // = 206; + // = 207; + // = 208; + // = 209; + // = 210; + // = 211; + = 212; + = 213; + = 214; + = 215; + = 216; + = 217; + = 218; + // = 219; + // = 220; + // = 221; + = 222; + = 223; + = 224; + = 225; + = 226; + = 227; + = 228; + = 229; + = 230; + = 231; + = 232; + = 233; + = 234; + = 235; + = 236; + = 237; + = 238; + = 239; + = 240; + = 241; + = 242; + = 243; + = 244; + = 245; + = 246; + = 247; + = 248; + = 249; + = 250; + = 251; + = 252; + = 253; + = 254; + = 255; + + // MacBooks generate 0x65 for the lower brightness key + = 101; + + // Codes generated for scancodes 0x59-0x5f, 0x62-0x76 + = 157; // + = 170; // + = 181; // + alias = ; + = 182; // + = 183; // + = 184; // + = 189; // + = 190; // + = 191; // + = 192; // + = 193; // + = 198; // + = 199; // + = 200; // + = 201; // + = 203; // + = 204; // + = 205; // + = 206; // + = 207; // + alias = ; // + alias = ; // + alias = ; // + alias = ; // + = 219; // + = 220; // + = 221; // + + // Solaris compatibility + + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + + // Other codes never generated. The XFree86 ddx never generates + // these codes. + // Thus we can use them as fake keys + = 93; // + = 124; // + = 125; // + = 156; // + = 127; // + = 128; // + + indicator 1 = "Caps Lock"; + indicator 2 = "Num Lock"; + indicator 3 = "Scroll Lock"; + + alias = ; + + // For Brazilian ABNT2 + alias = ; +}; + +// What keyboard is this? + +xkb_keycodes "102" { + include "xfree86(xfree86)" + + // There will be warnings from xkbcomp because of multiple definitions. + + = 122; + = 123; + + = 121; + = 118; + + = 131; + = 135; + = 119; + = 129; + = 130; + = 134; + + = 128; + = 132; + = 120; + = 133; + + = 125; + + = 124; +}; + + +// IBM ThinkPad Z60m/Z60t/Z61m/Z61t +xkb_keycodes "thinkpadz60" { + include "xfree86(xfree86)" + = 227; +}; diff --git a/xorg-server/xkeyboard-config/keycodes/xfree98 b/xorg-server/xkeyboard-config/keycodes/xfree98 index 59483caf3..3faea5ca5 100644 --- a/xorg-server/xkeyboard-config/keycodes/xfree98 +++ b/xorg-server/xkeyboard-config/keycodes/xfree98 @@ -1,155 +1,152 @@ -// $Xorg: xfree98,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $ -// -//Copyright 1996, 1998 The Open Group -// -//Permission to use, copy, modify, distribute, and sell this software and its -//documentation for any purpose is hereby granted without fee, provided that -//the above copyright notice appear in all copies and that both that -//copyright notice and this permission notice appear in supporting -//documentation. -// -//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 OPEN GROUP 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 Open Group 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 Open Group. -// -// $XFree86: xc/programs/xkbcomp/keycodes/xfree98,v 3.6 2001/01/17 23:45:51 dawes Exp $ -// -default xkb_keycodes "pc98" { - - minimum= 8; - maximum= 255; - - = 8; - = 9; - = 10; - = 11; - = 12; - = 13; - = 14; - = 15; - = 16; - = 17; - = 18; - = 19; - = 20; - = 21; - = 22; - - = 23; - = 24; - = 25; - = 26; - = 27; - = 28; - = 29; - = 30; - = 31; - = 32; - = 33; - = 34; - = 35; - = 36; - - = 124; - = 121; - = 37; - = 38; - = 39; - = 40; - = 41; - = 42; - = 43; - = 44; - = 45; - = 46; - = 47; - = 48; - - = 120; - = 49; - = 50; - = 51; - = 52; - = 53; - = 54; - = 55; - = 56; - = 57; - = 58; - = 59; - - = 122; - = 123; - = 89; - = 60; - = 61; - - = 104; - = 105; - = 106; - = 107; - = 108; - = 109; - = 110; - = 111; - = 112; - = 113; - = 114; - = 115; - = 90; - = 91; - = 92; - = 93; - = 94; - - - = 64; - = 65; - = 63; - = 62; - = 66; - = 67; - = 68; - = 69; - - = 70; - = 71; - - = 72; - = 73; - - = 74; - = 75; - = 76; - = 77; - - = 78; - = 79; - = 80; - = 81; - - = 82; - = 83; - = 84; - = 85; - - = 86; - = 87; - = 88; - - indicator 1 = "Caps Lock"; - indicator 2 = "Kana"; -}; - +// +//Copyright 1996, 1998 The Open Group +// +//Permission to use, copy, modify, distribute, and sell this software and its +//documentation for any purpose is hereby granted without fee, provided that +//the above copyright notice appear in all copies and that both that +//copyright notice and this permission notice appear in supporting +//documentation. +// +//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 OPEN GROUP 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 Open Group 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 Open Group. +// +// +default xkb_keycodes "pc98" { + + minimum= 8; + maximum= 255; + + = 8; + = 9; + = 10; + = 11; + = 12; + = 13; + = 14; + = 15; + = 16; + = 17; + = 18; + = 19; + = 20; + = 21; + = 22; + + = 23; + = 24; + = 25; + = 26; + = 27; + = 28; + = 29; + = 30; + = 31; + = 32; + = 33; + = 34; + = 35; + = 36; + + = 124; + = 121; + = 37; + = 38; + = 39; + = 40; + = 41; + = 42; + = 43; + = 44; + = 45; + = 46; + = 47; + = 48; + + = 120; + = 49; + = 50; + = 51; + = 52; + = 53; + = 54; + = 55; + = 56; + = 57; + = 58; + = 59; + + = 122; + = 123; + = 89; + = 60; + = 61; + + = 104; + = 105; + = 106; + = 107; + = 108; + = 109; + = 110; + = 111; + = 112; + = 113; + = 114; + = 115; + = 90; + = 91; + = 92; + = 93; + = 94; + + + = 64; + = 65; + = 63; + = 62; + = 66; + = 67; + = 68; + = 69; + + = 70; + = 71; + + = 72; + = 73; + + = 74; + = 75; + = 76; + = 77; + + = 78; + = 79; + = 80; + = 81; + + = 82; + = 83; + = 84; + = 85; + + = 86; + = 87; + = 88; + + indicator 1 = "Caps Lock"; + indicator 2 = "Kana"; +}; -- cgit v1.2.3