From 990bc3f015a4f8fce2eb918375defcd44980a845 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 8 Jun 2012 09:33:13 +0200 Subject: Used synchronise script to update files --- xorg-server/xkeyboard-config/symbols/altwin | 158 +- xorg-server/xkeyboard-config/symbols/compose | 108 +- .../symbols/digital_vndr/Makefile.am | 10 +- .../xkeyboard-config/symbols/digital_vndr/lk | 260 ++-- .../xkeyboard-config/symbols/digital_vndr/pc | 350 ++--- .../xkeyboard-config/symbols/digital_vndr/us | 422 ++--- .../xkeyboard-config/symbols/digital_vndr/vt | 316 ++-- xorg-server/xkeyboard-config/symbols/empty | 8 +- xorg-server/xkeyboard-config/symbols/eurosign | 46 +- .../xkeyboard-config/symbols/extractGroupNames.sh | 6 +- .../symbols/fujitsu_vndr/Makefile.am | 8 +- .../xkeyboard-config/symbols/fujitsu_vndr/jp | 174 +-- .../xkeyboard-config/symbols/fujitsu_vndr/us | 286 ++-- .../xkeyboard-config/symbols/hp_vndr/Makefile.am | 8 +- xorg-server/xkeyboard-config/symbols/hp_vndr/us | 208 +-- xorg-server/xkeyboard-config/symbols/kpdl | 204 +-- xorg-server/xkeyboard-config/symbols/level3 | 392 ++--- xorg-server/xkeyboard-config/symbols/level5 | 294 ++-- .../xkeyboard-config/symbols/macintosh_vndr/ch | 202 +-- .../xkeyboard-config/symbols/macintosh_vndr/de | 188 +-- .../xkeyboard-config/symbols/macintosh_vndr/fi | 34 +- .../xkeyboard-config/symbols/macintosh_vndr/fr | 220 +-- .../xkeyboard-config/symbols/macintosh_vndr/gb | 34 +- .../xkeyboard-config/symbols/macintosh_vndr/is | 254 +-- .../xkeyboard-config/symbols/macintosh_vndr/it | 124 +- .../xkeyboard-config/symbols/macintosh_vndr/latam | 74 +- .../xkeyboard-config/symbols/macintosh_vndr/nl | 30 +- .../xkeyboard-config/symbols/macintosh_vndr/no | 100 +- .../xkeyboard-config/symbols/macintosh_vndr/pt | 122 +- .../xkeyboard-config/symbols/macintosh_vndr/se | 88 +- xorg-server/xkeyboard-config/symbols/mao | 42 +- .../xkeyboard-config/symbols/nec_vndr/Makefile.am | 8 +- xorg-server/xkeyboard-config/symbols/nec_vndr/jp | 326 ++-- .../symbols/nokia_vndr/Makefile.am | 12 +- .../xkeyboard-config/symbols/nokia_vndr/rx-44 | 606 ++++---- xorg-server/xkeyboard-config/symbols/olpc | 42 +- xorg-server/xkeyboard-config/symbols/rupeesign | 10 +- .../xkeyboard-config/symbols/sgi_vndr/Makefile.am | 8 +- xorg-server/xkeyboard-config/symbols/sgi_vndr/jp | 88 +- xorg-server/xkeyboard-config/symbols/shift | 168 +- .../xkeyboard-config/symbols/sony_vndr/Makefile.am | 8 +- xorg-server/xkeyboard-config/symbols/sony_vndr/us | 182 +-- xorg-server/xkeyboard-config/symbols/sun_vndr/ara | 232 +-- xorg-server/xkeyboard-config/symbols/sun_vndr/be | 196 +-- xorg-server/xkeyboard-config/symbols/sun_vndr/br | 202 +-- xorg-server/xkeyboard-config/symbols/sun_vndr/ca | 194 +-- xorg-server/xkeyboard-config/symbols/sun_vndr/ch | 266 ++-- xorg-server/xkeyboard-config/symbols/sun_vndr/cz | 210 +-- xorg-server/xkeyboard-config/symbols/sun_vndr/de | 280 ++-- xorg-server/xkeyboard-config/symbols/sun_vndr/dk | 294 ++-- xorg-server/xkeyboard-config/symbols/sun_vndr/ee | 234 +-- xorg-server/xkeyboard-config/symbols/sun_vndr/es | 290 ++-- xorg-server/xkeyboard-config/symbols/sun_vndr/fi | 178 +-- xorg-server/xkeyboard-config/symbols/sun_vndr/fr | 192 +-- xorg-server/xkeyboard-config/symbols/sun_vndr/gb | 204 +-- xorg-server/xkeyboard-config/symbols/sun_vndr/gr | 234 +-- xorg-server/xkeyboard-config/symbols/sun_vndr/it | 280 ++-- xorg-server/xkeyboard-config/symbols/sun_vndr/jp | 1632 ++++++++++---------- xorg-server/xkeyboard-config/symbols/sun_vndr/kr | 194 +-- xorg-server/xkeyboard-config/symbols/sun_vndr/lt | 236 +-- xorg-server/xkeyboard-config/symbols/sun_vndr/lv | 234 +-- xorg-server/xkeyboard-config/symbols/sun_vndr/nl | 296 ++-- xorg-server/xkeyboard-config/symbols/sun_vndr/no | 288 ++-- xorg-server/xkeyboard-config/symbols/sun_vndr/pl | 202 +-- xorg-server/xkeyboard-config/symbols/sun_vndr/pt | 284 ++-- xorg-server/xkeyboard-config/symbols/sun_vndr/ro | 234 +-- xorg-server/xkeyboard-config/symbols/sun_vndr/ru | 222 +-- xorg-server/xkeyboard-config/symbols/sun_vndr/se | 558 +++---- xorg-server/xkeyboard-config/symbols/sun_vndr/sk | 218 +-- xorg-server/xkeyboard-config/symbols/sun_vndr/tr | 184 +-- xorg-server/xkeyboard-config/symbols/sun_vndr/tuv | 522 +++---- xorg-server/xkeyboard-config/symbols/sun_vndr/tw | 156 +- xorg-server/xkeyboard-config/symbols/sun_vndr/ua | 234 +-- xorg-server/xkeyboard-config/symbols/typo | 102 +- .../symbols/xfree68_vndr/Makefile.am | 8 +- .../xkeyboard-config/symbols/xfree68_vndr/amiga | 252 +-- .../xkeyboard-config/symbols/xfree68_vndr/ataritt | 310 ++-- 77 files changed, 8040 insertions(+), 8040 deletions(-) (limited to 'xorg-server/xkeyboard-config/symbols') diff --git a/xorg-server/xkeyboard-config/symbols/altwin b/xorg-server/xkeyboard-config/symbols/altwin index 597b3fb92..92599128f 100644 --- a/xorg-server/xkeyboard-config/symbols/altwin +++ b/xorg-server/xkeyboard-config/symbols/altwin @@ -1,79 +1,79 @@ -partial modifier_keys -xkb_symbols "meta_alt" { - key { [ Alt_L, Meta_L ] }; - key { type[Group1] = "TWO_LEVEL", - symbols[Group1] = [ Alt_R, Meta_R ] }; - modifier_map Mod1 { Alt_L, Alt_R, Meta_L, Meta_R }; -// modifier_map Mod4 {}; -}; - -// Control is mapped to the Win-keys (and the usual Ctrl keys). -partial modifier_keys -xkb_symbols "ctrl_win" { - key { [ Control_L ] }; - key { [ Control_R ] }; - modifier_map Control { , }; -}; - -// Ctrl is mapped to the Alt-keys, Alt is mapped to the Win-keys, Win is mapped to the Ctrl-keys. -partial modifier_keys -xkb_symbols "ctrl_alt_win" { - key { [ Control_L, Control_L ] }; - key { type[Group1] = "TWO_LEVEL", - symbols[Group1] = [ Control_R, Control_R ] }; - key { [ Alt_L, Meta_L ] }; - key { [ Alt_R, Meta_R ] }; - modifier_map Control { , }; - modifier_map Mod1 { , }; -}; - - -partial modifier_keys -xkb_symbols "meta_win" { - key { [ Alt_L, Alt_L ] }; - key { type[Group1] = "TWO_LEVEL", - symbols[Group1] = [ Alt_R, Alt_R ] }; - key { [ Meta_L ] }; - key { [ Meta_R ] }; - modifier_map Mod1 { Alt_L, Alt_R }; - modifier_map Mod4 { , Meta_L, Meta_R }; -}; - -partial modifier_keys -xkb_symbols "left_meta_win" { - key { [ Alt_L, Alt_L ] }; - key { [ Meta_L ] }; - modifier_map Mod1 { Alt_L }; - modifier_map Mod4 { , Meta_L }; -}; - -partial modifier_keys -xkb_symbols "hyper_win" { - key { [ Hyper_L ] }; - key { [ Hyper_R ] }; - modifier_map Mod4 { Hyper_L, Hyper_R }; -}; - -// Use Menu for the menu key -partial modifier_keys -xkb_symbols "menu" { - key { [ Menu ] }; -}; - -// Layout for Tux key caps with additional right Alt key -partial modifier_keys -xkb_symbols "alt_super_win" { - key { [ Alt_L, Meta_L ] }; - key { [ Alt_R, Meta_R ] }; - key { [ Super_L ] }; - key { [ Super_R ] }; - modifier_map Mod1 { Alt_L, Alt_R, Meta_L, Meta_R }; - modifier_map Mod4 { Super_L, Super_R }; -}; - -partial modifier_keys -xkb_symbols "swap_lalt_lwin" { - key { type[Group1] = "ONE_LEVEL", - symbols[Group1] = [ Super_L ] }; - key { [ Alt_L, Meta_L ] }; -}; +partial modifier_keys +xkb_symbols "meta_alt" { + key { [ Alt_L, Meta_L ] }; + key { type[Group1] = "TWO_LEVEL", + symbols[Group1] = [ Alt_R, Meta_R ] }; + modifier_map Mod1 { Alt_L, Alt_R, Meta_L, Meta_R }; +// modifier_map Mod4 {}; +}; + +// Control is mapped to the Win-keys (and the usual Ctrl keys). +partial modifier_keys +xkb_symbols "ctrl_win" { + key { [ Control_L ] }; + key { [ Control_R ] }; + modifier_map Control { , }; +}; + +// Ctrl is mapped to the Alt-keys, Alt is mapped to the Win-keys, Win is mapped to the Ctrl-keys. +partial modifier_keys +xkb_symbols "ctrl_alt_win" { + key { [ Control_L, Control_L ] }; + key { type[Group1] = "TWO_LEVEL", + symbols[Group1] = [ Control_R, Control_R ] }; + key { [ Alt_L, Meta_L ] }; + key { [ Alt_R, Meta_R ] }; + modifier_map Control { , }; + modifier_map Mod1 { , }; +}; + + +partial modifier_keys +xkb_symbols "meta_win" { + key { [ Alt_L, Alt_L ] }; + key { type[Group1] = "TWO_LEVEL", + symbols[Group1] = [ Alt_R, Alt_R ] }; + key { [ Meta_L ] }; + key { [ Meta_R ] }; + modifier_map Mod1 { Alt_L, Alt_R }; + modifier_map Mod4 { , Meta_L, Meta_R }; +}; + +partial modifier_keys +xkb_symbols "left_meta_win" { + key { [ Alt_L, Alt_L ] }; + key { [ Meta_L ] }; + modifier_map Mod1 { Alt_L }; + modifier_map Mod4 { , Meta_L }; +}; + +partial modifier_keys +xkb_symbols "hyper_win" { + key { [ Hyper_L ] }; + key { [ Hyper_R ] }; + modifier_map Mod4 { Hyper_L, Hyper_R }; +}; + +// Use Menu for the menu key +partial modifier_keys +xkb_symbols "menu" { + key { [ Menu ] }; +}; + +// Layout for Tux key caps with additional right Alt key +partial modifier_keys +xkb_symbols "alt_super_win" { + key { [ Alt_L, Meta_L ] }; + key { [ Alt_R, Meta_R ] }; + key { [ Super_L ] }; + key { [ Super_R ] }; + modifier_map Mod1 { Alt_L, Alt_R, Meta_L, Meta_R }; + modifier_map Mod4 { Super_L, Super_R }; +}; + +partial modifier_keys +xkb_symbols "swap_lalt_lwin" { + key { type[Group1] = "ONE_LEVEL", + symbols[Group1] = [ Super_L ] }; + key { [ Alt_L, Meta_L ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/compose b/xorg-server/xkeyboard-config/symbols/compose index 520d44aaf..d7257329e 100644 --- a/xorg-server/xkeyboard-config/symbols/compose +++ b/xorg-server/xkeyboard-config/symbols/compose @@ -1,54 +1,54 @@ -partial modifier_keys -xkb_symbols "ralt" { - key { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] }; -}; - -partial modifier_keys -xkb_symbols "lwin" { - key { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] }; -}; - -partial modifier_keys -xkb_symbols "rwin" { - key { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] }; -}; - -partial modifier_keys -xkb_symbols "menu" { - key { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] }; -}; - -partial modifier_keys -xkb_symbols "rctrl" { - key { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] }; -}; - -partial modifier_keys -xkb_symbols "lctrl" { - key { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] }; -}; - -partial modifier_keys -xkb_symbols "caps" { - key { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] }; -}; - -partial modifier_keys -xkb_symbols "102" { - key { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] }; -}; - -partial modifier_keys -xkb_symbols "paus" { - key { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] }; -}; - -partial modifier_keys -xkb_symbols "prsc" { - key { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] }; -}; - -partial modifier_keys -xkb_symbols "sclk" { - key { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] }; -}; +partial modifier_keys +xkb_symbols "ralt" { + key { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] }; +}; + +partial modifier_keys +xkb_symbols "lwin" { + key { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] }; +}; + +partial modifier_keys +xkb_symbols "rwin" { + key { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] }; +}; + +partial modifier_keys +xkb_symbols "menu" { + key { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] }; +}; + +partial modifier_keys +xkb_symbols "rctrl" { + key { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] }; +}; + +partial modifier_keys +xkb_symbols "lctrl" { + key { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] }; +}; + +partial modifier_keys +xkb_symbols "caps" { + key { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] }; +}; + +partial modifier_keys +xkb_symbols "102" { + key { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] }; +}; + +partial modifier_keys +xkb_symbols "paus" { + key { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] }; +}; + +partial modifier_keys +xkb_symbols "prsc" { + key { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] }; +}; + +partial modifier_keys +xkb_symbols "sclk" { + key { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am index 063fc8d57..69184024b 100644 --- a/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am +++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am @@ -1,5 +1,5 @@ -symbolsdir = $(xkb_base)/symbols/digital_vndr - -dist_symbols_DATA = \ -lk pc us \ -vt +symbolsdir = $(xkb_base)/symbols/digital_vndr + +dist_symbols_DATA = \ +lk pc us \ +vt diff --git a/xorg-server/xkeyboard-config/symbols/digital_vndr/lk b/xorg-server/xkeyboard-config/symbols/digital_vndr/lk index 82a8c90c6..243086581 100644 --- a/xorg-server/xkeyboard-config/symbols/digital_vndr/lk +++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/lk @@ -1,130 +1,130 @@ -// -//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: lk,v -// Revision 1.2 1996/06/18 09:10:09 erik -// use flags correctly, assorted cleanups and consortium fixes -// -// Revision 1.1.2.2 1995/03/10 17:16:52 William_Walker -// Rename to avoid name conflicts with XKB stuff -// [1995/03/10 17:10:33 William_Walker] -// -// Revision 1.1.2.2 1994/10/31 15:22:00 William_Walker -// New experimental version. -// [1994/10/31 14:48:37 William_Walker] -// -// EndLog -// -// @(#)RCSfile: lk,v Revision: 1.2 (DEC) Date: 1996/01/24 12:14:58 -// -// Symbols common to all the LK-style keyboards. -// -default xkb_symbols "common" { - - // Modifier mappings - modifier_map Shift { Shift_L, Shift_R }; - modifier_map Lock { Caps_Lock }; - modifier_map Control { Control_L, Control_R }; - modifier_map Mod1 { Alt_L, Alt_R, Meta_L, Meta_R }; - modifier_map Mod2 { Num_Lock }; - modifier_map Mod3 { Scroll_Lock }; - - // Additional alphanumeric keys - key { [ less, greater ] }; - key { [ Alt_L, Meta_L ] }; - - // "Function" keys - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ F9 ] }; - key { [ F10 ] }; - key { [ Escape, F11 ] }; - key { [ F12 ] }; - key { [ F13 ] }; - key { [ F14 ] }; - key { [ F17 ] }; - key { [ F18 ] }; - key { [ F19 ] }; - key { [ F20 ] }; - - // "Editing" keys - key { [ Help ] }; - key { [ Menu ] }; - key { [ Find ] }; - key { [ Insert ] }; - key { [ Delete ] }; - key { [ Select ] }; - key { [ Prior ] }; - key { [ Next ] }; - - key { [ Up ] }; - key { [ Left ] }; - key { [ Down ] }; - key { [ Right ] }; - - // "Keypad" keys - key { - type= "SHIFT+ALT", - symbols[Group1]=[ KP_F1,Pointer_EnableKeys ] - }; - key { [ KP_F2 ] }; - key { [ KP_F3 ] }; - key { [ KP_F4 ] }; - - key { [ KP_Separator ] }; - key { [ KP_Subtract ] }; - - key { [ KP_7 ] }; - key { [ KP_8 ] }; - key { [ KP_9 ] }; - - key { [ KP_4 ] }; - key { [ KP_5 ] }; - key { [ KP_6 ] }; - - key { [ KP_1 ] }; - key { [ KP_2 ] }; - key { [ KP_3 ] }; - key { [ KP_Enter ] }; - - key { [ KP_0 ] }; - key { [ KP_Decimal ] }; -}; - -xkb_symbols "lk401" { - include "symbols/digital_vndr/lk(common)" - key { [ Alt_R, Meta_R ] }; - key { [ Multi_key ] }; - key { [ Multi_key ] }; -}; +// +//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: lk,v +// Revision 1.2 1996/06/18 09:10:09 erik +// use flags correctly, assorted cleanups and consortium fixes +// +// Revision 1.1.2.2 1995/03/10 17:16:52 William_Walker +// Rename to avoid name conflicts with XKB stuff +// [1995/03/10 17:10:33 William_Walker] +// +// Revision 1.1.2.2 1994/10/31 15:22:00 William_Walker +// New experimental version. +// [1994/10/31 14:48:37 William_Walker] +// +// EndLog +// +// @(#)RCSfile: lk,v Revision: 1.2 (DEC) Date: 1996/01/24 12:14:58 +// +// Symbols common to all the LK-style keyboards. +// +default xkb_symbols "common" { + + // Modifier mappings + modifier_map Shift { Shift_L, Shift_R }; + modifier_map Lock { Caps_Lock }; + modifier_map Control { Control_L, Control_R }; + modifier_map Mod1 { Alt_L, Alt_R, Meta_L, Meta_R }; + modifier_map Mod2 { Num_Lock }; + modifier_map Mod3 { Scroll_Lock }; + + // Additional alphanumeric keys + key { [ less, greater ] }; + key { [ Alt_L, Meta_L ] }; + + // "Function" keys + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F10 ] }; + key { [ Escape, F11 ] }; + key { [ F12 ] }; + key { [ F13 ] }; + key { [ F14 ] }; + key { [ F17 ] }; + key { [ F18 ] }; + key { [ F19 ] }; + key { [ F20 ] }; + + // "Editing" keys + key { [ Help ] }; + key { [ Menu ] }; + key { [ Find ] }; + key { [ Insert ] }; + key { [ Delete ] }; + key { [ Select ] }; + key { [ Prior ] }; + key { [ Next ] }; + + key { [ Up ] }; + key { [ Left ] }; + key { [ Down ] }; + key { [ Right ] }; + + // "Keypad" keys + key { + type= "SHIFT+ALT", + symbols[Group1]=[ KP_F1,Pointer_EnableKeys ] + }; + key { [ KP_F2 ] }; + key { [ KP_F3 ] }; + key { [ KP_F4 ] }; + + key { [ KP_Separator ] }; + key { [ KP_Subtract ] }; + + key { [ KP_7 ] }; + key { [ KP_8 ] }; + key { [ KP_9 ] }; + + key { [ KP_4 ] }; + key { [ KP_5 ] }; + key { [ KP_6 ] }; + + key { [ KP_1 ] }; + key { [ KP_2 ] }; + key { [ KP_3 ] }; + key { [ KP_Enter ] }; + + key { [ KP_0 ] }; + key { [ KP_Decimal ] }; +}; + +xkb_symbols "lk401" { + include "symbols/digital_vndr/lk(common)" + key { [ Alt_R, Meta_R ] }; + key { [ Multi_key ] }; + key { [ Multi_key ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/digital_vndr/pc b/xorg-server/xkeyboard-config/symbols/digital_vndr/pc index b8d1fb2bb..f50d4cde4 100644 --- a/xorg-server/xkeyboard-config/symbols/digital_vndr/pc +++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/pc @@ -1,175 +1,175 @@ -// -//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:10:12 erik -// use flags correctly, assorted cleanups and consortium fixes -// -// Revision 1.1.6.4 1995/12/19 19:55:58 William_Walker -// Update to XKB 0.65 -// [1995/12/17 02:37:07 William_Walker] -// -// Revision 1.1.6.3 1995/10/25 21:01:09 William_Walker -// Make sure we use DIN 2137 and VT510 Spec for Group Semantics -// [1995/10/23 15:49:03 William_Walker] -// -// Revision 1.1.6.2 1995/08/07 17:40:40 William_Walker -// Upgrade XKB to protocol 0.62 (dual submit from decx11) -// [1995/08/06 14:06:32 William_Walker] -// -// Revision 1.1.2.7 1995/08/05 15:25:57 William_Walker -// Sync up with Erik's pool. -// [1995/08/03 20:17:15 William_Walker] -// -// Revision 1.1.2.6 1995/06/27 12:18:25 William_Walker -// Add LK201 and LK450 support as well as TW and DP variants. -// [1995/06/26 20:29:52 William_Walker] -// -// Revision 1.1.2.5 1995/06/08 17:10:28 William_Walker -// Make RALT default to Mode_switch -// [1995/06/08 17:08:50 William_Walker] -// -// Revision 1.1.2.4 1995/06/05 19:24:14 William_Walker -// New file. I love keymaps. -// [1995/06/05 18:17:03 William_Walker] -// -// EndLog -// -// @(#)RCSfile: pc Revision: /main/4 (DEC) Date: 1996/01/24 12:15:02 -// - -// ************************************************************** -// * * -// * The symbols common to all Extended PC layouts. * -// * * -// ************************************************************** -xkb_symbols "pc" { - - // Modifier mappings - // - modifier_map Shift { Shift_L, Shift_R }; - modifier_map Lock { Caps_Lock }; - modifier_map Control { Control_L, Control_R }; - modifier_map Mod1 { Alt_L, Alt_R, Meta_L, Meta_R }; - modifier_map Mod3 { Mode_switch }; - modifier_map Mod4 { Num_Lock }; - modifier_map Mod5 { Scroll_Lock }; - - // Common keys - // - key { [ BackSpace, Delete ] }; - key { [ Tab, ISO_Left_Tab ] }; - key { [ Caps_Lock ] }; - key { [ Return ] }; - key { [ Shift_L ] }; - key { [ Shift_R ] }; - key { [ Control_L ] }; - key { [ Alt_L, Meta_L ] }; - key { [ space ] }; - key { [ Mode_switch ] }; - key { [ Control_R ] }; - - // "Function" keys - // - key { [ Escape ] }; - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ F9 ] }; - key { [ F10 ] }; - key { [ F11 ] }; - key { [ F12 ] }; - key { - type= "PC_ALT_LEVEL2", - symbols[Group1]= [ Print, Sys_Req ] - }; - key { [ Scroll_Lock ] }; - key { - type= "PC_CONTROL_LEVEL2", - symbols[Group1]= [ Pause, Break ] - }; - - // "Editing" keys - // - key { [ Insert ] }; - key { [ Home ] }; - key { [ Prior ] }; - key { [ Delete ] }; - key { [ End ] }; - key { [ Next ] }; - - key { [ Up ] }; - key { [ Left ] }; - key { [ Down ] }; - key { [ Right ] }; - - // "Keypad" keys - // - key { - type= "SHIFT+ALT", - symbols[Group1]= [ Num_Lock,Pointer_EnableKeys] - }; - key { [ KP_Divide ] }; - key { [ KP_Multiply ] }; - key { [ KP_Subtract ] }; - - key { [ KP_Home, KP_7 ] }; - key { [ KP_Up, KP_8 ] }; - key { [ KP_Prior, KP_9 ] }; - key { [ KP_Add ] }; - - key { [ KP_Left, KP_4 ] }; - key { [ KP_5 ] }; - key { [ KP_Right, KP_6 ] }; - - key { [ KP_End, KP_1 ] }; - key { [ KP_Down, KP_2 ] }; - key { [ KP_Next, KP_3 ] }; - key { [ KP_Enter ] }; - - key { [ KP_Insert, KP_0 ] }; - key { [ KP_Delete, KP_Decimal ] }; - - // Key to support Lock-Down Modifier descriptions for R5 - // - key { [ NoSymbol ] }; -}; - -xkb_symbols "pc104" { - include "digital_vndr/pc(pc)" - - replace key { [ Alt_L ] }; - key { [ Meta_L ] }; - key { [ Meta_R ] }; - key { [ Menu ] }; -}; +// +//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:10:12 erik +// use flags correctly, assorted cleanups and consortium fixes +// +// Revision 1.1.6.4 1995/12/19 19:55:58 William_Walker +// Update to XKB 0.65 +// [1995/12/17 02:37:07 William_Walker] +// +// Revision 1.1.6.3 1995/10/25 21:01:09 William_Walker +// Make sure we use DIN 2137 and VT510 Spec for Group Semantics +// [1995/10/23 15:49:03 William_Walker] +// +// Revision 1.1.6.2 1995/08/07 17:40:40 William_Walker +// Upgrade XKB to protocol 0.62 (dual submit from decx11) +// [1995/08/06 14:06:32 William_Walker] +// +// Revision 1.1.2.7 1995/08/05 15:25:57 William_Walker +// Sync up with Erik's pool. +// [1995/08/03 20:17:15 William_Walker] +// +// Revision 1.1.2.6 1995/06/27 12:18:25 William_Walker +// Add LK201 and LK450 support as well as TW and DP variants. +// [1995/06/26 20:29:52 William_Walker] +// +// Revision 1.1.2.5 1995/06/08 17:10:28 William_Walker +// Make RALT default to Mode_switch +// [1995/06/08 17:08:50 William_Walker] +// +// Revision 1.1.2.4 1995/06/05 19:24:14 William_Walker +// New file. I love keymaps. +// [1995/06/05 18:17:03 William_Walker] +// +// EndLog +// +// @(#)RCSfile: pc Revision: /main/4 (DEC) Date: 1996/01/24 12:15:02 +// + +// ************************************************************** +// * * +// * The symbols common to all Extended PC layouts. * +// * * +// ************************************************************** +xkb_symbols "pc" { + + // Modifier mappings + // + modifier_map Shift { Shift_L, Shift_R }; + modifier_map Lock { Caps_Lock }; + modifier_map Control { Control_L, Control_R }; + modifier_map Mod1 { Alt_L, Alt_R, Meta_L, Meta_R }; + modifier_map Mod3 { Mode_switch }; + modifier_map Mod4 { Num_Lock }; + modifier_map Mod5 { Scroll_Lock }; + + // Common keys + // + key { [ BackSpace, Delete ] }; + key { [ Tab, ISO_Left_Tab ] }; + key { [ Caps_Lock ] }; + key { [ Return ] }; + key { [ Shift_L ] }; + key { [ Shift_R ] }; + key { [ Control_L ] }; + key { [ Alt_L, Meta_L ] }; + key { [ space ] }; + key { [ Mode_switch ] }; + key { [ Control_R ] }; + + // "Function" keys + // + key { [ Escape ] }; + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F10 ] }; + key { [ F11 ] }; + key { [ F12 ] }; + key { + type= "PC_ALT_LEVEL2", + symbols[Group1]= [ Print, Sys_Req ] + }; + key { [ Scroll_Lock ] }; + key { + type= "PC_CONTROL_LEVEL2", + symbols[Group1]= [ Pause, Break ] + }; + + // "Editing" keys + // + key { [ Insert ] }; + key { [ Home ] }; + key { [ Prior ] }; + key { [ Delete ] }; + key { [ End ] }; + key { [ Next ] }; + + key { [ Up ] }; + key { [ Left ] }; + key { [ Down ] }; + key { [ Right ] }; + + // "Keypad" keys + // + key { + type= "SHIFT+ALT", + symbols[Group1]= [ Num_Lock,Pointer_EnableKeys] + }; + key { [ KP_Divide ] }; + key { [ KP_Multiply ] }; + key { [ KP_Subtract ] }; + + key { [ KP_Home, KP_7 ] }; + key { [ KP_Up, KP_8 ] }; + key { [ KP_Prior, KP_9 ] }; + key { [ KP_Add ] }; + + key { [ KP_Left, KP_4 ] }; + key { [ KP_5 ] }; + key { [ KP_Right, KP_6 ] }; + + key { [ KP_End, KP_1 ] }; + key { [ KP_Down, KP_2 ] }; + key { [ KP_Next, KP_3 ] }; + key { [ KP_Enter ] }; + + key { [ KP_Insert, KP_0 ] }; + key { [ KP_Delete, KP_Decimal ] }; + + // Key to support Lock-Down Modifier descriptions for R5 + // + key { [ NoSymbol ] }; +}; + +xkb_symbols "pc104" { + include "digital_vndr/pc(pc)" + + replace key { [ Alt_L ] }; + key { [ Meta_L ] }; + key { [ Meta_R ] }; + key { [ Menu ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/digital_vndr/us b/xorg-server/xkeyboard-config/symbols/digital_vndr/us index 95d7301e7..e737e4e3f 100644 --- a/xorg-server/xkeyboard-config/symbols/digital_vndr/us +++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/us @@ -1,211 +1,211 @@ -// -//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:10:16 erik -// use flags correctly, assorted cleanups and consortium fixes -// -// Revision 1.1.6.3 1995/12/19 19:56:37 William_Walker -// Update to XKB 0.65 -// [1995/12/17 02:37:44 William_Walker] -// -// Revision 1.1.6.2 1995/10/25 21:01:25 William_Walker -// Add pc104-key support -// [1995/10/23 15:46:27 William_Walker] -// -// Revision 1.1.2.7 1995/06/27 12:18:40 William_Walker -// Add LK201 and LK450 support as well as TW and DP variants. -// [1995/06/26 20:30:33 William_Walker] -// -// Revision 1.1.2.6 1995/06/09 20:55:20 William_Walker -// Add VT105 layout support and ISO group support -// [1995/06/09 20:43:05 William_Walker] -// -// Revision 1.1.2.5 1995/06/08 21:05:49 William_Walker -// Use ISO_Next_Group instead of grouplock -// [1995/06/08 21:03:56 William_Walker] -// -// Revision 1.1.2.4 1995/06/05 19:25:00 William_Walker -// New file. I love keymaps. -// [1995/06/05 18:17:54 William_Walker] -// -// EndLog -// -// @(#)RCSfile: us Revision: /main/4 (DEC) Date: 1996/01/24 12:15:05 -// - -// ************************************************************** -// * * -// * Symbols for en_US.ISO8859-1 - English for U.S. * -// * * -// ************************************************************** - -xkb_symbols "us" { - - key { [ grave, asciitilde ] }; - key { [ 1, exclam ] }; - key { [ 2, at ] }; - key { [ 3, numbersign ] }; - key { [ 4, dollar ] }; - key { [ 5, percent ] }; - key { [ 6, asciicircum ] }; - key { [ 7, ampersand ] }; - key { [ 8, asterisk ] }; - key { [ 9, parenleft ] }; - key { [ 0, parenright ] }; - key { [ minus, underscore ] }; - key { [ equal, plus ] }; - - key { [ q, Q ] }; - key { [ w, W ] }; - key { [ e, E ] }; - key { [ r, R ] }; - key { [ t, T ] }; - key { [ y, Y ] }; - key { [ u, U ] }; - key { [ i, I ] }; - key { [ o, O ] }; - key { [ p, P ] }; - key { [ bracketleft, braceleft ] }; - key { [ bracketright, braceright ] }; - - key { [ a, A ] }; - key { [ s, S ] }; - key { [ d, D ] }; - key { [ f, F ] }; - key { [ g, G ] }; - key { [ h, H ] }; - key { [ j, J ] }; - key { [ k, K ] }; - key { [ l, L ] }; - key { [ semicolon, colon ] }; - key { [ apostrophe, quotedbl ] }; - key { [ backslash, bar ] }; - - key { [ z, Z ] }; - key { [ x, X ] }; - key { [ c, C ] }; - key { [ v, V ] }; - key { [ b, B ] }; - key { [ n, N ] }; - key { [ m, M ] }; - key { [ comma, less ] }; - key { [ period, greater ] }; - key { [ slash, question ] }; -}; - -// ************************************************************** -// * * -// * The VT105 layouts * -// * * -// * NOTES: The typewriter (TW) and dataprocessing (DP) keys * -// * for the VT108 layout are identical for the US. * -// * * -// ************************************************************** -xkb_symbols "vt105-tw" { - include "digital_vndr/us(us)" - include "digital_vndr/vt(vt105)" - override key { - symbols[Group1]= [ 3, numbersign ], - symbols[Group2]= [ sterling ] - }; - key { [ less, greater ] }; -}; - -xkb_symbols "vt105-dp" { include "digital_vndr/us(vt105-tw)" }; -xkb_symbols "vt105" { include "digital_vndr/us(vt105-tw)" }; - -// ************************************************************** -// * * -// * The VT108 layouts - based upon the LK401-AA * -// * * -// * NOTES: The typewriter (TW) and dataprocessing (DP) keys * -// * for the VT108 layout are identical for the US. * -// * * -// ************************************************************** -xkb_symbols "vt108-tw" { - include "digital_vndr/us(us)" - include "digital_vndr/vt(vt108)" - replace key { [ Multi_key ] }; - override key { - symbols[Group1]= [ 3, numbersign ], - symbols[Group2]= [ sterling ] - }; - key { [ less, greater ] }; -}; - -xkb_symbols "vt108-dp" { include "digital_vndr/us(vt108-tw)" }; -xkb_symbols "vt108" { include "digital_vndr/us(vt108-tw)" }; - -// ************************************************************** -// * * -// * The "unix" layouts - based upon the LK421-AA * -// * * -// * NOTES: The "unix" keyboard emits the same keycodes as the * -// * LK401, but is a shorter keyboard that uses an * -// * "extend" key. To make life easier, we map * -// * to Escape so users do not have to press Extend+F11 * -// * to get Escape. * -// * * -// ************************************************************** -xkb_symbols "unix" { - include "digital_vndr/us(vt108)" - override key { [ Escape ] }; - override key { [ grave, asciitilde ] }; -}; - -// ************************************************************** -// * * -// * The "pcxal" layouts * -// * * -// * NOTES: The pcxal layouts are pretty much standardized for * -// * the US and use a 101-key keyboard. * -// * * -// ************************************************************** -xkb_symbols "pcxalga" { - include "digital_vndr/pc(pc)" - include "digital_vndr/us(us)" - replace key { [ Alt_R, Meta_R ] }; -}; - -xkb_symbols "pcxal" { include "digital_vndr/us(pcxalga)" }; -xkb_symbols "pcxalaa" { include "digital_vndr/us(pcxalga)" }; -xkb_symbols "pcxalfa" { include "digital_vndr/us(pcxalga)" }; -xkb_symbols "pcxalka" { include "digital_vndr/us(pcxalga)" }; -xkb_symbols "lk44x" { include "digital_vndr/us(pcxalga)" }; - -// ************************************************************** -// * * -// * The "pc104" layouts. * -// * * -// ************************************************************** -xkb_symbols "pc104" { - include "digital_vndr/pc(pc104)" - include "digital_vndr/us(us)" - replace key { [ Alt_R ] }; -}; +// +//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:10:16 erik +// use flags correctly, assorted cleanups and consortium fixes +// +// Revision 1.1.6.3 1995/12/19 19:56:37 William_Walker +// Update to XKB 0.65 +// [1995/12/17 02:37:44 William_Walker] +// +// Revision 1.1.6.2 1995/10/25 21:01:25 William_Walker +// Add pc104-key support +// [1995/10/23 15:46:27 William_Walker] +// +// Revision 1.1.2.7 1995/06/27 12:18:40 William_Walker +// Add LK201 and LK450 support as well as TW and DP variants. +// [1995/06/26 20:30:33 William_Walker] +// +// Revision 1.1.2.6 1995/06/09 20:55:20 William_Walker +// Add VT105 layout support and ISO group support +// [1995/06/09 20:43:05 William_Walker] +// +// Revision 1.1.2.5 1995/06/08 21:05:49 William_Walker +// Use ISO_Next_Group instead of grouplock +// [1995/06/08 21:03:56 William_Walker] +// +// Revision 1.1.2.4 1995/06/05 19:25:00 William_Walker +// New file. I love keymaps. +// [1995/06/05 18:17:54 William_Walker] +// +// EndLog +// +// @(#)RCSfile: us Revision: /main/4 (DEC) Date: 1996/01/24 12:15:05 +// + +// ************************************************************** +// * * +// * Symbols for en_US.ISO8859-1 - English for U.S. * +// * * +// ************************************************************** + +xkb_symbols "us" { + + key { [ grave, asciitilde ] }; + key { [ 1, exclam ] }; + key { [ 2, at ] }; + key { [ 3, numbersign ] }; + key { [ 4, dollar ] }; + key { [ 5, percent ] }; + key { [ 6, asciicircum ] }; + key { [ 7, ampersand ] }; + key { [ 8, asterisk ] }; + key { [ 9, parenleft ] }; + key { [ 0, parenright ] }; + key { [ minus, underscore ] }; + key { [ equal, plus ] }; + + key { [ q, Q ] }; + key { [ w, W ] }; + key { [ e, E ] }; + key { [ r, R ] }; + key { [ t, T ] }; + key { [ y, Y ] }; + key { [ u, U ] }; + key { [ i, I ] }; + key { [ o, O ] }; + key { [ p, P ] }; + key { [ bracketleft, braceleft ] }; + key { [ bracketright, braceright ] }; + + key { [ a, A ] }; + key { [ s, S ] }; + key { [ d, D ] }; + key { [ f, F ] }; + key { [ g, G ] }; + key { [ h, H ] }; + key { [ j, J ] }; + key { [ k, K ] }; + key { [ l, L ] }; + key { [ semicolon, colon ] }; + key { [ apostrophe, quotedbl ] }; + key { [ backslash, bar ] }; + + key { [ z, Z ] }; + key { [ x, X ] }; + key { [ c, C ] }; + key { [ v, V ] }; + key { [ b, B ] }; + key { [ n, N ] }; + key { [ m, M ] }; + key { [ comma, less ] }; + key { [ period, greater ] }; + key { [ slash, question ] }; +}; + +// ************************************************************** +// * * +// * The VT105 layouts * +// * * +// * NOTES: The typewriter (TW) and dataprocessing (DP) keys * +// * for the VT108 layout are identical for the US. * +// * * +// ************************************************************** +xkb_symbols "vt105-tw" { + include "digital_vndr/us(us)" + include "digital_vndr/vt(vt105)" + override key { + symbols[Group1]= [ 3, numbersign ], + symbols[Group2]= [ sterling ] + }; + key { [ less, greater ] }; +}; + +xkb_symbols "vt105-dp" { include "digital_vndr/us(vt105-tw)" }; +xkb_symbols "vt105" { include "digital_vndr/us(vt105-tw)" }; + +// ************************************************************** +// * * +// * The VT108 layouts - based upon the LK401-AA * +// * * +// * NOTES: The typewriter (TW) and dataprocessing (DP) keys * +// * for the VT108 layout are identical for the US. * +// * * +// ************************************************************** +xkb_symbols "vt108-tw" { + include "digital_vndr/us(us)" + include "digital_vndr/vt(vt108)" + replace key { [ Multi_key ] }; + override key { + symbols[Group1]= [ 3, numbersign ], + symbols[Group2]= [ sterling ] + }; + key { [ less, greater ] }; +}; + +xkb_symbols "vt108-dp" { include "digital_vndr/us(vt108-tw)" }; +xkb_symbols "vt108" { include "digital_vndr/us(vt108-tw)" }; + +// ************************************************************** +// * * +// * The "unix" layouts - based upon the LK421-AA * +// * * +// * NOTES: The "unix" keyboard emits the same keycodes as the * +// * LK401, but is a shorter keyboard that uses an * +// * "extend" key. To make life easier, we map * +// * to Escape so users do not have to press Extend+F11 * +// * to get Escape. * +// * * +// ************************************************************** +xkb_symbols "unix" { + include "digital_vndr/us(vt108)" + override key { [ Escape ] }; + override key { [ grave, asciitilde ] }; +}; + +// ************************************************************** +// * * +// * The "pcxal" layouts * +// * * +// * NOTES: The pcxal layouts are pretty much standardized for * +// * the US and use a 101-key keyboard. * +// * * +// ************************************************************** +xkb_symbols "pcxalga" { + include "digital_vndr/pc(pc)" + include "digital_vndr/us(us)" + replace key { [ Alt_R, Meta_R ] }; +}; + +xkb_symbols "pcxal" { include "digital_vndr/us(pcxalga)" }; +xkb_symbols "pcxalaa" { include "digital_vndr/us(pcxalga)" }; +xkb_symbols "pcxalfa" { include "digital_vndr/us(pcxalga)" }; +xkb_symbols "pcxalka" { include "digital_vndr/us(pcxalga)" }; +xkb_symbols "lk44x" { include "digital_vndr/us(pcxalga)" }; + +// ************************************************************** +// * * +// * The "pc104" layouts. * +// * * +// ************************************************************** +xkb_symbols "pc104" { + include "digital_vndr/pc(pc104)" + include "digital_vndr/us(us)" + replace key { [ Alt_R ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/digital_vndr/vt b/xorg-server/xkeyboard-config/symbols/digital_vndr/vt index 5d3680db4..13f7941c6 100644 --- a/xorg-server/xkeyboard-config/symbols/digital_vndr/vt +++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/vt @@ -1,158 +1,158 @@ -// -//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:10:19 erik -// use flags correctly, assorted cleanups and consortium fixes -// -// Revision 1.1.6.2 1995/12/19 19:56:39 William_Walker -// Update to XKB 0.65 -// [1995/12/17 02:37:47 William_Walker] -// -// Revision 1.1.2.5 1995/07/11 21:20:50 William_Walker -// Make RALT act as RALT -// [1995/07/11 21:18:28 William_Walker] -// -// Revision 1.1.2.4 1995/06/27 12:18:41 William_Walker -// Add LK201 and LK450 support as well as TW and DP variants. -// [1995/06/26 20:30:37 William_Walker] -// -// Revision 1.1.2.3 1995/06/09 20:55:21 William_Walker -// Add VT105 layout support and ISO group support -// [1995/06/09 20:43:09 William_Walker] -// -// Revision 1.1.2.2 1995/06/05 19:25:04 William_Walker -// New file. I love keymaps. -// [1995/06/05 18:17:58 William_Walker] -// -// EndLog -// -// @(#)RCSfile: vt Revision: /main/3 (DEC) Date: 1996/01/24 12:15:08 -// -xkb_symbols "vt105" { - - // Modifier mappings - // - modifier_map Shift { Shift_L, Shift_R }; - modifier_map Lock { Caps_Lock }; - modifier_map Control { Control_L, Control_R }; - modifier_map Mod1 { Alt_L, Alt_R, Meta_L, Meta_R }; - modifier_map Mod3 { Mode_switch }; - - // Common keys - // - key { [ Delete ] }; - key { [ Tab ] }; - key { [ Return ] }; - key { [ Control_L ] }; - key { [ Caps_Lock ] }; - key { [ Shift_L ] }; - key { [ Shift_R ] }; - key { [ Alt_L, Meta_L ] }; - key { [ space ] }; - - // "Function" keys - // - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ F9 ] }; - key { [ F10 ] }; - key { [ Escape, F11 ] }; - key { [ F12 ] }; - key { [ F13 ] }; - key { [ F14 ] }; - key { [ F17 ] }; - key { [ F18 ] }; - key { [ F19 ] }; - key { [ F20 ] }; - - // "Editing" keys - // - key { [ Help ] }; - key { [ Menu ] }; - key { [ Find ] }; - key { [ Insert ] }; - key { [ apLineDel ] }; - key { [ Select ] }; - key { [ Prior ] }; - key { [ Next ] }; - - key { [ Up ] }; - key { [ Left ] }; - key { [ Down ] }; - key { [ Right ] }; - - // "Keypad" keys - // - key { - type= "SHIFT+ALT", - symbols[Group1]= [ KP_F1,Pointer_EnableKeys ] - }; - key { [ KP_F2 ] }; - key { [ KP_F3 ] }; - key { [ KP_F4 ] }; - - key { [ KP_7 ] }; - key { [ KP_8 ] }; - key { [ KP_9 ] }; - key { [ KP_Subtract ] }; - - key { [ KP_4 ] }; - key { [ KP_5 ] }; - key { [ KP_6 ] }; - key { [ KP_Separator ] }; - - key { [ KP_1 ] }; - key { [ KP_2 ] }; - key { [ KP_3 ] }; - key { [ KP_Enter ] }; - - key { [ KP_0 ] }; - key { [ KP_Decimal ] }; - - // Key to support Lock-Down Modifier descriptions for R5 - // - key { [ NoSymbol ] }; -}; - -xkb_symbols "vt108" { - - include "digital_vndr/vt(vt105)" - - replace key { [ Mode_switch ] }; - - key { [ Alt_L, Meta_L ] }; - key { [ Alt_R, Meta_R ] }; - key { [ Multi_key ] }; -}; +// +//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:10:19 erik +// use flags correctly, assorted cleanups and consortium fixes +// +// Revision 1.1.6.2 1995/12/19 19:56:39 William_Walker +// Update to XKB 0.65 +// [1995/12/17 02:37:47 William_Walker] +// +// Revision 1.1.2.5 1995/07/11 21:20:50 William_Walker +// Make RALT act as RALT +// [1995/07/11 21:18:28 William_Walker] +// +// Revision 1.1.2.4 1995/06/27 12:18:41 William_Walker +// Add LK201 and LK450 support as well as TW and DP variants. +// [1995/06/26 20:30:37 William_Walker] +// +// Revision 1.1.2.3 1995/06/09 20:55:21 William_Walker +// Add VT105 layout support and ISO group support +// [1995/06/09 20:43:09 William_Walker] +// +// Revision 1.1.2.2 1995/06/05 19:25:04 William_Walker +// New file. I love keymaps. +// [1995/06/05 18:17:58 William_Walker] +// +// EndLog +// +// @(#)RCSfile: vt Revision: /main/3 (DEC) Date: 1996/01/24 12:15:08 +// +xkb_symbols "vt105" { + + // Modifier mappings + // + modifier_map Shift { Shift_L, Shift_R }; + modifier_map Lock { Caps_Lock }; + modifier_map Control { Control_L, Control_R }; + modifier_map Mod1 { Alt_L, Alt_R, Meta_L, Meta_R }; + modifier_map Mod3 { Mode_switch }; + + // Common keys + // + key { [ Delete ] }; + key { [ Tab ] }; + key { [ Return ] }; + key { [ Control_L ] }; + key { [ Caps_Lock ] }; + key { [ Shift_L ] }; + key { [ Shift_R ] }; + key { [ Alt_L, Meta_L ] }; + key { [ space ] }; + + // "Function" keys + // + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F10 ] }; + key { [ Escape, F11 ] }; + key { [ F12 ] }; + key { [ F13 ] }; + key { [ F14 ] }; + key { [ F17 ] }; + key { [ F18 ] }; + key { [ F19 ] }; + key { [ F20 ] }; + + // "Editing" keys + // + key { [ Help ] }; + key { [ Menu ] }; + key { [ Find ] }; + key { [ Insert ] }; + key { [ apLineDel ] }; + key { [ Select ] }; + key { [ Prior ] }; + key { [ Next ] }; + + key { [ Up ] }; + key { [ Left ] }; + key { [ Down ] }; + key { [ Right ] }; + + // "Keypad" keys + // + key { + type= "SHIFT+ALT", + symbols[Group1]= [ KP_F1,Pointer_EnableKeys ] + }; + key { [ KP_F2 ] }; + key { [ KP_F3 ] }; + key { [ KP_F4 ] }; + + key { [ KP_7 ] }; + key { [ KP_8 ] }; + key { [ KP_9 ] }; + key { [ KP_Subtract ] }; + + key { [ KP_4 ] }; + key { [ KP_5 ] }; + key { [ KP_6 ] }; + key { [ KP_Separator ] }; + + key { [ KP_1 ] }; + key { [ KP_2 ] }; + key { [ KP_3 ] }; + key { [ KP_Enter ] }; + + key { [ KP_0 ] }; + key { [ KP_Decimal ] }; + + // Key to support Lock-Down Modifier descriptions for R5 + // + key { [ NoSymbol ] }; +}; + +xkb_symbols "vt108" { + + include "digital_vndr/vt(vt105)" + + replace key { [ Mode_switch ] }; + + key { [ Alt_L, Meta_L ] }; + key { [ Alt_R, Meta_R ] }; + key { [ Multi_key ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/empty b/xorg-server/xkeyboard-config/symbols/empty index 16443b28c..cae330310 100644 --- a/xorg-server/xkeyboard-config/symbols/empty +++ b/xorg-server/xkeyboard-config/symbols/empty @@ -1,4 +1,4 @@ -default partial alphanumeric_keys modifier_keys -xkb_symbols "basic" { - name[Group1]= "Empty"; -}; +default partial alphanumeric_keys modifier_keys +xkb_symbols "basic" { + name[Group1]= "Empty"; +}; diff --git a/xorg-server/xkeyboard-config/symbols/eurosign b/xorg-server/xkeyboard-config/symbols/eurosign index 380350174..0d95a900f 100644 --- a/xorg-server/xkeyboard-config/symbols/eurosign +++ b/xorg-server/xkeyboard-config/symbols/eurosign @@ -1,23 +1,23 @@ -// Most keyboards have the EuroSign engraved on the E key -partial -xkb_symbols "e" { - key { [ NoSymbol, NoSymbol, EuroSign, NoSymbol ] }; -}; - -// Many Apple keyboards have the EuroSign engraved on the 2 key -partial -xkb_symbols "2" { - key { [ NoSymbol, NoSymbol, EuroSign, NoSymbol ] }; -}; - -// Some keyboards have the EuroSign engraved on the 4 key -partial -xkb_symbols "4" { - key { [ NoSymbol, NoSymbol, EuroSign, NoSymbol ] }; -}; - -// Many keyboards have the EuroSign engraved on the 5 key -partial -xkb_symbols "5" { - key { [ NoSymbol, NoSymbol, EuroSign, NoSymbol ] }; -}; +// Most keyboards have the EuroSign engraved on the E key +partial +xkb_symbols "e" { + key { [ NoSymbol, NoSymbol, EuroSign, NoSymbol ] }; +}; + +// Many Apple keyboards have the EuroSign engraved on the 2 key +partial +xkb_symbols "2" { + key { [ NoSymbol, NoSymbol, EuroSign, NoSymbol ] }; +}; + +// Some keyboards have the EuroSign engraved on the 4 key +partial +xkb_symbols "4" { + key { [ NoSymbol, NoSymbol, EuroSign, NoSymbol ] }; +}; + +// Many keyboards have the EuroSign engraved on the 5 key +partial +xkb_symbols "5" { + key { [ NoSymbol, NoSymbol, EuroSign, NoSymbol ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/extractGroupNames.sh b/xorg-server/xkeyboard-config/symbols/extractGroupNames.sh index fb128fd19..bbcd6d58d 100644 --- a/xorg-server/xkeyboard-config/symbols/extractGroupNames.sh +++ b/xorg-server/xkeyboard-config/symbols/extractGroupNames.sh @@ -1,3 +1,3 @@ -#!/bin/sh - -grep 'name\[Group1\]' * | sed 's/[[:space:]]*name\[Group1\].*=[[:space:]]*//;s/;[[:space:]]*$//' | sort +#!/bin/sh + +grep 'name\[Group1\]' * | sed 's/[[:space:]]*name\[Group1\].*=[[:space:]]*//;s/;[[:space:]]*$//' | sort diff --git a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/Makefile.am index 4e3a96ee1..5c9b0b833 100644 --- a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/Makefile.am +++ b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/Makefile.am @@ -1,4 +1,4 @@ -symbolsdir = $(xkb_base)/symbols/fujitsu_vndr - -dist_symbols_DATA = \ -jp us +symbolsdir = $(xkb_base)/symbols/fujitsu_vndr + +dist_symbols_DATA = \ +jp us diff --git a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/jp b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/jp index 0eb277712..63bf56aca 100644 --- a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/jp +++ b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/jp @@ -1,87 +1,87 @@ -// -//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. -// -// Japanese layout for a Fujitsu 140 key keyboard - -xkb_symbols { - override "fujitsu_vndr/us" - augment key { [], [ kana_NU ] }; - key { [ 2, quotedbl ], [ kana_FU ] }; - key { [ 3, numbersign ], [ kana_A, kana_a ] }; - key { [ 4, dollar ], [ kana_U, kana_u ] }; - augment key { [], [ kana_E, kana_e ] }; - key { [ 6, ampersand ], [ kana_O, kana_o ] }; - key { [ 7, apostrophe ], [ kana_YA, kana_ya ] }; - key { [ 8, parenleft ], [ kana_YU, kana_yu ] }; - key { [ 9, parenright ], [ kana_YO, kana_yo ] }; - replace key { [ 0 ], [ kana_WA, kana_WO ] }; - key { [ minus, equal ], [ kana_HO ] }; - key { [ asciicircum, asciitilde ], [ kana_HE ] }; - key { [ backslash, bar ], [ prolongedsound] }; - augment key { [], [ kana_TA ] }; - augment key { [], [ kana_TE ] }; - augment key { [], [ kana_I, kana_i ] }; - augment key { [], [ kana_SU ] }; - augment key { [], [ kana_KA ] }; - augment key { [], [ kana_N ] }; - augment key { [], [ kana_NA ] }; - augment key { [], [ kana_NI ] }; - augment key { [], [ kana_RA ] }; - augment key { [], [ kana_SE ] }; - key { [ at, grave ], [ voicedsound ] }; - key { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] }; - augment key { [], [ kana_CHI ] }; - augment key { [], [ kana_TO ] }; - augment key { [], [ kana_SHI ] }; - augment key { [], [ kana_HA ] }; - augment key { [], [ kana_KI ] }; - augment key { [], [ kana_KU ] }; - augment key { [], [ kana_MA ] }; - augment key { [], [ kana_NO ] }; - augment key { [], [ kana_RI ] }; - key { [ semicolon, plus ], [ kana_RE ] }; - key { [ colon, asterisk ], [ kana_KE ] }; - key { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] }; - augment key { [], [ kana_TSU, kana_tsu ] }; - augment key { [], [ kana_SA ] }; - augment key { [], [ kana_SO ] }; - augment key { [], [ kana_HI ] }; - augment key { [], [ kana_KO ] }; - augment key { [], [ kana_MI ] }; - augment key { [], [ kana_MO ] }; - augment key { [], [ kana_NE, kana_comma ] }; - augment key { [], [ kana_RU, kana_fullstop ] }; - augment key { [], [ kana_ME, kana_conjunctive ] }; - key { [ underscore ], [ kana_RO ] }; - key { [ Select ] }; - key { [ Massyo ] }; - key { [ Touroku ] }; - key { [ Zenkaku_Hankaku ] }; - key { [ Eisu_Shift ] }; - key { [ Mode_switch ] }; - key { [ Cancel ] }; - key { [ Muhenkan ] }; - key { [ Henkan ] }; -}; +// +//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. +// +// Japanese layout for a Fujitsu 140 key keyboard + +xkb_symbols { + override "fujitsu_vndr/us" + augment key { [], [ kana_NU ] }; + key { [ 2, quotedbl ], [ kana_FU ] }; + key { [ 3, numbersign ], [ kana_A, kana_a ] }; + key { [ 4, dollar ], [ kana_U, kana_u ] }; + augment key { [], [ kana_E, kana_e ] }; + key { [ 6, ampersand ], [ kana_O, kana_o ] }; + key { [ 7, apostrophe ], [ kana_YA, kana_ya ] }; + key { [ 8, parenleft ], [ kana_YU, kana_yu ] }; + key { [ 9, parenright ], [ kana_YO, kana_yo ] }; + replace key { [ 0 ], [ kana_WA, kana_WO ] }; + key { [ minus, equal ], [ kana_HO ] }; + key { [ asciicircum, asciitilde ], [ kana_HE ] }; + key { [ backslash, bar ], [ prolongedsound] }; + augment key { [], [ kana_TA ] }; + augment key { [], [ kana_TE ] }; + augment key { [], [ kana_I, kana_i ] }; + augment key { [], [ kana_SU ] }; + augment key { [], [ kana_KA ] }; + augment key { [], [ kana_N ] }; + augment key { [], [ kana_NA ] }; + augment key { [], [ kana_NI ] }; + augment key { [], [ kana_RA ] }; + augment key { [], [ kana_SE ] }; + key { [ at, grave ], [ voicedsound ] }; + key { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] }; + augment key { [], [ kana_CHI ] }; + augment key { [], [ kana_TO ] }; + augment key { [], [ kana_SHI ] }; + augment key { [], [ kana_HA ] }; + augment key { [], [ kana_KI ] }; + augment key { [], [ kana_KU ] }; + augment key { [], [ kana_MA ] }; + augment key { [], [ kana_NO ] }; + augment key { [], [ kana_RI ] }; + key { [ semicolon, plus ], [ kana_RE ] }; + key { [ colon, asterisk ], [ kana_KE ] }; + key { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] }; + augment key { [], [ kana_TSU, kana_tsu ] }; + augment key { [], [ kana_SA ] }; + augment key { [], [ kana_SO ] }; + augment key { [], [ kana_HI ] }; + augment key { [], [ kana_KO ] }; + augment key { [], [ kana_MI ] }; + augment key { [], [ kana_MO ] }; + augment key { [], [ kana_NE, kana_comma ] }; + augment key { [], [ kana_RU, kana_fullstop ] }; + augment key { [], [ kana_ME, kana_conjunctive ] }; + key { [ underscore ], [ kana_RO ] }; + key { [ Select ] }; + key { [ Massyo ] }; + key { [ Touroku ] }; + key { [ Zenkaku_Hankaku ] }; + key { [ Eisu_Shift ] }; + key { [ Mode_switch ] }; + key { [ Cancel ] }; + key { [ Muhenkan ] }; + key { [ Henkan ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us index 73dde7612..b856393fd 100644 --- a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us +++ b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us @@ -1,143 +1,143 @@ -// -//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. -// -// US/ASCII layout for a Fujitsu 138 key keyboard -xkb_symbols { - include "us(basic)" - - // A few alphanumeric keys are different - key { [ grave, asciitilde ] }; - key { [ BackSpace ] }; - key { [ backslash, bar ] }; - key { [ ] }; - - key { [ Shift_R ] }; - - key { [ Alt_L ] }; - key { [ Alt_R ] }; - key { [ Meta_L ] }; - key { [ Meta_R ] }; - key { [ Linefeed ] }; - key { [ Multi_key ] }; - // End alphanumeric section - - // Begin "Function" section - key { [ Break ] }; - key { [ Print ] }; - key { [ Kanji ] }; - key { [ Pause ] }; - - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ F9 ] }; - key { [ F10 ] }; - key { [ F11 ] }; - key { [ F12 ] }; - key { [ F13 ] }; - key { [ F14 ] }; - key { [ F15 ] }; - key { [ F16 ] }; - key { [ F17 ] }; - key { [ F18 ] }; - key { [ F19 ] }; - key { [ F20 ] }; - key { [ F21 ] }; - key { [ F22 ] }; - key { [ F23 ] }; - key { [ F24 ] }; - key { [ F25 ] }; - key { [ F26 ] }; - key { [ F27 ] }; - key { [ F28 ] }; - key { [ F29 ] }; - key { [ F30 ] }; - key { [ F31 ] }; - key { [ F32 ] }; - // End "Function" section - - // Begin "Editing" section - key { [ Undo ] }; - key { [ F33 ] }; - key { [ F34 ] }; - key { [ F35 ] }; - key { [ Help ] }; - // End "Editing" section - - // Begin "Cursor" section - key { [ ] }; - key { [ ] }; - key { [ ] }; - key { [ Prior ] }; - key { [ Home ] }; - key { [ Next ] }; - key { [ ] }; - key { [ Delete ] }; - key { [ Insert ] }; - key { [ Left ] }; - key { [ Right ] }; - key { [ Up ] }; - key { [ Down ] }; - key { [ Execute ] }; - // End "Cursor" section - - // Begin "Keypad" section - key { [ KP_Multiply ] }; - key { [ KP_Divide ] }; - key { [ KP_Add ] }; - key { [ KP_Subtract ] }; - - key { [ KP_7 ] }; - key { [ KP_8 ] }; - key { [ KP_9 ] }; - key { [ KP_Equal ] }; - - key { [ KP_4 ] }; - key { [ KP_5 ] }; - key { [ KP_6 ] }; - key { [ KP_Decimal ] }; - - key { [ KP_1 ] }; - key { [ KP_2 ] }; - key { [ KP_3 ] }; - key { [ KP_Enter ] }; - - key { [ KP_0 ] }; - key { [ KP_0 ] }; - // End "Keypad" section - - // begin modifier mappings - modifier_map Shift { Shift_R }; - modifier_map Mod1 { Meta_L, Meta_R }; - modifier_map Mod2 { Mode_switch }; - modifier_map Mod3 { Alt_L }; - modifier_map Mod4 { Num_Lock }; - modifier_map Mod5 { F13, F18, F20 }; -}; +// +//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. +// +// US/ASCII layout for a Fujitsu 138 key keyboard +xkb_symbols { + include "us(basic)" + + // A few alphanumeric keys are different + key { [ grave, asciitilde ] }; + key { [ BackSpace ] }; + key { [ backslash, bar ] }; + key { [ ] }; + + key { [ Shift_R ] }; + + key { [ Alt_L ] }; + key { [ Alt_R ] }; + key { [ Meta_L ] }; + key { [ Meta_R ] }; + key { [ Linefeed ] }; + key { [ Multi_key ] }; + // End alphanumeric section + + // Begin "Function" section + key { [ Break ] }; + key { [ Print ] }; + key { [ Kanji ] }; + key { [ Pause ] }; + + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F10 ] }; + key { [ F11 ] }; + key { [ F12 ] }; + key { [ F13 ] }; + key { [ F14 ] }; + key { [ F15 ] }; + key { [ F16 ] }; + key { [ F17 ] }; + key { [ F18 ] }; + key { [ F19 ] }; + key { [ F20 ] }; + key { [ F21 ] }; + key { [ F22 ] }; + key { [ F23 ] }; + key { [ F24 ] }; + key { [ F25 ] }; + key { [ F26 ] }; + key { [ F27 ] }; + key { [ F28 ] }; + key { [ F29 ] }; + key { [ F30 ] }; + key { [ F31 ] }; + key { [ F32 ] }; + // End "Function" section + + // Begin "Editing" section + key { [ Undo ] }; + key { [ F33 ] }; + key { [ F34 ] }; + key { [ F35 ] }; + key { [ Help ] }; + // End "Editing" section + + // Begin "Cursor" section + key { [ ] }; + key { [ ] }; + key { [ ] }; + key { [ Prior ] }; + key { [ Home ] }; + key { [ Next ] }; + key { [ ] }; + key { [ Delete ] }; + key { [ Insert ] }; + key { [ Left ] }; + key { [ Right ] }; + key { [ Up ] }; + key { [ Down ] }; + key { [ Execute ] }; + // End "Cursor" section + + // Begin "Keypad" section + key { [ KP_Multiply ] }; + key { [ KP_Divide ] }; + key { [ KP_Add ] }; + key { [ KP_Subtract ] }; + + key { [ KP_7 ] }; + key { [ KP_8 ] }; + key { [ KP_9 ] }; + key { [ KP_Equal ] }; + + key { [ KP_4 ] }; + key { [ KP_5 ] }; + key { [ KP_6 ] }; + key { [ KP_Decimal ] }; + + key { [ KP_1 ] }; + key { [ KP_2 ] }; + key { [ KP_3 ] }; + key { [ KP_Enter ] }; + + key { [ KP_0 ] }; + key { [ KP_0 ] }; + // End "Keypad" section + + // begin modifier mappings + modifier_map Shift { Shift_R }; + modifier_map Mod1 { Meta_L, Meta_R }; + modifier_map Mod2 { Mode_switch }; + modifier_map Mod3 { Alt_L }; + modifier_map Mod4 { Num_Lock }; + modifier_map Mod5 { F13, F18, F20 }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/hp_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/hp_vndr/Makefile.am index 6bcd4da3e..25e8fa44f 100644 --- a/xorg-server/xkeyboard-config/symbols/hp_vndr/Makefile.am +++ b/xorg-server/xkeyboard-config/symbols/hp_vndr/Makefile.am @@ -1,4 +1,4 @@ -symbolsdir = $(xkb_base)/symbols/hp_vndr - -dist_symbols_DATA = \ -us +symbolsdir = $(xkb_base)/symbols/hp_vndr + +dist_symbols_DATA = \ +us diff --git a/xorg-server/xkeyboard-config/symbols/hp_vndr/us b/xorg-server/xkeyboard-config/symbols/hp_vndr/us index 7e07198d6..aedda92d2 100644 --- a/xorg-server/xkeyboard-config/symbols/hp_vndr/us +++ b/xorg-server/xkeyboard-config/symbols/hp_vndr/us @@ -1,104 +1,104 @@ -// -//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. -// -// US/ASCII layout for a HP non-PC keyboard -xkb_symbols "hil" { - include "us(basic)" - - // A few alphanumeric keys are different - key { [ grave, asciitilde ]}; - key { [ Shift_R ]}; - key { [ Meta_L ]}; - key { [ Meta_R ]}; - // End alphanumeric section - - // Begin "Function" section - key { [ Break ]}; - key { [ Cancel ]}; - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ Menu ] }; - key { [ hpSystem ]}; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ hpClearLine ]}; - key { [ Clear ]}; - key { [ F9 ] }; - key { [ F10 ] }; - key { [ F11 ] }; - key { [ F12 ] }; - // End "Function" section - - // Begin "Editing" section - key { [ Execute, Print ]}; - key { [ hpInsertLine ]}; - key { [ hpDeleteLine ]}; - key { [ hpInsertChar ]}; - key { [ hpDeleteChar ]}; - key { [ Home ] }; - key { [ Prior ] }; - key { [ Next ] }; - key { [ Select ] }; - key { [ Left ] }; - key { [ Down ] }; - key { [ Up ] }; - key { [ Right ]}; - - // End "Editing" section, begin "Keypad" - key { [ KP_Multiply ]}; - key { [ KP_Divide ]}; - key { [ KP_Add ]}; - key { [ KP_Subtract ]}; - - key { [ KP_7 ] }; - key { [ KP_8 ] }; - key { [ KP_9 ] }; - key { [ KP_Enter ]}; - - key { [ KP_4 ] }; - key { [ KP_5 ] }; - key { [ KP_6 ] }; - key { [ KP_Separator ]}; - - key { [ KP_1 ] }; - key { [ KP_2 ] }; - key { [ KP_3 ] }; - key { [ KP_Tab ]}; - - key { [ KP_0 ] }; - key { [ KP_Decimal ] }; - // End "Keypad" section - - - // begin modifier mappings - modifier_map Shift { Shift_R }; - modifier_map Mod1 { Meta_L, Meta_R }; - modifier_map Mod2 { Alt_L }; - modifier_map Mod3 { Mode_switch }; -}; +// +//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. +// +// US/ASCII layout for a HP non-PC keyboard +xkb_symbols "hil" { + include "us(basic)" + + // A few alphanumeric keys are different + key { [ grave, asciitilde ]}; + key { [ Shift_R ]}; + key { [ Meta_L ]}; + key { [ Meta_R ]}; + // End alphanumeric section + + // Begin "Function" section + key { [ Break ]}; + key { [ Cancel ]}; + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ Menu ] }; + key { [ hpSystem ]}; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ hpClearLine ]}; + key { [ Clear ]}; + key { [ F9 ] }; + key { [ F10 ] }; + key { [ F11 ] }; + key { [ F12 ] }; + // End "Function" section + + // Begin "Editing" section + key { [ Execute, Print ]}; + key { [ hpInsertLine ]}; + key { [ hpDeleteLine ]}; + key { [ hpInsertChar ]}; + key { [ hpDeleteChar ]}; + key { [ Home ] }; + key { [ Prior ] }; + key { [ Next ] }; + key { [ Select ] }; + key { [ Left ] }; + key { [ Down ] }; + key { [ Up ] }; + key { [ Right ]}; + + // End "Editing" section, begin "Keypad" + key { [ KP_Multiply ]}; + key { [ KP_Divide ]}; + key { [ KP_Add ]}; + key { [ KP_Subtract ]}; + + key { [ KP_7 ] }; + key { [ KP_8 ] }; + key { [ KP_9 ] }; + key { [ KP_Enter ]}; + + key { [ KP_4 ] }; + key { [ KP_5 ] }; + key { [ KP_6 ] }; + key { [ KP_Separator ]}; + + key { [ KP_1 ] }; + key { [ KP_2 ] }; + key { [ KP_3 ] }; + key { [ KP_Tab ]}; + + key { [ KP_0 ] }; + key { [ KP_Decimal ] }; + // End "Keypad" section + + + // begin modifier mappings + modifier_map Shift { Shift_R }; + modifier_map Mod1 { Meta_L, Meta_R }; + modifier_map Mod2 { Alt_L }; + modifier_map Mod3 { Mode_switch }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/kpdl b/xorg-server/xkeyboard-config/symbols/kpdl index 1e4a537a9..968dbd2d9 100644 --- a/xorg-server/xkeyboard-config/symbols/kpdl +++ b/xorg-server/xkeyboard-config/symbols/kpdl @@ -1,102 +1,102 @@ -// The key is a mess. -// It was probably originally meant to be a decimal separator. -// Except since it was declared by USA people it didn't use the original -// SI separator "," but a "." (since then the USA managed to f-up the SI -// by making "." an accepted alternative, but standards still use "," as -// default) -// As a result users of SI-abiding countries expect either a "." or a "," -// or a "decimal_separator" which may or may not be translated in one of the -// above depending on applications. -// It's not possible to define a default per-country since user expectations -// depend on the conflicting choices of their most-used applications, -// operating system, etc. Therefore it needs to be a configuration setting -// Copyright © 2007 Nicolas Mailhot - - -// Legacy #1 -// This assumes KP_Decimal will be translated in a dot -partial keypad_keys -xkb_symbols "dot" { - - key.type[Group1]="KEYPAD" ; - - key { [ KP_Delete, KP_Decimal ] }; // -}; - - -// Legacy #2 -// This assumes KP_Separator will be translated in a comma -partial keypad_keys -xkb_symbols "comma" { - - key.type[Group1]="KEYPAD" ; - - key { [ KP_Delete, KP_Separator ] }; // -}; - - -// Period , usual keyboard serigraphy in most countries -partial keypad_keys -xkb_symbols "dotoss" { - - key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ; - - key { [ KP_Delete, period, comma, 0x100202F ] }; // . , â½ (narrow no-break space) -}; - - -// Period , usual keyboard serigraphy in most countries, latin-9 restriction -partial keypad_keys -xkb_symbols "dotoss_latin9" { - - key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ; - - key { [ KP_Delete, period, comma, nobreakspace ] }; // . , â½ (no-break space) -}; - - -// Comma , what most non anglo-saxon people consider the real separator -partial keypad_keys -xkb_symbols "commaoss" { - - key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ; - - key { [ KP_Delete, comma, period, 0x100202F ] }; // , . â½ (narrow no-break space) -}; - - -// Momayyez : Bahrain, Iran, Iraq, Kuwait, Oman, Qatar, Saudi Arabia, Syria, UAE -partial keypad_keys -xkb_symbols "momayyezoss" { - - key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ; - - key { [ KP_Delete, 0x100066B, comma, 0x100202F ] }; // ? , â½ (narrow no-break space) -}; - - -// Abstracted , pray everything will work out (it usually does not) -partial keypad_keys -xkb_symbols "kposs" { - - key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ; - - key { [ KP_Delete, KP_Decimal, KP_Separator, 0x100202F ] }; // ? ? â½ (narrow no-break space) -}; - -// Spreadsheets may be configured to use the dot as decimal -// punctuation, comma as a thousands separator and then semi-colon as -// the list separator. Of these, dot and semi-colon is most important -// when entering data by the keyboard; the comma can then be inferred -// and added to the presentation afterwards. Using semi-colon as a -// general separator may in fact be preferred to avoid ambiguities -// in data files. Most times a decimal separator is hard-coded, it -// seems to be period, probably since this is the syntax used in -// (most) programming languages. -partial keypad_keys -xkb_symbols "semi" { - - key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ; - - key { [ NoSymbol, NoSymbol, semicolon ] }; -}; +// The key is a mess. +// It was probably originally meant to be a decimal separator. +// Except since it was declared by USA people it didn't use the original +// SI separator "," but a "." (since then the USA managed to f-up the SI +// by making "." an accepted alternative, but standards still use "," as +// default) +// As a result users of SI-abiding countries expect either a "." or a "," +// or a "decimal_separator" which may or may not be translated in one of the +// above depending on applications. +// It's not possible to define a default per-country since user expectations +// depend on the conflicting choices of their most-used applications, +// operating system, etc. Therefore it needs to be a configuration setting +// Copyright © 2007 Nicolas Mailhot + + +// Legacy #1 +// This assumes KP_Decimal will be translated in a dot +partial keypad_keys +xkb_symbols "dot" { + + key.type[Group1]="KEYPAD" ; + + key { [ KP_Delete, KP_Decimal ] }; // +}; + + +// Legacy #2 +// This assumes KP_Separator will be translated in a comma +partial keypad_keys +xkb_symbols "comma" { + + key.type[Group1]="KEYPAD" ; + + key { [ KP_Delete, KP_Separator ] }; // +}; + + +// Period , usual keyboard serigraphy in most countries +partial keypad_keys +xkb_symbols "dotoss" { + + key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ; + + key { [ KP_Delete, period, comma, 0x100202F ] }; // . , â½ (narrow no-break space) +}; + + +// Period , usual keyboard serigraphy in most countries, latin-9 restriction +partial keypad_keys +xkb_symbols "dotoss_latin9" { + + key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ; + + key { [ KP_Delete, period, comma, nobreakspace ] }; // . , â½ (no-break space) +}; + + +// Comma , what most non anglo-saxon people consider the real separator +partial keypad_keys +xkb_symbols "commaoss" { + + key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ; + + key { [ KP_Delete, comma, period, 0x100202F ] }; // , . â½ (narrow no-break space) +}; + + +// Momayyez : Bahrain, Iran, Iraq, Kuwait, Oman, Qatar, Saudi Arabia, Syria, UAE +partial keypad_keys +xkb_symbols "momayyezoss" { + + key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ; + + key { [ KP_Delete, 0x100066B, comma, 0x100202F ] }; // ? , â½ (narrow no-break space) +}; + + +// Abstracted , pray everything will work out (it usually does not) +partial keypad_keys +xkb_symbols "kposs" { + + key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ; + + key { [ KP_Delete, KP_Decimal, KP_Separator, 0x100202F ] }; // ? ? â½ (narrow no-break space) +}; + +// Spreadsheets may be configured to use the dot as decimal +// punctuation, comma as a thousands separator and then semi-colon as +// the list separator. Of these, dot and semi-colon is most important +// when entering data by the keyboard; the comma can then be inferred +// and added to the presentation afterwards. Using semi-colon as a +// general separator may in fact be preferred to avoid ambiguities +// in data files. Most times a decimal separator is hard-coded, it +// seems to be period, probably since this is the syntax used in +// (most) programming languages. +partial keypad_keys +xkb_symbols "semi" { + + key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ; + + key { [ NoSymbol, NoSymbol, semicolon ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/level3 b/xorg-server/xkeyboard-config/symbols/level3 index 599443002..9d495550a 100644 --- a/xorg-server/xkeyboard-config/symbols/level3 +++ b/xorg-server/xkeyboard-config/symbols/level3 @@ -1,196 +1,196 @@ -// these variants assign various XKB keycodes to ISO_Level3_Shift so that -// the third shift level can be reached -// - -// the default behavior is for the right Alt key (AltGr) to generate the -// third engraved symbol -default partial modifier_keys -xkb_symbols "ralt_switch" { - key { - type[Group1]="ONE_LEVEL", - symbols[Group1] = [ ISO_Level3_Shift ] - }; - modifier_map Mod5 { ISO_Level3_Shift }; -}; - -// Right Alt key never chooses 3rd level. -// This option attempts to undo the effect of a layout's -// including ralt_switch. You may also want to select another -// level3 option that maps the level3 shift to some other key. -partial modifier_keys -xkb_symbols "ralt_alt" { - key { - type[Group1]="TWO_LEVEL", - type[Group2]="TWO_LEVEL", - type[Group3]="TWO_LEVEL", - type[Group4]="TWO_LEVEL", - symbols[Group1] = [ Alt_R, Meta_R ], - symbols[Group2] = [ Alt_R, Meta_R ], - symbols[Group3] = [ Alt_R, Meta_R ], - symbols[Group4] = [ Alt_R, Meta_R ] - }; - modifier_map Mod1 { }; -}; - -partial modifier_keys -xkb_symbols "ralt_switch_multikey" { - key { - type[Group1]="TWO_LEVEL", - symbols[Group1] = [ ISO_Level3_Shift, Multi_key ] - }; -}; - -// special case or right Alt switch - for use with grp:alts_toggle -// -partial hidden modifier_keys -xkb_symbols "ralt_switch_for_alts_toggle" { - virtual_modifiers LAlt, AlGr; - key { - type[Group1]="PC_RALT_LEVEL2", - symbols[Group1] = [ Alt_L, ISO_Prev_Group, ISO_Prev_Group ], - virtualMods= LAlt - }; - key { - type[Group1]="PC_ALT_LEVEL2", - symbols[Group1] = [ ISO_Level3_Shift, ISO_Next_Group ], - virtualMods= AltGr - }; - modifier_map Mod5 { ISO_Level3_Shift }; -}; - -// using the level(alt_switch) map, either Alt key temporarily chooses -// the third shift level. (Mostly be used to imitate Mac OS functionality.) -partial modifier_keys -xkb_symbols "alt_switch" { - include "level3(lalt_switch)" - include "level3(ralt_switch)" -}; - -partial modifier_keys -xkb_symbols "lalt_switch" { - key { - type[Group1]="ONE_LEVEL", - symbols[Group1] = [ ISO_Level3_Shift ] - }; - modifier_map Mod5 { }; -}; - -// using the level(switch) map, the right Control key temporarily -// chooses the third shift level (until it is released). -partial modifier_keys -xkb_symbols "switch" { - key { - type[Group1]="ONE_LEVEL", - symbols[Group1] = [ ISO_Level3_Shift ] - }; - modifier_map Mod5 { ISO_Level3_Shift }; -}; - -// using the level(menu_switch) map, the Menu key temporarily -// chooses the third shift level (until it is released). -partial modifier_keys -xkb_symbols "menu_switch" { - key { - type[Group1]="ONE_LEVEL", - symbols[Group1] = [ ISO_Level3_Shift ] - }; - modifier_map Mod5 { ISO_Level3_Shift }; -}; - -// using the level3(win_switch) map, the either Windows' logo key -// temporarily chooses the third shift level. -partial modifier_keys -xkb_symbols "win_switch" { - include "level3(lwin_switch)" - include "level3(rwin_switch)" -}; - -// using the level3(lwin_switch) map, the left Windows' logo key -// temporarily chooses the third shift level. -partial modifier_keys -xkb_symbols "lwin_switch" { - key { - type[Group1]="ONE_LEVEL", - symbols[Group1] = [ ISO_Level3_Shift ] - }; - modifier_map Mod5 { ISO_Level3_Shift }; -}; - -// using the level(rwin_switch) map, the right Windows' logo key -// temporarily chooses the third shift level. If you use this map, -// you should define your keyboard as pc101 or pc102 instead of pc104 -// or pc105. -partial modifier_keys -xkb_symbols "rwin_switch" { - key { - type[Group1]="ONE_LEVEL", - symbols[Group1] = [ ISO_Level3_Shift ] - }; - modifier_map Mod5 { ISO_Level3_Shift }; -}; - -// using the level3(enter_switch) map, the Enter key on the keypad -// temporarily chooses the third shift level. This is especially -// useful for Mac laptops which miss the right Alt key. -partial modifier_keys -xkb_symbols "enter_switch" { - key { - type[Group1]="ONE_LEVEL", - symbols[Group1] = [ ISO_Level3_Shift ] - }; - modifier_map Mod5 { ISO_Level3_Shift }; -}; - -partial modifier_keys -xkb_symbols "caps_switch" { - key { - type[Group1]="ONE_LEVEL", - symbols[Group1] = [ ISO_Level3_Shift ] - }; - modifier_map Mod5 { ISO_Level3_Shift }; -}; - -partial modifier_keys -xkb_symbols "bksl_switch" { - key { - type[Group1]="ONE_LEVEL", - symbols[Group1] = [ ISO_Level3_Shift ] - }; - modifier_map Mod5 { ISO_Level3_Shift }; -}; - -partial modifier_keys -xkb_symbols "lsgt_switch" { - key { - type[Group1]="ONE_LEVEL", - symbols[Group1] = [ ISO_Level3_Shift ] - }; - modifier_map Mod5 { ISO_Level3_Shift }; -}; - -partial modifier_keys -xkb_symbols "caps_switch_latch" { - key { - type[Group1]="THREE_LEVEL", - symbols[Group1] = [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Latch ] - }; - modifier_map Mod5 { ISO_Level3_Shift }; -}; - -partial modifier_keys -xkb_symbols "bksl_switch_latch" { - key { - type[Group1]="THREE_LEVEL", - symbols[Group1] = [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Latch ] - }; - modifier_map Mod5 { ISO_Level3_Shift }; -}; - -partial modifier_keys -xkb_symbols "lsgt_switch_latch" { - key { - type[Group1]="THREE_LEVEL", - symbols[Group1] = [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Latch ] - }; - modifier_map Mod5 { ISO_Level3_Shift }; -}; +// these variants assign various XKB keycodes to ISO_Level3_Shift so that +// the third shift level can be reached +// + +// the default behavior is for the right Alt key (AltGr) to generate the +// third engraved symbol +default partial modifier_keys +xkb_symbols "ralt_switch" { + key { + type[Group1]="ONE_LEVEL", + symbols[Group1] = [ ISO_Level3_Shift ] + }; + modifier_map Mod5 { ISO_Level3_Shift }; +}; + +// Right Alt key never chooses 3rd level. +// This option attempts to undo the effect of a layout's +// including ralt_switch. You may also want to select another +// level3 option that maps the level3 shift to some other key. +partial modifier_keys +xkb_symbols "ralt_alt" { + key { + type[Group1]="TWO_LEVEL", + type[Group2]="TWO_LEVEL", + type[Group3]="TWO_LEVEL", + type[Group4]="TWO_LEVEL", + symbols[Group1] = [ Alt_R, Meta_R ], + symbols[Group2] = [ Alt_R, Meta_R ], + symbols[Group3] = [ Alt_R, Meta_R ], + symbols[Group4] = [ Alt_R, Meta_R ] + }; + modifier_map Mod1 { }; +}; + +partial modifier_keys +xkb_symbols "ralt_switch_multikey" { + key { + type[Group1]="TWO_LEVEL", + symbols[Group1] = [ ISO_Level3_Shift, Multi_key ] + }; +}; + +// special case or right Alt switch - for use with grp:alts_toggle +// +partial hidden modifier_keys +xkb_symbols "ralt_switch_for_alts_toggle" { + virtual_modifiers LAlt, AlGr; + key { + type[Group1]="PC_RALT_LEVEL2", + symbols[Group1] = [ Alt_L, ISO_Prev_Group, ISO_Prev_Group ], + virtualMods= LAlt + }; + key { + type[Group1]="PC_ALT_LEVEL2", + symbols[Group1] = [ ISO_Level3_Shift, ISO_Next_Group ], + virtualMods= AltGr + }; + modifier_map Mod5 { ISO_Level3_Shift }; +}; + +// using the level(alt_switch) map, either Alt key temporarily chooses +// the third shift level. (Mostly be used to imitate Mac OS functionality.) +partial modifier_keys +xkb_symbols "alt_switch" { + include "level3(lalt_switch)" + include "level3(ralt_switch)" +}; + +partial modifier_keys +xkb_symbols "lalt_switch" { + key { + type[Group1]="ONE_LEVEL", + symbols[Group1] = [ ISO_Level3_Shift ] + }; + modifier_map Mod5 { }; +}; + +// using the level(switch) map, the right Control key temporarily +// chooses the third shift level (until it is released). +partial modifier_keys +xkb_symbols "switch" { + key { + type[Group1]="ONE_LEVEL", + symbols[Group1] = [ ISO_Level3_Shift ] + }; + modifier_map Mod5 { ISO_Level3_Shift }; +}; + +// using the level(menu_switch) map, the Menu key temporarily +// chooses the third shift level (until it is released). +partial modifier_keys +xkb_symbols "menu_switch" { + key { + type[Group1]="ONE_LEVEL", + symbols[Group1] = [ ISO_Level3_Shift ] + }; + modifier_map Mod5 { ISO_Level3_Shift }; +}; + +// using the level3(win_switch) map, the either Windows' logo key +// temporarily chooses the third shift level. +partial modifier_keys +xkb_symbols "win_switch" { + include "level3(lwin_switch)" + include "level3(rwin_switch)" +}; + +// using the level3(lwin_switch) map, the left Windows' logo key +// temporarily chooses the third shift level. +partial modifier_keys +xkb_symbols "lwin_switch" { + key { + type[Group1]="ONE_LEVEL", + symbols[Group1] = [ ISO_Level3_Shift ] + }; + modifier_map Mod5 { ISO_Level3_Shift }; +}; + +// using the level(rwin_switch) map, the right Windows' logo key +// temporarily chooses the third shift level. If you use this map, +// you should define your keyboard as pc101 or pc102 instead of pc104 +// or pc105. +partial modifier_keys +xkb_symbols "rwin_switch" { + key { + type[Group1]="ONE_LEVEL", + symbols[Group1] = [ ISO_Level3_Shift ] + }; + modifier_map Mod5 { ISO_Level3_Shift }; +}; + +// using the level3(enter_switch) map, the Enter key on the keypad +// temporarily chooses the third shift level. This is especially +// useful for Mac laptops which miss the right Alt key. +partial modifier_keys +xkb_symbols "enter_switch" { + key { + type[Group1]="ONE_LEVEL", + symbols[Group1] = [ ISO_Level3_Shift ] + }; + modifier_map Mod5 { ISO_Level3_Shift }; +}; + +partial modifier_keys +xkb_symbols "caps_switch" { + key { + type[Group1]="ONE_LEVEL", + symbols[Group1] = [ ISO_Level3_Shift ] + }; + modifier_map Mod5 { ISO_Level3_Shift }; +}; + +partial modifier_keys +xkb_symbols "bksl_switch" { + key { + type[Group1]="ONE_LEVEL", + symbols[Group1] = [ ISO_Level3_Shift ] + }; + modifier_map Mod5 { ISO_Level3_Shift }; +}; + +partial modifier_keys +xkb_symbols "lsgt_switch" { + key { + type[Group1]="ONE_LEVEL", + symbols[Group1] = [ ISO_Level3_Shift ] + }; + modifier_map Mod5 { ISO_Level3_Shift }; +}; + +partial modifier_keys +xkb_symbols "caps_switch_latch" { + key { + type[Group1]="THREE_LEVEL", + symbols[Group1] = [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Latch ] + }; + modifier_map Mod5 { ISO_Level3_Shift }; +}; + +partial modifier_keys +xkb_symbols "bksl_switch_latch" { + key { + type[Group1]="THREE_LEVEL", + symbols[Group1] = [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Latch ] + }; + modifier_map Mod5 { ISO_Level3_Shift }; +}; + +partial modifier_keys +xkb_symbols "lsgt_switch_latch" { + key { + type[Group1]="THREE_LEVEL", + symbols[Group1] = [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Latch ] + }; + modifier_map Mod5 { ISO_Level3_Shift }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/level5 b/xorg-server/xkeyboard-config/symbols/level5 index 6e9a693cc..ce219b5bf 100644 --- a/xorg-server/xkeyboard-config/symbols/level5 +++ b/xorg-server/xkeyboard-config/symbols/level5 @@ -1,147 +1,147 @@ -// these variants assign various XKB keycodes to ISO_Level5_Shift so that -// the third shift level can be reached -// - -// using the level(switch) map, the right Control key temporarily -// chooses the fifth shift level (until it is released). -partial modifier_keys -xkb_symbols "rctrl_switch" { - key { - type[Group1]="ONE_LEVEL", - symbols[Group1] = [ ISO_Level5_Shift ] - }; - modifier_map Mod3 { ISO_Level5_Shift }; -}; - -partial modifier_keys -xkb_symbols "lsgt_switch" { - key { - type[Group1]="ONE_LEVEL", - symbols[Group1] = [ ISO_Level5_Shift ] - }; - modifier_map Mod3 { ISO_Level5_Shift }; -}; - -partial modifier_keys -xkb_symbols "ralt_switch" { - key { - type[Group1]="ONE_LEVEL", - symbols[Group1] = [ ISO_Level5_Shift ] - }; - modifier_map Mod3 { ISO_Level5_Shift }; -}; - - -// The following modifier keys are used to switch to the third shift and to set a -// corresponding lock, implemented as NumLock. - -partial modifier_keys -xkb_symbols "lock" { - // This adds the definitions needed to create a level5-lock behaviour, using - // the real modifier NumLock as a lock indicator. - // See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK - // See also: compat/level5(level5_lock) - key.type[Group1] = "ONE_LEVEL"; - - replace key { - vmods = LevelFive, - symbols[Group1] = [ ISO_Level5_Shift ], - actions[Group1] = [ SetMods(modifiers=LevelFive) ] - }; - modifier_map Mod3 { }; - - replace key { - vmods = NumLock, - symbols[Group1] = [ NoSymbol ], - actions[Group1] = [ SetMods(modifiers=NumLock) ] - }; - modifier_map Mod2 { }; -}; - -partial modifier_keys -xkb_symbols "lsgt_switch_lock" { - - include "level5(lock)" - - key { - type[Group1] = "EIGHT_LEVEL", - symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] - }; -}; - -partial modifier_keys -xkb_symbols "lwin_switch_lock" { - - include "level5(lock)" - - key { - type[Group1] = "EIGHT_LEVEL", - symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] - }; -}; - -partial modifier_keys -xkb_symbols "ralt_switch_lock" { - - include "level5(lock)" - - key { - type[Group1] = "EIGHT_LEVEL", - symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] - }; -}; - -partial modifier_keys -xkb_symbols "rwin_switch_lock" { - - include "level5(lock)" - - key { - type[Group1] = "EIGHT_LEVEL", - symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] - }; -}; - -partial modifier_keys -xkb_symbols "lsgt_switch_lock_cancel" { - - include "level5(lock)" - - key { - type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK", - symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] - }; -}; - -partial modifier_keys -xkb_symbols "lwin_switch_lock_cancel" { - - include "level5(lock)" - - key { - type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK", - symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] - }; -}; - -partial modifier_keys -xkb_symbols "ralt_switch_lock_cancel" { - - include "level5(lock)" - - key { - type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK", - symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] - }; -}; - -partial modifier_keys -xkb_symbols "rwin_switch_lock_cancel" { - - include "level5(lock)" - - key { - type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK", - symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] - }; -}; +// these variants assign various XKB keycodes to ISO_Level5_Shift so that +// the third shift level can be reached +// + +// using the level(switch) map, the right Control key temporarily +// chooses the fifth shift level (until it is released). +partial modifier_keys +xkb_symbols "rctrl_switch" { + key { + type[Group1]="ONE_LEVEL", + symbols[Group1] = [ ISO_Level5_Shift ] + }; + modifier_map Mod3 { ISO_Level5_Shift }; +}; + +partial modifier_keys +xkb_symbols "lsgt_switch" { + key { + type[Group1]="ONE_LEVEL", + symbols[Group1] = [ ISO_Level5_Shift ] + }; + modifier_map Mod3 { ISO_Level5_Shift }; +}; + +partial modifier_keys +xkb_symbols "ralt_switch" { + key { + type[Group1]="ONE_LEVEL", + symbols[Group1] = [ ISO_Level5_Shift ] + }; + modifier_map Mod3 { ISO_Level5_Shift }; +}; + + +// The following modifier keys are used to switch to the third shift and to set a +// corresponding lock, implemented as NumLock. + +partial modifier_keys +xkb_symbols "lock" { + // This adds the definitions needed to create a level5-lock behaviour, using + // the real modifier NumLock as a lock indicator. + // See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK + // See also: compat/level5(level5_lock) + key.type[Group1] = "ONE_LEVEL"; + + replace key { + vmods = LevelFive, + symbols[Group1] = [ ISO_Level5_Shift ], + actions[Group1] = [ SetMods(modifiers=LevelFive) ] + }; + modifier_map Mod3 { }; + + replace key { + vmods = NumLock, + symbols[Group1] = [ NoSymbol ], + actions[Group1] = [ SetMods(modifiers=NumLock) ] + }; + modifier_map Mod2 { }; +}; + +partial modifier_keys +xkb_symbols "lsgt_switch_lock" { + + include "level5(lock)" + + key { + type[Group1] = "EIGHT_LEVEL", + symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] + }; +}; + +partial modifier_keys +xkb_symbols "lwin_switch_lock" { + + include "level5(lock)" + + key { + type[Group1] = "EIGHT_LEVEL", + symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] + }; +}; + +partial modifier_keys +xkb_symbols "ralt_switch_lock" { + + include "level5(lock)" + + key { + type[Group1] = "EIGHT_LEVEL", + symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] + }; +}; + +partial modifier_keys +xkb_symbols "rwin_switch_lock" { + + include "level5(lock)" + + key { + type[Group1] = "EIGHT_LEVEL", + symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] + }; +}; + +partial modifier_keys +xkb_symbols "lsgt_switch_lock_cancel" { + + include "level5(lock)" + + key { + type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK", + symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] + }; +}; + +partial modifier_keys +xkb_symbols "lwin_switch_lock_cancel" { + + include "level5(lock)" + + key { + type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK", + symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] + }; +}; + +partial modifier_keys +xkb_symbols "ralt_switch_lock_cancel" { + + include "level5(lock)" + + key { + type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK", + symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] + }; +}; + +partial modifier_keys +xkb_symbols "rwin_switch_lock_cancel" { + + include "level5(lock)" + + key { + type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK", + symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] + }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch index 09c2fb32f..54b61d215 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch @@ -1,101 +1,101 @@ -// -// 03.01.2003 -// Andreas Tobler -// modified for Swiss German Apple Extended Keyboard II - -partial alphanumeric_keys -xkb_symbols "extended" { - - name[Group1]= "Switzerland - German, Mac"; - - // Alphanumeric section - - key { [ 1, plus, plusminus, infinity ] }; - key { [ 2, quotedbl, leftdoublequotemark, rightdoublequotemark ] }; - key { [ 3, asterisk, numbersign, leftcaret ] }; - // not displayed here - key { [ 4, ccedilla, Ccedilla, slash ] }; - key { [ 5, percent, bracketleft ] }; - key { [ 6, ampersand, bracketright ] }; - key { [ 7, slash, bar, backslash ] }; - key { [ 8, parenleft, braceleft, Ograve ] }; - key { [ 9, parenright, braceright, Ocircumflex ] }; - key { [ 0, equal, notequal, Uacute ] }; - key { [ apostrophe, question, questiondown, NoSymbol ] }; - key { [ dead_circumflex,dead_grave, dead_acute, asciicircum ] }; - key { [ q, Q, oe, OE ] }; - key { [ w, W, Greek_SIGMA, Aacute ] }; - key { [ e, E, EuroSign, Ediaeresis ] }; - key { [ r, R, registered, Egrave ] }; - key { [ t, T, dagger, Icircumflex ] }; - key { [ z, Z, Greek_OMEGA, Iacute ] }; - key { [ u, U, degree, Ugrave ] }; - key { [ i, I, exclamdown, idotless ] }; - key { [ o, O, oslash, Ooblique ] }; - key { [ p, P, Greek_pi, Greek_PI ] }; - key { [ udiaeresis, egrave, section, ydiaeresis ] }; - key { [ dead_diaeresis, exclam, grave, apostrophe ] }; - key { [ a, A, aring, Aring ] }; - key { [ s, S, ssharp, NoSymbol ] }; - // ligature fl - key { [ d, D, Greek_sigma, NoSymbol ] }; - // partialderivative is not available here att - key { [ f, F, function, doubledagger ] }; - key { [ g, G, at, comma ] }; - key { [ h, H, ordfeminine, periodcentered ] }; - key { [ j, J, masculine, eth ] }; - key { [ k, K, Greek_DELTA, macron ] }; - key { [ l, L, notsign, caret ] }; - key { [ odiaeresis, eacute, cent, breve ] }; - key { [ adiaeresis, agrave, ae, AE ] }; - key { [ y, Y, yen, Ydiaeresis ] }; - key { [ x, X, similarequal, trademark ] }; - key { [ c, C, copyright, NoSymbol ] }; - key { [ v, V, radical, diamond ] }; - key { [ b, B, integral, NoSymbol ] }; - key { [ n, N, dead_tilde, enopencircbullet ] }; - // to be fixed att - key { [ m, M, mu, dead_abovering ] }; - // not sure att - key { [ comma, semicolon, guillemotleft, guillemotright ] }; - key { [ period, colon, ellipsis, division ] }; - key { [ minus, underscore, hyphen, emdash ] }; - key { [ section, degree, NoSymbol, NoSymbol ] }; - // ligature fi // per mille - key { [ space, nobreakspace, nobreakspace ] }; - key { [ less, greater, lessthanequal, greaterthanequal ] }; - key { [ dollar, sterling, paragraph, enfilledcircbullet ] }; - - include "kpdl(comma)" - include "level3(ralt_switch)" -}; - -partial alphanumeric_keys -xkb_symbols "de" { - include "macintosh_vndr/ch(extended)" -}; - -partial alphanumeric_keys -xkb_symbols "fr" { - - // Describes the differences between a very simple US/ASCII - // keyboard and a very simple Swiss/French keybaord - - include "macintosh_vndr/ch(extended)" - name[Group1]= "Switzerland - French, Mac"; - - override key { - [ egrave, udiaeresis, bracketleft ] - }; - override key { - [ eacute, odiaeresis ] - }; - override key { - [ agrave, adiaeresis, braceleft ] - }; -}; - -partial alphanumeric_keys -xkb_symbols "nodeadkeys" { - include "macintosh_vndr/ch(fr)" // for consistent naming -}; +// +// 03.01.2003 +// Andreas Tobler +// modified for Swiss German Apple Extended Keyboard II + +partial alphanumeric_keys +xkb_symbols "extended" { + + name[Group1]= "Switzerland - German, Mac"; + + // Alphanumeric section + + key { [ 1, plus, plusminus, infinity ] }; + key { [ 2, quotedbl, leftdoublequotemark, rightdoublequotemark ] }; + key { [ 3, asterisk, numbersign, leftcaret ] }; + // not displayed here + key { [ 4, ccedilla, Ccedilla, slash ] }; + key { [ 5, percent, bracketleft ] }; + key { [ 6, ampersand, bracketright ] }; + key { [ 7, slash, bar, backslash ] }; + key { [ 8, parenleft, braceleft, Ograve ] }; + key { [ 9, parenright, braceright, Ocircumflex ] }; + key { [ 0, equal, notequal, Uacute ] }; + key { [ apostrophe, question, questiondown, NoSymbol ] }; + key { [ dead_circumflex,dead_grave, dead_acute, asciicircum ] }; + key { [ q, Q, oe, OE ] }; + key { [ w, W, Greek_SIGMA, Aacute ] }; + key { [ e, E, EuroSign, Ediaeresis ] }; + key { [ r, R, registered, Egrave ] }; + key { [ t, T, dagger, Icircumflex ] }; + key { [ z, Z, Greek_OMEGA, Iacute ] }; + key { [ u, U, degree, Ugrave ] }; + key { [ i, I, exclamdown, idotless ] }; + key { [ o, O, oslash, Ooblique ] }; + key { [ p, P, Greek_pi, Greek_PI ] }; + key { [ udiaeresis, egrave, section, ydiaeresis ] }; + key { [ dead_diaeresis, exclam, grave, apostrophe ] }; + key { [ a, A, aring, Aring ] }; + key { [ s, S, ssharp, NoSymbol ] }; + // ligature fl + key { [ d, D, Greek_sigma, NoSymbol ] }; + // partialderivative is not available here att + key { [ f, F, function, doubledagger ] }; + key { [ g, G, at, comma ] }; + key { [ h, H, ordfeminine, periodcentered ] }; + key { [ j, J, masculine, eth ] }; + key { [ k, K, Greek_DELTA, macron ] }; + key { [ l, L, notsign, caret ] }; + key { [ odiaeresis, eacute, cent, breve ] }; + key { [ adiaeresis, agrave, ae, AE ] }; + key { [ y, Y, yen, Ydiaeresis ] }; + key { [ x, X, similarequal, trademark ] }; + key { [ c, C, copyright, NoSymbol ] }; + key { [ v, V, radical, diamond ] }; + key { [ b, B, integral, NoSymbol ] }; + key { [ n, N, dead_tilde, enopencircbullet ] }; + // to be fixed att + key { [ m, M, mu, dead_abovering ] }; + // not sure att + key { [ comma, semicolon, guillemotleft, guillemotright ] }; + key { [ period, colon, ellipsis, division ] }; + key { [ minus, underscore, hyphen, emdash ] }; + key { [ section, degree, NoSymbol, NoSymbol ] }; + // ligature fi // per mille + key { [ space, nobreakspace, nobreakspace ] }; + key { [ less, greater, lessthanequal, greaterthanequal ] }; + key { [ dollar, sterling, paragraph, enfilledcircbullet ] }; + + include "kpdl(comma)" + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "de" { + include "macintosh_vndr/ch(extended)" +}; + +partial alphanumeric_keys +xkb_symbols "fr" { + + // Describes the differences between a very simple US/ASCII + // keyboard and a very simple Swiss/French keybaord + + include "macintosh_vndr/ch(extended)" + name[Group1]= "Switzerland - French, Mac"; + + override key { + [ egrave, udiaeresis, bracketleft ] + }; + override key { + [ eacute, odiaeresis ] + }; + override key { + [ agrave, adiaeresis, braceleft ] + }; +}; + +partial alphanumeric_keys +xkb_symbols "nodeadkeys" { + include "macintosh_vndr/ch(fr)" // for consistent naming +}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de index 4c8bebdf4..da5bc7772 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de @@ -1,94 +1,94 @@ -// olh@suse.de very close to MacOS map - -default partial alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple US/ASCII - // keyboard and a very simple German keybaord - - include "latin" - name[Group1]= "Germany - Mac"; - - // Alphanumeric section - key { [ dead_circumflex, degree, notsign ] }; - key { [ 1, exclam, exclamdown, at ] }; - key { [ 2, quotedbl, twosuperior ] }; - key { [ 3, section, threesuperior,sterling ] }; - key { [ 4, dollar, onequarter, currency ] }; - key { [ 5, percent, bracketleft ] }; - key { [ 6, ampersand, bracketright ] }; - key { [ 7, slash, bar, backslash ] }; - key { [ 8, parenleft, braceleft, asciitilde ] }; - key { [ 9, parenright, braceright ] }; - key { [ 0, equal, braceright, degree ] }; - key { [ ssharp, question, backslash, questiondown ] }; - key { [ dead_acute, dead_grave, dead_cedilla ] }; - - key { [ q, Q, guillemotleft,guillemotright ] }; - key { [ e, E, EuroSign ] }; - key { [ r, R, registered ] }; - key { [ t, T ] }; - key { [ z, Z ] }; - key { [ u, U, diaeresis, Aacute ] }; - key { [ i, I, slash, Ucircumflex ] }; - key { [ o, O, oslash, Ooblique ] }; - key { [ udiaeresis, Udiaeresis, periodcentered, degree ] }; - key { [ plus, asterisk, asciitilde ] }; - key { [ a, A, aring, Aring ] }; - key { [ f, F ] }; - key { [ g, G, copyright ] }; - key { [ h, H, ordfeminine ] }; - key { [ l, L, at ] }; - key { [ odiaeresis, Odiaeresis, dead_acute ] }; - key { [ adiaeresis, Adiaeresis, dead_circumflex ] }; - - key { [ less, greater, bar ] }; - key { [ y, Y, guillemotleft,less ] }; - key { [ n, N, asciitilde ] }; - key { [ m, M, mu ] }; - key { [ comma, semicolon ] }; - key { [ period, colon, periodcentered, division ] }; - key { [ minus, underscore ] }; - key { [ numbersign, apostrophe, dead_grave ] }; - - include "kpdl(comma)" - include "level3(ralt_switch)" - -}; - -partial alphanumeric_keys -xkb_symbols "Sundeadkeys" { - // modify the default German layout to use Sun dead keys - include "macintosh_vndr/de(basic)" - name[Group1]= "Germany - Mac, Sun dead keys"; - - key { [ SunFA_Circum, degree, notsign ] }; - key { [ SunFA_Acute, SunFA_Grave, SunFA_Cedilla ] }; - key { [ udiaeresis, Udiaeresis, SunFA_Diaeresis ] }; - key { [ plus, asterisk, SunFA_Tilde, dead_macron ] }; - key { [ odiaeresis, Odiaeresis, SunFA_Acute ] }; - key { [ adiaeresis, Adiaeresis, SunFA_Circum ] }; - - key { [ numbersign, acute, SunFA_Grave ] }; -}; - -partial alphanumeric_keys -xkb_symbols "sundeadkeys" { - include "macintosh_vndr/de(Sundeadkeys)" -}; - -partial alphanumeric_keys -xkb_symbols "nodeadkeys" { - // modify the default German layout to not have any dead keys - include "macintosh_vndr/de(basic)" - name[Group1]= "Germany - Mac, eliminate dead keys"; - - key { [ asciicircum, degree, notsign ] }; - key { [ acute, grave, cedilla ] }; - key { [ udiaeresis, Udiaeresis, diaeresis ] }; - key { [ plus, asterisk, asciitilde, macron ] }; - key { [ odiaeresis, Odiaeresis, acute ] }; - key { [ adiaeresis, Adiaeresis, asciicircum ] }; - - key { [ numbersign, apostrophe, grave ] }; -}; +// olh@suse.de very close to MacOS map + +default partial alphanumeric_keys +xkb_symbols "basic" { + + // Describes the differences between a very simple US/ASCII + // keyboard and a very simple German keybaord + + include "latin" + name[Group1]= "Germany - Mac"; + + // Alphanumeric section + key { [ dead_circumflex, degree, notsign ] }; + key { [ 1, exclam, exclamdown, at ] }; + key { [ 2, quotedbl, twosuperior ] }; + key { [ 3, section, threesuperior,sterling ] }; + key { [ 4, dollar, onequarter, currency ] }; + key { [ 5, percent, bracketleft ] }; + key { [ 6, ampersand, bracketright ] }; + key { [ 7, slash, bar, backslash ] }; + key { [ 8, parenleft, braceleft, asciitilde ] }; + key { [ 9, parenright, braceright ] }; + key { [ 0, equal, braceright, degree ] }; + key { [ ssharp, question, backslash, questiondown ] }; + key { [ dead_acute, dead_grave, dead_cedilla ] }; + + key { [ q, Q, guillemotleft,guillemotright ] }; + key { [ e, E, EuroSign ] }; + key { [ r, R, registered ] }; + key { [ t, T ] }; + key { [ z, Z ] }; + key { [ u, U, diaeresis, Aacute ] }; + key { [ i, I, slash, Ucircumflex ] }; + key { [ o, O, oslash, Ooblique ] }; + key { [ udiaeresis, Udiaeresis, periodcentered, degree ] }; + key { [ plus, asterisk, asciitilde ] }; + key { [ a, A, aring, Aring ] }; + key { [ f, F ] }; + key { [ g, G, copyright ] }; + key { [ h, H, ordfeminine ] }; + key { [ l, L, at ] }; + key { [ odiaeresis, Odiaeresis, dead_acute ] }; + key { [ adiaeresis, Adiaeresis, dead_circumflex ] }; + + key { [ less, greater, bar ] }; + key { [ y, Y, guillemotleft,less ] }; + key { [ n, N, asciitilde ] }; + key { [ m, M, mu ] }; + key { [ comma, semicolon ] }; + key { [ period, colon, periodcentered, division ] }; + key { [ minus, underscore ] }; + key { [ numbersign, apostrophe, dead_grave ] }; + + include "kpdl(comma)" + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys +xkb_symbols "Sundeadkeys" { + // modify the default German layout to use Sun dead keys + include "macintosh_vndr/de(basic)" + name[Group1]= "Germany - Mac, Sun dead keys"; + + key { [ SunFA_Circum, degree, notsign ] }; + key { [ SunFA_Acute, SunFA_Grave, SunFA_Cedilla ] }; + key { [ udiaeresis, Udiaeresis, SunFA_Diaeresis ] }; + key { [ plus, asterisk, SunFA_Tilde, dead_macron ] }; + key { [ odiaeresis, Odiaeresis, SunFA_Acute ] }; + key { [ adiaeresis, Adiaeresis, SunFA_Circum ] }; + + key { [ numbersign, acute, SunFA_Grave ] }; +}; + +partial alphanumeric_keys +xkb_symbols "sundeadkeys" { + include "macintosh_vndr/de(Sundeadkeys)" +}; + +partial alphanumeric_keys +xkb_symbols "nodeadkeys" { + // modify the default German layout to not have any dead keys + include "macintosh_vndr/de(basic)" + name[Group1]= "Germany - Mac, eliminate dead keys"; + + key { [ asciicircum, degree, notsign ] }; + key { [ acute, grave, cedilla ] }; + key { [ udiaeresis, Udiaeresis, diaeresis ] }; + key { [ plus, asterisk, asciitilde, macron ] }; + key { [ odiaeresis, Odiaeresis, acute ] }; + key { [ adiaeresis, Adiaeresis, asciicircum ] }; + + key { [ numbersign, apostrophe, grave ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi index 177913737..7a865d2bc 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi @@ -1,17 +1,17 @@ -partial default alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple mac_US - // keyboard and a very simple Swedish(Finland) keybaord - - include "macintosh_vndr/se(basic)" // for consistent naming - name[Group1]= "Finland - Mac"; - -}; - - -partial alphanumeric_keys -xkb_symbols "nodeadkeys" { - include "macintosh_vndr/se(basic)" // for consistent naming - name[Group1]= "Finland - Mac, eliminate dead keys"; -}; +partial default alphanumeric_keys +xkb_symbols "basic" { + + // Describes the differences between a very simple mac_US + // keyboard and a very simple Swedish(Finland) keybaord + + include "macintosh_vndr/se(basic)" // for consistent naming + name[Group1]= "Finland - Mac"; + +}; + + +partial alphanumeric_keys +xkb_symbols "nodeadkeys" { + include "macintosh_vndr/se(basic)" // for consistent naming + name[Group1]= "Finland - Mac, eliminate dead keys"; +}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr index 9a8f8de23..c76551d30 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr @@ -1,110 +1,110 @@ -// Marc.Shapiro@inria.fr 19-sep-1998 -// modifications : Etienne Herlent june 2000 -// adapted to the new input layer : -// Martin Costabel 3-jan-2001 -////////////////////////////////////////////////////////////////// -// Petites Modification le juillet 2005 par Bin Zhang : -// 1) La ligne 83 : remplacer les deux "VoidSymbol" par oe et OE -// 2) La ligne 89 : remplacer "VoidSymbol" par "EuroSign" -// ( 1) et 2) fonctionnent sous UTF-8, mais pas sous iso-8859-1. ) -// 3) Remplacer la ligne 148 par la ligne 149 pour que la touche Alt_L -// (la touche Apple-Pomme) fonctionne correctement sous Xorg, une idée -// motivée par http://www.linux-france.org/macintosh/clavier_gentoo.html -////////////////////////////////////////////////////////////////// -// This map is an almost-complete mapping of the standard French -// MacIntosh keyboard under Xwindows. I tried to remain as faithful -// as possible to the Mac meaning of each key. I did this entirely by -// hand and by intuition, relying on the Clavier (Keyboard?) Desktop -// Accessory for the Mac meaning of keys, and on reading keysymdef.h -// to intuit the corresponding X names. Lacking proper documentation, -// I may have made some mistakes. - -// Entries marked CHECK are particularly uncertain - -// Entries marked MISSING mark Mac characters for which I was unable -// to find a corresponding keysym. (Some for sure don't: e.g. the -// Apple mark and the oe/OE character; others I may have simply not -// found.) - -default -xkb_symbols "extended" { - - name[Group1]= "France - Mac"; - - key { [ Escape ] }; - - // Alphanumeric section - key { [ at, numbersign, periodcentered, Ydiaeresis ] }; - key { [ KP_Enter ] }; - key { [ ampersand, 1, VoidSymbol, dead_acute ] }; // MISSING: Apple - key { [ eacute, 2, ediaeresis, Eacute ] }; - key { [ quotedbl, 3, leftdoublequotemark, rightdoublequotemark ] }; - key { [ apostrophe, 4, leftsinglequotemark, rightsinglequotemark ] }; - key { [ parenleft, 5, braceleft, bracketleft ] }; - key { [ section, 6, paragraph, aring ] }; - key { [ egrave, 7, guillemotleft, guillemotright] }; - key { [ exclam, 8, exclamdown, Ucircumflex ] }; - key { [ ccedilla, 9, Ccedilla, Aacute ] }; - key { [ agrave, 0, oslash, Oslash ] }; - key { [ parenright, degree, braceright, bracketright ] }; - key { [ minus, underscore, emdash, endash ] }; - key { [ BackSpace, VoidSymbol, Delete, VoidSymbol ] }; - - key { [ Tab, ISO_Left_Tab ] }; - key { [ a, A, ae, AE ] }; - key { [ z, Z, Acircumflex, Aring ] }; - key { [ e, E, ecircumflex, Ecircumflex ] }; - key { [ r, R, registered, currency ] }; - key { [ t, T, dagger, trademark ] }; - key { [ y, Y, Uacute, Ydiaeresis ] }; - key { [ u, U, masculine, ordfeminine ] }; - key { [ i, I, icircumflex, idiaeresis ] }; - key { [ o, O, oe, OE ] }; - key { [ p, P, Greek_pi, Greek_PI ] }; - key { [dead_circumflex,dead_diaeresis,ocircumflex, Ocircumflex ] }; - key { [ dollar, asterisk, EuroSign, yen ] }; - key { [ Caps_Lock ] }; - key { [ q, Q, doubledagger, Greek_OMEGA ] }; - key { [ s, S, Ograve, Greek_SIGMA ] }; - key { [ d, D, Greek_delta, Greek_DELTA ] }; - key { [ f, F, VoidSymbol, periodcentered ] }; - key { [ g, G, VoidSymbol, VoidSymbol ] }; // MISSING: ligature fi,fl - key { [ h, H, Igrave, Icircumflex ] }; - key { [ j, J, Idiaeresis, Iacute ] }; - key { [ k, K, Egrave, Ediaeresis ] }; - key { [ l, L, notsign, bar ] }; - key { [ m, M, mu, Oacute ] }; - key { [ ugrave, percent, Ugrave, 0x1002030 ] }; - key { [ dead_grave, sterling, at, numbersign ] }; - key { [ Return ] }; - - key { [ less, greater, lessthanequal, greaterthanequal ] }; - key { [ w, W, guilsinglleft, guilsinglright ] }; // MISSING: half-guillemot (single angle bracket) - key { [ x, X, VoidSymbol, VoidSymbol ] }; // CHECK: similarequal; MISSING: extra-slanted slash - key { [ c, C, copyright, cent ] }; - key { [ v, V, diamond, radical ] }; // CHECK diamond - key { [ b, B, ssharp, integral ] }; - key { [ n, N, dead_tilde, asciitilde ] }; - key { [ comma, question, infinity, questiondown ] }; - key { [ semicolon, period, ellipsis, periodcentered ] }; - key { [ colon, slash, division, backslash ] }; - key { [ equal, plus, notequal, plusminus ] }; - - key { [ space, space, nobreakspace, nobreakspace ] }; - // End alphanumeric section - - include "level3(ralt_switch)" -}; - - - -xkb_symbols "nodeadkeys" { -include "macintosh_vndr/fr(extended)" - name[Group1]= "France - Mac, eliminate dead keys"; - - key { [ ampersand, 1, VoidSymbol, acute ] }; // MISSING: Apple - key { [asciicircum,diaeresis,ocircumflex, Ocircumflex ] }; - key { [ grave, sterling, at, numbersign ] }; - - key { [ n, N, asciitilde, dead_tilde ] }; -}; +// Marc.Shapiro@inria.fr 19-sep-1998 +// modifications : Etienne Herlent june 2000 +// adapted to the new input layer : +// Martin Costabel 3-jan-2001 +////////////////////////////////////////////////////////////////// +// Petites Modification le juillet 2005 par Bin Zhang : +// 1) La ligne 83 : remplacer les deux "VoidSymbol" par oe et OE +// 2) La ligne 89 : remplacer "VoidSymbol" par "EuroSign" +// ( 1) et 2) fonctionnent sous UTF-8, mais pas sous iso-8859-1. ) +// 3) Remplacer la ligne 148 par la ligne 149 pour que la touche Alt_L +// (la touche Apple-Pomme) fonctionne correctement sous Xorg, une idée +// motivée par http://www.linux-france.org/macintosh/clavier_gentoo.html +////////////////////////////////////////////////////////////////// +// This map is an almost-complete mapping of the standard French +// MacIntosh keyboard under Xwindows. I tried to remain as faithful +// as possible to the Mac meaning of each key. I did this entirely by +// hand and by intuition, relying on the Clavier (Keyboard?) Desktop +// Accessory for the Mac meaning of keys, and on reading keysymdef.h +// to intuit the corresponding X names. Lacking proper documentation, +// I may have made some mistakes. + +// Entries marked CHECK are particularly uncertain + +// Entries marked MISSING mark Mac characters for which I was unable +// to find a corresponding keysym. (Some for sure don't: e.g. the +// Apple mark and the oe/OE character; others I may have simply not +// found.) + +default +xkb_symbols "extended" { + + name[Group1]= "France - Mac"; + + key { [ Escape ] }; + + // Alphanumeric section + key { [ at, numbersign, periodcentered, Ydiaeresis ] }; + key { [ KP_Enter ] }; + key { [ ampersand, 1, VoidSymbol, dead_acute ] }; // MISSING: Apple + key { [ eacute, 2, ediaeresis, Eacute ] }; + key { [ quotedbl, 3, leftdoublequotemark, rightdoublequotemark ] }; + key { [ apostrophe, 4, leftsinglequotemark, rightsinglequotemark ] }; + key { [ parenleft, 5, braceleft, bracketleft ] }; + key { [ section, 6, paragraph, aring ] }; + key { [ egrave, 7, guillemotleft, guillemotright] }; + key { [ exclam, 8, exclamdown, Ucircumflex ] }; + key { [ ccedilla, 9, Ccedilla, Aacute ] }; + key { [ agrave, 0, oslash, Oslash ] }; + key { [ parenright, degree, braceright, bracketright ] }; + key { [ minus, underscore, emdash, endash ] }; + key { [ BackSpace, VoidSymbol, Delete, VoidSymbol ] }; + + key { [ Tab, ISO_Left_Tab ] }; + key { [ a, A, ae, AE ] }; + key { [ z, Z, Acircumflex, Aring ] }; + key { [ e, E, ecircumflex, Ecircumflex ] }; + key { [ r, R, registered, currency ] }; + key { [ t, T, dagger, trademark ] }; + key { [ y, Y, Uacute, Ydiaeresis ] }; + key { [ u, U, masculine, ordfeminine ] }; + key { [ i, I, icircumflex, idiaeresis ] }; + key { [ o, O, oe, OE ] }; + key { [ p, P, Greek_pi, Greek_PI ] }; + key { [dead_circumflex,dead_diaeresis,ocircumflex, Ocircumflex ] }; + key { [ dollar, asterisk, EuroSign, yen ] }; + key { [ Caps_Lock ] }; + key { [ q, Q, doubledagger, Greek_OMEGA ] }; + key { [ s, S, Ograve, Greek_SIGMA ] }; + key { [ d, D, Greek_delta, Greek_DELTA ] }; + key { [ f, F, VoidSymbol, periodcentered ] }; + key { [ g, G, VoidSymbol, VoidSymbol ] }; // MISSING: ligature fi,fl + key { [ h, H, Igrave, Icircumflex ] }; + key { [ j, J, Idiaeresis, Iacute ] }; + key { [ k, K, Egrave, Ediaeresis ] }; + key { [ l, L, notsign, bar ] }; + key { [ m, M, mu, Oacute ] }; + key { [ ugrave, percent, Ugrave, 0x1002030 ] }; + key { [ dead_grave, sterling, at, numbersign ] }; + key { [ Return ] }; + + key { [ less, greater, lessthanequal, greaterthanequal ] }; + key { [ w, W, guilsinglleft, guilsinglright ] }; // MISSING: half-guillemot (single angle bracket) + key { [ x, X, VoidSymbol, VoidSymbol ] }; // CHECK: similarequal; MISSING: extra-slanted slash + key { [ c, C, copyright, cent ] }; + key { [ v, V, diamond, radical ] }; // CHECK diamond + key { [ b, B, ssharp, integral ] }; + key { [ n, N, dead_tilde, asciitilde ] }; + key { [ comma, question, infinity, questiondown ] }; + key { [ semicolon, period, ellipsis, periodcentered ] }; + key { [ colon, slash, division, backslash ] }; + key { [ equal, plus, notequal, plusminus ] }; + + key { [ space, space, nobreakspace, nobreakspace ] }; + // End alphanumeric section + + include "level3(ralt_switch)" +}; + + + +xkb_symbols "nodeadkeys" { +include "macintosh_vndr/fr(extended)" + name[Group1]= "France - Mac, eliminate dead keys"; + + key { [ ampersand, 1, VoidSymbol, acute ] }; // MISSING: Apple + key { [asciicircum,diaeresis,ocircumflex, Ocircumflex ] }; + key { [ grave, sterling, at, numbersign ] }; + + key { [ n, N, asciitilde, dead_tilde ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb index 5343673c1..a6bc48e8c 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb @@ -1,17 +1,17 @@ -partial default alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple en_US - // keyboard and a very simple U.K. keyboard layout - - include "latin" - - name[Group1]= "United Kingdom - Mac"; - - key { [ 2, at, EuroSign ] }; - key { [ 3, sterling, numbersign ] }; - - // End alphanumeric section - - include "level3(ralt_switch)" -}; +partial default alphanumeric_keys +xkb_symbols "basic" { + + // Describes the differences between a very simple en_US + // keyboard and a very simple U.K. keyboard layout + + include "latin" + + name[Group1]= "United Kingdom - Mac"; + + key { [ 2, at, EuroSign ] }; + key { [ 3, sterling, numbersign ] }; + + // End alphanumeric section + + include "level3(ralt_switch)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/is b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/is index d16d92f61..b9870ffe8 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/is +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/is @@ -1,127 +1,127 @@ -// -// This file describes the differences between a Macintosh US Extended -// keymap and an Icelandic keyboard layout in the style of Mac OS and Mac OS X -// -// Copyright (C) 2004, 2006 Ævar Arnfjörð Bjarmason -// -// 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 a copyright holder shall -// not be used in advertising or otherwise to promote the sale, use or -// other dealings in this Software without prior written authorization of -// the copyright holder. -// -// = HISTORY -// * 2004-09-28: -// Initial cleanroom writing of the keymap, I just booted Mac OS X, opened -// TextEdit.app and wrote down what the value produced by each key was when I -// pressed it, a for a, A for shift + a, Ã¥ for lalt + a etc and made the -// keymap from that information -// -// * 2006-01-14: -// Revised the comments in the file -// -// = NOTES -// * 20 characters in this keymap have no named character defined in -// include/keysymdef.h and as a result their Unicode code points in -// hexadecimal are listed here, these can be generated with the following -// perl command: -// $ perl -CA -e 'printf "U%x\n", ord shift' Æ -// and converted back like: -// $ perl -CO -le '$_=shift;s/[^a-f0-9]//ig;print chr hex' Uc6 -// * The Apple logo appears twice on this keymap like the Mac OS and Mac OS X -// keymaps. In the MacRoman encoding it has the code point 0xF0 (240) but it -// has no assigned code point in Unicode, the code point Apple uses for it is -// U+F8FF (63743) which is in the BMP's Private Use Area (U+E000–U+F8FF) -// * This keymap has only been tested on a PowerBook6,5 (iBook G4) but it -// should work on other Apple laptop models which use the same keyboard -// layout. It will probably work on standard sized keyboards with little or -// no modification but it might not support them fully, please report if -// you're able to get it running with such a keyboard - -partial default alphanumeric_keys -xkb_symbols "basic" { - name[Group1]= "Iceland - Mac"; - - //-- Row 5 (E) --// - key { [ sterling, section, UF8FF, apostrophe ] }; - key { [ 1, exclam, exclamdown, VoidSymbol ] }; - key { [ 2, quotedbl, at, VoidSymbol ] }; - key { [ 3, numbersign, U2122, sterling ] }; - key { [ 4, dollar, U00A2, EuroSign ] }; - key { [ 5, percent, U2030, infinity ] }; - key { [ 6, ampersand, asciicircum, U2044 ] }; - key { [ 7, slash, backslash, U00F7 ] }; - key { [ 8, parenleft, bracketleft, braceleft ] }; - key { [ 9, parenright, bracketright, braceright ] }; - key { [ 0, equal, U2260, U2248 ] }; - key { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; - key { [ minus, underscore, endash, emdash ] }; - - - //-- Row 4 (D) --// - key { [ q, Q, paragraph, VoidSymbol ] }; - key { [ w, W, U2211, VoidSymbol ] }; - key { [ e, E, dead_grave, VoidSymbol ] }; - key { [ r, R, registered, VoidSymbol ] }; - key { [ t, T, degree, VoidSymbol ] }; - key { [ y, Y, yen, VoidSymbol ] }; - key { [ u, U, dead_diaeresis, VoidSymbol ] }; - key { [ i, I, U0131, U00AA ] }; - key { [ o, O, dead_circumflex,U00BA ] }; - key { [ p, P, Greek_pi, Greek_PI ] }; - key { [ eth, Eth, U201e, U201c ] }; - key { [ apostrophe, question, questiondown, U00B7 ] }; - - - //-- Row 3 (C) --// - key { [ a, A, aring, Aring ] }; - key { [ s, S, ssharp, abovedot ] }; - key { [ d, D, U2202, U2DA ] }; - key { [ f, F, U192, macron ] }; - key { [ g, G, copyright, breve ] }; - key { [ h, H, bar, VoidSymbol ] }; - key { [ j, J, U2206, U2dd ] }; - key { [ k, K, U00AC, VoidSymbol ] }; - key { [ l, L, U2026, caron ] }; - key { [ ae, AE, oe, OE ] }; - key { [ dead_acute, dead_diaeresis, U201A, U2018 ] }; - key { [ plus, asterisk, U2022, plusminus ] }; - - - //-- Row 2 (B) --// - key { [ less, greater, section, UF8FF ] }; - key { [ z, Z, U3A9, VoidSymbol ] }; - key { [ x, X, asciitilde, VoidSymbol ] }; - key { [ c, C, ccedilla, Ccedilla ] }; - key { [ v, V, U221A, U25CA ] }; - key { [ b, B, U222B, VoidSymbol ] }; - key { [ n, N, dead_tilde, VoidSymbol ] }; - key { [ m, M, U00B5, VoidSymbol ] }; - key { [ comma, semicolon, lessthanequal, guillemotleft ] }; - key { [ period, colon, greaterthanequal,guillemotright ] }; - key { [ thorn, Thorn, U2019, U201d ] }; - - include "level3(ralt_switch)" -}; - -partial alphanumeric_keys -xkb_symbols "nodeadkeys" { - include "macintosh_vndr/is(basic)" // for consistent naming - name[Group1]= "Iceland - Mac, eliminate dead keys"; -}; +// +// This file describes the differences between a Macintosh US Extended +// keymap and an Icelandic keyboard layout in the style of Mac OS and Mac OS X +// +// Copyright (C) 2004, 2006 Ævar Arnfjörð Bjarmason +// +// 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 a copyright holder shall +// not be used in advertising or otherwise to promote the sale, use or +// other dealings in this Software without prior written authorization of +// the copyright holder. +// +// = HISTORY +// * 2004-09-28: +// Initial cleanroom writing of the keymap, I just booted Mac OS X, opened +// TextEdit.app and wrote down what the value produced by each key was when I +// pressed it, a for a, A for shift + a, Ã¥ for lalt + a etc and made the +// keymap from that information +// +// * 2006-01-14: +// Revised the comments in the file +// +// = NOTES +// * 20 characters in this keymap have no named character defined in +// include/keysymdef.h and as a result their Unicode code points in +// hexadecimal are listed here, these can be generated with the following +// perl command: +// $ perl -CA -e 'printf "U%x\n", ord shift' Æ +// and converted back like: +// $ perl -CO -le '$_=shift;s/[^a-f0-9]//ig;print chr hex' Uc6 +// * The Apple logo appears twice on this keymap like the Mac OS and Mac OS X +// keymaps. In the MacRoman encoding it has the code point 0xF0 (240) but it +// has no assigned code point in Unicode, the code point Apple uses for it is +// U+F8FF (63743) which is in the BMP's Private Use Area (U+E000–U+F8FF) +// * This keymap has only been tested on a PowerBook6,5 (iBook G4) but it +// should work on other Apple laptop models which use the same keyboard +// layout. It will probably work on standard sized keyboards with little or +// no modification but it might not support them fully, please report if +// you're able to get it running with such a keyboard + +partial default alphanumeric_keys +xkb_symbols "basic" { + name[Group1]= "Iceland - Mac"; + + //-- Row 5 (E) --// + key { [ sterling, section, UF8FF, apostrophe ] }; + key { [ 1, exclam, exclamdown, VoidSymbol ] }; + key { [ 2, quotedbl, at, VoidSymbol ] }; + key { [ 3, numbersign, U2122, sterling ] }; + key { [ 4, dollar, U00A2, EuroSign ] }; + key { [ 5, percent, U2030, infinity ] }; + key { [ 6, ampersand, asciicircum, U2044 ] }; + key { [ 7, slash, backslash, U00F7 ] }; + key { [ 8, parenleft, bracketleft, braceleft ] }; + key { [ 9, parenright, bracketright, braceright ] }; + key { [ 0, equal, U2260, U2248 ] }; + key { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; + key { [ minus, underscore, endash, emdash ] }; + + + //-- Row 4 (D) --// + key { [ q, Q, paragraph, VoidSymbol ] }; + key { [ w, W, U2211, VoidSymbol ] }; + key { [ e, E, dead_grave, VoidSymbol ] }; + key { [ r, R, registered, VoidSymbol ] }; + key { [ t, T, degree, VoidSymbol ] }; + key { [ y, Y, yen, VoidSymbol ] }; + key { [ u, U, dead_diaeresis, VoidSymbol ] }; + key { [ i, I, U0131, U00AA ] }; + key { [ o, O, dead_circumflex,U00BA ] }; + key { [ p, P, Greek_pi, Greek_PI ] }; + key { [ eth, Eth, U201e, U201c ] }; + key { [ apostrophe, question, questiondown, U00B7 ] }; + + + //-- Row 3 (C) --// + key { [ a, A, aring, Aring ] }; + key { [ s, S, ssharp, abovedot ] }; + key { [ d, D, U2202, U2DA ] }; + key { [ f, F, U192, macron ] }; + key { [ g, G, copyright, breve ] }; + key { [ h, H, bar, VoidSymbol ] }; + key { [ j, J, U2206, U2dd ] }; + key { [ k, K, U00AC, VoidSymbol ] }; + key { [ l, L, U2026, caron ] }; + key { [ ae, AE, oe, OE ] }; + key { [ dead_acute, dead_diaeresis, U201A, U2018 ] }; + key { [ plus, asterisk, U2022, plusminus ] }; + + + //-- Row 2 (B) --// + key { [ less, greater, section, UF8FF ] }; + key { [ z, Z, U3A9, VoidSymbol ] }; + key { [ x, X, asciitilde, VoidSymbol ] }; + key { [ c, C, ccedilla, Ccedilla ] }; + key { [ v, V, U221A, U25CA ] }; + key { [ b, B, U222B, VoidSymbol ] }; + key { [ n, N, dead_tilde, VoidSymbol ] }; + key { [ m, M, U00B5, VoidSymbol ] }; + key { [ comma, semicolon, lessthanequal, guillemotleft ] }; + key { [ period, colon, greaterthanequal,guillemotright ] }; + key { [ thorn, Thorn, U2019, U201d ] }; + + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "nodeadkeys" { + include "macintosh_vndr/is(basic)" // for consistent naming + name[Group1]= "Iceland - Mac, eliminate dead keys"; +}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it index 889653f8e..2438231cd 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it @@ -1,62 +1,62 @@ -xkb_symbols "extended" { - - name[Group1]= "Italy - Mac"; - - // Alphanumeric section - key { [ less, greater ] }; - key { [ at, numbersign, periodcentered ] }; - key { [ ampersand, 1, guillemotleft,guillemotright ] }; - key { [ quotedbl, 2 ] }; - key { [ apostrophe, 3 ] }; - key { [ parenleft, 4, braceleft, bracketleft ] }; - key { [ ccedilla, 5, Ccedilla, Iacute ] }; - key { [ egrave, 6, paragraph, periodcentered] }; - key { [ parenright, 7, braceright, bracketright ] }; - key { [ sterling, 8, infinity ] }; - key { [ agrave, 9, acute, Ocircumflex ] }; - key { [ eacute, 0, grave, Oacute ] }; - key { [ minus, underscore ] }; - key { [ equal, plus, notequal, plusminus ] }; - - key { [ q, Q ] }; - key { [ z, Z ] }; - key { [ e, E, EuroSign ] }; - key { [ r, R, registered ] }; - key { [ t, T ] }; - key { [ y, Y, Uacute, ydiaeresis ] }; - key { [ u, U ] }; - key { [ i, I, icircumflex, idiaeresis ] }; - key { [ o, O ] }; - key { [ p, P ] }; - key { [ igrave, asciicircum ] }; - key { [ dollar, asterisk ] }; - key { [ section, degree, at, numbersign ] }; - - key { [ a, A, aring, Aring ] }; - key { [ s, S, ssharp ] }; - key { [ d, D ] }; - key { [ f, F ] }; - key { [ g, G ] }; - key { [ h, H, Igrave, Icircumflex ] }; - key { [ j, J, Idiaeresis, Iacute ] }; - key { [ k, K, Egrave, Ediaeresis ] }; - key { [ l, L, ssharp, bar ] }; - key { [ m, M, mu, Oacute ] }; - key { [ ugrave, percent, ae, AE ] }; - - key { [ w, W ] }; - key { [ x, X ] }; - key { [ c, C, copyright, copyright ] }; - key { [ v, V ] }; - key { [ b, B ] }; - key { [ n, N, dead_tilde ] }; - key { [ comma, question, questiondown ] }; - key { [ semicolon, period ] }; - key { [ colon, slash, bar, backslash ] }; - key { [ ograve, exclam, exclamdown ] }; - - // End alphanumeric section - - include "kpdl(dot)" - include "level3(ralt_switch)" -}; +xkb_symbols "extended" { + + name[Group1]= "Italy - Mac"; + + // Alphanumeric section + key { [ less, greater ] }; + key { [ at, numbersign, periodcentered ] }; + key { [ ampersand, 1, guillemotleft,guillemotright ] }; + key { [ quotedbl, 2 ] }; + key { [ apostrophe, 3 ] }; + key { [ parenleft, 4, braceleft, bracketleft ] }; + key { [ ccedilla, 5, Ccedilla, Iacute ] }; + key { [ egrave, 6, paragraph, periodcentered] }; + key { [ parenright, 7, braceright, bracketright ] }; + key { [ sterling, 8, infinity ] }; + key { [ agrave, 9, acute, Ocircumflex ] }; + key { [ eacute, 0, grave, Oacute ] }; + key { [ minus, underscore ] }; + key { [ equal, plus, notequal, plusminus ] }; + + key { [ q, Q ] }; + key { [ z, Z ] }; + key { [ e, E, EuroSign ] }; + key { [ r, R, registered ] }; + key { [ t, T ] }; + key { [ y, Y, Uacute, ydiaeresis ] }; + key { [ u, U ] }; + key { [ i, I, icircumflex, idiaeresis ] }; + key { [ o, O ] }; + key { [ p, P ] }; + key { [ igrave, asciicircum ] }; + key { [ dollar, asterisk ] }; + key { [ section, degree, at, numbersign ] }; + + key { [ a, A, aring, Aring ] }; + key { [ s, S, ssharp ] }; + key { [ d, D ] }; + key { [ f, F ] }; + key { [ g, G ] }; + key { [ h, H, Igrave, Icircumflex ] }; + key { [ j, J, Idiaeresis, Iacute ] }; + key { [ k, K, Egrave, Ediaeresis ] }; + key { [ l, L, ssharp, bar ] }; + key { [ m, M, mu, Oacute ] }; + key { [ ugrave, percent, ae, AE ] }; + + key { [ w, W ] }; + key { [ x, X ] }; + key { [ c, C, copyright, copyright ] }; + key { [ v, V ] }; + key { [ b, B ] }; + key { [ n, N, dead_tilde ] }; + key { [ comma, question, questiondown ] }; + key { [ semicolon, period ] }; + key { [ colon, slash, bar, backslash ] }; + key { [ ograve, exclam, exclamdown ] }; + + // End alphanumeric section + + include "kpdl(dot)" + include "level3(ralt_switch)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam index a588ab27c..dcb9db624 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam @@ -1,37 +1,37 @@ -partial default alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple mac_US - // keyboard and a very simple Spanish keybaord - - include "latin" - name[Group1]= "Latin American - Mac"; - - key { [ bracketleft, bracketright, braceleft, braceright ] }; - key { [ less, greater, bracketleft, braceleft ] }; - key { [ 1, exclamdown ] }; - key { [ 2, exclam, at, oneeighth ] }; - key { [ 3, numbersign, guillemotleft, guillemotright ] }; - key { [ 4, dollar, yen, Icircumflex ] }; - key { [ 5, percent ] }; - key { [ 6, slash, backslash, Idiaeresis ] }; - key { [ 7, ampersand, bar, Iacute ] }; - key { [ 8, asterisk, degree ] }; - key { [ 9, parenleft, sterling, Ocircumflex ] }; - key { [ 0, parenright ] }; - key { [ minus, underscore ] }; - key { [ equal, plus, plusminus ] }; - key { [ dead_grave, degree ] }; - key { [ dead_acute, dead_diaeresis, bar ] }; - - key { [ comma, questiondown ] }; - key { [ period, question ] }; - key { [ ccedilla, Ccedilla ] }; - key { [ ntilde, Ntilde, asciitilde, dead_doubleacute ] }; - key { [ semicolon, colon ] }; - key { [ apostrophe, quotedbl ] }; - - // End alphanumeric section - - include "level3(ralt_switch)" -}; +partial default alphanumeric_keys +xkb_symbols "basic" { + + // Describes the differences between a very simple mac_US + // keyboard and a very simple Spanish keybaord + + include "latin" + name[Group1]= "Latin American - Mac"; + + key { [ bracketleft, bracketright, braceleft, braceright ] }; + key { [ less, greater, bracketleft, braceleft ] }; + key { [ 1, exclamdown ] }; + key { [ 2, exclam, at, oneeighth ] }; + key { [ 3, numbersign, guillemotleft, guillemotright ] }; + key { [ 4, dollar, yen, Icircumflex ] }; + key { [ 5, percent ] }; + key { [ 6, slash, backslash, Idiaeresis ] }; + key { [ 7, ampersand, bar, Iacute ] }; + key { [ 8, asterisk, degree ] }; + key { [ 9, parenleft, sterling, Ocircumflex ] }; + key { [ 0, parenright ] }; + key { [ minus, underscore ] }; + key { [ equal, plus, plusminus ] }; + key { [ dead_grave, degree ] }; + key { [ dead_acute, dead_diaeresis, bar ] }; + + key { [ comma, questiondown ] }; + key { [ period, question ] }; + key { [ ccedilla, Ccedilla ] }; + key { [ ntilde, Ntilde, asciitilde, dead_doubleacute ] }; + key { [ semicolon, colon ] }; + key { [ apostrophe, quotedbl ] }; + + // End alphanumeric section + + include "level3(ralt_switch)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl index 05034701e..5eb66c444 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl @@ -1,15 +1,15 @@ -partial default alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple mac_US - // keyboard and a very simple netherland keybaord - - include "latin" - - name[Group1]= "Netherlands - Mac"; - - include "level3(ralt_switch)" - -// do just nothing - -}; +partial default alphanumeric_keys +xkb_symbols "basic" { + + // Describes the differences between a very simple mac_US + // keyboard and a very simple netherland keybaord + + include "latin" + + name[Group1]= "Netherlands - Mac"; + + include "level3(ralt_switch)" + +// do just nothing + +}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no index 442aee9af..fb0cb74a2 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no @@ -1,50 +1,50 @@ -partial default alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple en_US - // keyboard and a very simple Norwegian keybaord - - include "latin" - - name[Group1]= "Norway - Mac"; - - key { [ bar, section ] }; - key { [ 2, quotedbl, at, oneeighth ] }; - key { [ 4, currency, dollar, dollar ] }; - key { [ 3, numbersign, sterling, sterling ] }; - key { [ 6, ampersand ] }; - key { [ 7, slash, bar, backslash ] }; - key { [ 8, parenleft, bracketleft, braceleft ] }; - key { [ 9, parenright, bracketright, braceright ] }; - key { [ 0, equal ] }; - - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - key { [ oslash, Ooblique, odiaeresis, Odiaeresis ] }; - key { [ plus, question ] }; - key { [ ae, AE ] }; - key { [ aring, Aring ] }; - key { [ dead_grave, dead_acute, acute, dead_ogonek ] }; - key { [ diaeresis, asciicircum, asciitilde, dead_macron ] }; - key { [ at, asterisk ] }; - key { [ less, greater ] }; - - // End alphanumeric section - - include "eurosign(e)" - include "level3(ralt_switch)" -}; - - -partial alphanumeric_keys -xkb_symbols "nodeadkeys" { - - // Modifies the basic Norwegian layout to eliminate dead keys - include "macintosh_vndr/no(basic)" - name[Group1]= "Norway - Mac, eliminate dead keys"; - - key { [ grave, acute, acute, ogonek ] }; - key { [ diaeresis, asciicircum, asciitilde, macron ] }; - -}; +partial default alphanumeric_keys +xkb_symbols "basic" { + + // Describes the differences between a very simple en_US + // keyboard and a very simple Norwegian keybaord + + include "latin" + + name[Group1]= "Norway - Mac"; + + key { [ bar, section ] }; + key { [ 2, quotedbl, at, oneeighth ] }; + key { [ 4, currency, dollar, dollar ] }; + key { [ 3, numbersign, sterling, sterling ] }; + key { [ 6, ampersand ] }; + key { [ 7, slash, bar, backslash ] }; + key { [ 8, parenleft, bracketleft, braceleft ] }; + key { [ 9, parenright, bracketright, braceright ] }; + key { [ 0, equal ] }; + + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + key { [ oslash, Ooblique, odiaeresis, Odiaeresis ] }; + key { [ plus, question ] }; + key { [ ae, AE ] }; + key { [ aring, Aring ] }; + key { [ dead_grave, dead_acute, acute, dead_ogonek ] }; + key { [ diaeresis, asciicircum, asciitilde, dead_macron ] }; + key { [ at, asterisk ] }; + key { [ less, greater ] }; + + // End alphanumeric section + + include "eurosign(e)" + include "level3(ralt_switch)" +}; + + +partial alphanumeric_keys +xkb_symbols "nodeadkeys" { + + // Modifies the basic Norwegian layout to eliminate dead keys + include "macintosh_vndr/no(basic)" + name[Group1]= "Norway - Mac, eliminate dead keys"; + + key { [ grave, acute, acute, ogonek ] }; + key { [ diaeresis, asciicircum, asciitilde, macron ] }; + +}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt index 8c3b7173c..01ac86d85 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt @@ -1,61 +1,61 @@ -// mac version from Ricardo Cabral - -partial default alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple en_US - // keyboard and a very simple Portuguese keybaord - - include "latin" - - name[Group1]= "Portugal - Mac"; - - key { [ less, greater, bar, brokenbar ] }; - key { [ 2, quotedbl, at, oneeighth ] }; - key { [ 4, dollar, section, dollar ] }; - key { [ 3, numbersign, sterling, sterling ] }; - key { [ 6, ampersand ] }; - key { [ 7, slash ] }; - key { [ 8, parenleft, bracketleft, braceleft ] }; - key { [ 9, parenright, bracketright, braceright ] }; - key { [ 0, equal ] }; - key { [ apostrophe, question ] }; - key { [ plus, asterisk, dead_diaeresis ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - key { [ ccedilla, Ccedilla ] }; - key { [ dead_tilde, dead_circumflex ] }; - key { [ backslash, bar ] }; - key { [ masculine, ordfeminine ] }; - key { [ dead_acute, dead_grave ] }; - // End alphanumeric section - - include "eurosign(e)" - include "level3(ralt_switch)" -}; - -partial alphanumeric_keys -xkb_symbols "Sundeadkeys" { - include "macintosh_vndr/pt(basic)" // for consistent naming - name[Group1]= "Portugal - Mac, Sun dead keys"; - - key { [ plus, asterisk, SunFA_Diaeresis, SunFA_Diaeresis ] }; - key { [ SunFA_Tilde, SunFA_Circum ] }; - key { [ SunFA_Acute, SunFA_Grave ] }; -}; - -partial alphanumeric_keys -xkb_symbols "sundeadkeys" { - include "macintosh_vndr/pt(Sundeadkeys)" // for consistent naming -}; - -partial alphanumeric_keys -xkb_symbols "nodeadkeys" { - include "macintosh_vndr/pt(basic)" // for consistent naming - name[Group1]= "Portugal - Mac, eliminate dead keys"; - - key { [ plus, asterisk, quotedbl, quotedbl ] }; - key { [ asciitilde, asciicircum ] }; - key { [ acute, grave ] }; -}; +// mac version from Ricardo Cabral + +partial default alphanumeric_keys +xkb_symbols "basic" { + + // Describes the differences between a very simple en_US + // keyboard and a very simple Portuguese keybaord + + include "latin" + + name[Group1]= "Portugal - Mac"; + + key { [ less, greater, bar, brokenbar ] }; + key { [ 2, quotedbl, at, oneeighth ] }; + key { [ 4, dollar, section, dollar ] }; + key { [ 3, numbersign, sterling, sterling ] }; + key { [ 6, ampersand ] }; + key { [ 7, slash ] }; + key { [ 8, parenleft, bracketleft, braceleft ] }; + key { [ 9, parenright, bracketright, braceright ] }; + key { [ 0, equal ] }; + key { [ apostrophe, question ] }; + key { [ plus, asterisk, dead_diaeresis ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + key { [ ccedilla, Ccedilla ] }; + key { [ dead_tilde, dead_circumflex ] }; + key { [ backslash, bar ] }; + key { [ masculine, ordfeminine ] }; + key { [ dead_acute, dead_grave ] }; + // End alphanumeric section + + include "eurosign(e)" + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "Sundeadkeys" { + include "macintosh_vndr/pt(basic)" // for consistent naming + name[Group1]= "Portugal - Mac, Sun dead keys"; + + key { [ plus, asterisk, SunFA_Diaeresis, SunFA_Diaeresis ] }; + key { [ SunFA_Tilde, SunFA_Circum ] }; + key { [ SunFA_Acute, SunFA_Grave ] }; +}; + +partial alphanumeric_keys +xkb_symbols "sundeadkeys" { + include "macintosh_vndr/pt(Sundeadkeys)" // for consistent naming +}; + +partial alphanumeric_keys +xkb_symbols "nodeadkeys" { + include "macintosh_vndr/pt(basic)" // for consistent naming + name[Group1]= "Portugal - Mac, eliminate dead keys"; + + key { [ plus, asterisk, quotedbl, quotedbl ] }; + key { [ asciitilde, asciicircum ] }; + key { [ acute, grave ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se index 56d77bd0f..d2d05f248 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se @@ -1,44 +1,44 @@ -partial default alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple en_US - // keyboard and a very simple Swedish(Sweden) keybaord - - include "latin" - - name[Group1]= "Sweden - Mac"; - - key { [ section, degree ] }; - - key { [ 1, exclam, copyright, exclamdown ] }; - key { [ 2, quotedbl, at, oneeighth ] }; - key { [ 3, numbersign, sterling, yen ] }; - key { [ 4, currency, dollar, cent ] }; - key { [ 6, ampersand ] }; - key { [ 7, slash, bar, backslash ] }; - key { [ 8, parenleft, bracketleft, braceleft ] }; - key { [ 9, parenright, bracketright, braceright ] }; - key { [ comma, semicolon ] }; - key { [ 0, equal ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - key { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; - key { [ plus, question ] }; - key { [ adiaeresis, Adiaeresis, ae, AE ] }; - key { [ aring, Aring ] }; - key { [ acute, grave ] }; - key { [ diaeresis, asciicircum, asciitilde ] }; - key { [ apostrophe, asterisk, at ] }; - key { [ less, greater, bar, brokenbar ] }; - - include "kpdl(comma)" - include "eurosign(e)" - include "level3(ralt_switch)" -}; - - -partial alphanumeric_keys -xkb_symbols "nodeadkeys" { - include "macintosh_vndr/se(basic)" // for consistent naming - name[Group1]= "Sweden - Mac, eliminate dead keys"; -}; +partial default alphanumeric_keys +xkb_symbols "basic" { + + // Describes the differences between a very simple en_US + // keyboard and a very simple Swedish(Sweden) keybaord + + include "latin" + + name[Group1]= "Sweden - Mac"; + + key { [ section, degree ] }; + + key { [ 1, exclam, copyright, exclamdown ] }; + key { [ 2, quotedbl, at, oneeighth ] }; + key { [ 3, numbersign, sterling, yen ] }; + key { [ 4, currency, dollar, cent ] }; + key { [ 6, ampersand ] }; + key { [ 7, slash, bar, backslash ] }; + key { [ 8, parenleft, bracketleft, braceleft ] }; + key { [ 9, parenright, bracketright, braceright ] }; + key { [ comma, semicolon ] }; + key { [ 0, equal ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + key { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; + key { [ plus, question ] }; + key { [ adiaeresis, Adiaeresis, ae, AE ] }; + key { [ aring, Aring ] }; + key { [ acute, grave ] }; + key { [ diaeresis, asciicircum, asciitilde ] }; + key { [ apostrophe, asterisk, at ] }; + key { [ less, greater, bar, brokenbar ] }; + + include "kpdl(comma)" + include "eurosign(e)" + include "level3(ralt_switch)" +}; + + +partial alphanumeric_keys +xkb_symbols "nodeadkeys" { + include "macintosh_vndr/se(basic)" // for consistent naming + name[Group1]= "Sweden - Mac, eliminate dead keys"; +}; diff --git a/xorg-server/xkeyboard-config/symbols/mao b/xorg-server/xkeyboard-config/symbols/mao index b62994b2c..ce1b2ea3c 100644 --- a/xorg-server/xkeyboard-config/symbols/mao +++ b/xorg-server/xkeyboard-config/symbols/mao @@ -1,21 +1,21 @@ -partial default alphanumeric_keys -xkb_symbols "basic" { - - // Adds the macrons needed for the Maori language to - // a simple us keyboard layout. - - include "latin" - - name[Group1]="Maori"; - - key { [ a, A, amacron, Amacron ] }; - key { [ e, E, emacron, Emacron ] }; - key { [ i, I, imacron, Imacron ] }; - - key { [ o, O, omacron, Omacron ] }; - key { [ u, U, umacron, Umacron ] }; - - key { type[Group1]="TWO_LEVEL", - [ ISO_Level3_Shift, Multi_key ] }; - modifier_map Mod5 { }; -}; +partial default alphanumeric_keys +xkb_symbols "basic" { + + // Adds the macrons needed for the Maori language to + // a simple us keyboard layout. + + include "latin" + + name[Group1]="Maori"; + + key { [ a, A, amacron, Amacron ] }; + key { [ e, E, emacron, Emacron ] }; + key { [ i, I, imacron, Imacron ] }; + + key { [ o, O, omacron, Omacron ] }; + key { [ u, U, umacron, Umacron ] }; + + key { type[Group1]="TWO_LEVEL", + [ ISO_Level3_Shift, Multi_key ] }; + modifier_map Mod5 { }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/nec_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/nec_vndr/Makefile.am index ff070065a..ac1de6ec9 100644 --- a/xorg-server/xkeyboard-config/symbols/nec_vndr/Makefile.am +++ b/xorg-server/xkeyboard-config/symbols/nec_vndr/Makefile.am @@ -1,4 +1,4 @@ -symbolsdir = $(xkb_base)/symbols/nec_vndr - -dist_symbols_DATA = \ -jp +symbolsdir = $(xkb_base)/symbols/nec_vndr + +dist_symbols_DATA = \ +jp diff --git a/xorg-server/xkeyboard-config/symbols/nec_vndr/jp b/xorg-server/xkeyboard-config/symbols/nec_vndr/jp index 10477a43c..29b279c9f 100644 --- a/xorg-server/xkeyboard-config/symbols/nec_vndr/jp +++ b/xorg-server/xkeyboard-config/symbols/nec_vndr/jp @@ -1,163 +1,163 @@ -// -//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. -// -// symbols for a NEC PC98 keyboard -default xkb_symbols "pc98" { - - key { [ Escape ] }; - - // Alphanumeric section - key { [ 1, exclam ], [ kana_NU ] }; - key { [ 2, quotedbl ], [ kana_FU ] }; - key { [ 3, numbersign ], [ kana_A, kana_a ] }; - key { [ 4, dollar ], [ kana_U, kana_u ] }; - key { [ 5, percent ], [ kana_E, kana_e ] }; - key { [ 6, ampersand ], [ kana_O, kana_o ] }; - key { [ 7, apostrophe ], [ kana_YA, kana_ya ] }; - key { [ 8, parenleft ], [ kana_YU, kana_yu ] }; - key { [ 9, parenright ], [ kana_YO, kana_yo ] }; - key { [ 0 ], [ kana_WA, kana_WO ] }; - key { [ minus, equal ], [ kana_HO ] }; - key { [ asciicircum, quoteleft ], [ kana_HE ] }; - key { [ backslash, bar ], [ prolongedsound ] }; - key { [ BackSpace ] }; - - key { [ Tab, ISO_Left_Tab ] }; - key { [ q, Q ], [ kana_TA ] }; - key { [ w, W ], [ kana_TE ] }; - key { [ e, E ], [ kana_I, kana_i ] }; - key { [ r, R ], [ kana_SU ] }; - key { [ t, T ], [ kana_KA ] }; - key { [ y, Y ], [ kana_N ] }; - key { [ u, U ], [ kana_NA ] }; - key { [ i, I ], [ kana_NI ] }; - key { [ o, O ], [ kana_RA ] }; - key { [ p, P ], [ kana_SE ] }; - key { [ at, asciitilde ], [ voicedsound ] }; - key { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] }; - key { [ Return ] }; - - key { [ Control_L ] }; - key { [ Caps_Lock ] }; - key { [ a, A ], [ kana_CHI ] }; - key { [ s, S ], [ kana_TO ] }; - key { [ d, D ], [ kana_SHI ] }; - key { [ f, F ], [ kana_HA ] }; - key { [ g, G ], [ kana_KI ] }; - key { [ h, H ], [ kana_KU ] }; - key { [ j, J ], [ kana_MA ] }; - key { [ k, K ], [ kana_NO ] }; - key { [ l, L ], [ kana_RI ] }; - key { [ semicolon, plus ], [ kana_RE ] }; - key { [ colon, asterisk ], [ kana_KE ] }; - key { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] }; - - key { [ Shift_L ] }; - key { [ z, Z ], [ kana_TSU, kana_tsu ] }; - key { [ x, X ], [ kana_SA ] }; - key { [ c, C ], [ kana_SO ] }; - key { [ v, V ], [ kana_HI ] }; - key { [ b, B ], [ kana_KO ] }; - key { [ n, N ], [ kana_MI ] }; - key { [ m, M ], [ kana_MO ] }; - key { [ comma, less ], [ kana_NE, kana_comma ] }; - key { [ period, greater ], [ kana_RU, kana_fullstop ] }; - key { [ slash, question ], [ kana_ME, kana_middledot ] }; - key { [ NoSymbol, underscore ], [ kana_RO ] }; -// key { [ Shift_R ] }; - - key { [ Mode_switch ] }; - key { [ Alt_L ] }; - key { [ Muhenkan ] }; - key { [ space ] }; - key { [ Henkan, Kanji ] }; - - // End alphanumeric section - - // Begin "Function" section - key { [ Break ] }; - key { [ Print ] }; - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ F9 ] }; - key { [ F10 ] }; - key { [ F11 ] }; - key { [ F12 ] }; - key { [ F13 ] }; - key { [ F14 ] }; - key { [ F15 ] }; - // End "Function" section - - // Begin "Editing" section - key { [ Insert ] }; - key { [ Delete ] }; - key { [ Prior ] }; - key { [ Next ] }; - key { [ Up ] }; - key { [ Left ] }; - key { [ Right ] }; - key { [ Down ] }; - // End "Editing" section - - // Begin "Keypad" section - key { [ Clear, Home ] }; - key { [ Help ] }; - key { [ KP_Subtract ] }; - key { [ KP_Divide ] }; - - key { [ KP_7 ] }; - key { [ KP_8 ] }; - key { [ KP_9 ] }; - key { [ KP_Multiply ] }; - - key { [ KP_4 ] }; - key { [ KP_5 ] }; - key { [ KP_6 ] }; - key { [ KP_Add ] }; - - key { [ KP_1 ] }; - key { [ KP_2 ] }; - key { [ KP_3 ] }; - key { [ KP_Equal ] }; - - key { [ KP_0 ] }; - key { [ KP_Separator ] }; - key { [ KP_Decimal ] }; -// key { [ KP_Enter ] }; - // End "Keypad" section - - // begin modifier mappings - modifier_map Shift { Shift_L }; - modifier_map Lock { Caps_Lock }; - modifier_map Control{ Control_L }; - modifier_map Mod1 { Alt_L }; - modifier_map Mod2 { Mode_switch }; -}; +// +//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. +// +// symbols for a NEC PC98 keyboard +default xkb_symbols "pc98" { + + key { [ Escape ] }; + + // Alphanumeric section + key { [ 1, exclam ], [ kana_NU ] }; + key { [ 2, quotedbl ], [ kana_FU ] }; + key { [ 3, numbersign ], [ kana_A, kana_a ] }; + key { [ 4, dollar ], [ kana_U, kana_u ] }; + key { [ 5, percent ], [ kana_E, kana_e ] }; + key { [ 6, ampersand ], [ kana_O, kana_o ] }; + key { [ 7, apostrophe ], [ kana_YA, kana_ya ] }; + key { [ 8, parenleft ], [ kana_YU, kana_yu ] }; + key { [ 9, parenright ], [ kana_YO, kana_yo ] }; + key { [ 0 ], [ kana_WA, kana_WO ] }; + key { [ minus, equal ], [ kana_HO ] }; + key { [ asciicircum, quoteleft ], [ kana_HE ] }; + key { [ backslash, bar ], [ prolongedsound ] }; + key { [ BackSpace ] }; + + key { [ Tab, ISO_Left_Tab ] }; + key { [ q, Q ], [ kana_TA ] }; + key { [ w, W ], [ kana_TE ] }; + key { [ e, E ], [ kana_I, kana_i ] }; + key { [ r, R ], [ kana_SU ] }; + key { [ t, T ], [ kana_KA ] }; + key { [ y, Y ], [ kana_N ] }; + key { [ u, U ], [ kana_NA ] }; + key { [ i, I ], [ kana_NI ] }; + key { [ o, O ], [ kana_RA ] }; + key { [ p, P ], [ kana_SE ] }; + key { [ at, asciitilde ], [ voicedsound ] }; + key { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] }; + key { [ Return ] }; + + key { [ Control_L ] }; + key { [ Caps_Lock ] }; + key { [ a, A ], [ kana_CHI ] }; + key { [ s, S ], [ kana_TO ] }; + key { [ d, D ], [ kana_SHI ] }; + key { [ f, F ], [ kana_HA ] }; + key { [ g, G ], [ kana_KI ] }; + key { [ h, H ], [ kana_KU ] }; + key { [ j, J ], [ kana_MA ] }; + key { [ k, K ], [ kana_NO ] }; + key { [ l, L ], [ kana_RI ] }; + key { [ semicolon, plus ], [ kana_RE ] }; + key { [ colon, asterisk ], [ kana_KE ] }; + key { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] }; + + key { [ Shift_L ] }; + key { [ z, Z ], [ kana_TSU, kana_tsu ] }; + key { [ x, X ], [ kana_SA ] }; + key { [ c, C ], [ kana_SO ] }; + key { [ v, V ], [ kana_HI ] }; + key { [ b, B ], [ kana_KO ] }; + key { [ n, N ], [ kana_MI ] }; + key { [ m, M ], [ kana_MO ] }; + key { [ comma, less ], [ kana_NE, kana_comma ] }; + key { [ period, greater ], [ kana_RU, kana_fullstop ] }; + key { [ slash, question ], [ kana_ME, kana_middledot ] }; + key { [ NoSymbol, underscore ], [ kana_RO ] }; +// key { [ Shift_R ] }; + + key { [ Mode_switch ] }; + key { [ Alt_L ] }; + key { [ Muhenkan ] }; + key { [ space ] }; + key { [ Henkan, Kanji ] }; + + // End alphanumeric section + + // Begin "Function" section + key { [ Break ] }; + key { [ Print ] }; + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F10 ] }; + key { [ F11 ] }; + key { [ F12 ] }; + key { [ F13 ] }; + key { [ F14 ] }; + key { [ F15 ] }; + // End "Function" section + + // Begin "Editing" section + key { [ Insert ] }; + key { [ Delete ] }; + key { [ Prior ] }; + key { [ Next ] }; + key { [ Up ] }; + key { [ Left ] }; + key { [ Right ] }; + key { [ Down ] }; + // End "Editing" section + + // Begin "Keypad" section + key { [ Clear, Home ] }; + key { [ Help ] }; + key { [ KP_Subtract ] }; + key { [ KP_Divide ] }; + + key { [ KP_7 ] }; + key { [ KP_8 ] }; + key { [ KP_9 ] }; + key { [ KP_Multiply ] }; + + key { [ KP_4 ] }; + key { [ KP_5 ] }; + key { [ KP_6 ] }; + key { [ KP_Add ] }; + + key { [ KP_1 ] }; + key { [ KP_2 ] }; + key { [ KP_3 ] }; + key { [ KP_Equal ] }; + + key { [ KP_0 ] }; + key { [ KP_Separator ] }; + key { [ KP_Decimal ] }; +// key { [ KP_Enter ] }; + // End "Keypad" section + + // begin modifier mappings + modifier_map Shift { Shift_L }; + modifier_map Lock { Caps_Lock }; + modifier_map Control{ Control_L }; + modifier_map Mod1 { Alt_L }; + modifier_map Mod2 { Mode_switch }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/nokia_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/nokia_vndr/Makefile.am index 71200ec4d..63dc5db6e 100644 --- a/xorg-server/xkeyboard-config/symbols/nokia_vndr/Makefile.am +++ b/xorg-server/xkeyboard-config/symbols/nokia_vndr/Makefile.am @@ -1,6 +1,6 @@ -symbolsdir = $(xkb_base)/symbols/nokia_vndr - -dist_symbols_DATA = \ -rx-44 \ -rx-51 \ -su-8w +symbolsdir = $(xkb_base)/symbols/nokia_vndr + +dist_symbols_DATA = \ +rx-44 \ +rx-51 \ +su-8w diff --git a/xorg-server/xkeyboard-config/symbols/nokia_vndr/rx-44 b/xorg-server/xkeyboard-config/symbols/nokia_vndr/rx-44 index 515b69eef..7d91d6db3 100644 --- a/xorg-server/xkeyboard-config/symbols/nokia_vndr/rx-44 +++ b/xorg-server/xkeyboard-config/symbols/nokia_vndr/rx-44 @@ -1,303 +1,303 @@ -partial alphanumeric_keys -xkb_symbols "us" { - name[Group1] = "U.S. English"; - - include "nokia_vndr/rx-44(base)" - - key { [ a, A, exclam, exclam ] }; - key { [ s, S, quotedbl, quotedbl ] }; - key { [ d, D, at, at ] }; - key { [ f, F, numbersign, numbersign ] }; - key { [ g, G, backslash, backslash ] }; - key { [ h, H, slash, slash ] }; - key { [ j, J, parenleft, parenleft ] }; - key { [ k, K, parenright, parenright ] }; - key { [ l, L, asterisk, asterisk ] }; - key { [ apostrophe, question, question, question ] }; - - key { [ z, Z, yen, yen ] }; - key { [ x, X, asciicircum, asciicircum ] }; - key { [ c, C, asciitilde, asciitilde ] }; - key { [ v, V, percent, percent ] }; - key { [ b, B, ampersand, ampersand ] }; - key { [ n, N, dollar, dollar ] }; - key { [ m, M, EuroSign, EuroSign ] }; - key { [ semicolon, colon, sterling, sterling ] }; - key { [ minus, underscore, underscore, underscore ] }; - key { [ plus, equal, equal, equal ] }; - - key { [ comma, less, comma, less ] }; - key { [ period, greater, period, greater ] }; -}; - - - -partial alphanumeric_keys -xkb_symbols "fisenoda" { - name[Group1] = "Finnish/Swedish/Norwegian/Danish"; - - include "nokia_vndr/rx-44(base)" - - key { [ a, A, exclam, exclam ] }; - key { [ s, S, quotedbl, quotedbl ] }; - key { [ d, D, at, at ] }; - key { [ f, F, numbersign, numbersign ] }; - key { [ g, G, asterisk, asterisk ] }; - key { [ h, H, backslash, backslash ] }; - key { [ j, J, slash, slash ] }; - key { [ k, K, parenleft, parenleft ] }; - key { [ l, L, parenright, parenright ] }; - key { [ aring, Aring, question, question ] }; - - key { [ z, Z, EuroSign, EuroSign ] }; - key { [ x, X, asciitilde, asciitilde ] }; - key { [ c, C, percent, percent ] }; - key { [ v, V, ampersand, ampersand ] }; - key { [ b, B, plus, plus ] }; - key { [ n, N, less, less ] }; - key { [ m, M, greater, greater ] }; - key { type="EIGHT_LEVEL", [ oslash, Oslash, equal, equal, odiaeresis, Odiaeresis, equal, equal ] }; - key { type="EIGHT_LEVEL", [ ae, AE, apostrophe, apostrophe, adiaeresis, Adiaeresis, apostrophe, apostrophe ] }; - key { [ minus, underscore, underscore, underscore ] }; - - key { [ comma, semicolon, comma, semicolon ] }; - key { [ period, colon, period, colon ] }; -}; - - - -partial alphanumeric_keys -xkb_symbols "ptes" { - name[Group1] = "Portuguese/Spanish"; - - include "nokia_vndr/rx-44(base)" - - key { [ a, A, exclam, exclam ] }; - key { [ s, S, quotedbl, quotedbl ] }; - key { [ d, D, at, at ] }; - key { [ f, F, numbersign, numbersign ] }; - key { [ g, G, asterisk, asterisk ] }; - key { [ h, H, backslash, backslash ] }; - key { [ j, J, slash, slash ] }; - key { [ k, K, parenleft, parenleft ] }; - key { [ l, L, parenright, parenright ] }; - key { [ dead_acute, dead_grave, dead_diaeresis, dead_diaeresis ] }; - - key { [ z, Z, EuroSign, EuroSign ] }; - key { [ x, X, percent, percent ] }; - key { [ c, C, ampersand, ampersand ] }; - key { [ v, V, exclamdown, exclamdown ] }; - key { [ b, B, apostrophe, apostrophe ] }; - key { [ n, N, plus, plus ] }; - key { [ m, M, equal, equal ] }; - key { [ ccedilla, Ccedilla, questiondown, questiondown ] }; - key { [ ntilde, Ntilde, question, question ] }; - key { [ dead_tilde, dead_circumflex, dead_circumflex, dead_circumflex ] }; - - key { [ comma, semicolon, minus, minus ] }; - key { [ period, colon, underscore, underscore ] }; -}; - - - -partial alphanumeric_keys -xkb_symbols "fr" { - name[Group1] = "French"; - - include "nokia_vndr/rx-44(base)" - - key { [ a, A, 1, 1 ] }; - key { [ z, Z, 2, 2 ] }; - - key { [ q, Q, at, at ] }; - key { [ s, S, percent, percent ] }; - key { [ d, D, ecircumflex, Ecircumflex ] }; - key { [ f, F, eacute, Eacute ] }; - key { [ g, G, egrave, Egrave ] }; - key { [ h, H, oe, OE ] }; - key { [ j, J, parenleft, parenleft ] }; - key { [ k, K, parenright, parenright ] }; - key { [ l, L, agrave, Agrave ] }; - key { [ m, M, ugrave, Ugrave ] }; - - key { [ w, w, EuroSign, EuroSign ] }; - key { [ x, X, numbersign, numbersign ] }; - key { [ c, C, ccedilla, Ccedilla ] }; - key { [ v, V, plus, plus ] }; - key { [ b, B, equal, equal ] }; - key { [ n, N, quotedbl, quotedbl ] }; - key { [ comma, question, backslash, backslash ] }; - key { [ semicolon, period, minus, minus ] }; - key { [ colon, slash, underscore, underscore ] }; - key { [ apostrophe, apostrophe, mu, mu ] }; - - key { [ less, greater, less, greater ] }; - key { [ exclam, section, asterisk, asterisk ] }; -}; - - - -partial alphanumeric_keys -xkb_symbols "de" { - name[Group1] = "German"; - - include "nokia_vndr/rx-44(base)" - - key { [ z, Z, 6, 6 ] }; - - key { [ a, A, exclam, exclam ] }; - key { [ s, S, quotedbl, quotedbl ] }; - key { [ d, D, at, at ] }; - key { [ f, F, numbersign, numbersign ] }; - key { [ g, G, percent, percent ] }; - key { [ h, H, backslash, backslash ] }; - key { [ j, J, slash, slash ] }; - key { [ k, K, parenleft, parenleft ] }; - key { [ l, L, parenright, parenright ] }; - key { [ udiaeresis, Udiaeresis, question, question ] }; - - key { [ y, Y, EuroSign, EuroSign ] }; - key { [ x, X, asciitilde, asciitilde ] }; - key { [ c, C, asterisk, asterisk ] }; - key { [ v, V, ampersand, ampersand ] }; - key { [ b, B, plus, plus ] }; - key { [ n, N, less, less ] }; - key { [ m, M, greater, greater ] }; - key { [ odiaeresis, Odiaeresis, equal, equal ] }; - key { [ adiaeresis, Adiaeresis, apostrophe, apostrophe ] }; - key { [ minus, underscore, ssharp, ssharp ] }; - - key { [ comma, semicolon, comma, semicolon ] }; - key { [ period, colon, period, colon ] }; -}; - - -// Levels 5-8 are Russian, levels 1-4 US English, for shortcut reasons. -partial alphanumeric_keys -xkb_symbols "ru" { - name[Group1] = "Russian"; - - include "nokia_vndr/rx-44(base)" - - key { type="EIGHT_LEVEL", [ q, Q, 1, 1, Cyrillic_shorti, Cyrillic_SHORTI, 1, 1 ] }; - key { type="EIGHT_LEVEL", [ w, W, 2, 2, Cyrillic_tse, Cyrillic_TSE, 2, 2 ] }; - key { type="EIGHT_LEVEL", [ e, E, 3, 3, Cyrillic_u, Cyrillic_U, 3, 3 ] }; - key { type="EIGHT_LEVEL", [ r, R, 4, 4, Cyrillic_ka, Cyrillic_KA, 4, 4 ] }; - key { type="EIGHT_LEVEL", [ t, T, 5, 5, Cyrillic_ie, Cyrillic_IE, 5, 5 ] }; - key { type="EIGHT_LEVEL", [ y, Y, 6, 6, Cyrillic_en, Cyrillic_EN, 6, 6 ] }; - key { type="EIGHT_LEVEL", [ u, U, 7, 7, Cyrillic_ghe, Cyrillic_GHE, 7, 7 ] }; - key { type="EIGHT_LEVEL", [ i, I, 8, 8, Cyrillic_sha, Cyrillic_SHA, 8, 8 ] }; - key { type="EIGHT_LEVEL", [ o, O, 9, 9, Cyrillic_shcha, Cyrillic_SHCHA, 9, 9 ] }; - key { type="EIGHT_LEVEL", [ p, P, 0, 0, Cyrillic_ze, Cyrillic_ZE, 0, 0 ] }; - - key { type="EIGHT_LEVEL", [ a, A, exclam, exclam, Cyrillic_ef, Cyrillic_EF, exclam, exclam ] }; - key { type="EIGHT_LEVEL", [ s, S, quotedbl, quotedbl, Cyrillic_yeru, Cyrillic_YERU, quotedbl, quotedbl ] }; - key { type="EIGHT_LEVEL", [ d, D, at, at, Cyrillic_ve, Cyrillic_VE, at, at ] }; - key { type="EIGHT_LEVEL", [ f, F, numbersign, numbersign, Cyrillic_a, Cyrillic_A, numbersign, numbersign ] }; - key { type="EIGHT_LEVEL", [ g, G, backslash, backslash, Cyrillic_pe, Cyrillic_PE, backslash, backslash ] }; - key { type="EIGHT_LEVEL", [ h, H, slash, slash, Cyrillic_er, Cyrillic_ER, slash, slash ] }; - key { type="EIGHT_LEVEL", [ j, J, parenleft, parenleft, Cyrillic_o, Cyrillic_O, parenleft, parenleft ] }; - key { type="EIGHT_LEVEL", [ k, K, parenright, parenright, Cyrillic_el, Cyrillic_EL, parenright, parenright ] }; - key { type="EIGHT_LEVEL", [ l, L, colon, colon, Cyrillic_de, Cyrillic_DE, colon, colon ] }; - key { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, semicolon, semicolon, Cyrillic_zhe, Cyrillic_ZHE, semicolon, semicolon ] }; - - key { type="EIGHT_LEVEL", [ z, Z, underscore, underscore, Cyrillic_ya, Cyrillic_YA, minus, minus ] }; - key { type="EIGHT_LEVEL", [ x, X, percent, percent, Cyrillic_che, Cyrillic_CHE, percent, percent ] }; - key { type="EIGHT_LEVEL", [ c, C, 0x1002116, 0x1002116, Cyrillic_es, Cyrillic_ES, 0x1002116, 0x1002116 ] }; - key { type="EIGHT_LEVEL", [ v, V, equal, equal, Cyrillic_em, Cyrillic_EM, equal, equal ] }; - key { type="EIGHT_LEVEL", [ b, B, ampersand, ampersand, Cyrillic_i, Cyrillic_I, ampersand, ampersand ] }; - key { type="EIGHT_LEVEL", [ n, N, asterisk, asterisk, Cyrillic_te, Cyrillic_TE, asterisk, asterisk ] }; - key { type="EIGHT_LEVEL", [ m, M, apostrophe, apostrophe, Cyrillic_softsign, Cyrillic_SOFTSIGN, apostrophe, apostrophe ] }; - key { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, minus, minus, Cyrillic_be, Cyrillic_BE, minus, minus ] }; - key { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, question, question, Cyrillic_yu, Cyrillic_YU, question, question ] }; - key { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, Cyrillic_hardsign, Cyrillic_HARDSIGN, Cyrillic_ha, Cyrillic_HA, Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; - - key { type="EIGHT_LEVEL", [ period, comma, period, comma, period, comma, period, comma ] }; - key { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, Cyrillic_io, Cyrillic_IO, Cyrillic_e, Cyrillic_E, Cyrillic_io, Cyrillic_IO ] }; -}; - - - -partial alphanumeric_keys -xkb_symbols "it" { - name[Group1] = "Italian"; - - include "nokia_vndr/rx-44(base)" - - key { [ a, A, exclam, exclam ] }; - key { [ s, S, quotedbl, quotedbl ] }; - key { [ d, D, at, at ] }; - key { [ f, F, numbersign, numbersign ] }; - key { [ g, G, asterisk, asterisk ] }; - key { [ h, H, backslash, backslash ] }; - key { [ j, J, slash, slash ] }; - key { [ k, K, parenleft, parenleft ] }; - key { [ l, L, parenright, parenright ] }; - key { [ apostrophe, question, igrave, Igrave ] }; - - key { [ z, Z, EuroSign, EuroSign ] }; - key { [ x, X, asciitilde, asciitilde ] }; - key { [ c, C, ampersand, ampersand ] }; - key { [ v, V, equal, equal ] }; - key { [ b, B, less, less ] }; - key { [ n, N, greater, greater ] }; - key { [ m, M, plus, plus ] }; - key { [ eacute, Eacute, ograve, Ograve ] }; - key { [ egrave, Egrave, agrave, Agrave ] }; - key { [ minus, underscore, ugrave, Ugrave ] }; - - key { [ comma, semicolon, comma, semicolon ] }; - key { [ period, colon, period, colon ] }; -}; - -partial default alphanumeric_keys -xkb_symbols "base" { - key { [ q, Q, 1, 1 ] }; - key { [ w, W, 2, 2 ] }; - key { [ e, E, 3, 3 ] }; - key { [ r, R, 4, 4 ] }; - key { [ t, T, 5, 5 ] }; - key { [ y, Y, 6, 6 ] }; - key { [ u, U, 7, 7 ] }; - key { [ i, I, 8, 8 ] }; - key { [ o, O, 9, 9 ] }; - key { [ p, P, 0, 0 ] }; - key { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; - - // broken UI spec. - key { [ KP_Enter, KP_Enter, KP_Enter, KP_Enter ] }; - - key { [ Multi_key, Multi_key, Multi_key, Multi_key ] }; - key { [ Shift_L, Shift_L, Shift_L, Shift_L ] }; - key { [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Shift ] }; - key { [ space, space, space, space ] }; - key { [ Control_R, Control_R, Control_R, Control_R ] }; - key { [ Tab, Tab, Tab, Tab ] }; - - modifier_map Shift { Shift_L }; - modifier_map Mod5 { ISO_Level3_Shift }; - modifier_map Control { Control_R }; - - key { [ Return ] }; - key { [ Up ] }; - key { [ Down ] }; - key { [ Left ] }; - key { [ Right ] }; - - key { [ Escape ] }; - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ F9 ] }; - key { [ F10 ] }; - key { [ F11 ] }; - key { [ F12 ] }; - - // generated from the headset, must always be in the map. - key { [ XF86Phone ] }; -}; +partial alphanumeric_keys +xkb_symbols "us" { + name[Group1] = "U.S. English"; + + include "nokia_vndr/rx-44(base)" + + key { [ a, A, exclam, exclam ] }; + key { [ s, S, quotedbl, quotedbl ] }; + key { [ d, D, at, at ] }; + key { [ f, F, numbersign, numbersign ] }; + key { [ g, G, backslash, backslash ] }; + key { [ h, H, slash, slash ] }; + key { [ j, J, parenleft, parenleft ] }; + key { [ k, K, parenright, parenright ] }; + key { [ l, L, asterisk, asterisk ] }; + key { [ apostrophe, question, question, question ] }; + + key { [ z, Z, yen, yen ] }; + key { [ x, X, asciicircum, asciicircum ] }; + key { [ c, C, asciitilde, asciitilde ] }; + key { [ v, V, percent, percent ] }; + key { [ b, B, ampersand, ampersand ] }; + key { [ n, N, dollar, dollar ] }; + key { [ m, M, EuroSign, EuroSign ] }; + key { [ semicolon, colon, sterling, sterling ] }; + key { [ minus, underscore, underscore, underscore ] }; + key { [ plus, equal, equal, equal ] }; + + key { [ comma, less, comma, less ] }; + key { [ period, greater, period, greater ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "fisenoda" { + name[Group1] = "Finnish/Swedish/Norwegian/Danish"; + + include "nokia_vndr/rx-44(base)" + + key { [ a, A, exclam, exclam ] }; + key { [ s, S, quotedbl, quotedbl ] }; + key { [ d, D, at, at ] }; + key { [ f, F, numbersign, numbersign ] }; + key { [ g, G, asterisk, asterisk ] }; + key { [ h, H, backslash, backslash ] }; + key { [ j, J, slash, slash ] }; + key { [ k, K, parenleft, parenleft ] }; + key { [ l, L, parenright, parenright ] }; + key { [ aring, Aring, question, question ] }; + + key { [ z, Z, EuroSign, EuroSign ] }; + key { [ x, X, asciitilde, asciitilde ] }; + key { [ c, C, percent, percent ] }; + key { [ v, V, ampersand, ampersand ] }; + key { [ b, B, plus, plus ] }; + key { [ n, N, less, less ] }; + key { [ m, M, greater, greater ] }; + key { type="EIGHT_LEVEL", [ oslash, Oslash, equal, equal, odiaeresis, Odiaeresis, equal, equal ] }; + key { type="EIGHT_LEVEL", [ ae, AE, apostrophe, apostrophe, adiaeresis, Adiaeresis, apostrophe, apostrophe ] }; + key { [ minus, underscore, underscore, underscore ] }; + + key { [ comma, semicolon, comma, semicolon ] }; + key { [ period, colon, period, colon ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "ptes" { + name[Group1] = "Portuguese/Spanish"; + + include "nokia_vndr/rx-44(base)" + + key { [ a, A, exclam, exclam ] }; + key { [ s, S, quotedbl, quotedbl ] }; + key { [ d, D, at, at ] }; + key { [ f, F, numbersign, numbersign ] }; + key { [ g, G, asterisk, asterisk ] }; + key { [ h, H, backslash, backslash ] }; + key { [ j, J, slash, slash ] }; + key { [ k, K, parenleft, parenleft ] }; + key { [ l, L, parenright, parenright ] }; + key { [ dead_acute, dead_grave, dead_diaeresis, dead_diaeresis ] }; + + key { [ z, Z, EuroSign, EuroSign ] }; + key { [ x, X, percent, percent ] }; + key { [ c, C, ampersand, ampersand ] }; + key { [ v, V, exclamdown, exclamdown ] }; + key { [ b, B, apostrophe, apostrophe ] }; + key { [ n, N, plus, plus ] }; + key { [ m, M, equal, equal ] }; + key { [ ccedilla, Ccedilla, questiondown, questiondown ] }; + key { [ ntilde, Ntilde, question, question ] }; + key { [ dead_tilde, dead_circumflex, dead_circumflex, dead_circumflex ] }; + + key { [ comma, semicolon, minus, minus ] }; + key { [ period, colon, underscore, underscore ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "fr" { + name[Group1] = "French"; + + include "nokia_vndr/rx-44(base)" + + key { [ a, A, 1, 1 ] }; + key { [ z, Z, 2, 2 ] }; + + key { [ q, Q, at, at ] }; + key { [ s, S, percent, percent ] }; + key { [ d, D, ecircumflex, Ecircumflex ] }; + key { [ f, F, eacute, Eacute ] }; + key { [ g, G, egrave, Egrave ] }; + key { [ h, H, oe, OE ] }; + key { [ j, J, parenleft, parenleft ] }; + key { [ k, K, parenright, parenright ] }; + key { [ l, L, agrave, Agrave ] }; + key { [ m, M, ugrave, Ugrave ] }; + + key { [ w, w, EuroSign, EuroSign ] }; + key { [ x, X, numbersign, numbersign ] }; + key { [ c, C, ccedilla, Ccedilla ] }; + key { [ v, V, plus, plus ] }; + key { [ b, B, equal, equal ] }; + key { [ n, N, quotedbl, quotedbl ] }; + key { [ comma, question, backslash, backslash ] }; + key { [ semicolon, period, minus, minus ] }; + key { [ colon, slash, underscore, underscore ] }; + key { [ apostrophe, apostrophe, mu, mu ] }; + + key { [ less, greater, less, greater ] }; + key { [ exclam, section, asterisk, asterisk ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "de" { + name[Group1] = "German"; + + include "nokia_vndr/rx-44(base)" + + key { [ z, Z, 6, 6 ] }; + + key { [ a, A, exclam, exclam ] }; + key { [ s, S, quotedbl, quotedbl ] }; + key { [ d, D, at, at ] }; + key { [ f, F, numbersign, numbersign ] }; + key { [ g, G, percent, percent ] }; + key { [ h, H, backslash, backslash ] }; + key { [ j, J, slash, slash ] }; + key { [ k, K, parenleft, parenleft ] }; + key { [ l, L, parenright, parenright ] }; + key { [ udiaeresis, Udiaeresis, question, question ] }; + + key { [ y, Y, EuroSign, EuroSign ] }; + key { [ x, X, asciitilde, asciitilde ] }; + key { [ c, C, asterisk, asterisk ] }; + key { [ v, V, ampersand, ampersand ] }; + key { [ b, B, plus, plus ] }; + key { [ n, N, less, less ] }; + key { [ m, M, greater, greater ] }; + key { [ odiaeresis, Odiaeresis, equal, equal ] }; + key { [ adiaeresis, Adiaeresis, apostrophe, apostrophe ] }; + key { [ minus, underscore, ssharp, ssharp ] }; + + key { [ comma, semicolon, comma, semicolon ] }; + key { [ period, colon, period, colon ] }; +}; + + +// Levels 5-8 are Russian, levels 1-4 US English, for shortcut reasons. +partial alphanumeric_keys +xkb_symbols "ru" { + name[Group1] = "Russian"; + + include "nokia_vndr/rx-44(base)" + + key { type="EIGHT_LEVEL", [ q, Q, 1, 1, Cyrillic_shorti, Cyrillic_SHORTI, 1, 1 ] }; + key { type="EIGHT_LEVEL", [ w, W, 2, 2, Cyrillic_tse, Cyrillic_TSE, 2, 2 ] }; + key { type="EIGHT_LEVEL", [ e, E, 3, 3, Cyrillic_u, Cyrillic_U, 3, 3 ] }; + key { type="EIGHT_LEVEL", [ r, R, 4, 4, Cyrillic_ka, Cyrillic_KA, 4, 4 ] }; + key { type="EIGHT_LEVEL", [ t, T, 5, 5, Cyrillic_ie, Cyrillic_IE, 5, 5 ] }; + key { type="EIGHT_LEVEL", [ y, Y, 6, 6, Cyrillic_en, Cyrillic_EN, 6, 6 ] }; + key { type="EIGHT_LEVEL", [ u, U, 7, 7, Cyrillic_ghe, Cyrillic_GHE, 7, 7 ] }; + key { type="EIGHT_LEVEL", [ i, I, 8, 8, Cyrillic_sha, Cyrillic_SHA, 8, 8 ] }; + key { type="EIGHT_LEVEL", [ o, O, 9, 9, Cyrillic_shcha, Cyrillic_SHCHA, 9, 9 ] }; + key { type="EIGHT_LEVEL", [ p, P, 0, 0, Cyrillic_ze, Cyrillic_ZE, 0, 0 ] }; + + key { type="EIGHT_LEVEL", [ a, A, exclam, exclam, Cyrillic_ef, Cyrillic_EF, exclam, exclam ] }; + key { type="EIGHT_LEVEL", [ s, S, quotedbl, quotedbl, Cyrillic_yeru, Cyrillic_YERU, quotedbl, quotedbl ] }; + key { type="EIGHT_LEVEL", [ d, D, at, at, Cyrillic_ve, Cyrillic_VE, at, at ] }; + key { type="EIGHT_LEVEL", [ f, F, numbersign, numbersign, Cyrillic_a, Cyrillic_A, numbersign, numbersign ] }; + key { type="EIGHT_LEVEL", [ g, G, backslash, backslash, Cyrillic_pe, Cyrillic_PE, backslash, backslash ] }; + key { type="EIGHT_LEVEL", [ h, H, slash, slash, Cyrillic_er, Cyrillic_ER, slash, slash ] }; + key { type="EIGHT_LEVEL", [ j, J, parenleft, parenleft, Cyrillic_o, Cyrillic_O, parenleft, parenleft ] }; + key { type="EIGHT_LEVEL", [ k, K, parenright, parenright, Cyrillic_el, Cyrillic_EL, parenright, parenright ] }; + key { type="EIGHT_LEVEL", [ l, L, colon, colon, Cyrillic_de, Cyrillic_DE, colon, colon ] }; + key { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, semicolon, semicolon, Cyrillic_zhe, Cyrillic_ZHE, semicolon, semicolon ] }; + + key { type="EIGHT_LEVEL", [ z, Z, underscore, underscore, Cyrillic_ya, Cyrillic_YA, minus, minus ] }; + key { type="EIGHT_LEVEL", [ x, X, percent, percent, Cyrillic_che, Cyrillic_CHE, percent, percent ] }; + key { type="EIGHT_LEVEL", [ c, C, 0x1002116, 0x1002116, Cyrillic_es, Cyrillic_ES, 0x1002116, 0x1002116 ] }; + key { type="EIGHT_LEVEL", [ v, V, equal, equal, Cyrillic_em, Cyrillic_EM, equal, equal ] }; + key { type="EIGHT_LEVEL", [ b, B, ampersand, ampersand, Cyrillic_i, Cyrillic_I, ampersand, ampersand ] }; + key { type="EIGHT_LEVEL", [ n, N, asterisk, asterisk, Cyrillic_te, Cyrillic_TE, asterisk, asterisk ] }; + key { type="EIGHT_LEVEL", [ m, M, apostrophe, apostrophe, Cyrillic_softsign, Cyrillic_SOFTSIGN, apostrophe, apostrophe ] }; + key { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, minus, minus, Cyrillic_be, Cyrillic_BE, minus, minus ] }; + key { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, question, question, Cyrillic_yu, Cyrillic_YU, question, question ] }; + key { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, Cyrillic_hardsign, Cyrillic_HARDSIGN, Cyrillic_ha, Cyrillic_HA, Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; + + key { type="EIGHT_LEVEL", [ period, comma, period, comma, period, comma, period, comma ] }; + key { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, Cyrillic_io, Cyrillic_IO, Cyrillic_e, Cyrillic_E, Cyrillic_io, Cyrillic_IO ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "it" { + name[Group1] = "Italian"; + + include "nokia_vndr/rx-44(base)" + + key { [ a, A, exclam, exclam ] }; + key { [ s, S, quotedbl, quotedbl ] }; + key { [ d, D, at, at ] }; + key { [ f, F, numbersign, numbersign ] }; + key { [ g, G, asterisk, asterisk ] }; + key { [ h, H, backslash, backslash ] }; + key { [ j, J, slash, slash ] }; + key { [ k, K, parenleft, parenleft ] }; + key { [ l, L, parenright, parenright ] }; + key { [ apostrophe, question, igrave, Igrave ] }; + + key { [ z, Z, EuroSign, EuroSign ] }; + key { [ x, X, asciitilde, asciitilde ] }; + key { [ c, C, ampersand, ampersand ] }; + key { [ v, V, equal, equal ] }; + key { [ b, B, less, less ] }; + key { [ n, N, greater, greater ] }; + key { [ m, M, plus, plus ] }; + key { [ eacute, Eacute, ograve, Ograve ] }; + key { [ egrave, Egrave, agrave, Agrave ] }; + key { [ minus, underscore, ugrave, Ugrave ] }; + + key { [ comma, semicolon, comma, semicolon ] }; + key { [ period, colon, period, colon ] }; +}; + +partial default alphanumeric_keys +xkb_symbols "base" { + key { [ q, Q, 1, 1 ] }; + key { [ w, W, 2, 2 ] }; + key { [ e, E, 3, 3 ] }; + key { [ r, R, 4, 4 ] }; + key { [ t, T, 5, 5 ] }; + key { [ y, Y, 6, 6 ] }; + key { [ u, U, 7, 7 ] }; + key { [ i, I, 8, 8 ] }; + key { [ o, O, 9, 9 ] }; + key { [ p, P, 0, 0 ] }; + key { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; + + // broken UI spec. + key { [ KP_Enter, KP_Enter, KP_Enter, KP_Enter ] }; + + key { [ Multi_key, Multi_key, Multi_key, Multi_key ] }; + key { [ Shift_L, Shift_L, Shift_L, Shift_L ] }; + key { [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Shift ] }; + key { [ space, space, space, space ] }; + key { [ Control_R, Control_R, Control_R, Control_R ] }; + key { [ Tab, Tab, Tab, Tab ] }; + + modifier_map Shift { Shift_L }; + modifier_map Mod5 { ISO_Level3_Shift }; + modifier_map Control { Control_R }; + + key { [ Return ] }; + key { [ Up ] }; + key { [ Down ] }; + key { [ Left ] }; + key { [ Right ] }; + + key { [ Escape ] }; + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F10 ] }; + key { [ F11 ] }; + key { [ F12 ] }; + + // generated from the headset, must always be in the map. + key { [ XF86Phone ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/olpc b/xorg-server/xkeyboard-config/symbols/olpc index 9e74e47b8..e9e950b1e 100644 --- a/xorg-server/xkeyboard-config/symbols/olpc +++ b/xorg-server/xkeyboard-config/symbols/olpc @@ -1,21 +1,21 @@ -// -// Created by Bernardo Innocenti -// -// Additional symbol definitions for the OLPC keyboards -// - -alphanumeric_keys modifier_keys -xkb_symbols "olpc" { - include "pc(pc105)" - - modifier_map Mod1 { KP_Home }; // KP_Home is the "square" game key - modifier_map Mod3 { KP_End }; // KP_End is the "tick" game key - modifier_map Mod4 { KP_Prior }; // KP_Prior is the "O" game key - modifier_map Mod5 { KP_Next }; // KP_Next is the "X" game key - - key { [ XF86Search ] }; // search key - key { [ XF86Meeting ] }; // fn+search key - key { [ XF86Start ] }; // gear key (fn+space) - key { [ XF86TaskPane ] }; // frame key (the top-right key) - key { [ XF86Messenger ] }; // overlay key (next to frame key) -}; +// +// Created by Bernardo Innocenti +// +// Additional symbol definitions for the OLPC keyboards +// + +alphanumeric_keys modifier_keys +xkb_symbols "olpc" { + include "pc(pc105)" + + modifier_map Mod1 { KP_Home }; // KP_Home is the "square" game key + modifier_map Mod3 { KP_End }; // KP_End is the "tick" game key + modifier_map Mod4 { KP_Prior }; // KP_Prior is the "O" game key + modifier_map Mod5 { KP_Next }; // KP_Next is the "X" game key + + key { [ XF86Search ] }; // search key + key { [ XF86Meeting ] }; // fn+search key + key { [ XF86Start ] }; // gear key (fn+space) + key { [ XF86TaskPane ] }; // frame key (the top-right key) + key { [ XF86Messenger ] }; // overlay key (next to frame key) +}; diff --git a/xorg-server/xkeyboard-config/symbols/rupeesign b/xorg-server/xkeyboard-config/symbols/rupeesign index 605060af7..efde69cb3 100644 --- a/xorg-server/xkeyboard-config/symbols/rupeesign +++ b/xorg-server/xkeyboard-config/symbols/rupeesign @@ -1,5 +1,5 @@ -// keyboards having the RupeeSign on the 4 key -partial -xkb_symbols "4" { - key { [ NoSymbol, NoSymbol, U20B9 ] }; -}; +// keyboards having the RupeeSign on the 4 key +partial +xkb_symbols "4" { + key { [ NoSymbol, NoSymbol, U20B9 ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/sgi_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/sgi_vndr/Makefile.am index b1123e70e..0133ca001 100644 --- a/xorg-server/xkeyboard-config/symbols/sgi_vndr/Makefile.am +++ b/xorg-server/xkeyboard-config/symbols/sgi_vndr/Makefile.am @@ -1,4 +1,4 @@ -symbolsdir = $(xkb_base)/symbols/sgi_vndr - -dist_symbols_DATA = \ -jp +symbolsdir = $(xkb_base)/symbols/sgi_vndr + +dist_symbols_DATA = \ +jp diff --git a/xorg-server/xkeyboard-config/symbols/sgi_vndr/jp b/xorg-server/xkeyboard-config/symbols/sgi_vndr/jp index 00f9ede0f..f60c80290 100644 --- a/xorg-server/xkeyboard-config/symbols/sgi_vndr/jp +++ b/xorg-server/xkeyboard-config/symbols/sgi_vndr/jp @@ -1,44 +1,44 @@ -xkb_symbols "jp106" { - - name[group1]="Japan/ASCII"; - - key { [ Zenkaku_Hankaku ] }; - key { [ 1, exclam ] }; - key { [ 2, quotedbl ] }; - key { [ 3, numbersign ] }; - key { [ 4, dollar ] }; - key { [ 5, percent ] }; - key { [ 6, ampersand ] }; - key { [ 7, apostrophe ] }; - key { [ 8, parenleft ] }; - key { [ 9, parenright ] }; - key { [ 0, asciitilde ] }; - key { [ minus, equal ] }; - key { [ asciicircum, overbar ] }; - key { [ yen, bar ] }; - - // keys and - are identical to US/ASCII keyboard - key { [ at, grave ] }; - key { [ bracketleft, braceleft ] }; - - key { [ Eisu_Shift, Caps_Lock ] }; - // keys - are identical to US/ASCII keyboard - key { [ semicolon, plus ] }; - key { [ colon, asterisk ] }; - key { [ bracketright, braceright ] }; - - // keys and - are identical to US/ASCII keyboard - key { [ backslash, underscore ] }; - - key { [ Muhenkan ] }; - key { [ Kanji ] }; - key { [ Hiragana_Katakana ] }; -}; - -xkb_symbols "alternate106" { - key { [ 0, overbar ] }; - key { [ asciicircum, asciitilde] }; - key { [ backslash, bar ] }; - key { [ underbar, underscore ] }; - augment "sgi/jp(jp106)" -}; +xkb_symbols "jp106" { + + name[group1]="Japan/ASCII"; + + key { [ Zenkaku_Hankaku ] }; + key { [ 1, exclam ] }; + key { [ 2, quotedbl ] }; + key { [ 3, numbersign ] }; + key { [ 4, dollar ] }; + key { [ 5, percent ] }; + key { [ 6, ampersand ] }; + key { [ 7, apostrophe ] }; + key { [ 8, parenleft ] }; + key { [ 9, parenright ] }; + key { [ 0, asciitilde ] }; + key { [ minus, equal ] }; + key { [ asciicircum, overbar ] }; + key { [ yen, bar ] }; + + // keys and - are identical to US/ASCII keyboard + key { [ at, grave ] }; + key { [ bracketleft, braceleft ] }; + + key { [ Eisu_Shift, Caps_Lock ] }; + // keys - are identical to US/ASCII keyboard + key { [ semicolon, plus ] }; + key { [ colon, asterisk ] }; + key { [ bracketright, braceright ] }; + + // keys and - are identical to US/ASCII keyboard + key { [ backslash, underscore ] }; + + key { [ Muhenkan ] }; + key { [ Kanji ] }; + key { [ Hiragana_Katakana ] }; +}; + +xkb_symbols "alternate106" { + key { [ 0, overbar ] }; + key { [ asciicircum, asciitilde] }; + key { [ backslash, bar ] }; + key { [ underbar, underscore ] }; + augment "sgi/jp(jp106)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/shift b/xorg-server/xkeyboard-config/symbols/shift index 64dae8e43..6fbec5b2a 100644 --- a/xorg-server/xkeyboard-config/symbols/shift +++ b/xorg-server/xkeyboard-config/symbols/shift @@ -1,84 +1,84 @@ -partial modifier_keys -xkb_symbols "breaks_caps" { - key { - type = "ALPHABETIC", - actions [Group1] = [ - SetMods(modifiers=Shift), - SetMods(modifiers=Shift+Lock,clearLocks) - ] - }; - key { - type = "ALPHABETIC", - actions [Group1] = [ - SetMods(modifiers=Shift), - SetMods(modifiers=Shift+Lock,clearLocks) - ] - }; -}; - -// When pressed together with another Shift key, set/release Lock. -partial modifier_keys -xkb_symbols "lshift_both_capslock" { - key { - type[Group1]="TWO_LEVEL", - symbols[Group1] = [ Shift_L, Caps_Lock ] - }; -}; -// When pressed together with another Shift key, set or unset Lock. -partial modifier_keys -xkb_symbols "rshift_both_capslock" { - key { - type[Group1]="TWO_LEVEL", - symbols[Group1] = [ Shift_R, Caps_Lock ] - }; -}; -partial modifier_keys -xkb_symbols "both_capslock" { - include "shift(lshift_both_capslock)" - include "shift(rshift_both_capslock)" -}; - -// Release Lock when pressed alone and set Lock when pressed with another Shift key. -partial modifier_keys -xkb_symbols "lshift_both_capslock_cancel" { - key { - type[Group1]="ALPHABETIC", - symbols[Group1] = [ Shift_L, Caps_Lock ] - }; -}; -// Release Lock when pressed alone and set Lock when pressed with another Shift key. -partial modifier_keys -xkb_symbols "rshift_both_capslock_cancel" { - key { - type[Group1]="ALPHABETIC", - symbols[Group1] = [ Shift_R, Caps_Lock ] - }; -}; -partial modifier_keys -xkb_symbols "both_capslock_cancel" { - include "shift(lshift_both_capslock_cancel)" - include "shift(rshift_both_capslock_cancel)" -}; - - -// When pressed together with another Shift key, lock/unlock Shift. -partial modifier_keys -xkb_symbols "lshift_both_shiftlock" { - key { - type[Group1]="TWO_LEVEL", - symbols[Group1] = [ Shift_L, Shift_Lock ] - }; -}; -// When pressed together with another Shift key, lock/unlock Shift. -partial modifier_keys -xkb_symbols "rshift_both_shiftlock" { - key { - type[Group1]="TWO_LEVEL", - symbols[Group1] = [ Shift_R, Shift_Lock ] - }; -}; -partial modifier_keys -xkb_symbols "both_shiftlock" { - include "shift(lshift_both_shiftlock)" - include "shift(rshift_both_shiftlock)" -}; +partial modifier_keys +xkb_symbols "breaks_caps" { + key { + type = "ALPHABETIC", + actions [Group1] = [ + SetMods(modifiers=Shift), + SetMods(modifiers=Shift+Lock,clearLocks) + ] + }; + key { + type = "ALPHABETIC", + actions [Group1] = [ + SetMods(modifiers=Shift), + SetMods(modifiers=Shift+Lock,clearLocks) + ] + }; +}; + +// When pressed together with another Shift key, set/release Lock. +partial modifier_keys +xkb_symbols "lshift_both_capslock" { + key { + type[Group1]="TWO_LEVEL", + symbols[Group1] = [ Shift_L, Caps_Lock ] + }; +}; +// When pressed together with another Shift key, set or unset Lock. +partial modifier_keys +xkb_symbols "rshift_both_capslock" { + key { + type[Group1]="TWO_LEVEL", + symbols[Group1] = [ Shift_R, Caps_Lock ] + }; +}; +partial modifier_keys +xkb_symbols "both_capslock" { + include "shift(lshift_both_capslock)" + include "shift(rshift_both_capslock)" +}; + +// Release Lock when pressed alone and set Lock when pressed with another Shift key. +partial modifier_keys +xkb_symbols "lshift_both_capslock_cancel" { + key { + type[Group1]="ALPHABETIC", + symbols[Group1] = [ Shift_L, Caps_Lock ] + }; +}; +// Release Lock when pressed alone and set Lock when pressed with another Shift key. +partial modifier_keys +xkb_symbols "rshift_both_capslock_cancel" { + key { + type[Group1]="ALPHABETIC", + symbols[Group1] = [ Shift_R, Caps_Lock ] + }; +}; +partial modifier_keys +xkb_symbols "both_capslock_cancel" { + include "shift(lshift_both_capslock_cancel)" + include "shift(rshift_both_capslock_cancel)" +}; + + +// When pressed together with another Shift key, lock/unlock Shift. +partial modifier_keys +xkb_symbols "lshift_both_shiftlock" { + key { + type[Group1]="TWO_LEVEL", + symbols[Group1] = [ Shift_L, Shift_Lock ] + }; +}; +// When pressed together with another Shift key, lock/unlock Shift. +partial modifier_keys +xkb_symbols "rshift_both_shiftlock" { + key { + type[Group1]="TWO_LEVEL", + symbols[Group1] = [ Shift_R, Shift_Lock ] + }; +}; +partial modifier_keys +xkb_symbols "both_shiftlock" { + include "shift(lshift_both_shiftlock)" + include "shift(rshift_both_shiftlock)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sony_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/sony_vndr/Makefile.am index e1a77d957..5577f7c7c 100644 --- a/xorg-server/xkeyboard-config/symbols/sony_vndr/Makefile.am +++ b/xorg-server/xkeyboard-config/symbols/sony_vndr/Makefile.am @@ -1,4 +1,4 @@ -symbolsdir = $(xkb_base)/symbols/sony_vndr - -dist_symbols_DATA = \ -us +symbolsdir = $(xkb_base)/symbols/sony_vndr + +dist_symbols_DATA = \ +us diff --git a/xorg-server/xkeyboard-config/symbols/sony_vndr/us b/xorg-server/xkeyboard-config/symbols/sony_vndr/us index a34d7b931..e91ca11b2 100644 --- a/xorg-server/xkeyboard-config/symbols/sony_vndr/us +++ b/xorg-server/xkeyboard-config/symbols/sony_vndr/us @@ -1,91 +1,91 @@ -// -//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. -// -// US/ASCII layout for a nwp5461 keyboard -xkb_symbols "nwp5461" { - include "us(basic)" - - key { [ Alt_L, Meta_L ] }; - key { [ Shift_R ] }; - key { [ NoSymbol ] }; - - // Begin "Function" section - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ F9 ] }; - key { [ F10 ] }; - key { [ F11 ] }; - key { [ F12 ] }; - key { [ Help ] }; - key { [ Cancel ] }; - key { [ Select ] }; - key { [ Execute ] }; - key { [ Delete ] }; - key { [ Left ] }; - key { [ Right ] }; - key { [ Up ] }; - key { [ Down ] }; - key { [ Prior ] }; - key { [ Next ] }; - key { [ Insert ] }; - key { [ Clear ] }; - // End "Function" section - - // Begin "Keypad" section - key { [ KP_Multiply ] }; - key { [ KP_Divide ] }; - key { [ KP_Add ] }; - - key { [ KP_7 ] }; - key { [ KP_8 ] }; - key { [ KP_9 ] }; - key { [ KP_Subtract ] }; - - key { [ KP_4 ] }; - key { [ KP_5 ] }; - key { [ KP_6 ] }; - key { [ KP_Separator ] }; - - key { [ KP_1 ] }; - key { [ KP_2 ] }; - key { [ KP_3 ] }; - key { [ KP_Enter ] }; - - key { [ KP_0 ] }; - key { [ KP_Decimal ] }; - key { [ KP_Tab ] }; - // End "Keypad" section - - - // begin modifier mappings - modifier_map Shift { Shift_R }; - modifier_map Mod3 { Alt_L }; -}; +// +//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. +// +// US/ASCII layout for a nwp5461 keyboard +xkb_symbols "nwp5461" { + include "us(basic)" + + key { [ Alt_L, Meta_L ] }; + key { [ Shift_R ] }; + key { [ NoSymbol ] }; + + // Begin "Function" section + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F10 ] }; + key { [ F11 ] }; + key { [ F12 ] }; + key { [ Help ] }; + key { [ Cancel ] }; + key { [ Select ] }; + key { [ Execute ] }; + key { [ Delete ] }; + key { [ Left ] }; + key { [ Right ] }; + key { [ Up ] }; + key { [ Down ] }; + key { [ Prior ] }; + key { [ Next ] }; + key { [ Insert ] }; + key { [ Clear ] }; + // End "Function" section + + // Begin "Keypad" section + key { [ KP_Multiply ] }; + key { [ KP_Divide ] }; + key { [ KP_Add ] }; + + key { [ KP_7 ] }; + key { [ KP_8 ] }; + key { [ KP_9 ] }; + key { [ KP_Subtract ] }; + + key { [ KP_4 ] }; + key { [ KP_5 ] }; + key { [ KP_6 ] }; + key { [ KP_Separator ] }; + + key { [ KP_1 ] }; + key { [ KP_2 ] }; + key { [ KP_3 ] }; + key { [ KP_Enter ] }; + + key { [ KP_0 ] }; + key { [ KP_Decimal ] }; + key { [ KP_Tab ] }; + // End "Keypad" section + + + // begin modifier mappings + modifier_map Shift { Shift_R }; + modifier_map Mod3 { Alt_L }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ara b/xorg-server/xkeyboard-config/symbols/sun_vndr/ara index d62bb6da9..70e1b9b90 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ara +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ara @@ -1,116 +1,116 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - -partial default alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]= "Arabic"; - - key { [ Arabic_thal, Arabic_shadda, grave, asciitilde ] }; - key { [ 1, exclam, 1, exclam ] }; - key { [ 2, at, 2, at ] }; - key { [ 3, numbersign, 3, numbersign ] }; - key { [ 4, dollar, 4, dollar ] }; - key { [ 5, percent, 5, percent ] }; - key { [ 6, asciicircum, 6, asciicircum ] }; - key { [ 7, ampersand, 7, ampersand ] }; - key { [ 8, asterisk, 8, asterisk ] }; - key { [ 9, parenright, 9, parenright ] }; - key { [ 0, parenleft, 0, parenleft ] }; - key { [ minus, underscore, minus, underscore ] }; - key { [ equal, plus, equal, plus ] }; - - key { [ Arabic_dad, Arabic_fatha, q, Q ] }; - key { [ Arabic_sad, Arabic_fathatan, w, W ] }; - key { [ Arabic_theh, Arabic_damma, e, E ] }; - key { [ Arabic_qaf, Arabic_dammatan, r, R ] }; - key { [ Arabic_feh, 0x100fef9, t, T ] }; - key { [ Arabic_ghain, Arabic_hamzaunderalef, y, Y ] }; - key { [ Arabic_ain, grave, u, U ] }; - key { [ Arabic_ha, division, i, I ] }; - key { [ Arabic_khah, multiply, o, O ] }; - key { [ Arabic_hah, Arabic_semicolon, p, P ] }; - key { [ Arabic_jeem, greater, bracketleft, braceleft ] }; - key { [ Arabic_dal, less, bracketright, braceright ] }; - - key { [ Arabic_sheen, Arabic_kasra, a, A ] }; - key { [ Arabic_seen, Arabic_kasratan, s, S ] }; - key { [ Arabic_yeh, bracketright, d, D ] }; - key { [ Arabic_beh, bracketleft, f, F ] }; - key { [ Arabic_lam, 0x100fef7, g, G ] }; - key { [ Arabic_alef, Arabic_hamzaonalef, h, H ] }; - key { [ Arabic_teh, Arabic_tatweel, j, J ] }; - key { [ Arabic_noon, Arabic_comma, k, K ] }; - key { [ Arabic_meem, slash, l, L ] }; - key { [ Arabic_kaf, colon, semicolon, colon ] }; - key { [ Arabic_tah, quotedbl, apostrophe, quotedbl ] }; - key { [ backslash, bar, backslash, bar ] }; - - key { [ bar, brokenbar, bar, brokenbar ] }; - key { [Arabic_hamzaonyeh, asciitilde, z, Z ] }; - key { [ Arabic_hamza, Arabic_sukun, x, X ] }; - key { [Arabic_hamzaonwaw, braceright, c, C ] }; - key { [ Arabic_ra, braceleft, v, V ] }; - key { [ 0x100fefb, 0x100fef5, b, B ] }; - key { [Arabic_alefmaksura, Arabic_maddaonalef, n, N ] }; - key { [Arabic_tehmarbuta, apostrophe, m, M ] }; - key { [ Arabic_waw, comma, comma, less ] }; - key { [ Arabic_zain, period, period, greater ] }; - key { [ Arabic_zah, Arabic_question_mark, slash, question ] }; - - include "level3(ralt_switch)" - -}; - - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/ara(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]= "Arabic"; + + key { [ Arabic_thal, Arabic_shadda, grave, asciitilde ] }; + key { [ 1, exclam, 1, exclam ] }; + key { [ 2, at, 2, at ] }; + key { [ 3, numbersign, 3, numbersign ] }; + key { [ 4, dollar, 4, dollar ] }; + key { [ 5, percent, 5, percent ] }; + key { [ 6, asciicircum, 6, asciicircum ] }; + key { [ 7, ampersand, 7, ampersand ] }; + key { [ 8, asterisk, 8, asterisk ] }; + key { [ 9, parenright, 9, parenright ] }; + key { [ 0, parenleft, 0, parenleft ] }; + key { [ minus, underscore, minus, underscore ] }; + key { [ equal, plus, equal, plus ] }; + + key { [ Arabic_dad, Arabic_fatha, q, Q ] }; + key { [ Arabic_sad, Arabic_fathatan, w, W ] }; + key { [ Arabic_theh, Arabic_damma, e, E ] }; + key { [ Arabic_qaf, Arabic_dammatan, r, R ] }; + key { [ Arabic_feh, 0x100fef9, t, T ] }; + key { [ Arabic_ghain, Arabic_hamzaunderalef, y, Y ] }; + key { [ Arabic_ain, grave, u, U ] }; + key { [ Arabic_ha, division, i, I ] }; + key { [ Arabic_khah, multiply, o, O ] }; + key { [ Arabic_hah, Arabic_semicolon, p, P ] }; + key { [ Arabic_jeem, greater, bracketleft, braceleft ] }; + key { [ Arabic_dal, less, bracketright, braceright ] }; + + key { [ Arabic_sheen, Arabic_kasra, a, A ] }; + key { [ Arabic_seen, Arabic_kasratan, s, S ] }; + key { [ Arabic_yeh, bracketright, d, D ] }; + key { [ Arabic_beh, bracketleft, f, F ] }; + key { [ Arabic_lam, 0x100fef7, g, G ] }; + key { [ Arabic_alef, Arabic_hamzaonalef, h, H ] }; + key { [ Arabic_teh, Arabic_tatweel, j, J ] }; + key { [ Arabic_noon, Arabic_comma, k, K ] }; + key { [ Arabic_meem, slash, l, L ] }; + key { [ Arabic_kaf, colon, semicolon, colon ] }; + key { [ Arabic_tah, quotedbl, apostrophe, quotedbl ] }; + key { [ backslash, bar, backslash, bar ] }; + + key { [ bar, brokenbar, bar, brokenbar ] }; + key { [Arabic_hamzaonyeh, asciitilde, z, Z ] }; + key { [ Arabic_hamza, Arabic_sukun, x, X ] }; + key { [Arabic_hamzaonwaw, braceright, c, C ] }; + key { [ Arabic_ra, braceleft, v, V ] }; + key { [ 0x100fefb, 0x100fef5, b, B ] }; + key { [Arabic_alefmaksura, Arabic_maddaonalef, n, N ] }; + key { [Arabic_tehmarbuta, apostrophe, m, M ] }; + key { [ Arabic_waw, comma, comma, less ] }; + key { [ Arabic_zain, period, period, greater ] }; + key { [ Arabic_zah, Arabic_question_mark, slash, question ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/ara(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/be b/xorg-server/xkeyboard-config/symbols/sun_vndr/be index 58abfd6e6..202e8a4c1 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/be +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/be @@ -1,98 +1,98 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - - -partial default alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Belgium"; - - key { [twosuperior, threesuperior ] }; - key { [ ampersand, 1, bar ] }; - key { [ eacute, 2, at ] }; - key { [ quotedbl, 3, numbersign ] }; - key { [apostrophe, 4 ] }; - key { [ parenleft, 5 ] }; - key { [ section, 6, asciicircum ] }; - key { [ egrave, 7 ] }; - key { [ exclam, 8 ] }; - key { [ ccedilla, 9, braceleft ] }; - key { [ agrave, 0, braceright ] }; - key { [parenright, degree ] }; - key { [ minus, underscore ] }; - - key { [ a, A ] }; - key { [ z, Z ] }; - key { [ e, E, EuroSign ] }; - key { [ o, O ] }; - key { [dead_circumflex, dead_diaeresis, bracketleft ] }; - key { [ dollar, asterisk, bracketright ] }; - - key { [ q, Q ] }; - key { [ m, M ] }; - key { [ ugrave, percent, dead_acute ] }; - key { [ mu, sterling, dead_grave ] }; - - key { [ less, greater, backslash ] }; - key { [ w, W ] }; - key { [ comma, question ] }; - key { [ semicolon, period ] }; - key { [ colon, slash ] }; - key { [ equal, plus, dead_tilde ] }; - - include "level3(ralt_switch)" - -}; - - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/be(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Belgium"; + + key { [twosuperior, threesuperior ] }; + key { [ ampersand, 1, bar ] }; + key { [ eacute, 2, at ] }; + key { [ quotedbl, 3, numbersign ] }; + key { [apostrophe, 4 ] }; + key { [ parenleft, 5 ] }; + key { [ section, 6, asciicircum ] }; + key { [ egrave, 7 ] }; + key { [ exclam, 8 ] }; + key { [ ccedilla, 9, braceleft ] }; + key { [ agrave, 0, braceright ] }; + key { [parenright, degree ] }; + key { [ minus, underscore ] }; + + key { [ a, A ] }; + key { [ z, Z ] }; + key { [ e, E, EuroSign ] }; + key { [ o, O ] }; + key { [dead_circumflex, dead_diaeresis, bracketleft ] }; + key { [ dollar, asterisk, bracketright ] }; + + key { [ q, Q ] }; + key { [ m, M ] }; + key { [ ugrave, percent, dead_acute ] }; + key { [ mu, sterling, dead_grave ] }; + + key { [ less, greater, backslash ] }; + key { [ w, W ] }; + key { [ comma, question ] }; + key { [ semicolon, period ] }; + key { [ colon, slash ] }; + key { [ equal, plus, dead_tilde ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/be(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/br b/xorg-server/xkeyboard-config/symbols/sun_vndr/br index 3cea0bf9c..7ad2dd1cf 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/br +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/br @@ -1,101 +1,101 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - -partial default alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Brazil"; - - key { [ apostrophe, quotedbl, notsign ] }; - key { [ 1, exclam, onesuperior, exclamdown ] }; - key { [ 2, at, twosuperior, onehalf ] }; - key { [ 3, numbersign, threesuperior, threequarters ] }; - key { [ 4, dollar, sterling, onequarter ] }; - key { [ 5, percent, cent ] }; - key { [ 6, dead_diaeresis, notsign, diaeresis ] }; - key { [ 7, ampersand, braceleft ] }; - key { [ 8, asterisk, bracketleft ] }; - key { [ 9, parenleft, bracketright ] }; - key { [ 0, parenright, braceright ] }; - key { [ minus, underscore, backslash ] }; - key { [ equal, plus, section ] }; - - key { [ e, E, EuroSign ] }; - key { [ r, R, registered ] }; - key { [ dead_acute, dead_grave, acute, grave ] }; - key { [ bracketleft, braceleft, ordfeminine ] }; - - key { [ ccedilla, Ccedilla, exclamdown ] }; - key { [ dead_tilde, dead_circumflex, asciitilde, asciicircum ] }; - key { [ bracketright, braceright, masculine ] }; - key { [ bracketright, braceright, masculine ] }; - - key { [ slash, bar, degree ] }; - key { [ z, Z, guillemotleft ] }; - key { [ x, X, guillemotright ] }; - key { [ c, C, copyright ] }; - key { [ m, M, mu ] }; - key { [ comma, less, question ] }; - key { [ period, greater, questiondown ] }; - key { [ semicolon, colon ] }; - key { [ slash, question, degree, questiondown ] }; - - key { [ KP_Decimal ] }; - key { [ KP_Delete, comma ] }; - - include "level3(ralt_switch)" - -}; - - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/br(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Brazil"; + + key { [ apostrophe, quotedbl, notsign ] }; + key { [ 1, exclam, onesuperior, exclamdown ] }; + key { [ 2, at, twosuperior, onehalf ] }; + key { [ 3, numbersign, threesuperior, threequarters ] }; + key { [ 4, dollar, sterling, onequarter ] }; + key { [ 5, percent, cent ] }; + key { [ 6, dead_diaeresis, notsign, diaeresis ] }; + key { [ 7, ampersand, braceleft ] }; + key { [ 8, asterisk, bracketleft ] }; + key { [ 9, parenleft, bracketright ] }; + key { [ 0, parenright, braceright ] }; + key { [ minus, underscore, backslash ] }; + key { [ equal, plus, section ] }; + + key { [ e, E, EuroSign ] }; + key { [ r, R, registered ] }; + key { [ dead_acute, dead_grave, acute, grave ] }; + key { [ bracketleft, braceleft, ordfeminine ] }; + + key { [ ccedilla, Ccedilla, exclamdown ] }; + key { [ dead_tilde, dead_circumflex, asciitilde, asciicircum ] }; + key { [ bracketright, braceright, masculine ] }; + key { [ bracketright, braceright, masculine ] }; + + key { [ slash, bar, degree ] }; + key { [ z, Z, guillemotleft ] }; + key { [ x, X, guillemotright ] }; + key { [ c, C, copyright ] }; + key { [ m, M, mu ] }; + key { [ comma, less, question ] }; + key { [ period, greater, questiondown ] }; + key { [ semicolon, colon ] }; + key { [ slash, question, degree, questiondown ] }; + + key { [ KP_Decimal ] }; + key { [ KP_Delete, comma ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/br(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ca b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca index 6fb72c462..4705123dc 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ca +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca @@ -1,97 +1,97 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - - -partial default alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Canada Bilingual"; - - key { [ slash, bar, backslash ]}; - key { [ 1, exclam, plusminus ]}; - key { [ 2, at ]}; - key { [ 3, numbersign, sterling ]}; - key { [ 4, dollar, cent ]}; - key { [ 5, percent, currency ]}; - key { [ 6, question, notsign ]}; - key { [ 7, ampersand, braceleft ]}; - key { [ 8, asterisk, braceright ]}; - key { [ 9, parenleft, bracketleft ]}; - key { [ 0, parenright, bracketright ]}; - key { [ minus, underscore, onehalf ]}; - key { [ equal, plus, notsign ]}; - - key { [ e, E, EuroSign ]}; - key { [ o, O, section ]}; - key { [ p, P, paragraph ]}; - key { [ dead_circumflex, dead_diaeresis, dead_grave ]}; - key { [ ccedilla, Ccedilla, asciitilde ]}; - - key { [ semicolon, colon, degree ]}; - key { [ egrave, Egrave, braceleft ]}; - key { [ agrave, Agrave, braceright ]}; - key { [ agrave, Agrave, braceright ]}; - - key { [ uacute, Uacute ]}; - key { [ z, Z, guillemotleft ]}; - key { [ x, X, guillemotright ]}; - key { [ m, M, mu ]}; - key { [ comma, quoteright, less ]}; - key { [ period, quotedbl, greater ]}; - key { [ eacute, Eacute, quoteleft ]}; - - include "level3(ralt_switch)" - -}; - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/ca(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Canada Bilingual"; + + key { [ slash, bar, backslash ]}; + key { [ 1, exclam, plusminus ]}; + key { [ 2, at ]}; + key { [ 3, numbersign, sterling ]}; + key { [ 4, dollar, cent ]}; + key { [ 5, percent, currency ]}; + key { [ 6, question, notsign ]}; + key { [ 7, ampersand, braceleft ]}; + key { [ 8, asterisk, braceright ]}; + key { [ 9, parenleft, bracketleft ]}; + key { [ 0, parenright, bracketright ]}; + key { [ minus, underscore, onehalf ]}; + key { [ equal, plus, notsign ]}; + + key { [ e, E, EuroSign ]}; + key { [ o, O, section ]}; + key { [ p, P, paragraph ]}; + key { [ dead_circumflex, dead_diaeresis, dead_grave ]}; + key { [ ccedilla, Ccedilla, asciitilde ]}; + + key { [ semicolon, colon, degree ]}; + key { [ egrave, Egrave, braceleft ]}; + key { [ agrave, Agrave, braceright ]}; + key { [ agrave, Agrave, braceright ]}; + + key { [ uacute, Uacute ]}; + key { [ z, Z, guillemotleft ]}; + key { [ x, X, guillemotright ]}; + key { [ m, M, mu ]}; + key { [ comma, quoteright, less ]}; + key { [ period, quotedbl, greater ]}; + key { [ eacute, Eacute, quoteleft ]}; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/ca(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ch b/xorg-server/xkeyboard-config/symbols/sun_vndr/ch index 82c0681cc..8a41ea303 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ch +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ch @@ -1,133 +1,133 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - -partial default alphanumeric_keys -xkb_symbols "de_type6" { - - name[Group1]= "Switzerland - German"; - - key { [ section, degree ] }; - key { [ 1, plus, bar ] }; - key { [ 2, quotedbl, at ] }; - key { [ 3, asterisk, numbersign ] }; - key { [ 4, ccedilla, asciicircum ] }; - key { [ 5, percent, asciitilde ] }; - key { [ 6, ampersand, notsign ] }; - key { [ 7, slash, brokenbar ] }; - key { [ 8, parenleft, cent ] }; - key { [ 9, parenright ] }; - key { [ 0, equal, quoteleft ] }; - key { [ quoteright, question, dead_acute ] }; - key { [ dead_circumflex, dead_grave, dead_tilde ] }; - - key { [ e, E, EuroSign ] }; - key { [ z, Z ] }; - key { [ udiaeresis, egrave, bracketleft ] }; - key { [ dead_diaeresis, exclam, bracketright ] }; - - key { [ odiaeresis, eacute ] }; - key { [ adiaeresis, agrave, braceleft ] }; - key { [ dollar, sterling, braceright ] }; - - key { [ less, greater, backslash ] }; - key { [ y, Y ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - - include "level3(ralt_switch)" - -}; - - - -partial alphanumeric_keys -xkb_symbols "fr_type6" { - - name[Group1]= "Switzerland - French, Sun type 6"; - - key { [ section, degree ] }; - key { [ 1, plus, bar ] }; - key { [ 2, quotedbl, at ] }; - key { [ 3, asterisk, numbersign ] }; - key { [ 4, ccedilla, asciicircum ] }; - key { [ 5, percent, asciitilde ] }; - key { [ 6, ampersand, notsign ] }; - key { [ 7, slash, brokenbar ] }; - key { [ 8, parenleft, cent ] }; - key { [ 9, parenright ] }; - key { [ 0, equal, quoteleft ] }; - key { [ quoteright, question, dead_acute ] }; - key { [ dead_circumflex, dead_grave, dead_tilde ] }; - - key { [ e, E, EuroSign ] }; - key { [ z, Z ] }; - key { [ egrave, udiaeresis, bracketleft ] }; - key { [ dead_diaeresis, exclam, bracketright ] }; - - key { [ eacute, odiaeresis ] }; - key { [ agrave, adiaeresis, braceleft ] }; - key { [ dollar, sterling, braceright ] }; - - key { [ less, greater, backslash ] }; - key { [ y, Y ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - - include "level3(ralt_switch)" - -}; - - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/ch(de_type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial default alphanumeric_keys +xkb_symbols "de_type6" { + + name[Group1]= "Switzerland - German"; + + key { [ section, degree ] }; + key { [ 1, plus, bar ] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, asterisk, numbersign ] }; + key { [ 4, ccedilla, asciicircum ] }; + key { [ 5, percent, asciitilde ] }; + key { [ 6, ampersand, notsign ] }; + key { [ 7, slash, brokenbar ] }; + key { [ 8, parenleft, cent ] }; + key { [ 9, parenright ] }; + key { [ 0, equal, quoteleft ] }; + key { [ quoteright, question, dead_acute ] }; + key { [ dead_circumflex, dead_grave, dead_tilde ] }; + + key { [ e, E, EuroSign ] }; + key { [ z, Z ] }; + key { [ udiaeresis, egrave, bracketleft ] }; + key { [ dead_diaeresis, exclam, bracketright ] }; + + key { [ odiaeresis, eacute ] }; + key { [ adiaeresis, agrave, braceleft ] }; + key { [ dollar, sterling, braceright ] }; + + key { [ less, greater, backslash ] }; + key { [ y, Y ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + + include "level3(ralt_switch)" + +}; + + + +partial alphanumeric_keys +xkb_symbols "fr_type6" { + + name[Group1]= "Switzerland - French, Sun type 6"; + + key { [ section, degree ] }; + key { [ 1, plus, bar ] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, asterisk, numbersign ] }; + key { [ 4, ccedilla, asciicircum ] }; + key { [ 5, percent, asciitilde ] }; + key { [ 6, ampersand, notsign ] }; + key { [ 7, slash, brokenbar ] }; + key { [ 8, parenleft, cent ] }; + key { [ 9, parenright ] }; + key { [ 0, equal, quoteleft ] }; + key { [ quoteright, question, dead_acute ] }; + key { [ dead_circumflex, dead_grave, dead_tilde ] }; + + key { [ e, E, EuroSign ] }; + key { [ z, Z ] }; + key { [ egrave, udiaeresis, bracketleft ] }; + key { [ dead_diaeresis, exclam, bracketright ] }; + + key { [ eacute, odiaeresis ] }; + key { [ agrave, adiaeresis, braceleft ] }; + key { [ dollar, sterling, braceright ] }; + + key { [ less, greater, backslash ] }; + key { [ y, Y ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/ch(de_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/cz b/xorg-server/xkeyboard-config/symbols/sun_vndr/cz index 55859db9a..b46f01c2b 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/cz +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/cz @@ -1,105 +1,105 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - - -partial default alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Czech"; - - key { [ semicolon, dead_abovering, quoteleft, asciitilde ] }; - key { [ plus, 1, exclam, asciitilde ] }; - key { [ ecaron, 2, at, dead_caron ] }; - key { [ scaron, 3, numbersign, dead_circumflex ] }; - key { [ ccaron, 4, dollar, dead_breve ] }; - key { [ rcaron, 5, percent, dead_abovering ] }; - key { [ zcaron, 6, asciicircum, dead_ogonek ] }; - key { [ yacute, 7, ampersand, grave ] }; - key { [ aacute, 8, asterisk, dead_abovedot ] }; - key { [ iacute, 9, parenleft, dead_acute ] }; - key { [ eacute, 0, parenright, dead_doubleacute ] }; - key { [ equal, percent, dead_diaeresis, backslash ] }; - key { [ dead_acute, dead_caron, dead_cedilla, minus ] }; - - key { [ q, Q, backslash ] }; - key { [ w, W, bar ] }; - key { [ e, E, EuroSign ] }; - key { [ z, Z ] }; - key { [ uacute, slash, division ] }; - key { [parenright, parenleft, multiply ] }; - - key { [ s, S, dstroke ] }; - key { [ d, D, Dstroke ] }; - key { [ f, F, bracketleft ] }; - key { [ g, G, bracketright ] }; - key { [ k, K, lstroke ] }; - key { [ l, L, Lstroke ] }; - key { [ uring, quotedbl, dollar ] }; - key { [ section, exclam, ssharp, currency ] }; - key { [ dead_diaeresis, apostrophe, backslash, bar ] }; - - key { [ backslash, asterisk, slash, brokenbar ] }; - key { [ y, Y, less ] }; - key { [ x, X, greater, numbersign ] }; - key { [ v, V, at ] }; - key { [ b, B, braceleft ] }; - key { [ n, N, braceright ] }; - key { [ comma, question, less ] }; - key { [ period, colon, greater ] }; - key { [ minus, underscore ] }; - - include "level3(ralt_switch)" - -}; - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/cz(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Czech"; + + key { [ semicolon, dead_abovering, quoteleft, asciitilde ] }; + key { [ plus, 1, exclam, asciitilde ] }; + key { [ ecaron, 2, at, dead_caron ] }; + key { [ scaron, 3, numbersign, dead_circumflex ] }; + key { [ ccaron, 4, dollar, dead_breve ] }; + key { [ rcaron, 5, percent, dead_abovering ] }; + key { [ zcaron, 6, asciicircum, dead_ogonek ] }; + key { [ yacute, 7, ampersand, grave ] }; + key { [ aacute, 8, asterisk, dead_abovedot ] }; + key { [ iacute, 9, parenleft, dead_acute ] }; + key { [ eacute, 0, parenright, dead_doubleacute ] }; + key { [ equal, percent, dead_diaeresis, backslash ] }; + key { [ dead_acute, dead_caron, dead_cedilla, minus ] }; + + key { [ q, Q, backslash ] }; + key { [ w, W, bar ] }; + key { [ e, E, EuroSign ] }; + key { [ z, Z ] }; + key { [ uacute, slash, division ] }; + key { [parenright, parenleft, multiply ] }; + + key { [ s, S, dstroke ] }; + key { [ d, D, Dstroke ] }; + key { [ f, F, bracketleft ] }; + key { [ g, G, bracketright ] }; + key { [ k, K, lstroke ] }; + key { [ l, L, Lstroke ] }; + key { [ uring, quotedbl, dollar ] }; + key { [ section, exclam, ssharp, currency ] }; + key { [ dead_diaeresis, apostrophe, backslash, bar ] }; + + key { [ backslash, asterisk, slash, brokenbar ] }; + key { [ y, Y, less ] }; + key { [ x, X, greater, numbersign ] }; + key { [ v, V, at ] }; + key { [ b, B, braceleft ] }; + key { [ n, N, braceright ] }; + key { [ comma, question, less ] }; + key { [ period, colon, greater ] }; + key { [ minus, underscore ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/cz(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/de b/xorg-server/xkeyboard-config/symbols/sun_vndr/de index 2c46ea941..5177b989a 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/de +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/de @@ -1,140 +1,140 @@ -// -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - -partial default alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Germany"; - - key { [ asciicircum, degree ] }; - key { [ 2, quotedbl, twosuperior ] }; - key { [ 3, section, threesuperior ] }; - key { [ 4, dollar ] }; - key { [ 6, ampersand, section ] }; - key { [ 7, slash, braceleft ] }; - key { [ 8, parenleft, bracketleft ] }; - key { [ 9, parenright, bracketright ] }; - key { [ 0, equal, braceright ] }; - key { [ ssharp, question, backslash ] }; - key { [ dead_acute, dead_grave ] }; - key { [ q, Q, at ] }; - key { [ e, E, EuroSign ] }; - key { [ z, Z ] }; - key { [ udiaeresis, Udiaeresis ] }; - key { [ plus, asterisk, asciitilde ] }; - key { [ odiaeresis, Odiaeresis ] }; - key { [ adiaeresis, Adiaeresis ] }; - key { [ y, Y ] }; - key { [ m, M, mu ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - key { [ numbersign, apostrophe, grave ] }; - key { [ less, greater, bar ] }; - - include "level3(ralt_switch)" - include "kpdl(comma)" - -}; - -partial alphanumeric_keys -xkb_symbols "type4" { - - name[Group1]="Germany - Sun type 4"; - - key { [ less, braceleft ] }; - key { [ greater, braceright ] }; - key { [ Delete ] }; - - key { [ 1, plus, exclam ] }; - key { [ 2, quotedbl, at, oneeighth ] }; - key { [ 3, asterisk, numbersign, sterling ] }; - key { [ 4, ccedilla, cent ] }; - key { [ 5, percent, asciitilde ] }; - key { [ 6, ampersand, section ] }; - key { [ 7, slash, bar ] }; - key { [ 8, parenleft, degree ] }; - key { [ 9, parenright, backslash ] }; - key { [ 0, equal, asciicircum ] }; - Key { [ quoteright, question, quoteleft ] }; - key { [ dead_circumflex, dead_grave ] }; - - key { [ e, E, EuroSign, EuroSign ] }; - key { [ z, Z, leftarrow, yen ] }; - key { [ udiaeresis, egrave, dead_diaeresis, dead_abovering ] }; - key { [ dead_diaeresis, dead_acute ] }; - - key { [ s, S ] }; - key { [ j, J, dead_belowdot, dead_abovedot ] }; - key { [ odiaeresis, eacute, dead_doubleacute, dead_belowdot ] }; - key { [ adiaeresis, agrave, dead_circumflex, dead_caron ] }; - key { [ dollar, dead_tilde, sterling ] }; - - key { [ y, Y, guillemotright ] }; - key { [ x, X, guillemotleft ] }; - key { [ v, V, doublelowquotemark, singlelowquotemark ] }; - key { [ b, B, leftdoublequotemark, leftsinglequotemark ] }; - key { [ n, N, rightdoublequotemark, rightsinglequotemark ] }; - key { [ m, M, mu ] }; - key { [ comma, semicolon, periodcentered, multiply ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - - include "level3(ralt_switch)" - include "kpdl(comma)" - -}; - - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/de(type6)" -}; +// +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Germany"; + + key { [ asciicircum, degree ] }; + key { [ 2, quotedbl, twosuperior ] }; + key { [ 3, section, threesuperior ] }; + key { [ 4, dollar ] }; + key { [ 6, ampersand, section ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, equal, braceright ] }; + key { [ ssharp, question, backslash ] }; + key { [ dead_acute, dead_grave ] }; + key { [ q, Q, at ] }; + key { [ e, E, EuroSign ] }; + key { [ z, Z ] }; + key { [ udiaeresis, Udiaeresis ] }; + key { [ plus, asterisk, asciitilde ] }; + key { [ odiaeresis, Odiaeresis ] }; + key { [ adiaeresis, Adiaeresis ] }; + key { [ y, Y ] }; + key { [ m, M, mu ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + key { [ numbersign, apostrophe, grave ] }; + key { [ less, greater, bar ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" + +}; + +partial alphanumeric_keys +xkb_symbols "type4" { + + name[Group1]="Germany - Sun type 4"; + + key { [ less, braceleft ] }; + key { [ greater, braceright ] }; + key { [ Delete ] }; + + key { [ 1, plus, exclam ] }; + key { [ 2, quotedbl, at, oneeighth ] }; + key { [ 3, asterisk, numbersign, sterling ] }; + key { [ 4, ccedilla, cent ] }; + key { [ 5, percent, asciitilde ] }; + key { [ 6, ampersand, section ] }; + key { [ 7, slash, bar ] }; + key { [ 8, parenleft, degree ] }; + key { [ 9, parenright, backslash ] }; + key { [ 0, equal, asciicircum ] }; + Key { [ quoteright, question, quoteleft ] }; + key { [ dead_circumflex, dead_grave ] }; + + key { [ e, E, EuroSign, EuroSign ] }; + key { [ z, Z, leftarrow, yen ] }; + key { [ udiaeresis, egrave, dead_diaeresis, dead_abovering ] }; + key { [ dead_diaeresis, dead_acute ] }; + + key { [ s, S ] }; + key { [ j, J, dead_belowdot, dead_abovedot ] }; + key { [ odiaeresis, eacute, dead_doubleacute, dead_belowdot ] }; + key { [ adiaeresis, agrave, dead_circumflex, dead_caron ] }; + key { [ dollar, dead_tilde, sterling ] }; + + key { [ y, Y, guillemotright ] }; + key { [ x, X, guillemotleft ] }; + key { [ v, V, doublelowquotemark, singlelowquotemark ] }; + key { [ b, B, leftdoublequotemark, leftsinglequotemark ] }; + key { [ n, N, rightdoublequotemark, rightsinglequotemark ] }; + key { [ m, M, mu ] }; + key { [ comma, semicolon, periodcentered, multiply ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" + +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/de(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/dk b/xorg-server/xkeyboard-config/symbols/sun_vndr/dk index 0cc81153d..e5db30e7f 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/dk +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/dk @@ -1,147 +1,147 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - -partial default alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Denmark"; - - key { [ onehalf, section ] }; - key { [ 2, quotedbl, at ] }; - key { [ 3, numbersign, sterling ] }; - key { [ 4, currency, dollar ] }; - key { [ 5, percent, asciitilde ] }; - key { [ 6, ampersand, asciicircum ] }; - key { [ 7, slash, braceleft ] }; - key { [ 8, parenleft, bracketleft ] }; - key { [ 9, parenright, bracketright ] }; - key { [ 0, equal, braceright ] }; - key { [ plus, question ] }; - key { [ dead_acute, dead_grave, bar ] }; - key { [ e, E, EuroSign ] }; - key { [ aring, Aring ] }; - key { [ dead_diaeresis, dead_circumflex, dead_tilde ] }; - key { [ apostrophe, asterisk, grave ] }; - key { [ ae, AE ] }; - key { [ oslash, Ooblique ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - key { [ less, greater, backslash ] }; - - include "level3(ralt_switch)" - include "kpdl(comma)" - -}; - - -partial alphanumeric_keys -xkb_symbols "type4" { - - name[Group1]="Denmark - Sun type 4"; - - key { [ onehalf, section ] }; - key { [ asciitilde, asciicircum ] }; - key { [ 2, quotedbl, at ] }; - key { [ 3, numbersign, sterling ] }; - key { [ 4, currency, dollar ] }; - key { [ 6, ampersand ] }; - key { [ 7, slash, braceleft ] }; - key { [ 8, parenleft, bracketleft ] }; - key { [ 9, parenright, bracketright ] }; - key { [ 0, equal, braceright ] }; - key { [ plus, question ] }; - key { [ dead_acute, dead_grave, bar ] }; - key { [ e, E, EuroSign ] }; - key { [ aring, Aring ] }; - key { [ dead_diaeresis, dead_circumflex, dead_tilde ] }; - key { [ Caps_Lock ] }; - key { [ ae, AE ] }; - key { [ ooblique, Ooblique ] }; - key { [ quoteright, asterisk, quoteleft ] }; - key { [ less, greater, backslash ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - key { [ Control_L ] }; - key { [ SunAltGraph ] }; - key { [ SunCompose ] }; - - include "level3(ralt_switch)" - include "kpdl(comma)" - -}; - - -partial alphanumeric_keys -xkb_symbols "type5" { - - include "sun_vndr/dk(type4)" - - name[Group1]="Denmark - Sun type 5"; - - key { [ 5, percent, asciitilde ] }; - key { [ 6, ampersand, asciicircum ] }; - key { [ 7, slash, braceleft ] }; - key { [ 8, parenleft, bracketleft ] }; - key { [ 9, parenright, bracketright ] }; - key { [ 0, equal, braceright ] }; - key { [ quoteright, asterisk, quoteleft ] }; - - include "level3(ralt_switch)" - include "kpdl(comma)" - -}; - - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/dk(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Denmark"; + + key { [ onehalf, section ] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, numbersign, sterling ] }; + key { [ 4, currency, dollar ] }; + key { [ 5, percent, asciitilde ] }; + key { [ 6, ampersand, asciicircum ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, equal, braceright ] }; + key { [ plus, question ] }; + key { [ dead_acute, dead_grave, bar ] }; + key { [ e, E, EuroSign ] }; + key { [ aring, Aring ] }; + key { [ dead_diaeresis, dead_circumflex, dead_tilde ] }; + key { [ apostrophe, asterisk, grave ] }; + key { [ ae, AE ] }; + key { [ oslash, Ooblique ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + key { [ less, greater, backslash ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" + +}; + + +partial alphanumeric_keys +xkb_symbols "type4" { + + name[Group1]="Denmark - Sun type 4"; + + key { [ onehalf, section ] }; + key { [ asciitilde, asciicircum ] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, numbersign, sterling ] }; + key { [ 4, currency, dollar ] }; + key { [ 6, ampersand ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, equal, braceright ] }; + key { [ plus, question ] }; + key { [ dead_acute, dead_grave, bar ] }; + key { [ e, E, EuroSign ] }; + key { [ aring, Aring ] }; + key { [ dead_diaeresis, dead_circumflex, dead_tilde ] }; + key { [ Caps_Lock ] }; + key { [ ae, AE ] }; + key { [ ooblique, Ooblique ] }; + key { [ quoteright, asterisk, quoteleft ] }; + key { [ less, greater, backslash ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + key { [ Control_L ] }; + key { [ SunAltGraph ] }; + key { [ SunCompose ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" + +}; + + +partial alphanumeric_keys +xkb_symbols "type5" { + + include "sun_vndr/dk(type4)" + + name[Group1]="Denmark - Sun type 5"; + + key { [ 5, percent, asciitilde ] }; + key { [ 6, ampersand, asciicircum ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, equal, braceright ] }; + key { [ quoteright, asterisk, quoteleft ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" + +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/dk(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ee b/xorg-server/xkeyboard-config/symbols/sun_vndr/ee index 914a80dde..0530f9e2f 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ee +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ee @@ -1,117 +1,117 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - - -partial default alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Estonia"; - - - key { [ dead_caron, dead_tilde, notsign, notsign ] }; - key { [ 1, exclam, onesuperior, exclamdown ] }; - key { [ 2, quotedbl, at, oneeighth ] }; - key { [ 3, numbersign, sterling, sterling ] }; - key { [ 4, currency, dollar, dollar ] }; - key { [ 5, percent, onehalf, threeeighths ] }; - key { [ 6, ampersand, notsign, fiveeighths ] }; - key { [ 7, slash, braceleft, seveneighths ] }; - key { [ 8, parenleft, bracketleft, trademark ] }; - key { [ 9, parenright, bracketright, plusminus ] }; - key { [ 0, equal, braceright, degree ] }; - key { [ plus, question, backslash, questiondown ] }; - key { [ dead_acute, dead_grave, grave, apostrophe ] }; - - key { [ q, Q, at, Greek_OMEGA ] }; - key { [ w, W, lstroke, Lstroke ] }; - key { [ e, E, EuroSign, cent ] }; - key { [ r, R, paragraph, registered ] }; - key { [ t, T, tslash, Tslash ] }; - key { [ y, Y, leftarrow, yen ] }; - key { [ u, U, downarrow, uparrow ] }; - key { [ i, I, rightarrow, idotless ] }; - key { [ o, O, oslash, Ooblique ] }; - key { [ p, P, thorn, THORN ] }; - key { [ udiaeresis, Udiaeresis, dead_diaeresis,dead_abovering ] }; - key { [ otilde, Otilde, section, dead_macron ] }; - - key { [ a, A, ae, AE ] }; - key { [ s, S, ssharp, section ] }; - key { [ d, D, eth, ETH ] }; - key { [ f, F, dstroke, ordfeminine ] }; - key { [ g, G, eng, ENG ] }; - key { [ h, H, hstroke, Hstroke ] }; - key { [ j, J, j, J ] }; - key { [ k, K, kra, ampersand ] }; - key { [ l, L, lstroke, Lstroke ] }; - key { [ odiaeresis, Odiaeresis, dead_acute, dead_doubleacute ] }; - key { [ adiaeresis, Adiaeresis, asciicircum, dead_caron ] }; - key { [ backslash, bar, degree, brokenbar ] }; - - key { [ apostrophe, asterisk, onehalf, dead_breve ] }; - key { [ z, Z, zcaron, Zcaron ] }; - key { [ x, X, guillemotright, greater ] }; - key { [ c, C, cent, copyright ] }; - key { [ v, V, leftdoublequotemark, leftsinglequotemark ] }; - key { [ b, B, rightdoublequotemark, rightsinglequotemark ] }; - key { [ n, N, ncedilla, Ncedilla ] }; - key { [ m, M, mu, masculine ] }; - key { [ comma, semicolon, less, multiply ] }; - key { [ period, colon, greater, division ] }; - key { [ minus, underscore, dead_belowdot, dead_abovedot ] }; - - include "level3(ralt_switch)" - -}; - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/ee(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Estonia"; + + + key { [ dead_caron, dead_tilde, notsign, notsign ] }; + key { [ 1, exclam, onesuperior, exclamdown ] }; + key { [ 2, quotedbl, at, oneeighth ] }; + key { [ 3, numbersign, sterling, sterling ] }; + key { [ 4, currency, dollar, dollar ] }; + key { [ 5, percent, onehalf, threeeighths ] }; + key { [ 6, ampersand, notsign, fiveeighths ] }; + key { [ 7, slash, braceleft, seveneighths ] }; + key { [ 8, parenleft, bracketleft, trademark ] }; + key { [ 9, parenright, bracketright, plusminus ] }; + key { [ 0, equal, braceright, degree ] }; + key { [ plus, question, backslash, questiondown ] }; + key { [ dead_acute, dead_grave, grave, apostrophe ] }; + + key { [ q, Q, at, Greek_OMEGA ] }; + key { [ w, W, lstroke, Lstroke ] }; + key { [ e, E, EuroSign, cent ] }; + key { [ r, R, paragraph, registered ] }; + key { [ t, T, tslash, Tslash ] }; + key { [ y, Y, leftarrow, yen ] }; + key { [ u, U, downarrow, uparrow ] }; + key { [ i, I, rightarrow, idotless ] }; + key { [ o, O, oslash, Ooblique ] }; + key { [ p, P, thorn, THORN ] }; + key { [ udiaeresis, Udiaeresis, dead_diaeresis,dead_abovering ] }; + key { [ otilde, Otilde, section, dead_macron ] }; + + key { [ a, A, ae, AE ] }; + key { [ s, S, ssharp, section ] }; + key { [ d, D, eth, ETH ] }; + key { [ f, F, dstroke, ordfeminine ] }; + key { [ g, G, eng, ENG ] }; + key { [ h, H, hstroke, Hstroke ] }; + key { [ j, J, j, J ] }; + key { [ k, K, kra, ampersand ] }; + key { [ l, L, lstroke, Lstroke ] }; + key { [ odiaeresis, Odiaeresis, dead_acute, dead_doubleacute ] }; + key { [ adiaeresis, Adiaeresis, asciicircum, dead_caron ] }; + key { [ backslash, bar, degree, brokenbar ] }; + + key { [ apostrophe, asterisk, onehalf, dead_breve ] }; + key { [ z, Z, zcaron, Zcaron ] }; + key { [ x, X, guillemotright, greater ] }; + key { [ c, C, cent, copyright ] }; + key { [ v, V, leftdoublequotemark, leftsinglequotemark ] }; + key { [ b, B, rightdoublequotemark, rightsinglequotemark ] }; + key { [ n, N, ncedilla, Ncedilla ] }; + key { [ m, M, mu, masculine ] }; + key { [ comma, semicolon, less, multiply ] }; + key { [ period, colon, greater, division ] }; + key { [ minus, underscore, dead_belowdot, dead_abovedot ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/ee(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/es b/xorg-server/xkeyboard-config/symbols/sun_vndr/es index 9cb25f382..6d28bc541 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/es +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/es @@ -1,145 +1,145 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - -partial default alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Spain"; - - key { [ masculine, ordfeminine, backslash ] }; - key { [ less, greater ] }; - key { [ 1, exclam, bar ] }; - key { [ 2, quotedbl, at ] }; - key { [ 3, periodcentered, numbersign ] }; - key { [ 4, dollar, asciicircum ] }; - key { [ 5, percent, asciitilde ] }; - key { [ 6, ampersand, notsign ] }; - key { [ 7, slash ] }; - key { [ 8, parenleft ] }; - key { [ 9, parenright ] }; - key { [ 0, equal ] }; - key { [ apostrophe, question, grave ] }; - key { [ exclamdown, questiondown ] }; - key { [ e, E, EuroSign ] }; - key { [ dead_grave, dead_circumflex, bracketleft ] }; - key { [ plus, asterisk, bracketright ] }; - key { [ ntilde, Ntilde ] }; - key { [ dead_acute, dead_diaeresis, braceleft ] }; - key { [ ccedilla, Ccedilla, braceright ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - - include "level3(ralt_switch)" - -}; - - -partial alphanumeric_keys -xkb_symbols "type4" { - - name[Group1]="Spain - Sun type 4"; - - key { [ bracketleft, braceleft, guillemotleft ] }; - key { [ bracketright, braceright, guillemotright ] }; - key { [ 2, quotedbl, at ] }; - key { [ 3, periodcentered, numbersign ] }; - key { [ 5, percent, degree ] }; - key { [ 6, ampersand, notsign ] }; - key { [ 7, slash ] }; - key { [ 8, parenleft ] }; - key { [ 9, parenright, backslash ] }; - key { [ 0, equal, bar ] }; - key { [ quoteright, question, quoteleft ] }; - key { [ exclamdown, questiondown ] }; - key { [ e, E, EuroSign ] }; - key { [ o, O, masculine ] }; - key { [ dead_grave, dead_circumflex, asciicircum ] }; - key { [ plus, asterisk, asciitilde ] }; - key { [ a, A, ordfeminine ] }; - key { [ ntilde, Ntilde ] }; - key { [ dead_acute, dead_diaeresis ] }; - key { [ ccedilla, Ccedilla ] }; - key { [ Alt_R ] }; - key { [ Caps_Lock ] }; - key { [ Control_L ] }; - key { [ less, greater ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - -}; - - -partial alphanumeric_keys -xkb_symbols "type5" { - include "sun_vndr/es(type4)" - - name[Group1]="Spain - Sun type 5"; - - key { [ 3, periodcentered, numbersign ] }; - key { [ 4, dollar, asciicircum ] }; - key { [ 5, percent, asciitilde ] }; - key { [ 7, slash, braceleft ]}; - key { [ 8, parenleft, bracketleft ]}; - key { [ 9, parenright, bracketright ]}; - key { [ 0, equal, braceright ]}; - key { [ quoteright, question, quoteleft ] }; - key { [ dead_grave, dead_circumflex, bracketleft ] }; - key { [ dead_acute, dead_diaeresis, braceleft ] }; - - include "level3(ralt_switch)" -}; - - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/es(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Spain"; + + key { [ masculine, ordfeminine, backslash ] }; + key { [ less, greater ] }; + key { [ 1, exclam, bar ] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, periodcentered, numbersign ] }; + key { [ 4, dollar, asciicircum ] }; + key { [ 5, percent, asciitilde ] }; + key { [ 6, ampersand, notsign ] }; + key { [ 7, slash ] }; + key { [ 8, parenleft ] }; + key { [ 9, parenright ] }; + key { [ 0, equal ] }; + key { [ apostrophe, question, grave ] }; + key { [ exclamdown, questiondown ] }; + key { [ e, E, EuroSign ] }; + key { [ dead_grave, dead_circumflex, bracketleft ] }; + key { [ plus, asterisk, bracketright ] }; + key { [ ntilde, Ntilde ] }; + key { [ dead_acute, dead_diaeresis, braceleft ] }; + key { [ ccedilla, Ccedilla, braceright ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys +xkb_symbols "type4" { + + name[Group1]="Spain - Sun type 4"; + + key { [ bracketleft, braceleft, guillemotleft ] }; + key { [ bracketright, braceright, guillemotright ] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, periodcentered, numbersign ] }; + key { [ 5, percent, degree ] }; + key { [ 6, ampersand, notsign ] }; + key { [ 7, slash ] }; + key { [ 8, parenleft ] }; + key { [ 9, parenright, backslash ] }; + key { [ 0, equal, bar ] }; + key { [ quoteright, question, quoteleft ] }; + key { [ exclamdown, questiondown ] }; + key { [ e, E, EuroSign ] }; + key { [ o, O, masculine ] }; + key { [ dead_grave, dead_circumflex, asciicircum ] }; + key { [ plus, asterisk, asciitilde ] }; + key { [ a, A, ordfeminine ] }; + key { [ ntilde, Ntilde ] }; + key { [ dead_acute, dead_diaeresis ] }; + key { [ ccedilla, Ccedilla ] }; + key { [ Alt_R ] }; + key { [ Caps_Lock ] }; + key { [ Control_L ] }; + key { [ less, greater ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + +}; + + +partial alphanumeric_keys +xkb_symbols "type5" { + include "sun_vndr/es(type4)" + + name[Group1]="Spain - Sun type 5"; + + key { [ 3, periodcentered, numbersign ] }; + key { [ 4, dollar, asciicircum ] }; + key { [ 5, percent, asciitilde ] }; + key { [ 7, slash, braceleft ]}; + key { [ 8, parenleft, bracketleft ]}; + key { [ 9, parenright, bracketright ]}; + key { [ 0, equal, braceright ]}; + key { [ quoteright, question, quoteleft ] }; + key { [ dead_grave, dead_circumflex, bracketleft ] }; + key { [ dead_acute, dead_diaeresis, braceleft ] }; + + include "level3(ralt_switch)" +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/es(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/fi b/xorg-server/xkeyboard-config/symbols/sun_vndr/fi index a2f8cd8f4..eaa19e848 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/fi +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/fi @@ -1,89 +1,89 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - -partial default alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Finland"; - - key { [ section, onehalf ] }; - key { [ 1, exclam ] }; - key { [ 2, quotedbl, at ] }; - key { [ 3, numbersign, sterling ] }; - key { [ 4, currency, dollar ] }; - key { [ 5, percent ] }; - key { [ 6, ampersand ] }; - key { [ 7, slash, braceleft ] }; - key { [ 8, parenleft, bracketleft ] }; - key { [ 9, parenright, bracketright ] }; - key { [ 0, equal, braceright ] }; - key { [ plus, question, backslash ] }; - key { [ dead_acute, dead_grave ] }; - key { [ e, E, EuroSign ] }; - key { [ aring, Aring ] }; - key { [ dead_diaeresis, asciicircum, asciitilde ] }; - key { [ odiaeresis, Odiaeresis ] }; - key { [ adiaeresis, Adiaeresis ] }; - key { [ apostrophe, asterisk, quoteleft ] }; - key { [ less, greater, bar ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - - include "level3(ralt_switch)" - include "kpdl(comma)" - -}; - - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/fi(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Finland"; + + key { [ section, onehalf ] }; + key { [ 1, exclam ] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, numbersign, sterling ] }; + key { [ 4, currency, dollar ] }; + key { [ 5, percent ] }; + key { [ 6, ampersand ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, equal, braceright ] }; + key { [ plus, question, backslash ] }; + key { [ dead_acute, dead_grave ] }; + key { [ e, E, EuroSign ] }; + key { [ aring, Aring ] }; + key { [ dead_diaeresis, asciicircum, asciitilde ] }; + key { [ odiaeresis, Odiaeresis ] }; + key { [ adiaeresis, Adiaeresis ] }; + key { [ apostrophe, asterisk, quoteleft ] }; + key { [ less, greater, bar ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" + +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/fi(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/fr b/xorg-server/xkeyboard-config/symbols/sun_vndr/fr index e3e6828ef..a3850ba5f 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/fr +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/fr @@ -1,96 +1,96 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - -partial default alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="France"; - - key { [ twosuperior ] }; - key { [ ampersand, 1 ] }; - key { [ eacute, 2, asciitilde ] }; - key { [ quotedbl, 3, numbersign ] }; - key { [ apostrophe, 4, braceleft ] }; - key { [ parenleft, 5, bracketleft ] }; - key { [ minus, 6, bar ] }; - key { [ egrave, 7, grave ] }; - key { [ underscore, 8, backslash ] }; - key { [ ccedilla, 9, asciicircum ] }; - key { [ agrave, 0, at ] }; - key { [ parenright, degree, bracketright ] }; - key { [ equal, plus, braceright ] }; - - key { [ a, A ] }; - key { [ z, Z ] }; - key { [ e, E, EuroSign ] }; - key { [ dead_circumflex, dead_diaeresis ] }; - key { [ dollar, sterling, currency ] }; - - key { [ q, Q ] }; - key { [ m, M ] }; - key { [ ugrave, percent ] }; - key { [ asterisk, mu ] }; - - key { [ less, greater ] }; - key { [ w, W ] }; - key { [ comma, question ] }; - key { [ semicolon, period ] }; - key { [ colon, slash ] }; - key { [ exclam, section ] }; - - include "level3(ralt_switch)" - -}; - - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/fr(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="France"; + + key { [ twosuperior ] }; + key { [ ampersand, 1 ] }; + key { [ eacute, 2, asciitilde ] }; + key { [ quotedbl, 3, numbersign ] }; + key { [ apostrophe, 4, braceleft ] }; + key { [ parenleft, 5, bracketleft ] }; + key { [ minus, 6, bar ] }; + key { [ egrave, 7, grave ] }; + key { [ underscore, 8, backslash ] }; + key { [ ccedilla, 9, asciicircum ] }; + key { [ agrave, 0, at ] }; + key { [ parenright, degree, bracketright ] }; + key { [ equal, plus, braceright ] }; + + key { [ a, A ] }; + key { [ z, Z ] }; + key { [ e, E, EuroSign ] }; + key { [ dead_circumflex, dead_diaeresis ] }; + key { [ dollar, sterling, currency ] }; + + key { [ q, Q ] }; + key { [ m, M ] }; + key { [ ugrave, percent ] }; + key { [ asterisk, mu ] }; + + key { [ less, greater ] }; + key { [ w, W ] }; + key { [ comma, question ] }; + key { [ semicolon, period ] }; + key { [ colon, slash ] }; + key { [ exclam, section ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/fr(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/gb b/xorg-server/xkeyboard-config/symbols/sun_vndr/gb index fc775cd98..78287ec06 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/gb +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/gb @@ -1,102 +1,102 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - -partial default alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="United Kingdom"; - - key { [ quoteleft, notsign, brokenbar ] }; - - key { [ 2, quotedbl ] }; - key { [ 3, sterling ] }; - key { [ 4, dollar, EuroSign ] }; - key { [ numbersign, asciitilde ] }; - key { [ apostrophe, at ] }; - key { [ backslash, bar ] }; - - include "level3(ralt_switch)" - -}; - - -partial alphanumeric_keys -xkb_symbols "type5" { - - name[Group1]="United Kingdom - Sun type 5"; - - key { [ quoteleft, notsign, brokenbar ] }; - key { [ e, E, EuroSign ] }; - - include "level3(ralt_switch)" - -}; - - -partial alphanumeric_keys -xkb_symbols "type4" { - - name[Group1]="United Kingdom - Sun type 4"; - - key { [ 1, exclam, brokenbar ] }; - key { [ 3, sterling, numbersign ] }; - key { [ 4, dollar, EuroSign ] }; - key { [ minus, underscore, notsign ] }; - key { [ e, E, EuroSign ] }; - - include "level3(ralt_switch)" - -}; - - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/gb(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="United Kingdom"; + + key { [ quoteleft, notsign, brokenbar ] }; + + key { [ 2, quotedbl ] }; + key { [ 3, sterling ] }; + key { [ 4, dollar, EuroSign ] }; + key { [ numbersign, asciitilde ] }; + key { [ apostrophe, at ] }; + key { [ backslash, bar ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys +xkb_symbols "type5" { + + name[Group1]="United Kingdom - Sun type 5"; + + key { [ quoteleft, notsign, brokenbar ] }; + key { [ e, E, EuroSign ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys +xkb_symbols "type4" { + + name[Group1]="United Kingdom - Sun type 4"; + + key { [ 1, exclam, brokenbar ] }; + key { [ 3, sterling, numbersign ] }; + key { [ 4, dollar, EuroSign ] }; + key { [ minus, underscore, notsign ] }; + key { [ e, E, EuroSign ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/gb(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/gr b/xorg-server/xkeyboard-config/symbols/sun_vndr/gr index c3a83dad0..1f3fac799 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/gr +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/gr @@ -1,117 +1,117 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - - -partial default alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Greece"; - - - key { [ grave, asciitilde, onehalf ] }; - key { [ 1, exclam ] }; - key { [ 2, at ] }; - key { [ 3, numbersign, sterling ] }; - key { [ 4, dollar, EuroSign ] }; - key { [ 5, percent, EuroSign ] }; - key { [ 6, asciicircum, notsign ] }; - key { [ 7, ampersand ] }; - key { [ 8, asterisk ] }; - key { [ 9, parenleft ] }; - key { [ 0, parenright, degree ] }; - key { [ minus, underscore, plusminus ] }; - key { [ equal, plus ] }; - - key { [ semicolon, colon, periodcentered ] }; - key { [ Greek_finalsmallsigma, periodcentered, Greek_SIGMA ] }; - key { [ Greek_epsilon, Greek_EPSILON, EuroSign ] }; - key { [ Greek_rho, Greek_RHO, registered ] }; - key { [ Greek_tau, Greek_TAU ] }; - key { [ Greek_upsilon, Greek_UPSILON ] }; - key { [ Greek_theta, Greek_THETA ] }; - key { [ Greek_iota, Greek_IOTA ] }; - key { [ Greek_omicron, Greek_OMICRON ] }; - key { [ Greek_pi, Greek_PI ] }; - key { [ bracketleft, braceleft, guillemotleft ] }; - key { [ bracketright, braceright, guillemotright ] }; - - key { [ Greek_alpha, Greek_ALPHA ] }; - key { [ Greek_sigma, Greek_SIGMA ] }; - key { [ Greek_delta, Greek_DELTA ] }; - key { [ Greek_phi, Greek_PHI ] }; - key { [ Greek_gamma, Greek_GAMMA ] }; - key { [ Greek_eta, Greek_ETA ] }; - key { [ Greek_xi, Greek_XI ] }; - key { [ Greek_kappa, Greek_KAPPA ] }; - key { [ Greek_lamda, Greek_LAMDA ] }; - key { [ dead_acute, dead_diaeresis ] }; - key { [ apostrophe, quotedbl ] }; - key { [ backslash, bar, brokenbar ] }; - - key { [ guillemotleft, guillemotright, brokenbar ] }; - key { [ Greek_zeta, Greek_ZETA ] }; - key { [ Greek_chi, Greek_CHI ] }; - key { [ Greek_psi, Greek_PSI, copyright ] }; - key { [ Greek_omega, Greek_OMEGA ] }; - key { [ Greek_beta, Greek_BETA ] }; - key { [ Greek_nu, Greek_NU ] }; - key { [ Greek_mu, Greek_MU ] }; - key { [ comma, less, guillemotleft ] }; - key { [ period, greater, guillemotright ] }; - key { [ slash, question ] }; - - include "level3(ralt_switch)" - -}; - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/gr(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Greece"; + + + key { [ grave, asciitilde, onehalf ] }; + key { [ 1, exclam ] }; + key { [ 2, at ] }; + key { [ 3, numbersign, sterling ] }; + key { [ 4, dollar, EuroSign ] }; + key { [ 5, percent, EuroSign ] }; + key { [ 6, asciicircum, notsign ] }; + key { [ 7, ampersand ] }; + key { [ 8, asterisk ] }; + key { [ 9, parenleft ] }; + key { [ 0, parenright, degree ] }; + key { [ minus, underscore, plusminus ] }; + key { [ equal, plus ] }; + + key { [ semicolon, colon, periodcentered ] }; + key { [ Greek_finalsmallsigma, periodcentered, Greek_SIGMA ] }; + key { [ Greek_epsilon, Greek_EPSILON, EuroSign ] }; + key { [ Greek_rho, Greek_RHO, registered ] }; + key { [ Greek_tau, Greek_TAU ] }; + key { [ Greek_upsilon, Greek_UPSILON ] }; + key { [ Greek_theta, Greek_THETA ] }; + key { [ Greek_iota, Greek_IOTA ] }; + key { [ Greek_omicron, Greek_OMICRON ] }; + key { [ Greek_pi, Greek_PI ] }; + key { [ bracketleft, braceleft, guillemotleft ] }; + key { [ bracketright, braceright, guillemotright ] }; + + key { [ Greek_alpha, Greek_ALPHA ] }; + key { [ Greek_sigma, Greek_SIGMA ] }; + key { [ Greek_delta, Greek_DELTA ] }; + key { [ Greek_phi, Greek_PHI ] }; + key { [ Greek_gamma, Greek_GAMMA ] }; + key { [ Greek_eta, Greek_ETA ] }; + key { [ Greek_xi, Greek_XI ] }; + key { [ Greek_kappa, Greek_KAPPA ] }; + key { [ Greek_lamda, Greek_LAMDA ] }; + key { [ dead_acute, dead_diaeresis ] }; + key { [ apostrophe, quotedbl ] }; + key { [ backslash, bar, brokenbar ] }; + + key { [ guillemotleft, guillemotright, brokenbar ] }; + key { [ Greek_zeta, Greek_ZETA ] }; + key { [ Greek_chi, Greek_CHI ] }; + key { [ Greek_psi, Greek_PSI, copyright ] }; + key { [ Greek_omega, Greek_OMEGA ] }; + key { [ Greek_beta, Greek_BETA ] }; + key { [ Greek_nu, Greek_NU ] }; + key { [ Greek_mu, Greek_MU ] }; + key { [ comma, less, guillemotleft ] }; + key { [ period, greater, guillemotright ] }; + key { [ slash, question ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/gr(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/it b/xorg-server/xkeyboard-config/symbols/sun_vndr/it index 7149b0996..acd94a2fb 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/it +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/it @@ -1,140 +1,140 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - -partial default alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Italy"; - - key { [ less, greater ] }; - key { [ backslash, bar ] }; - key { [ 2, quotedbl ] }; - key { [ 3, sterling ] }; - key { [ 6, ampersand ] }; - key { [ 7, slash ] }; - key { [ 8, parenleft, braceleft ] }; - key { [ 9, parenright, braceright ] }; - key { [ 0, equal ] }; - key { [ apostrophe, question, grave ] }; - key { [ igrave, asciicircum ] }; - key { [ e, E, EuroSign ] }; - key { [ egrave, eacute, bracketleft, dead_abovering ] }; - key { [ plus, asterisk, bracketright ] }; - key { [ ugrave, section, asciitilde ] }; - key { [ ograve, ccedilla, at ] }; - key { [ agrave, degree, numbersign ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - - include "level3(ralt_switch)" - -}; - - -partial alphanumeric_keys -xkb_symbols "type4" { - - name[Group1]="Italy - Sun type 4"; - - key { [ bracketleft, braceleft, guillemotleft ] }; - key { [ bracketright, braceright, guillemotright ] }; - key { [ 2, quotedbl, twosuperior ] }; - key { [ 3, sterling, threesuperior ] }; - key { [ 6, ampersand, notsign ] }; - key { [ 7, slash ] }; - key { [ 8, parenleft ] }; - key { [ 9, parenright, backslash ] }; - key { [ 0, equal, bar ] }; - key { [ quoteright, question, quoteleft ] }; - key { [ igrave, asciicircum ] }; - - key { [ egrave, eacute ] }; - key { [ plus, asterisk, asciitilde ] }; - - key { [ ograve, ccedilla, at ] }; - key { [ agrave, degree, numbersign ] }; - key { [ ugrave, section ] }; - - key { [ less, greater ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - - - key { [ Alt_L ] }; - key { [ SunCompose ] }; - key { [ SunAltGraph ] }; - key { [ Caps_Lock ] }; - key { [ Control_L ] }; - - include "level3(ralt_switch)" - -}; - - -partial alphanumeric_keys -xkb_symbols "type5" { - - name[Group1]="Italy - Sun type 5"; - - key { [ 8, parenleft, braceleft ] }; - key { [ 9, parenright, braceright ] }; - key { [ ugrave, section, asciitilde ] }; - - include "level3(ralt_switch)" - -}; - - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/it(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Italy"; + + key { [ less, greater ] }; + key { [ backslash, bar ] }; + key { [ 2, quotedbl ] }; + key { [ 3, sterling ] }; + key { [ 6, ampersand ] }; + key { [ 7, slash ] }; + key { [ 8, parenleft, braceleft ] }; + key { [ 9, parenright, braceright ] }; + key { [ 0, equal ] }; + key { [ apostrophe, question, grave ] }; + key { [ igrave, asciicircum ] }; + key { [ e, E, EuroSign ] }; + key { [ egrave, eacute, bracketleft, dead_abovering ] }; + key { [ plus, asterisk, bracketright ] }; + key { [ ugrave, section, asciitilde ] }; + key { [ ograve, ccedilla, at ] }; + key { [ agrave, degree, numbersign ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys +xkb_symbols "type4" { + + name[Group1]="Italy - Sun type 4"; + + key { [ bracketleft, braceleft, guillemotleft ] }; + key { [ bracketright, braceright, guillemotright ] }; + key { [ 2, quotedbl, twosuperior ] }; + key { [ 3, sterling, threesuperior ] }; + key { [ 6, ampersand, notsign ] }; + key { [ 7, slash ] }; + key { [ 8, parenleft ] }; + key { [ 9, parenright, backslash ] }; + key { [ 0, equal, bar ] }; + key { [ quoteright, question, quoteleft ] }; + key { [ igrave, asciicircum ] }; + + key { [ egrave, eacute ] }; + key { [ plus, asterisk, asciitilde ] }; + + key { [ ograve, ccedilla, at ] }; + key { [ agrave, degree, numbersign ] }; + key { [ ugrave, section ] }; + + key { [ less, greater ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + + + key { [ Alt_L ] }; + key { [ SunCompose ] }; + key { [ SunAltGraph ] }; + key { [ Caps_Lock ] }; + key { [ Control_L ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys +xkb_symbols "type5" { + + name[Group1]="Italy - Sun type 5"; + + key { [ 8, parenleft, braceleft ] }; + key { [ 9, parenright, braceright ] }; + key { [ ugrave, section, asciitilde ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/it(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/jp b/xorg-server/xkeyboard-config/symbols/sun_vndr/jp index 9b6579e2a..26911494a 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/jp +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/jp @@ -1,816 +1,816 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// -// -//Copyright 1996, 1998 The Open Group -// -//All Rights Reserved. -// -//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. -// -// US/ASCII layout for a Type 4 Sun keyboard - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - -xkb_symbols "basic" { - // Alphanumeric section - key { [ 1, exclam ], [ kana_NU ] }; - key { [ 2, quotedbl ], [ kana_FU ] }; - key { [ 3, numbersign ], [ kana_A, kana_a ] }; - key { [ 4, dollar ], [ kana_U, kana_u ] }; - key { [ 5, percent ], [ kana_E, kana_e ] }; - key { [ 6, ampersand ], [ kana_O, kana_o ] }; - key { [ 7, apostrophe ], [ kana_YA, kana_ya ] }; - key { [ 8, parenleft ], [ kana_YU, kana_yu ] }; - key { [ 9, parenright ], [ kana_YO, kana_yo ] }; - key { [ 0 ], [ kana_WA, kana_WO ] }; - key { [ minus, equal ], [ kana_HO ] }; - key { [ asciicircum, asciitilde], [ kana_HE ] }; - key { [ BackSpace ] }; - - key { [ Tab, ISO_Left_Tab ] }; - key { [ q, Q ], [ kana_TA ] }; - key { [ w, W ], [ kana_TE ] }; - key { [ e, E ], [ kana_I, kana_i ] }; - key { [ r, R ], [ kana_SU ] }; - key { [ t, T ], [ kana_KA ] }; - key { [ y, Y ], [ kana_N ] }; - key { [ u, U ], [ kana_NA ] }; - key { [ i, I ], [ kana_NI ] }; - key { [ o, O ], [ kana_RA ] }; - key { [ p, P ], [ kana_SE ] }; - key { [ at, quoteleft ], [ voicedsound ] }; - key { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] }; - key { [ Return ] }; - - key { [ Caps_Lock ] }; - key { [ a, A ], [ kana_CHI ] }; - key { [ s, S ], [ kana_TO ] }; - key { [ d, D ], [ kana_SHI ] }; - key { [ f, F ], [ kana_HA ] }; - key { [ g, G ], [ kana_KI ] }; - key { [ h, H ], [ kana_KU ] }; - key { [ j, J ], [ kana_MA ] }; - key { [ k, K ], [ kana_NO ] }; - key { [ l, L ], [ kana_RI ] }; - key { [ semicolon, plus ], [ kana_RE ] }; - key { [ colon, asterisk ], [ kana_KE ] }; - key { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] }; - - key { [ z, Z ], [ kana_TSU, kana_tsu ] }; - key { [ x, X ], [ kana_SA ] }; - key { [ c, C ], [ kana_SO ] }; - key { [ v, V ], [ kana_HI ] }; - key { [ b, B ], [ kana_KO ] }; - key { [ n, N ], [ kana_MI ] }; - key { [ m, M ], [ kana_MO ] }; - key { [ comma, less ], [ kana_NE, kana_comma ] }; - key { [ period, greater ], [ kana_RU, kana_fullstop ] }; - key { [ slash, question ], [ kana_ME, kana_conjunctive ]}; - key { [ backslash, underscore], [ kana_RO ] }; - - key { [ space ] }; - key { [ Kanji ] }; - key { [ Henkan_Mode ] }; -// key { [ backslash, underscore], [ kana_RO ]}; - // End alphanumeric section - - // Begin "Function" section - key { [ Escape ] }; - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ F9 ] }; - key { [ F10 ] }; - key { [ SunF36 ] }; - key { [ SunF37 ] }; - key { [ backslash, bar ], [ prolongedsound ] }; -// key { [ Linefeed ] }; - key { [ Execute ] }; -}; -xkb_symbols "type4" { - - // Alphanumeric section - key { [ 1, exclam ], [ kana_NU ] }; - key { [ 2, quotedbl ], [ kana_FU ] }; - key { [ 3, numbersign ], [ kana_A, kana_a ] }; - key { [ 4, dollar ], [ kana_U, kana_u ] }; - key { [ 5, percent ], [ kana_E, kana_e ] }; - key { [ 6, ampersand ], [ kana_O, kana_o ] }; - key { [ 7, apostrophe ], [ kana_YA, kana_ya ] }; - key { [ 8, parenleft ], [ kana_YU, kana_yu ] }; - key { [ 9, parenright ], [ kana_YO, kana_yo ] }; - key { [ 0 ], [ kana_WA, kana_WO ] }; - key { [ minus, equal ], [ kana_HO ] }; - key { [ asciicircum, asciitilde], [ kana_HE ] }; - key { [ BackSpace ] }; - - key { [ Tab, ISO_Left_Tab ] }; - key { [ q, Q ], [ kana_TA ] }; - key { [ w, W ], [ kana_TE ] }; - key { [ e, E ], [ kana_I, kana_i ] }; - key { [ r, R ], [ kana_SU ] }; - key { [ t, T ], [ kana_KA ] }; - key { [ y, Y ], [ kana_N ] }; - key { [ u, U ], [ kana_NA ] }; - key { [ i, I ], [ kana_NI ] }; - key { [ o, O ], [ kana_RA ] }; - key { [ p, P ], [ kana_SE ] }; - key { [ at, quoteleft ], [ voicedsound ] }; - key { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] }; - key { [ Return ] }; - - key { [ Caps_Lock ] }; - key { [ a, A ], [ kana_CHI ] }; - key { [ s, S ], [ kana_TO ] }; - key { [ d, D ], [ kana_SHI ] }; - key { [ f, F ], [ kana_HA ] }; - key { [ g, G ], [ kana_KI ] }; - key { [ h, H ], [ kana_KU ] }; - key { [ j, J ], [ kana_MA ] }; - key { [ k, K ], [ kana_NO ] }; - key { [ l, L ], [ kana_RI ] }; - key { [ semicolon, plus ], [ kana_RE ] }; - key { [ colon, asterisk ], [ kana_KE ] }; - key { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] }; - - key { [ Shift_L ] }; - key { [ z, Z ], [ kana_TSU, kana_tsu ] }; - key { [ x, X ], [ kana_SA ] }; - key { [ c, C ], [ kana_SO ] }; - key { [ v, V ], [ kana_HI ] }; - key { [ b, B ], [ kana_KO ] }; - key { [ n, N ], [ kana_MI ] }; - key { [ m, M ], [ kana_MO ] }; - key { [ comma, less ], [ kana_NE, kana_comma ] }; - key { [ period, greater ], [ kana_RU, kana_fullstop ] }; - key { [ slash, question ], [ kana_ME, kana_conjunctive ]}; - key { [ backslash, underscore], [ kana_RO ] }; - key { [ Shift_R ] }; - - key { [ Control_L ] }; - key { [ space ] }; - key { [ Kanji ] }; - key { [ Henkan_Mode ] }; - key { [ Alt_L ] }; - key { [ Mode_switch ] }; - key { [ Meta_L ] }; - key { [ Meta_R ] }; - key { [ backslash, underscore], [ kana_RO ]}; - key { [ Multi_key ] }; - key { [ Execute ] }; -// key { [ Linefeed ] }; - // End alphanumeric section - - // Begin "Function" section - key { [ Escape ] }; - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ F9 ] }; - key { [ F10 ] }; - key { [ SunF36 ] }; - key { [ SunF37 ] }; - key { [ backslash, bar ], [ prolongedsound ] }; - key { [ Linefeed ] }; - - key { [ L1, L1 ], [ SunStop ] }; - key { [ L2, L2 ], [ SunAgain ] }; - key { [ L3, L3 ], [ SunProps ] }; - key { [ L4, L4 ], [ SunUndo ] }; - key { [ L5, L5 ], [ SunFront ] }; - key { [ L6, L6 ], [ SunCopy ] }; - key { [ L7, L7 ], [ SunOpen ] }; - key { [ L8, L8 ], [ SunPaste ] }; - key { [ L9, L9 ], [ SunFind ] }; - key { [ L10, L10 ], [ SunCut ] }; - // End "Function" section - - // Begin "Editing" section - key { [ R2, R2 ], [ Print ] }; - key { [ R3, R3 ], [ Scroll_Lock, Break ] }; - key { [ R1, R1 ], [ Pause ] }; - key { [ Delete ] }; - key { [ Help ] }; - - // End "Editing" section, begin "Keypad" - key { [ Num_Lock ] }; - key { [ R4, R4 ], [ KP_Equal ] }; - key { [ R5, R5 ], [ KP_Divide ] }; - key { [ R6, R6 ], [ KP_Multiply ] }; - key { [ KP_Subtract ] }; - - key { [ R7, R7 ], [ KP_7, Home ] }; - key { [ Up, R8 ], [ KP_8 ] }; - key { [ R9, R9 ], [ KP_9, Prior ] }; - key { [ KP_Add ] }; - - key { [ Left, R10 ], [ KP_4 ] }; - key { [ R11, R11 ], [ KP_5 ] }; - key { [ Right, R12 ], [ KP_6 ] }; - - key { [ R13, R13 ], [ KP_1, End ] }; - key { [ Down, R14 ], [ KP_2 ] }; - key { [ R15, R15 ], [ KP_3, Next ] }; - key { [ KP_Enter ] }; - key { [ KP_Insert, KP_Insert], [ KP_0 ] }; - key { [ Delete, Delete ], [ KP_Decimal ] }; - // End "Keypad" section - - - // begin modifier mappings - modifier_map Shift { Shift_R, Shift_L }; - modifier_map Mod1 { Meta_L, Meta_R }; - modifier_map Mod2 { Mode_switch }; - modifier_map Mod3 { Num_Lock }; - modifier_map Mod4 { Alt_L }; -}; - -// US/ASCII layout for a Type 5 Sun keyboard -xkb_symbols "type5" { - - // Alphanumeric section - key { [ backslash, bar ], [ prolongedsound ] }; - key { [ 1, exclam ], [ kana_NU ] }; - key { [ 2, quotedbl ], [ kana_FU ] }; - key { [ 3, numbersign ], [ kana_A, kana_a ] }; - key { [ 4, dollar ], [ kana_U, kana_u ] }; - key { [ 5, percent ], [ kana_E, kana_e ] }; - key { [ 6, ampersand ], [ kana_O, kana_o ] }; - key { [ 7, apostrophe ], [ kana_YA, kana_ya ] }; - key { [ 8, parenleft ], [ kana_YU, kana_yu ] }; - key { [ 9, parenright ], [ kana_YO, kana_yo ] }; - key { [ 0 ], [ kana_WA, kana_WO ] }; - key { [ minus, equal ], [ kana_HO ] }; - key { [ asciicircum, asciitilde], [ kana_HE ] }; - key { [ BackSpace ] }; - - key { [ Tab, ISO_Left_Tab ] }; - key { [ q, Q ], [ kana_TA ] }; - key { [ w, W ], [ kana_TE ] }; - key { [ e, E ], [ kana_I, kana_i ] }; - key { [ r, R ], [ kana_SU ] }; - key { [ t, T ], [ kana_KA ] }; - key { [ y, Y ], [ kana_N ] }; - key { [ u, U ], [ kana_NA ] }; - key { [ i, I ], [ kana_NI ] }; - key { [ o, O ], [ kana_RA ] }; - key { [ p, P ], [ kana_SE ] }; - key { [ at, quoteleft ], [ voicedsound ] }; - key { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] }; - key { [ Return ] }; - - key { [ Caps_Lock ] }; - key { [ a, A ], [ kana_CHI ] }; - key { [ s, S ], [ kana_TO ] }; - key { [ d, D ], [ kana_SHI ] }; - key { [ f, F ], [ kana_HA ] }; - key { [ g, G ], [ kana_KI ] }; - key { [ h, H ], [ kana_KU ] }; - key { [ j, J ], [ kana_MA ] }; - key { [ k, K ], [ kana_NO ] }; - key { [ l, L ], [ kana_RI ] }; - key { [ semicolon, plus ], [ kana_RE ] }; - key { [ colon, asterisk ], [ kana_KE ] }; - key { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] }; - - key { [ Shift_L ] }; - key { [ z, Z ], [ kana_TSU, kana_tsu ] }; - key { [ x, X ], [ kana_SA ] }; - key { [ c, C ], [ kana_SO ] }; - key { [ v, V ], [ kana_HI ] }; - key { [ b, B ], [ kana_KO ] }; - key { [ n, N ], [ kana_MI ] }; - key { [ m, M ], [ kana_MO ] }; - key { [ comma, less ], [ kana_NE, kana_comma ] }; - key { [ period, greater ], [ kana_RU, kana_fullstop ] }; - key { [ slash, question ], [ kana_ME, kana_conjunctive ]}; - key { [ backslash, underscore], [ kana_RO ] }; - key { [ Shift_R ] }; - - key { [ Control_L ] }; -// key { [ Control_R ] }; - key { [ Execute ] }; - key { [ space ] }; - key { [ Kanji ] }; - key { [ Henkan_Mode ] }; - key { [ Alt_L ] }; - key { [ Mode_switch ] }; - key { [ Meta_L ] }; - key { [ Meta_R ] }; - key { [ Multi_key ] }; - // End alphanumeric section - - // Begin "Function" section - key { [ Escape ] }; - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ F9 ] }; - key { [ F10 ] }; - key { [ SunF36 ] }; - key { [ SunF37 ] }; - key { [ L1, L1 ], [ SunStop ] }; - key { [ L2, L2 ], [ SunAgain ] }; - key { [ L3, L3 ], [ SunProps ] }; - key { [ L4, L4 ], [ SunUndo ] }; - key { [ L5, L5 ], [ SunFront ] }; - key { [ L6, L6 ], [ SunCopy ] }; - key { [ L7, L7 ], [ SunOpen ] }; - key { [ L8, L8 ], [ SunPaste ] }; - key { [ L9, L9 ], [ SunFind ] }; - key { [ L10, L10 ], [ SunCut ] }; - // End "Function" section - - // Begin "Editing" section - key { [ R2, R2 ], [ Print, SunSys_Req ] }; - key { [ R3, R3 ], [ Scroll_Lock ] }; - key { [ R1, R1 ], [ Pause, Break ] }; - key { [ Left ] }; - key { [ Right ] }; - key { [ Up ] }; - key { [ Down ] }; - - key { [ Delete ] }; - key { [ Insert ] }; - key { [ Prior ] }; - key { [ Next ] }; - key { [ Home ] }; - key { [ End ] }; - key { [ Help ] }; - - // End "Editing" section, begin "Keypad" - key { [ Num_Lock ] }; - key { [ R5, R5 ], [ KP_Divide ] }; - key { [ R6, R6 ], [ KP_Multiply ] }; - key { [ R4, R4 ], [ KP_Subtract ] }; - - key { [ R7, R7 ], [ KP_7, Home ] }; - key { [ Up, R8 ], [ KP_8 ] }; - key { [ R9, R9 ], [ KP_9, Prior ] }; - key { [ KP_Add ] }; - - key { [ Left, R10 ], [ KP_4 ] }; - key { [ R11, R11 ], [ KP_5 ] }; - key { [ Right, R12 ], [ KP_6 ] }; - - key { [ R13, R13 ], [ KP_1, End ] }; - key { [ Down, R14 ], [ KP_2 ] }; - key { [ R15, R15 ], [ KP_3 ] }; - key { [ KP_Enter ] }; - - key { [ KP_Insert, KP_Insert ], [ KP_0 ] }; - key { [ KP_Delete, KP_Delete ], [ KP_Decimal ] }; - // End "Keypad" section, - // begin "four keys up on the right" - - key { [ SunAudioMute, SunVideoDegauss ] }; - key { [ SunAudioLowerVolume, SunVideoLowerBrightness ] }; - key { [ SunAudioRaiseVolume, SunVideoRaiseBrightness ] }; - key { [ SunPowerSwitch, SunPowerSwitchShift ] }; - - // begin modifier mappings - modifier_map Shift { Shift_R }; - modifier_map Mod1 { Meta_L, Meta_R }; - modifier_map Mod2 { Alt_R }; - modifier_map Mod3 { Num_Lock }; - modifier_map Mod4 { Alt_L }; -}; - -xkb_symbols "type5hobo" { - - // Alphanumeric section - key { [ backslash, bar ], [ prolongedsound ] }; - key { [ 1, exclam ], [ kana_NU ] }; - key { [ 2, quotedbl ], [ kana_FU ] }; - key { [ 3, numbersign ], [ kana_A, kana_a ] }; - key { [ 4, dollar ], [ kana_U, kana_u ] }; - key { [ 5, percent ], [ kana_E, kana_e ] }; - key { [ 6, ampersand ], [ kana_O, kana_o ] }; - key { [ 7, apostrophe ], [ kana_YA, kana_ya ], [ KP_7 ]}; - key { [ 8, parenleft ], [ kana_YU, kana_yu ], [ KP_8 ]}; - key { [ 9, parenright ], [ kana_YO, kana_yo ], [ KP_9 ]}; - key { [ 0 ], [ kana_WA, kana_WO ], [ KP_Multiply]}; - key { [ minus, equal ], [ kana_HO ] }; - key { [ asciicircum, asciitilde], [ kana_HE ] }; - key { [ BackSpace ] }; - - key { [ Tab, ISO_Left_Tab ] }; - key { [ q, Q ], [ kana_TA ] }; - key { [ w, W ], [ kana_TE ] }; - key { [ e, E ], [ kana_I, kana_i ] }; - key { [ r, R ], [ kana_SU ] }; - key { [ t, T ], [ kana_KA ] }; - key { [ y, Y ], [ kana_N ] }; - key { [ u, U ], [ kana_NA ], [ KP_4 ] }; - key { [ i, I ], [ kana_NI ], [ KP_5 ] }; - key { [ o, O ], [ kana_RA ], [ KP_6 ] }; - key { [ p, P ], [ kana_SE ], [ KP_Subtract]}; - key { [ at, quoteleft ], [ voicedsound ] }; - key { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] }; - key { [ Return ], [ NoSymbol, NoSymbol], [ KP_Enter ] }; - - key { [ Caps_Lock ] }; - key { [ a, A ], [ kana_CHI ] }; - key { [ s, S ], [ kana_TO ] }; - key { [ d, D ], [ kana_SHI ] }; - key { [ f, F ], [ kana_HA ] }; - key { [ g, G ], [ kana_KI ] }; - key { [ h, H ], [ kana_KU ] }; - key { [ j, J ], [ kana_MA ], [ KP_1 ]}; - key { [ k, K ], [ kana_NO ], [ KP_2 ]}; - key { [ l, L ], [ kana_RI ], [ KP_3 ]}; - key { [ semicolon, plus], [ kana_RE ], [ KP_Add ]}; - key { [ colon, asterisk ], [ kana_KE ] }; - key { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] }; - - key { [ Shift_L ] }; - key { [ z, Z ], [ kana_TSU, kana_tsu ] }; - key { [ x, X ], [ kana_SA ] }; - key { [ c, C ], [ kana_SO ] }; - key { [ v, V ], [ kana_HI ] }; - key { [ b, B ], [ kana_KO ] }; - key { [ n, N ], [ kana_MI ] }; - key { [ m, M ], [ kana_MO ], [ KP_0 ]}; - key { [ comma, less ], [ kana_NE, kana_comma ] }; - key { [ period, greater ], [ kana_RU, kana_fullstop ], [ KP_Decimal ] }; - key { [ slash, question ], [ kana_ME, kana_conjunctive ], [ KP_Divide ]}; - key { [ backslash, underscore], [ kana_RO ] }; - key { [ Shift_R ] }; - - key { [ Control_L ] }; - key { [ Execute ] }; - key { [ space ] }; - key { [ Kanji ] }; - key { [ Henkan_Mode ] }; - key { [ Alt_L ] }; - key { [ Mode_switch ] }; - key { [ Meta_L ] }; - key { [ Meta_R ] }; - key { [ Multi_key ] }; - // End alphanumeric section - - // Begin "Function" section - key { [ Escape ] }; - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ F9 ] }; - key { [ F10 ] }; - key { [ SunF36 ] }; - key { [ SunF37 ] }; - key { [ L1, L1 ], [ SunStop ] }; - key { [ L2, L2 ], [ SunAgain ] }; - key { [ L3, L3 ], [ SunProps ] }; - key { [ L4, L4 ], [ SunUndo ] }; - key { [ L5, L5 ], [ SunFront ] }; - key { [ L6, L6 ], [ SunCopy ] }; - key { [ L7, L7 ], [ SunOpen ] }; - key { [ L8, L8 ], [ SunPaste ] }; - key { [ L9, L9 ], [ SunFind ] }; - key { [ L10, L10 ], [ SunCut ] }; - // End "Function" section - - // Begin "Editing" section - key { [ R2, R2 ], [ Print, SunSys_Req ] }; - key { [ R3, R3 ], [ Scroll_Lock ] }; - key { [ R1, R1 ], [ Pause, Break ] }; - key { [ Left ] }; - key { [ Right ] }; - key { [ Up ] }; - key { [ Down ] }; - - key { [ Delete ] }; - key { [ Insert ] }; - key { [ Prior ] }; - key { [ Next ] }; - key { [ Home ] }; - key { [ End ] }; - key { [ Help ] }; - - // End "Editing" section, begin "Keypad" - key { [ Num_Lock ] }; -// key { [ R5, R5 ], [ KP_Divide ] }; -// key { [ R6, R6 ], [ KP_Multiply ] }; -// key { [ R4, R4 ], [ KP_Subtract ] }; - -// key { [ R7, R7 ], [ KP_7, Home ] }; -// key { [ Up, R8 ], [ KP_8 ] }; -// key { [ R9, R9 ], [ KP_9, Prior ] }; -// key { [ KP_Add ] }; - -// key { [ Left, R10 ], [ KP_4 ] }; -// key { [ R11, R11 ], [ KP_5 ] }; -// key { [ Right, R12 ], [ KP_6 ] }; - -// key { [ R13, R13 ], [ KP_1, End ] }; -// key { [ Down, R14 ], [ KP_2 ] }; -// key { [ R15, R15 ], [ KP_3 ] }; -// key { [ KP_Enter ] }; - -// key { [ KP_Insert, KP_Insert ], [ KP_0 ] }; -// key { [ KP_Delete, KP_Delete ], [ KP_Decimal ] }; - // End "Keypad" section, - // begin "four keys up on the right" - - key { [ SunAudioMute, SunVideoDegauss ] }; - key { [ SunAudioLowerVolume, SunVideoLowerBrightness ] }; - key { [ SunAudioRaiseVolume, SunVideoRaiseBrightness ] }; - key { [ SunPowerSwitch, SunPowerSwitchShift ] }; - - // begin modifier mappings - modifier_map Shift { Shift_R }; - modifier_map Mod1 { Meta_L, Meta_R }; - modifier_map Mod2 { Alt_R }; - modifier_map Mod3 { Num_Lock }; - modifier_map Mod4 { Alt_L }; -}; - -// layout for a Japanese Type 6 Sun keyboard -// Just shows differences from Type 6 US layout -partial -xkb_symbols "type6" { - - // Alphanumeric section - // Though Yen symbol is engraved on key AE13, JA L10N folks want backslash. - key { [ backslash, bar ], [ prolongedsound ] }; - key { [ 1, exclam ], [ kana_NU ] }; - key { [ 2, quotedbl ], [ kana_FU ] }; - key { [ 3, numbersign ], [ kana_A, kana_a ] }; - key { [ 4, dollar ], [ kana_U, kana_u ] }; - key { [ 5, percent ], [ kana_E, kana_e ] }; - key { [ 6, ampersand ], [ kana_O, kana_o ] }; - key { [ 7, apostrophe ], [ kana_YA, kana_ya ] }; - key { [ 8, parenleft ], [ kana_YU, kana_yu ] }; - key { [ 9, parenright ], [ kana_YO, kana_yo ] }; - key { [ 0 ], [ kana_WA, kana_WO ] }; - key { [ minus, equal ], [ kana_HO ] }; - key { [ asciicircum, asciitilde], [ kana_HE ] }; - - key { [ q, Q ], [ kana_TA ] }; - key { [ w, W ], [ kana_TE ] }; - key { [ e, E ], [ kana_I, kana_i ] }; - key { [ r, R ], [ kana_SU ] }; - key { [ t, T ], [ kana_KA ] }; - key { [ y, Y ], [ kana_N ] }; - key { [ u, U ], [ kana_NA ] }; - key { [ i, I ], [ kana_NI ] }; - key { [ o, O ], [ kana_RA ] }; - key { [ p, P ], [ kana_SE ] }; - key { [ at, quoteleft ], [ voicedsound ] }; - key { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] }; - - key { [ a, A ], [ kana_CHI ] }; - key { [ s, S ], [ kana_TO ] }; - key { [ d, D ], [ kana_SHI ] }; - key { [ f, F ], [ kana_HA ] }; - key { [ g, G ], [ kana_KI ] }; - key { [ h, H ], [ kana_KU ] }; - key { [ j, J ], [ kana_MA ] }; - key { [ k, K ], [ kana_NO ] }; - key { [ l, L ], [ kana_RI ] }; - key { [ semicolon, plus ], [ kana_RE ] }; - key { [ colon, asterisk ], [ kana_KE ] }; - key { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] }; - - key { [ z, Z ], [ kana_TSU, kana_tsu ] }; - key { [ x, X ], [ kana_SA ] }; - key { [ c, C ], [ kana_SO ] }; - key { [ v, V ], [ kana_HI ] }; - key { [ b, B ], [ kana_KO ] }; - key { [ n, N ], [ kana_MI ] }; - key { [ m, M ], [ kana_MO ] }; - key { [ comma, less ], [ kana_NE, kana_comma ] }; - key { [ period, greater ], [ kana_RU, kana_fullstop ] }; - key { [ slash, question ], [ kana_ME, kana_conjunctive ]}; - key { [ backslash, underscore], [ kana_RO ] }; - key { [ backslash, underscore], [ kana_RO ] }; - - key { [ Execute ] }; - key { [ Kanji ] }; - key { [ Henkan_Mode ] }; - key { [ Kana_Lock, Mode_switch ] }; - // End alphanumeric section -}; - -xkb_symbols "x86" { - include "sun_vndr/us(pc101)" - include "sun_vndr/jp(basic)" - key { [ Henkan_Mode, Henkan_Mode ], [ Henkan_Mode ] }; - - key { [ 0, asciitilde ], [ kana_WA, kana_WO ]}; - key { [ backslash, bar ], [ prolongedsound ]}; - - - key { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ]}; - - key { [ Mode_switch ] }; - key { [ Alt_R ] }; - -}; - -xkb_symbols "J3100" { - include "sun_vndr/us(pc101)" - - // Alphanumeric section - key { [ 1, exclam ], [ kana_NU ] }; - key { [ 2, quotedbl ], [ kana_FU ] }; - key { [ 3, numbersign ], [ kana_A, kana_a ] }; - key { [ 4, dollar ], [ kana_U, kana_u ] }; - key { [ 5, percent ], [ kana_E, kana_e ] }; - key { [ 6, ampersand ], [ kana_O, kana_o ] }; - key { [ 7, apostrophe ], [ kana_YA, kana_ya ] }; - key { [ 8, parenleft ], [ kana_YU, kana_yu ] }; - key { [ 9, parenright ], [ kana_YO, kana_yo ] }; - key { [ 0 ], [ kana_WA, kana_WO ] }; - key { [ minus, equal ], [ kana_HO ] }; - key { [ asciicircum, asciitilde], [ kana_HE ] }; - key { [ BackSpace ] }; - - key { [ Tab, ISO_Left_Tab ] }; - key { [ q, Q ], [ kana_TA ] }; - key { [ w, W ], [ kana_TE ] }; - key { [ e, E ], [ kana_I, kana_i ] }; - key { [ r, R ], [ kana_SU ] }; - key { [ t, T ], [ kana_KA ] }; - key { [ y, Y ], [ kana_N ] }; - key { [ u, U ], [ kana_NA ] }; - key { [ i, I ], [ kana_NI ] }; - key { [ o, O ], [ kana_RA ] }; - key { [ p, P ], [ kana_SE ] }; - key { [ at, quoteleft ], [ voicedsound ] }; - key { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] }; - key { [ Return ] }; - - key { [ Caps_Lock ] }; - key { [ a, A ], [ kana_CHI ] }; - key { [ s, S ], [ kana_TO ] }; - key { [ d, D ], [ kana_SHI ] }; - key { [ f, F ], [ kana_HA ] }; - key { [ g, G ], [ kana_KI ] }; - key { [ h, H ], [ kana_KU ] }; - key { [ j, J ], [ kana_MA ] }; - key { [ k, K ], [ kana_NO ] }; - key { [ l, L ], [ kana_RI ] }; - key { [ semicolon, plus ], [ kana_RE ] }; - key { [ colon, asterisk ], [ kana_KE ] }; - key { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] }; - - key { [ z, Z ], [ kana_TSU, kana_tsu ] }; - key { [ x, X ], [ kana_SA ] }; - key { [ c, C ], [ kana_SO ] }; - key { [ v, V ], [ kana_HI ] }; - key { [ b, B ], [ kana_KO ] }; - key { [ n, N ], [ kana_MI ] }; - key { [ m, M ], [ kana_MO ] }; - key { [ comma, less ], [ kana_NE, kana_comma ] }; - key { [ period, greater ], [ kana_RU, kana_fullstop ] }; - key { [ slash, question ], [ kana_ME, kana_conjunctive ]}; -// key { [ backslash, underscore], [ kana_RO ] }; - - key { [ space ] }; -// key { [ Kanji ] }; -// key { [ Henkan_Mode ] }; -// key { [ backslash, underscore], [ kana_RO ]}; - // End alphanumeric section - - // Begin "Function" section - key { [ Escape ] }; - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ F9 ] }; - key { [ F10 ] }; - key { [ SunF36 ] }; - key { [ SunF37 ] }; - key { [ backslash, bar ], [ prolongedsound ] }; -// key { [ Linefeed ] }; -// key { [ Execute ] }; - - key { [ Escape, 3 ] }; - - key { [ 2, at ], [ kana_FU ]}; - key { [ 6, asciicircum ], [ kana_O, kana_o ]}; - key { [ 7, ampersand ], [ kana_YA, kana_ya ]}; - key { [ 8, asterisk ], [ kana_YU, kana_yu ]}; - key { [ 9, parenleft ], [ kana_YO, kana_yo ]}; - key { [ 0, parenright ], [ kana_WA, kana_WO ]}; - key { [ minus, underscore ], [ kana_HO ]}; - key { [ equal, plus ], [ kana_HE ]}; - - key { [ backslash, bar ], [ prolongedsound ]}; - key { [ equal, plus ], [ kana_HE ]}; - - key { [ bracketleft, braceleft ], [ voicedsound ]}; - key { [ bracketright, braceright ], [ semivoicedsound, kana_openingbracket ]}; - - key { [ semicolon, colon ], [ kana_RE ]}; - key { [ quoteright, quotedbl ], [ kana_KE ]}; - - key { [ quoteleft, asciitilde ], [ kana_MU, kana_closingbracket ]}; - key { [ backslash, bar ], [ kana_RO ]}; -// key { [ Mode_switch ] }; - key { [ Henkan_Mode ] }; - key { [ Mode_switch ] }; - -}; - -xkb_symbols "Muhenkan_x86" { - include "sun_vndr/jp(x86)" - - key { [ Muhenkan ] }; -}; - - - -partial -xkb_symbols "type7" { - include "sun_vndr/jp(type6)" - key { [ 0, asciitilde ], [ kana_WA, kana_WO ] }; - key { [ Henkan_Mode ] }; - key { [ Kana_Lock, Mode_switch ] }; - key { [ Alt_R, Alt_R ] }; -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// +// +//Copyright 1996, 1998 The Open Group +// +//All Rights Reserved. +// +//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. +// +// US/ASCII layout for a Type 4 Sun keyboard + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +xkb_symbols "basic" { + // Alphanumeric section + key { [ 1, exclam ], [ kana_NU ] }; + key { [ 2, quotedbl ], [ kana_FU ] }; + key { [ 3, numbersign ], [ kana_A, kana_a ] }; + key { [ 4, dollar ], [ kana_U, kana_u ] }; + key { [ 5, percent ], [ kana_E, kana_e ] }; + key { [ 6, ampersand ], [ kana_O, kana_o ] }; + key { [ 7, apostrophe ], [ kana_YA, kana_ya ] }; + key { [ 8, parenleft ], [ kana_YU, kana_yu ] }; + key { [ 9, parenright ], [ kana_YO, kana_yo ] }; + key { [ 0 ], [ kana_WA, kana_WO ] }; + key { [ minus, equal ], [ kana_HO ] }; + key { [ asciicircum, asciitilde], [ kana_HE ] }; + key { [ BackSpace ] }; + + key { [ Tab, ISO_Left_Tab ] }; + key { [ q, Q ], [ kana_TA ] }; + key { [ w, W ], [ kana_TE ] }; + key { [ e, E ], [ kana_I, kana_i ] }; + key { [ r, R ], [ kana_SU ] }; + key { [ t, T ], [ kana_KA ] }; + key { [ y, Y ], [ kana_N ] }; + key { [ u, U ], [ kana_NA ] }; + key { [ i, I ], [ kana_NI ] }; + key { [ o, O ], [ kana_RA ] }; + key { [ p, P ], [ kana_SE ] }; + key { [ at, quoteleft ], [ voicedsound ] }; + key { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] }; + key { [ Return ] }; + + key { [ Caps_Lock ] }; + key { [ a, A ], [ kana_CHI ] }; + key { [ s, S ], [ kana_TO ] }; + key { [ d, D ], [ kana_SHI ] }; + key { [ f, F ], [ kana_HA ] }; + key { [ g, G ], [ kana_KI ] }; + key { [ h, H ], [ kana_KU ] }; + key { [ j, J ], [ kana_MA ] }; + key { [ k, K ], [ kana_NO ] }; + key { [ l, L ], [ kana_RI ] }; + key { [ semicolon, plus ], [ kana_RE ] }; + key { [ colon, asterisk ], [ kana_KE ] }; + key { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] }; + + key { [ z, Z ], [ kana_TSU, kana_tsu ] }; + key { [ x, X ], [ kana_SA ] }; + key { [ c, C ], [ kana_SO ] }; + key { [ v, V ], [ kana_HI ] }; + key { [ b, B ], [ kana_KO ] }; + key { [ n, N ], [ kana_MI ] }; + key { [ m, M ], [ kana_MO ] }; + key { [ comma, less ], [ kana_NE, kana_comma ] }; + key { [ period, greater ], [ kana_RU, kana_fullstop ] }; + key { [ slash, question ], [ kana_ME, kana_conjunctive ]}; + key { [ backslash, underscore], [ kana_RO ] }; + + key { [ space ] }; + key { [ Kanji ] }; + key { [ Henkan_Mode ] }; +// key { [ backslash, underscore], [ kana_RO ]}; + // End alphanumeric section + + // Begin "Function" section + key { [ Escape ] }; + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F10 ] }; + key { [ SunF36 ] }; + key { [ SunF37 ] }; + key { [ backslash, bar ], [ prolongedsound ] }; +// key { [ Linefeed ] }; + key { [ Execute ] }; +}; +xkb_symbols "type4" { + + // Alphanumeric section + key { [ 1, exclam ], [ kana_NU ] }; + key { [ 2, quotedbl ], [ kana_FU ] }; + key { [ 3, numbersign ], [ kana_A, kana_a ] }; + key { [ 4, dollar ], [ kana_U, kana_u ] }; + key { [ 5, percent ], [ kana_E, kana_e ] }; + key { [ 6, ampersand ], [ kana_O, kana_o ] }; + key { [ 7, apostrophe ], [ kana_YA, kana_ya ] }; + key { [ 8, parenleft ], [ kana_YU, kana_yu ] }; + key { [ 9, parenright ], [ kana_YO, kana_yo ] }; + key { [ 0 ], [ kana_WA, kana_WO ] }; + key { [ minus, equal ], [ kana_HO ] }; + key { [ asciicircum, asciitilde], [ kana_HE ] }; + key { [ BackSpace ] }; + + key { [ Tab, ISO_Left_Tab ] }; + key { [ q, Q ], [ kana_TA ] }; + key { [ w, W ], [ kana_TE ] }; + key { [ e, E ], [ kana_I, kana_i ] }; + key { [ r, R ], [ kana_SU ] }; + key { [ t, T ], [ kana_KA ] }; + key { [ y, Y ], [ kana_N ] }; + key { [ u, U ], [ kana_NA ] }; + key { [ i, I ], [ kana_NI ] }; + key { [ o, O ], [ kana_RA ] }; + key { [ p, P ], [ kana_SE ] }; + key { [ at, quoteleft ], [ voicedsound ] }; + key { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] }; + key { [ Return ] }; + + key { [ Caps_Lock ] }; + key { [ a, A ], [ kana_CHI ] }; + key { [ s, S ], [ kana_TO ] }; + key { [ d, D ], [ kana_SHI ] }; + key { [ f, F ], [ kana_HA ] }; + key { [ g, G ], [ kana_KI ] }; + key { [ h, H ], [ kana_KU ] }; + key { [ j, J ], [ kana_MA ] }; + key { [ k, K ], [ kana_NO ] }; + key { [ l, L ], [ kana_RI ] }; + key { [ semicolon, plus ], [ kana_RE ] }; + key { [ colon, asterisk ], [ kana_KE ] }; + key { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] }; + + key { [ Shift_L ] }; + key { [ z, Z ], [ kana_TSU, kana_tsu ] }; + key { [ x, X ], [ kana_SA ] }; + key { [ c, C ], [ kana_SO ] }; + key { [ v, V ], [ kana_HI ] }; + key { [ b, B ], [ kana_KO ] }; + key { [ n, N ], [ kana_MI ] }; + key { [ m, M ], [ kana_MO ] }; + key { [ comma, less ], [ kana_NE, kana_comma ] }; + key { [ period, greater ], [ kana_RU, kana_fullstop ] }; + key { [ slash, question ], [ kana_ME, kana_conjunctive ]}; + key { [ backslash, underscore], [ kana_RO ] }; + key { [ Shift_R ] }; + + key { [ Control_L ] }; + key { [ space ] }; + key { [ Kanji ] }; + key { [ Henkan_Mode ] }; + key { [ Alt_L ] }; + key { [ Mode_switch ] }; + key { [ Meta_L ] }; + key { [ Meta_R ] }; + key { [ backslash, underscore], [ kana_RO ]}; + key { [ Multi_key ] }; + key { [ Execute ] }; +// key { [ Linefeed ] }; + // End alphanumeric section + + // Begin "Function" section + key { [ Escape ] }; + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F10 ] }; + key { [ SunF36 ] }; + key { [ SunF37 ] }; + key { [ backslash, bar ], [ prolongedsound ] }; + key { [ Linefeed ] }; + + key { [ L1, L1 ], [ SunStop ] }; + key { [ L2, L2 ], [ SunAgain ] }; + key { [ L3, L3 ], [ SunProps ] }; + key { [ L4, L4 ], [ SunUndo ] }; + key { [ L5, L5 ], [ SunFront ] }; + key { [ L6, L6 ], [ SunCopy ] }; + key { [ L7, L7 ], [ SunOpen ] }; + key { [ L8, L8 ], [ SunPaste ] }; + key { [ L9, L9 ], [ SunFind ] }; + key { [ L10, L10 ], [ SunCut ] }; + // End "Function" section + + // Begin "Editing" section + key { [ R2, R2 ], [ Print ] }; + key { [ R3, R3 ], [ Scroll_Lock, Break ] }; + key { [ R1, R1 ], [ Pause ] }; + key { [ Delete ] }; + key { [ Help ] }; + + // End "Editing" section, begin "Keypad" + key { [ Num_Lock ] }; + key { [ R4, R4 ], [ KP_Equal ] }; + key { [ R5, R5 ], [ KP_Divide ] }; + key { [ R6, R6 ], [ KP_Multiply ] }; + key { [ KP_Subtract ] }; + + key { [ R7, R7 ], [ KP_7, Home ] }; + key { [ Up, R8 ], [ KP_8 ] }; + key { [ R9, R9 ], [ KP_9, Prior ] }; + key { [ KP_Add ] }; + + key { [ Left, R10 ], [ KP_4 ] }; + key { [ R11, R11 ], [ KP_5 ] }; + key { [ Right, R12 ], [ KP_6 ] }; + + key { [ R13, R13 ], [ KP_1, End ] }; + key { [ Down, R14 ], [ KP_2 ] }; + key { [ R15, R15 ], [ KP_3, Next ] }; + key { [ KP_Enter ] }; + key { [ KP_Insert, KP_Insert], [ KP_0 ] }; + key { [ Delete, Delete ], [ KP_Decimal ] }; + // End "Keypad" section + + + // begin modifier mappings + modifier_map Shift { Shift_R, Shift_L }; + modifier_map Mod1 { Meta_L, Meta_R }; + modifier_map Mod2 { Mode_switch }; + modifier_map Mod3 { Num_Lock }; + modifier_map Mod4 { Alt_L }; +}; + +// US/ASCII layout for a Type 5 Sun keyboard +xkb_symbols "type5" { + + // Alphanumeric section + key { [ backslash, bar ], [ prolongedsound ] }; + key { [ 1, exclam ], [ kana_NU ] }; + key { [ 2, quotedbl ], [ kana_FU ] }; + key { [ 3, numbersign ], [ kana_A, kana_a ] }; + key { [ 4, dollar ], [ kana_U, kana_u ] }; + key { [ 5, percent ], [ kana_E, kana_e ] }; + key { [ 6, ampersand ], [ kana_O, kana_o ] }; + key { [ 7, apostrophe ], [ kana_YA, kana_ya ] }; + key { [ 8, parenleft ], [ kana_YU, kana_yu ] }; + key { [ 9, parenright ], [ kana_YO, kana_yo ] }; + key { [ 0 ], [ kana_WA, kana_WO ] }; + key { [ minus, equal ], [ kana_HO ] }; + key { [ asciicircum, asciitilde], [ kana_HE ] }; + key { [ BackSpace ] }; + + key { [ Tab, ISO_Left_Tab ] }; + key { [ q, Q ], [ kana_TA ] }; + key { [ w, W ], [ kana_TE ] }; + key { [ e, E ], [ kana_I, kana_i ] }; + key { [ r, R ], [ kana_SU ] }; + key { [ t, T ], [ kana_KA ] }; + key { [ y, Y ], [ kana_N ] }; + key { [ u, U ], [ kana_NA ] }; + key { [ i, I ], [ kana_NI ] }; + key { [ o, O ], [ kana_RA ] }; + key { [ p, P ], [ kana_SE ] }; + key { [ at, quoteleft ], [ voicedsound ] }; + key { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] }; + key { [ Return ] }; + + key { [ Caps_Lock ] }; + key { [ a, A ], [ kana_CHI ] }; + key { [ s, S ], [ kana_TO ] }; + key { [ d, D ], [ kana_SHI ] }; + key { [ f, F ], [ kana_HA ] }; + key { [ g, G ], [ kana_KI ] }; + key { [ h, H ], [ kana_KU ] }; + key { [ j, J ], [ kana_MA ] }; + key { [ k, K ], [ kana_NO ] }; + key { [ l, L ], [ kana_RI ] }; + key { [ semicolon, plus ], [ kana_RE ] }; + key { [ colon, asterisk ], [ kana_KE ] }; + key { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] }; + + key { [ Shift_L ] }; + key { [ z, Z ], [ kana_TSU, kana_tsu ] }; + key { [ x, X ], [ kana_SA ] }; + key { [ c, C ], [ kana_SO ] }; + key { [ v, V ], [ kana_HI ] }; + key { [ b, B ], [ kana_KO ] }; + key { [ n, N ], [ kana_MI ] }; + key { [ m, M ], [ kana_MO ] }; + key { [ comma, less ], [ kana_NE, kana_comma ] }; + key { [ period, greater ], [ kana_RU, kana_fullstop ] }; + key { [ slash, question ], [ kana_ME, kana_conjunctive ]}; + key { [ backslash, underscore], [ kana_RO ] }; + key { [ Shift_R ] }; + + key { [ Control_L ] }; +// key { [ Control_R ] }; + key { [ Execute ] }; + key { [ space ] }; + key { [ Kanji ] }; + key { [ Henkan_Mode ] }; + key { [ Alt_L ] }; + key { [ Mode_switch ] }; + key { [ Meta_L ] }; + key { [ Meta_R ] }; + key { [ Multi_key ] }; + // End alphanumeric section + + // Begin "Function" section + key { [ Escape ] }; + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F10 ] }; + key { [ SunF36 ] }; + key { [ SunF37 ] }; + key { [ L1, L1 ], [ SunStop ] }; + key { [ L2, L2 ], [ SunAgain ] }; + key { [ L3, L3 ], [ SunProps ] }; + key { [ L4, L4 ], [ SunUndo ] }; + key { [ L5, L5 ], [ SunFront ] }; + key { [ L6, L6 ], [ SunCopy ] }; + key { [ L7, L7 ], [ SunOpen ] }; + key { [ L8, L8 ], [ SunPaste ] }; + key { [ L9, L9 ], [ SunFind ] }; + key { [ L10, L10 ], [ SunCut ] }; + // End "Function" section + + // Begin "Editing" section + key { [ R2, R2 ], [ Print, SunSys_Req ] }; + key { [ R3, R3 ], [ Scroll_Lock ] }; + key { [ R1, R1 ], [ Pause, Break ] }; + key { [ Left ] }; + key { [ Right ] }; + key { [ Up ] }; + key { [ Down ] }; + + key { [ Delete ] }; + key { [ Insert ] }; + key { [ Prior ] }; + key { [ Next ] }; + key { [ Home ] }; + key { [ End ] }; + key { [ Help ] }; + + // End "Editing" section, begin "Keypad" + key { [ Num_Lock ] }; + key { [ R5, R5 ], [ KP_Divide ] }; + key { [ R6, R6 ], [ KP_Multiply ] }; + key { [ R4, R4 ], [ KP_Subtract ] }; + + key { [ R7, R7 ], [ KP_7, Home ] }; + key { [ Up, R8 ], [ KP_8 ] }; + key { [ R9, R9 ], [ KP_9, Prior ] }; + key { [ KP_Add ] }; + + key { [ Left, R10 ], [ KP_4 ] }; + key { [ R11, R11 ], [ KP_5 ] }; + key { [ Right, R12 ], [ KP_6 ] }; + + key { [ R13, R13 ], [ KP_1, End ] }; + key { [ Down, R14 ], [ KP_2 ] }; + key { [ R15, R15 ], [ KP_3 ] }; + key { [ KP_Enter ] }; + + key { [ KP_Insert, KP_Insert ], [ KP_0 ] }; + key { [ KP_Delete, KP_Delete ], [ KP_Decimal ] }; + // End "Keypad" section, + // begin "four keys up on the right" + + key { [ SunAudioMute, SunVideoDegauss ] }; + key { [ SunAudioLowerVolume, SunVideoLowerBrightness ] }; + key { [ SunAudioRaiseVolume, SunVideoRaiseBrightness ] }; + key { [ SunPowerSwitch, SunPowerSwitchShift ] }; + + // begin modifier mappings + modifier_map Shift { Shift_R }; + modifier_map Mod1 { Meta_L, Meta_R }; + modifier_map Mod2 { Alt_R }; + modifier_map Mod3 { Num_Lock }; + modifier_map Mod4 { Alt_L }; +}; + +xkb_symbols "type5hobo" { + + // Alphanumeric section + key { [ backslash, bar ], [ prolongedsound ] }; + key { [ 1, exclam ], [ kana_NU ] }; + key { [ 2, quotedbl ], [ kana_FU ] }; + key { [ 3, numbersign ], [ kana_A, kana_a ] }; + key { [ 4, dollar ], [ kana_U, kana_u ] }; + key { [ 5, percent ], [ kana_E, kana_e ] }; + key { [ 6, ampersand ], [ kana_O, kana_o ] }; + key { [ 7, apostrophe ], [ kana_YA, kana_ya ], [ KP_7 ]}; + key { [ 8, parenleft ], [ kana_YU, kana_yu ], [ KP_8 ]}; + key { [ 9, parenright ], [ kana_YO, kana_yo ], [ KP_9 ]}; + key { [ 0 ], [ kana_WA, kana_WO ], [ KP_Multiply]}; + key { [ minus, equal ], [ kana_HO ] }; + key { [ asciicircum, asciitilde], [ kana_HE ] }; + key { [ BackSpace ] }; + + key { [ Tab, ISO_Left_Tab ] }; + key { [ q, Q ], [ kana_TA ] }; + key { [ w, W ], [ kana_TE ] }; + key { [ e, E ], [ kana_I, kana_i ] }; + key { [ r, R ], [ kana_SU ] }; + key { [ t, T ], [ kana_KA ] }; + key { [ y, Y ], [ kana_N ] }; + key { [ u, U ], [ kana_NA ], [ KP_4 ] }; + key { [ i, I ], [ kana_NI ], [ KP_5 ] }; + key { [ o, O ], [ kana_RA ], [ KP_6 ] }; + key { [ p, P ], [ kana_SE ], [ KP_Subtract]}; + key { [ at, quoteleft ], [ voicedsound ] }; + key { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] }; + key { [ Return ], [ NoSymbol, NoSymbol], [ KP_Enter ] }; + + key { [ Caps_Lock ] }; + key { [ a, A ], [ kana_CHI ] }; + key { [ s, S ], [ kana_TO ] }; + key { [ d, D ], [ kana_SHI ] }; + key { [ f, F ], [ kana_HA ] }; + key { [ g, G ], [ kana_KI ] }; + key { [ h, H ], [ kana_KU ] }; + key { [ j, J ], [ kana_MA ], [ KP_1 ]}; + key { [ k, K ], [ kana_NO ], [ KP_2 ]}; + key { [ l, L ], [ kana_RI ], [ KP_3 ]}; + key { [ semicolon, plus], [ kana_RE ], [ KP_Add ]}; + key { [ colon, asterisk ], [ kana_KE ] }; + key { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] }; + + key { [ Shift_L ] }; + key { [ z, Z ], [ kana_TSU, kana_tsu ] }; + key { [ x, X ], [ kana_SA ] }; + key { [ c, C ], [ kana_SO ] }; + key { [ v, V ], [ kana_HI ] }; + key { [ b, B ], [ kana_KO ] }; + key { [ n, N ], [ kana_MI ] }; + key { [ m, M ], [ kana_MO ], [ KP_0 ]}; + key { [ comma, less ], [ kana_NE, kana_comma ] }; + key { [ period, greater ], [ kana_RU, kana_fullstop ], [ KP_Decimal ] }; + key { [ slash, question ], [ kana_ME, kana_conjunctive ], [ KP_Divide ]}; + key { [ backslash, underscore], [ kana_RO ] }; + key { [ Shift_R ] }; + + key { [ Control_L ] }; + key { [ Execute ] }; + key { [ space ] }; + key { [ Kanji ] }; + key { [ Henkan_Mode ] }; + key { [ Alt_L ] }; + key { [ Mode_switch ] }; + key { [ Meta_L ] }; + key { [ Meta_R ] }; + key { [ Multi_key ] }; + // End alphanumeric section + + // Begin "Function" section + key { [ Escape ] }; + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F10 ] }; + key { [ SunF36 ] }; + key { [ SunF37 ] }; + key { [ L1, L1 ], [ SunStop ] }; + key { [ L2, L2 ], [ SunAgain ] }; + key { [ L3, L3 ], [ SunProps ] }; + key { [ L4, L4 ], [ SunUndo ] }; + key { [ L5, L5 ], [ SunFront ] }; + key { [ L6, L6 ], [ SunCopy ] }; + key { [ L7, L7 ], [ SunOpen ] }; + key { [ L8, L8 ], [ SunPaste ] }; + key { [ L9, L9 ], [ SunFind ] }; + key { [ L10, L10 ], [ SunCut ] }; + // End "Function" section + + // Begin "Editing" section + key { [ R2, R2 ], [ Print, SunSys_Req ] }; + key { [ R3, R3 ], [ Scroll_Lock ] }; + key { [ R1, R1 ], [ Pause, Break ] }; + key { [ Left ] }; + key { [ Right ] }; + key { [ Up ] }; + key { [ Down ] }; + + key { [ Delete ] }; + key { [ Insert ] }; + key { [ Prior ] }; + key { [ Next ] }; + key { [ Home ] }; + key { [ End ] }; + key { [ Help ] }; + + // End "Editing" section, begin "Keypad" + key { [ Num_Lock ] }; +// key { [ R5, R5 ], [ KP_Divide ] }; +// key { [ R6, R6 ], [ KP_Multiply ] }; +// key { [ R4, R4 ], [ KP_Subtract ] }; + +// key { [ R7, R7 ], [ KP_7, Home ] }; +// key { [ Up, R8 ], [ KP_8 ] }; +// key { [ R9, R9 ], [ KP_9, Prior ] }; +// key { [ KP_Add ] }; + +// key { [ Left, R10 ], [ KP_4 ] }; +// key { [ R11, R11 ], [ KP_5 ] }; +// key { [ Right, R12 ], [ KP_6 ] }; + +// key { [ R13, R13 ], [ KP_1, End ] }; +// key { [ Down, R14 ], [ KP_2 ] }; +// key { [ R15, R15 ], [ KP_3 ] }; +// key { [ KP_Enter ] }; + +// key { [ KP_Insert, KP_Insert ], [ KP_0 ] }; +// key { [ KP_Delete, KP_Delete ], [ KP_Decimal ] }; + // End "Keypad" section, + // begin "four keys up on the right" + + key { [ SunAudioMute, SunVideoDegauss ] }; + key { [ SunAudioLowerVolume, SunVideoLowerBrightness ] }; + key { [ SunAudioRaiseVolume, SunVideoRaiseBrightness ] }; + key { [ SunPowerSwitch, SunPowerSwitchShift ] }; + + // begin modifier mappings + modifier_map Shift { Shift_R }; + modifier_map Mod1 { Meta_L, Meta_R }; + modifier_map Mod2 { Alt_R }; + modifier_map Mod3 { Num_Lock }; + modifier_map Mod4 { Alt_L }; +}; + +// layout for a Japanese Type 6 Sun keyboard +// Just shows differences from Type 6 US layout +partial +xkb_symbols "type6" { + + // Alphanumeric section + // Though Yen symbol is engraved on key AE13, JA L10N folks want backslash. + key { [ backslash, bar ], [ prolongedsound ] }; + key { [ 1, exclam ], [ kana_NU ] }; + key { [ 2, quotedbl ], [ kana_FU ] }; + key { [ 3, numbersign ], [ kana_A, kana_a ] }; + key { [ 4, dollar ], [ kana_U, kana_u ] }; + key { [ 5, percent ], [ kana_E, kana_e ] }; + key { [ 6, ampersand ], [ kana_O, kana_o ] }; + key { [ 7, apostrophe ], [ kana_YA, kana_ya ] }; + key { [ 8, parenleft ], [ kana_YU, kana_yu ] }; + key { [ 9, parenright ], [ kana_YO, kana_yo ] }; + key { [ 0 ], [ kana_WA, kana_WO ] }; + key { [ minus, equal ], [ kana_HO ] }; + key { [ asciicircum, asciitilde], [ kana_HE ] }; + + key { [ q, Q ], [ kana_TA ] }; + key { [ w, W ], [ kana_TE ] }; + key { [ e, E ], [ kana_I, kana_i ] }; + key { [ r, R ], [ kana_SU ] }; + key { [ t, T ], [ kana_KA ] }; + key { [ y, Y ], [ kana_N ] }; + key { [ u, U ], [ kana_NA ] }; + key { [ i, I ], [ kana_NI ] }; + key { [ o, O ], [ kana_RA ] }; + key { [ p, P ], [ kana_SE ] }; + key { [ at, quoteleft ], [ voicedsound ] }; + key { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] }; + + key { [ a, A ], [ kana_CHI ] }; + key { [ s, S ], [ kana_TO ] }; + key { [ d, D ], [ kana_SHI ] }; + key { [ f, F ], [ kana_HA ] }; + key { [ g, G ], [ kana_KI ] }; + key { [ h, H ], [ kana_KU ] }; + key { [ j, J ], [ kana_MA ] }; + key { [ k, K ], [ kana_NO ] }; + key { [ l, L ], [ kana_RI ] }; + key { [ semicolon, plus ], [ kana_RE ] }; + key { [ colon, asterisk ], [ kana_KE ] }; + key { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] }; + + key { [ z, Z ], [ kana_TSU, kana_tsu ] }; + key { [ x, X ], [ kana_SA ] }; + key { [ c, C ], [ kana_SO ] }; + key { [ v, V ], [ kana_HI ] }; + key { [ b, B ], [ kana_KO ] }; + key { [ n, N ], [ kana_MI ] }; + key { [ m, M ], [ kana_MO ] }; + key { [ comma, less ], [ kana_NE, kana_comma ] }; + key { [ period, greater ], [ kana_RU, kana_fullstop ] }; + key { [ slash, question ], [ kana_ME, kana_conjunctive ]}; + key { [ backslash, underscore], [ kana_RO ] }; + key { [ backslash, underscore], [ kana_RO ] }; + + key { [ Execute ] }; + key { [ Kanji ] }; + key { [ Henkan_Mode ] }; + key { [ Kana_Lock, Mode_switch ] }; + // End alphanumeric section +}; + +xkb_symbols "x86" { + include "sun_vndr/us(pc101)" + include "sun_vndr/jp(basic)" + key { [ Henkan_Mode, Henkan_Mode ], [ Henkan_Mode ] }; + + key { [ 0, asciitilde ], [ kana_WA, kana_WO ]}; + key { [ backslash, bar ], [ prolongedsound ]}; + + + key { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ]}; + + key { [ Mode_switch ] }; + key { [ Alt_R ] }; + +}; + +xkb_symbols "J3100" { + include "sun_vndr/us(pc101)" + + // Alphanumeric section + key { [ 1, exclam ], [ kana_NU ] }; + key { [ 2, quotedbl ], [ kana_FU ] }; + key { [ 3, numbersign ], [ kana_A, kana_a ] }; + key { [ 4, dollar ], [ kana_U, kana_u ] }; + key { [ 5, percent ], [ kana_E, kana_e ] }; + key { [ 6, ampersand ], [ kana_O, kana_o ] }; + key { [ 7, apostrophe ], [ kana_YA, kana_ya ] }; + key { [ 8, parenleft ], [ kana_YU, kana_yu ] }; + key { [ 9, parenright ], [ kana_YO, kana_yo ] }; + key { [ 0 ], [ kana_WA, kana_WO ] }; + key { [ minus, equal ], [ kana_HO ] }; + key { [ asciicircum, asciitilde], [ kana_HE ] }; + key { [ BackSpace ] }; + + key { [ Tab, ISO_Left_Tab ] }; + key { [ q, Q ], [ kana_TA ] }; + key { [ w, W ], [ kana_TE ] }; + key { [ e, E ], [ kana_I, kana_i ] }; + key { [ r, R ], [ kana_SU ] }; + key { [ t, T ], [ kana_KA ] }; + key { [ y, Y ], [ kana_N ] }; + key { [ u, U ], [ kana_NA ] }; + key { [ i, I ], [ kana_NI ] }; + key { [ o, O ], [ kana_RA ] }; + key { [ p, P ], [ kana_SE ] }; + key { [ at, quoteleft ], [ voicedsound ] }; + key { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] }; + key { [ Return ] }; + + key { [ Caps_Lock ] }; + key { [ a, A ], [ kana_CHI ] }; + key { [ s, S ], [ kana_TO ] }; + key { [ d, D ], [ kana_SHI ] }; + key { [ f, F ], [ kana_HA ] }; + key { [ g, G ], [ kana_KI ] }; + key { [ h, H ], [ kana_KU ] }; + key { [ j, J ], [ kana_MA ] }; + key { [ k, K ], [ kana_NO ] }; + key { [ l, L ], [ kana_RI ] }; + key { [ semicolon, plus ], [ kana_RE ] }; + key { [ colon, asterisk ], [ kana_KE ] }; + key { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] }; + + key { [ z, Z ], [ kana_TSU, kana_tsu ] }; + key { [ x, X ], [ kana_SA ] }; + key { [ c, C ], [ kana_SO ] }; + key { [ v, V ], [ kana_HI ] }; + key { [ b, B ], [ kana_KO ] }; + key { [ n, N ], [ kana_MI ] }; + key { [ m, M ], [ kana_MO ] }; + key { [ comma, less ], [ kana_NE, kana_comma ] }; + key { [ period, greater ], [ kana_RU, kana_fullstop ] }; + key { [ slash, question ], [ kana_ME, kana_conjunctive ]}; +// key { [ backslash, underscore], [ kana_RO ] }; + + key { [ space ] }; +// key { [ Kanji ] }; +// key { [ Henkan_Mode ] }; +// key { [ backslash, underscore], [ kana_RO ]}; + // End alphanumeric section + + // Begin "Function" section + key { [ Escape ] }; + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F10 ] }; + key { [ SunF36 ] }; + key { [ SunF37 ] }; + key { [ backslash, bar ], [ prolongedsound ] }; +// key { [ Linefeed ] }; +// key { [ Execute ] }; + + key { [ Escape, 3 ] }; + + key { [ 2, at ], [ kana_FU ]}; + key { [ 6, asciicircum ], [ kana_O, kana_o ]}; + key { [ 7, ampersand ], [ kana_YA, kana_ya ]}; + key { [ 8, asterisk ], [ kana_YU, kana_yu ]}; + key { [ 9, parenleft ], [ kana_YO, kana_yo ]}; + key { [ 0, parenright ], [ kana_WA, kana_WO ]}; + key { [ minus, underscore ], [ kana_HO ]}; + key { [ equal, plus ], [ kana_HE ]}; + + key { [ backslash, bar ], [ prolongedsound ]}; + key { [ equal, plus ], [ kana_HE ]}; + + key { [ bracketleft, braceleft ], [ voicedsound ]}; + key { [ bracketright, braceright ], [ semivoicedsound, kana_openingbracket ]}; + + key { [ semicolon, colon ], [ kana_RE ]}; + key { [ quoteright, quotedbl ], [ kana_KE ]}; + + key { [ quoteleft, asciitilde ], [ kana_MU, kana_closingbracket ]}; + key { [ backslash, bar ], [ kana_RO ]}; +// key { [ Mode_switch ] }; + key { [ Henkan_Mode ] }; + key { [ Mode_switch ] }; + +}; + +xkb_symbols "Muhenkan_x86" { + include "sun_vndr/jp(x86)" + + key { [ Muhenkan ] }; +}; + + + +partial +xkb_symbols "type7" { + include "sun_vndr/jp(type6)" + key { [ 0, asciitilde ], [ kana_WA, kana_WO ] }; + key { [ Henkan_Mode ] }; + key { [ Kana_Lock, Mode_switch ] }; + key { [ Alt_R, Alt_R ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/kr b/xorg-server/xkeyboard-config/symbols/sun_vndr/kr index 0973943bf..62cf63d71 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/kr +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/kr @@ -1,97 +1,97 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - -// Korean layout for a Type 6 Sun keyboard -partial -xkb_symbols "type6" { - - // A few keys are different - key { [ Hangul ] }; - key { [ Hangul_Hanja ] }; - key { [ Hangul ] }; - key { [ Hangul_Hanja ] }; - key { [ backslash, bar, brokenbar ] }; - - include "level3(ralt_switch)" - -}; - - -// Korean layout for a Type 4 Sun keyboard -xkb_symbols "type4" { - - key { [ backslash, bar, brokenbar ] }; - - key { [ Hangul ] }; - key { [ Linefeed ] }; - key { [ Hangul_Hanja ] }; - - include "level3(ralt_switch)" - -}; - -// Korean layout for a Type 5 Sun keyboard -xkb_symbols "type5" { - - // A few keys are different - key { [ Hangul ] }; - key { [ Hangul_Hanja ] }; - key { [ backslash, bar, brokenbar ] }; - - include "level3(ralt_switch)" - -}; - - -partial default alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/kr(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +// Korean layout for a Type 6 Sun keyboard +partial +xkb_symbols "type6" { + + // A few keys are different + key { [ Hangul ] }; + key { [ Hangul_Hanja ] }; + key { [ Hangul ] }; + key { [ Hangul_Hanja ] }; + key { [ backslash, bar, brokenbar ] }; + + include "level3(ralt_switch)" + +}; + + +// Korean layout for a Type 4 Sun keyboard +xkb_symbols "type4" { + + key { [ backslash, bar, brokenbar ] }; + + key { [ Hangul ] }; + key { [ Linefeed ] }; + key { [ Hangul_Hanja ] }; + + include "level3(ralt_switch)" + +}; + +// Korean layout for a Type 5 Sun keyboard +xkb_symbols "type5" { + + // A few keys are different + key { [ Hangul ] }; + key { [ Hangul_Hanja ] }; + key { [ backslash, bar, brokenbar ] }; + + include "level3(ralt_switch)" + +}; + + +partial default alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/kr(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/lt b/xorg-server/xkeyboard-config/symbols/sun_vndr/lt index b82ebcfb9..8e8bee0f8 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/lt +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/lt @@ -1,118 +1,118 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - - -partial default alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Lithuania"; - - - - key { [ quoteleft, asciitilde, notsign, brokenbar ] }; - key { [ aogonek, Aogonek, 1, exclam ] }; - key { [ ccaron, Ccaron, 2, at ] }; - key { [ eogonek, Eogonek, 3, numbersign ] }; - key { [ eabovedot, Eabovedot, 4, dollar ] }; - key { [ iogonek, Iogonek, 5, percent ] }; - key { [ scaron, Scaron, 6, asciicircum ] }; - key { [ uogonek, Uogonek, 7, ampersand ] }; - key { [ umacron, Umacron, 8, asterisk ] }; - key { [ doublelowquotemark, parenleft, 9, parenleft ] }; - key { [ leftdoublequotemark, parenright, 0, parenright ] }; - key { [ minus, underscore, backslash, questiondown ] }; - key { [ zcaron, Zcaron, equal, plus ] }; - - key { [ q, Q, at, Greek_OMEGA ] }; - key { [ w, W, lstroke, Lstroke ] }; - key { [ e, E, EuroSign ] }; - key { [ r, R, paragraph, registered ] }; - key { [ t, T, tslash, Tslash ] }; - key { [ y, Y, leftarrow, yen ] }; - key { [ u, U, downarrow, uparrow ] }; - key { [ i, I, rightarrow, idotless ] }; - key { [ o, O, oslash, Ooblique ] }; - key { [ p, P, thorn, THORN ] }; - key { [ bracketleft, braceleft, dead_diaeresis, dead_abovering ] }; - key { [ bracketright, braceright, dead_tilde, dead_macron ] }; - - key { [ a, A, ae, AE ] }; - key { [ s, S, ssharp, section ] }; - key { [ d, D, eth, ETH ] }; - key { [ f, F, dstroke, ordfeminine ] }; - key { [ g, G, eng, ENG ] }; - key { [ h, H, hstroke, Hstroke ] }; - key { [ j, J ] }; - key { [ k, K, kra, ampersand ] }; - key { [ l, L, lstroke, Lstroke ] }; - key { [ semicolon, colon, dead_acute, dead_doubleacute ] }; - key { [ apostrophe, quotedbl, dead_circumflex, dead_caron ] }; - key { [ backslash, bar, dead_grave, dead_breve ] }; - - key { [ backslash, bar, dead_grave, dead_breve ] }; - key { [ z, Z, guillemotleft, less ] }; - key { [ x, X, guillemotright, greater ] }; - key { [ c, C, cent, copyright ] }; - key { [ v, V, leftdoublequotemark, leftsinglequotemark ] }; - key { [ b, B, rightdoublequotemark, rightsinglequotemark ] }; - key { [ n, N ] }; - key { [ m, M, mu, masculine ] }; - key { [ comma, less, ampersand, multiply ] }; - key { [ period, greater, periodcentered, division ] }; - key { [ slash, question, dead_belowdot, dead_abovedot ] }; - - include "level3(ralt_switch)" - -}; - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/lt(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Lithuania"; + + + + key { [ quoteleft, asciitilde, notsign, brokenbar ] }; + key { [ aogonek, Aogonek, 1, exclam ] }; + key { [ ccaron, Ccaron, 2, at ] }; + key { [ eogonek, Eogonek, 3, numbersign ] }; + key { [ eabovedot, Eabovedot, 4, dollar ] }; + key { [ iogonek, Iogonek, 5, percent ] }; + key { [ scaron, Scaron, 6, asciicircum ] }; + key { [ uogonek, Uogonek, 7, ampersand ] }; + key { [ umacron, Umacron, 8, asterisk ] }; + key { [ doublelowquotemark, parenleft, 9, parenleft ] }; + key { [ leftdoublequotemark, parenright, 0, parenright ] }; + key { [ minus, underscore, backslash, questiondown ] }; + key { [ zcaron, Zcaron, equal, plus ] }; + + key { [ q, Q, at, Greek_OMEGA ] }; + key { [ w, W, lstroke, Lstroke ] }; + key { [ e, E, EuroSign ] }; + key { [ r, R, paragraph, registered ] }; + key { [ t, T, tslash, Tslash ] }; + key { [ y, Y, leftarrow, yen ] }; + key { [ u, U, downarrow, uparrow ] }; + key { [ i, I, rightarrow, idotless ] }; + key { [ o, O, oslash, Ooblique ] }; + key { [ p, P, thorn, THORN ] }; + key { [ bracketleft, braceleft, dead_diaeresis, dead_abovering ] }; + key { [ bracketright, braceright, dead_tilde, dead_macron ] }; + + key { [ a, A, ae, AE ] }; + key { [ s, S, ssharp, section ] }; + key { [ d, D, eth, ETH ] }; + key { [ f, F, dstroke, ordfeminine ] }; + key { [ g, G, eng, ENG ] }; + key { [ h, H, hstroke, Hstroke ] }; + key { [ j, J ] }; + key { [ k, K, kra, ampersand ] }; + key { [ l, L, lstroke, Lstroke ] }; + key { [ semicolon, colon, dead_acute, dead_doubleacute ] }; + key { [ apostrophe, quotedbl, dead_circumflex, dead_caron ] }; + key { [ backslash, bar, dead_grave, dead_breve ] }; + + key { [ backslash, bar, dead_grave, dead_breve ] }; + key { [ z, Z, guillemotleft, less ] }; + key { [ x, X, guillemotright, greater ] }; + key { [ c, C, cent, copyright ] }; + key { [ v, V, leftdoublequotemark, leftsinglequotemark ] }; + key { [ b, B, rightdoublequotemark, rightsinglequotemark ] }; + key { [ n, N ] }; + key { [ m, M, mu, masculine ] }; + key { [ comma, less, ampersand, multiply ] }; + key { [ period, greater, periodcentered, division ] }; + key { [ slash, question, dead_belowdot, dead_abovedot ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/lt(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/lv b/xorg-server/xkeyboard-config/symbols/sun_vndr/lv index d1573868b..befcfc679 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/lv +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/lv @@ -1,117 +1,117 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - - -partial default alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Latvia"; - - - key { [ grave, asciitilde, acute, asciitilde ] }; - key { [ 1, exclam, onesuperior, exclamdown ] }; - key { [ 2, at, twosuperior, oneeighth ] }; - key { [ 3, numbersign, threesuperior, sterling ] }; - key { [ 4, dollar, EuroSign, cent ] }; - key { [ 5, percent, onehalf, threeeighths ] }; - key { [ 6, asciicircum, threequarters, fiveeighths ] }; - key { [ 7, ampersand, braceleft, seveneighths ] }; - key { [ 8, asterisk, bracketleft, trademark ] }; - key { [ 9, parenleft, bracketright, plusminus ] }; - key { [ 0, parenright, braceright, degree ] }; - key { [ minus, underscore, backslash, questiondown ] }; - key { [ equal, plus, endash, emdash ] }; - - key { [ q, Q, q, Q ] }; - key { [ w, W, w, W ] }; - key { [ e, E, emacron, Emacron ] }; - key { [ r, R, rcedilla, Rcedilla ] }; - key { [ t, T, t, T ] }; - key { [ y, Y, y, Y ] }; - key { [ u, U, umacron, Umacron ] }; - key { [ i, I, imacron, Imacron ] }; - key { [ o, O, omacron, Omacron ] }; - key { [ p, P, p, P ] }; - key { [ bracketleft, braceleft, guillemotleft, leftdoublequotemark ] }; - key { [ bracketright, braceright, guillemotright, rightdoublequotemark ] }; - - key { [ a, A, amacron, Amacron ] }; - key { [ s, S, scaron, Scaron ] }; - key { [ d, D, d, D ] }; - key { [ f, F, f, F ] }; - key { [ g, G, gcedilla, Gcedilla ] }; - key { [ h, H, h, H ] }; - key { [ j, J, j, J ] }; - key { [ k, K, kcedilla, Kcedilla ] }; - key { [ l, L, lcedilla, Lcedilla ] }; - key { [ semicolon, colon, semicolon, colon ] }; - key { [ apostrophe, quotedbl, leftdoublequotemark, doublelowquotemark ] }; - key { [ backslash, bar, degree, brokenbar ] }; - - key { [ backslash, bar, grave, breve ] }; - key { [ z, Z, zcaron, Zcaron ] }; - key { [ x, X, x, X ] }; - key { [ c, C, ccaron, Ccaron ] }; - key { [ v, V, v, V ] }; - key { [ b, B, b, B ] }; - key { [ n, N, ncedilla, Ncedilla ] }; - key { [ m, M, m, M ] }; - key { [ comma, less, horizconnector, multiply ] }; - key { [ period, greater, periodcentered, division ] }; - key { [ slash, question, slash, abovedot ] }; - - include "level3(ralt_switch)" - -}; - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/lv(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Latvia"; + + + key { [ grave, asciitilde, acute, asciitilde ] }; + key { [ 1, exclam, onesuperior, exclamdown ] }; + key { [ 2, at, twosuperior, oneeighth ] }; + key { [ 3, numbersign, threesuperior, sterling ] }; + key { [ 4, dollar, EuroSign, cent ] }; + key { [ 5, percent, onehalf, threeeighths ] }; + key { [ 6, asciicircum, threequarters, fiveeighths ] }; + key { [ 7, ampersand, braceleft, seveneighths ] }; + key { [ 8, asterisk, bracketleft, trademark ] }; + key { [ 9, parenleft, bracketright, plusminus ] }; + key { [ 0, parenright, braceright, degree ] }; + key { [ minus, underscore, backslash, questiondown ] }; + key { [ equal, plus, endash, emdash ] }; + + key { [ q, Q, q, Q ] }; + key { [ w, W, w, W ] }; + key { [ e, E, emacron, Emacron ] }; + key { [ r, R, rcedilla, Rcedilla ] }; + key { [ t, T, t, T ] }; + key { [ y, Y, y, Y ] }; + key { [ u, U, umacron, Umacron ] }; + key { [ i, I, imacron, Imacron ] }; + key { [ o, O, omacron, Omacron ] }; + key { [ p, P, p, P ] }; + key { [ bracketleft, braceleft, guillemotleft, leftdoublequotemark ] }; + key { [ bracketright, braceright, guillemotright, rightdoublequotemark ] }; + + key { [ a, A, amacron, Amacron ] }; + key { [ s, S, scaron, Scaron ] }; + key { [ d, D, d, D ] }; + key { [ f, F, f, F ] }; + key { [ g, G, gcedilla, Gcedilla ] }; + key { [ h, H, h, H ] }; + key { [ j, J, j, J ] }; + key { [ k, K, kcedilla, Kcedilla ] }; + key { [ l, L, lcedilla, Lcedilla ] }; + key { [ semicolon, colon, semicolon, colon ] }; + key { [ apostrophe, quotedbl, leftdoublequotemark, doublelowquotemark ] }; + key { [ backslash, bar, degree, brokenbar ] }; + + key { [ backslash, bar, grave, breve ] }; + key { [ z, Z, zcaron, Zcaron ] }; + key { [ x, X, x, X ] }; + key { [ c, C, ccaron, Ccaron ] }; + key { [ v, V, v, V ] }; + key { [ b, B, b, B ] }; + key { [ n, N, ncedilla, Ncedilla ] }; + key { [ m, M, m, M ] }; + key { [ comma, less, horizconnector, multiply ] }; + key { [ period, greater, periodcentered, division ] }; + key { [ slash, question, slash, abovedot ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/lv(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/nl b/xorg-server/xkeyboard-config/symbols/sun_vndr/nl index 8469039f7..3e0ba2011 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/nl +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/nl @@ -1,148 +1,148 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - -default partial alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Netherlands"; - - key { [ at, section, notsign ] }; - key { [ 1, exclam, onesuperior ] }; - key { [ 2, quotedbl, twosuperior ] }; - key { [ 3, numbersign, threesuperior ] }; - key { [ 4, dollar, onequarter ] }; - key { [ 5, percent, onehalf ] }; - key { [ 6, ampersand, threequarters ] }; - key { [ 7, underscore, sterling ] }; - key { [ 8, parenleft, braceleft ] }; - key { [ 9, parenright, braceright ] }; - key { [ 0, quoteright, quoteleft ] }; - key { [ slash, question, backslash ] }; - key { [ degree, dead_tilde, dead_cedilla ] }; - - key { [ e, E, EuroSign ] }; - key { [ t, T ] }; - key { [ y, Y ] }; - key { [ u, U ] }; - key { [ i, I ] }; - key { [ o, O ] }; - key { [ p, P ] }; - key { [dead_diaeresis, dead_circumflex ] }; - key { [ asterisk, bar, asciitilde ] }; - - key { [ a, A ] }; - key { [ s, S, ssharp ] }; - key { [ f, F ] }; - key { [ plus, plusminus ] }; - key { [dead_acute, dead_grave ] }; - key { [ less, greater, asciicircum ] }; - - key { [bracketright, bracketleft, brokenbar ] }; - key { [ z, Z, guillemotleft ] }; - key { [ x, X, guillemotright ] }; - key { [ c, C, cent ] }; - key { [ n, N ] }; - key { [ m, M, mu ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, equal ] }; - - include "level3(ralt_switch)" - -}; - - -partial alphanumeric_keys -xkb_symbols "type4" { - - name[Group1]="Netherlands - Sun type 4"; - - key { [ at, section, notsign ] }; - key { [ backslash, bar ] }; - key { [ 1, exclam, onesuperior ] }; - key { [ 2, quotedbl, twosuperior ] }; - key { [ 3, numbersign, threesuperior] }; - key { [ 4, dollar, onequarter ] }; - key { [ 5, percent, onehalf ] }; - key { [ 6, ampersand, threequarters] }; - key { [ 7, underscore, sterling ] }; - key { [ 8, parenleft, braceleft ] }; - key { [ 9, parenright, braceright ] }; - key { [ 0, quoteright, quoteleft ] }; - key { [ slash, question, backslash ] }; - key { [ degree, dead_tilde, dead_cedilla] }; - key { [ e, E, EuroSign, Eacute ]}; - key { [ dead_diaeresis, dead_circumflex, asciitilde, asciicircum]}; - key { [ asterisk, bar, asciitilde ] }; - key { [ S, S, ssharp ] }; - key { [ plus, plusminus ] }; - key { [ dead_acute, dead_grave ] }; - key { [ less, greater, asciicircum ] }; - key { [ bracketleft, bracketright, brokenbar ] }; - key { [ z, Z, guillemotleft] }; - key { [ x, X, guillemotright] }; - key { [ c, C, cent ] }; - key { [ m, M, Greek_mu, masculine ] }; - key { [ comma, semicolon, cedilla, guillemotleft] }; - key { [ period, colon, periodcentered, guillemotright ] }; - key { [ minus, equal, hyphen ] }; - key { [ SunAltGraph ] }; -// key { [ SunCompose ] }; - key { [ Caps_Lock ] }; - - include "level3(ralt_switch)" - -}; - - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/nl(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +default partial alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Netherlands"; + + key { [ at, section, notsign ] }; + key { [ 1, exclam, onesuperior ] }; + key { [ 2, quotedbl, twosuperior ] }; + key { [ 3, numbersign, threesuperior ] }; + key { [ 4, dollar, onequarter ] }; + key { [ 5, percent, onehalf ] }; + key { [ 6, ampersand, threequarters ] }; + key { [ 7, underscore, sterling ] }; + key { [ 8, parenleft, braceleft ] }; + key { [ 9, parenright, braceright ] }; + key { [ 0, quoteright, quoteleft ] }; + key { [ slash, question, backslash ] }; + key { [ degree, dead_tilde, dead_cedilla ] }; + + key { [ e, E, EuroSign ] }; + key { [ t, T ] }; + key { [ y, Y ] }; + key { [ u, U ] }; + key { [ i, I ] }; + key { [ o, O ] }; + key { [ p, P ] }; + key { [dead_diaeresis, dead_circumflex ] }; + key { [ asterisk, bar, asciitilde ] }; + + key { [ a, A ] }; + key { [ s, S, ssharp ] }; + key { [ f, F ] }; + key { [ plus, plusminus ] }; + key { [dead_acute, dead_grave ] }; + key { [ less, greater, asciicircum ] }; + + key { [bracketright, bracketleft, brokenbar ] }; + key { [ z, Z, guillemotleft ] }; + key { [ x, X, guillemotright ] }; + key { [ c, C, cent ] }; + key { [ n, N ] }; + key { [ m, M, mu ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, equal ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys +xkb_symbols "type4" { + + name[Group1]="Netherlands - Sun type 4"; + + key { [ at, section, notsign ] }; + key { [ backslash, bar ] }; + key { [ 1, exclam, onesuperior ] }; + key { [ 2, quotedbl, twosuperior ] }; + key { [ 3, numbersign, threesuperior] }; + key { [ 4, dollar, onequarter ] }; + key { [ 5, percent, onehalf ] }; + key { [ 6, ampersand, threequarters] }; + key { [ 7, underscore, sterling ] }; + key { [ 8, parenleft, braceleft ] }; + key { [ 9, parenright, braceright ] }; + key { [ 0, quoteright, quoteleft ] }; + key { [ slash, question, backslash ] }; + key { [ degree, dead_tilde, dead_cedilla] }; + key { [ e, E, EuroSign, Eacute ]}; + key { [ dead_diaeresis, dead_circumflex, asciitilde, asciicircum]}; + key { [ asterisk, bar, asciitilde ] }; + key { [ S, S, ssharp ] }; + key { [ plus, plusminus ] }; + key { [ dead_acute, dead_grave ] }; + key { [ less, greater, asciicircum ] }; + key { [ bracketleft, bracketright, brokenbar ] }; + key { [ z, Z, guillemotleft] }; + key { [ x, X, guillemotright] }; + key { [ c, C, cent ] }; + key { [ m, M, Greek_mu, masculine ] }; + key { [ comma, semicolon, cedilla, guillemotleft] }; + key { [ period, colon, periodcentered, guillemotright ] }; + key { [ minus, equal, hyphen ] }; + key { [ SunAltGraph ] }; +// key { [ SunCompose ] }; + key { [ Caps_Lock ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/nl(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/no b/xorg-server/xkeyboard-config/symbols/sun_vndr/no index bbb414da7..bcc8c30cc 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/no +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/no @@ -1,144 +1,144 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - -partial alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Norway"; - - key { [ bar, section ] }; - key { [ less, greater ] }; - key { [ apostrophe, asterisk, grave ] }; - key { [ 2, quotedbl, at ] }; - key { [ 3, numbersign, sterling ] }; - key { [ 4, currency, dollar ] }; - key { [ 5, percent, asciitilde ] }; - key { [ 6, ampersand, asciicircum ] }; - key { [ 7, slash, braceleft ] }; - key { [ 8, parenleft, bracketleft ] }; - key { [ 9, parenright, bracketright ] }; - key { [ 0, equal, braceright ] }; - key { [ plus, question ] }; - key { [ backslash, dead_grave, dead_acute ] }; - key { [ e, E, EuroSign ] }; - key { [ aring, Aring ] }; - key { [ dead_diaeresis, dead_circumflex, dead_tilde ] }; - key { [ oslash, Oslash ] }; - key { [ ae, AE ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - - include "level3(ralt_switch)" - include "kpdl(comma)" - -}; - -partial alphanumeric_keys -xkb_symbols "type4" { - - name[Group1]="Norway - Sun type 4"; - - key { [ bar, section ] }; - key { [ asciitilde, asciicircum] }; - key { [ 2, quotedbl, at ] }; - key { [ 3, numbersign, sterling ] }; - key { [ 4, currency, dollar ] }; - key { [ 6, ampersand ] }; - key { [ 7, slash, braceleft ] }; - key { [ 8, parenleft, bracketleft ] }; - key { [ 9, parenright, bracketright] }; - key { [ 0, equal, braceright ] }; - key { [ plus, question ] }; - key { [ backslash, dead_grave, dead_acute ] }; - key { [ e, E, EuroSign ] }; - key { [ aring, Aring ] }; - key { [ dead_diaeresis, dead_circumflex, dead_tilde ] }; - key { [ Caps_Lock ] }; - key { [ Ooblique ] }; - key { [ ae, AE ] }; - key { [ quoteright, asterisk, quoteleft ] }; - key { [ less, greater ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - key { [ Control_L ] }; - - include "level3(ralt_switch)" - include "kpdl(comma)" - -}; - - -partial alphanumeric_keys -xkb_symbols "type5" { - - name[Group1]="Norway - Sun type 5"; - - key { [ 5, percent, asciitilde ] }; - key { [ 6, ampersand, asciicircum ] }; - key { [ 7, slash, braceleft ] }; - key { [ 8, parenleft, bracketright ] }; - key { [ 9, parenright, bracketright ] }; - key { [ 0, equal, braceright ] }; - - key { [ quoteright, asterisk, quoteleft ] }; - key { [ less, greater ] }; - - include "level3(ralt_switch)" - include "kpdl(comma)" - -}; - - -partial default alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/no(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Norway"; + + key { [ bar, section ] }; + key { [ less, greater ] }; + key { [ apostrophe, asterisk, grave ] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, numbersign, sterling ] }; + key { [ 4, currency, dollar ] }; + key { [ 5, percent, asciitilde ] }; + key { [ 6, ampersand, asciicircum ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, equal, braceright ] }; + key { [ plus, question ] }; + key { [ backslash, dead_grave, dead_acute ] }; + key { [ e, E, EuroSign ] }; + key { [ aring, Aring ] }; + key { [ dead_diaeresis, dead_circumflex, dead_tilde ] }; + key { [ oslash, Oslash ] }; + key { [ ae, AE ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" + +}; + +partial alphanumeric_keys +xkb_symbols "type4" { + + name[Group1]="Norway - Sun type 4"; + + key { [ bar, section ] }; + key { [ asciitilde, asciicircum] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, numbersign, sterling ] }; + key { [ 4, currency, dollar ] }; + key { [ 6, ampersand ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright] }; + key { [ 0, equal, braceright ] }; + key { [ plus, question ] }; + key { [ backslash, dead_grave, dead_acute ] }; + key { [ e, E, EuroSign ] }; + key { [ aring, Aring ] }; + key { [ dead_diaeresis, dead_circumflex, dead_tilde ] }; + key { [ Caps_Lock ] }; + key { [ Ooblique ] }; + key { [ ae, AE ] }; + key { [ quoteright, asterisk, quoteleft ] }; + key { [ less, greater ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + key { [ Control_L ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" + +}; + + +partial alphanumeric_keys +xkb_symbols "type5" { + + name[Group1]="Norway - Sun type 5"; + + key { [ 5, percent, asciitilde ] }; + key { [ 6, ampersand, asciicircum ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketright ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, equal, braceright ] }; + + key { [ quoteright, asterisk, quoteleft ] }; + key { [ less, greater ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" + +}; + + +partial default alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/no(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/pl b/xorg-server/xkeyboard-config/symbols/sun_vndr/pl index 6295c3206..2fdf1fe06 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/pl +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/pl @@ -1,101 +1,101 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - - -partial default alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Polish Developers"; - - key { [ grave, asciitilde ] }; - key { [ 1, exclam ] }; - key { [ 2, at ] }; - key { [ 3, numbersign ] }; - key { [ 4, dollar ] }; - key { [ 5, percent ] }; - key { [ 6, asciicirum ] }; - key { [ 7, ampersand ] }; - key { [ 8, asterisk ] }; - key { [ 9, parenleft ] }; - key { [ 0, parenright ] }; - key { [ minus, underscore ] }; - key { [ equal, plus ] }; - - key { [ e, E, eogonek, Eogonek ] }; - key { [ u, U, EuroSign ] }; - key { [ o, O, oacute, Oacute ] }; - key { [ bracketleft, braceleft ] }; - key { [ bracketright, braceright ] }; - - key { [ a, A, aogonek, Aogonek ] }; - key { [ s, S, sacute, Sacute ] }; - key { [ l, L, lstroke, Lstroke ] }; - key { [ semicolon, colon ] }; - key { [ apostrophe, quotedbl ] }; - key { [ backslash, bar, brokenbar ] }; - - key { [ less, greater, bar, brokenbar ] }; - key { [ z, Z, zabovedot, Zabovedot ] }; - key { [ x, X, zacute, Zacute ] }; - key { [ c, C, cacute, Cacute ] }; - key { [ n, N, nacute, Nacute ] }; - key { [ comma, less ] }; - key { [ period, greater ] }; - key { [ slash, question ] }; - - include "level3(ralt_switch)" - -}; - - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/pl(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Polish Developers"; + + key { [ grave, asciitilde ] }; + key { [ 1, exclam ] }; + key { [ 2, at ] }; + key { [ 3, numbersign ] }; + key { [ 4, dollar ] }; + key { [ 5, percent ] }; + key { [ 6, asciicirum ] }; + key { [ 7, ampersand ] }; + key { [ 8, asterisk ] }; + key { [ 9, parenleft ] }; + key { [ 0, parenright ] }; + key { [ minus, underscore ] }; + key { [ equal, plus ] }; + + key { [ e, E, eogonek, Eogonek ] }; + key { [ u, U, EuroSign ] }; + key { [ o, O, oacute, Oacute ] }; + key { [ bracketleft, braceleft ] }; + key { [ bracketright, braceright ] }; + + key { [ a, A, aogonek, Aogonek ] }; + key { [ s, S, sacute, Sacute ] }; + key { [ l, L, lstroke, Lstroke ] }; + key { [ semicolon, colon ] }; + key { [ apostrophe, quotedbl ] }; + key { [ backslash, bar, brokenbar ] }; + + key { [ less, greater, bar, brokenbar ] }; + key { [ z, Z, zabovedot, Zabovedot ] }; + key { [ x, X, zacute, Zacute ] }; + key { [ c, C, cacute, Cacute ] }; + key { [ n, N, nacute, Nacute ] }; + key { [ comma, less ] }; + key { [ period, greater ] }; + key { [ slash, question ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/pl(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/pt b/xorg-server/xkeyboard-config/symbols/sun_vndr/pt index b5b108632..9e0ec9502 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/pt +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/pt @@ -1,142 +1,142 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - -partial alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Portugal"; - - key { [ less, greater ] }; - key { [ backslash, bar ] }; - key { [ 2, quotedbl, at ] }; - key { [ 3, numbersign, sterling ] }; - key { [ 4, dollar, section ] }; - key { [ 5, percent, asciitilde ] }; - key { [ 6, ampersand, asciicircum ] }; - key { [ 7, slash, braceleft ] }; - key { [ 8, parenleft, bracketleft ] }; - key { [ 9, parenright, bracketright ] }; - key { [ 0, equal, braceright ] }; - key { [ quoteright, question, quoteleft ] }; - key { [ guillemotleft, guillemotright ] }; - key { [ e, E, EuroSign ] }; - key { [ plus, asterisk, dead_diaeresis ] }; - key { [ dead_acute, dead_grave ] }; - key { [ dead_tilde, dead_circumflex ] }; - key { [ ccedilla, Ccedilla ] }; - key { [ masculine, ordfeminine ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - - include "level3(ralt_switch)" - -}; - -partial alphanumeric_keys -xkb_symbols "type4" { - - name[Group1]="Portugal - Sun type 4"; - - key { [ bracketleft, braceleft, guillemotleft] }; - key { [ bracketright, braceright, guillemotright] }; - key { [ 2, quotedbl, at ] }; - key { [ 3, numbersign, sterling ] }; - key { [ 4, dollar, section ] }; - key { [ 6, ampersand, notsign ] }; - key { [ 7, slash ] }; - key { [ 8, parenleft ] }; - key { [ 9, parenright, backslash ] }; - key { [ 0, equal, bar ] }; - key { [ quoteright, question, quoteleft ] }; - key { [ exclamdown, questiondown ] }; - key { [ e, E, EuroSign ] }; - key { [ dead_diaeresis, asterisk, plus ] }; - key { [ dead_acute, dead_grave, asciitilde ] }; - key { [ Caps_Lock ] }; - key { [ ccedilla, Ccedilla ] }; - key { [ masculine, ordfeminine] }; - key { [ dead_tilde, dead_circumflex, asciicircum ] }; - key { [ less, greater ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - key { [ Control_L ] }; - - include "level3(ralt_switch)" - -}; - - -partial alphanumeric_keys -xkb_symbols "type5" { - - name[Group1]="Portugal - Sun type 5"; - - key { [ backslash, bar ] }; - key { [ 5, percent, asciitilde ]}; - key { [ 6, ampersand, asciicircum ]}; - key { [ 7, slash, braceleft ]}; - key { [ 8, parenleft, bracketleft ]}; - key { [ 9, parenright, bracketright ]}; - key { [ 0, equal, braceright ]}; - key { [ quoteright, question, quoteleft ]}; - - key { [ plus, asterisk, dead_diaeresis ]}; - - include "level3(ralt_switch)" - -}; - - -partial default alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/pt(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Portugal"; + + key { [ less, greater ] }; + key { [ backslash, bar ] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, numbersign, sterling ] }; + key { [ 4, dollar, section ] }; + key { [ 5, percent, asciitilde ] }; + key { [ 6, ampersand, asciicircum ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, equal, braceright ] }; + key { [ quoteright, question, quoteleft ] }; + key { [ guillemotleft, guillemotright ] }; + key { [ e, E, EuroSign ] }; + key { [ plus, asterisk, dead_diaeresis ] }; + key { [ dead_acute, dead_grave ] }; + key { [ dead_tilde, dead_circumflex ] }; + key { [ ccedilla, Ccedilla ] }; + key { [ masculine, ordfeminine ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys +xkb_symbols "type4" { + + name[Group1]="Portugal - Sun type 4"; + + key { [ bracketleft, braceleft, guillemotleft] }; + key { [ bracketright, braceright, guillemotright] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, numbersign, sterling ] }; + key { [ 4, dollar, section ] }; + key { [ 6, ampersand, notsign ] }; + key { [ 7, slash ] }; + key { [ 8, parenleft ] }; + key { [ 9, parenright, backslash ] }; + key { [ 0, equal, bar ] }; + key { [ quoteright, question, quoteleft ] }; + key { [ exclamdown, questiondown ] }; + key { [ e, E, EuroSign ] }; + key { [ dead_diaeresis, asterisk, plus ] }; + key { [ dead_acute, dead_grave, asciitilde ] }; + key { [ Caps_Lock ] }; + key { [ ccedilla, Ccedilla ] }; + key { [ masculine, ordfeminine] }; + key { [ dead_tilde, dead_circumflex, asciicircum ] }; + key { [ less, greater ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + key { [ Control_L ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys +xkb_symbols "type5" { + + name[Group1]="Portugal - Sun type 5"; + + key { [ backslash, bar ] }; + key { [ 5, percent, asciitilde ]}; + key { [ 6, ampersand, asciicircum ]}; + key { [ 7, slash, braceleft ]}; + key { [ 8, parenleft, bracketleft ]}; + key { [ 9, parenright, bracketright ]}; + key { [ 0, equal, braceright ]}; + key { [ quoteright, question, quoteleft ]}; + + key { [ plus, asterisk, dead_diaeresis ]}; + + include "level3(ralt_switch)" + +}; + + +partial default alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/pt(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ro b/xorg-server/xkeyboard-config/symbols/sun_vndr/ro index f21f9f624..07241a3ee 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ro +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ro @@ -1,117 +1,117 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - - -partial default alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Romania"; - - - key { [ grave, asciitilde, grave, asciitilde ] }; - key { [ 1, exclam, dead_tilde ] }; - key { [ 2, at, dead_caron ] }; - key { [ 3, numbersign, dead_circumflex ] }; - key { [ 4, dollar, dead_breve ] }; - key { [ 5, percent, dead_abovering ] }; - key { [ 6, asciicircum, dead_ogonek ] }; - key { [ 7, ampersand, dead_grave ] }; - key { [ 8, asterisk, dead_abovedot ] }; - key { [ 9, parenleft, dead_acute ] }; - key { [ 0, parenright, dead_doubleacute ] }; - key { [ minus, underscore, dead_diaeresis, endash ] }; - key { [ equal, plus, dead_cedilla, plusminus ] }; - - key { [ q, Q, acircumflex, Acircumflex ] }; - key { [ w, W, ssharp ] }; - key { [ e, E, EuroSign ] }; - key { [ r, R, r, R ] }; - key { [ t, T, 0x100021b, 0x100021a ] }; - key { [ y, Y, y, Y ] }; - key { [ u, U, u, U ] }; - key { [ i, I, icircumflex, Icircumflex ] }; - key { [ o, O, o, O ] }; - key { [ p, P, section ] }; - key { [ bracketleft, braceleft, doublelowquotemark ] }; - key { [ bracketright, braceright, rightdoublequotemark ] }; - - key { [ a, A, abreve, Abreve ] }; - key { [ s, S, 0x1000219, 0x1000218 ] }; - key { [ d, D, dstroke, Dstroke ] }; - key { [ f, F, f, F ] }; - key { [ g, G, g, G ] }; - key { [ h, H, h, H ] }; - key { [ j, J, j, J ] }; - key { [ k, K, k, K ] }; - key { [ l, L, lstroke, Lstroke ] }; - key { [ semicolon, colon, semicolon, colon ] }; - key { [ apostrophe, quotedbl, apostrophe, quotedbl ] }; - key { [ backslash, bar, backslash, brokenbar ] }; - - key { [ backslash, bar, backslash, brokenbar ] }; - key { [ z, Z, z, Z ] }; - key { [ x, X, x, X ] }; - key { [ c, C, copyright ] }; - key { [ v, V, v, V ] }; - key { [ b, B, b, B ] }; - key { [ n, N, n, N ] }; - key { [ m, M, m, M ] }; - key { [ comma, less, guillemotleft, multiply ] }; - key { [ period, greater, guillemotright, division ] }; - key { [ slash, question, slash, question ] }; - - include "level3(ralt_switch)" - -}; - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/ro(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Romania"; + + + key { [ grave, asciitilde, grave, asciitilde ] }; + key { [ 1, exclam, dead_tilde ] }; + key { [ 2, at, dead_caron ] }; + key { [ 3, numbersign, dead_circumflex ] }; + key { [ 4, dollar, dead_breve ] }; + key { [ 5, percent, dead_abovering ] }; + key { [ 6, asciicircum, dead_ogonek ] }; + key { [ 7, ampersand, dead_grave ] }; + key { [ 8, asterisk, dead_abovedot ] }; + key { [ 9, parenleft, dead_acute ] }; + key { [ 0, parenright, dead_doubleacute ] }; + key { [ minus, underscore, dead_diaeresis, endash ] }; + key { [ equal, plus, dead_cedilla, plusminus ] }; + + key { [ q, Q, acircumflex, Acircumflex ] }; + key { [ w, W, ssharp ] }; + key { [ e, E, EuroSign ] }; + key { [ r, R, r, R ] }; + key { [ t, T, 0x100021b, 0x100021a ] }; + key { [ y, Y, y, Y ] }; + key { [ u, U, u, U ] }; + key { [ i, I, icircumflex, Icircumflex ] }; + key { [ o, O, o, O ] }; + key { [ p, P, section ] }; + key { [ bracketleft, braceleft, doublelowquotemark ] }; + key { [ bracketright, braceright, rightdoublequotemark ] }; + + key { [ a, A, abreve, Abreve ] }; + key { [ s, S, 0x1000219, 0x1000218 ] }; + key { [ d, D, dstroke, Dstroke ] }; + key { [ f, F, f, F ] }; + key { [ g, G, g, G ] }; + key { [ h, H, h, H ] }; + key { [ j, J, j, J ] }; + key { [ k, K, k, K ] }; + key { [ l, L, lstroke, Lstroke ] }; + key { [ semicolon, colon, semicolon, colon ] }; + key { [ apostrophe, quotedbl, apostrophe, quotedbl ] }; + key { [ backslash, bar, backslash, brokenbar ] }; + + key { [ backslash, bar, backslash, brokenbar ] }; + key { [ z, Z, z, Z ] }; + key { [ x, X, x, X ] }; + key { [ c, C, copyright ] }; + key { [ v, V, v, V ] }; + key { [ b, B, b, B ] }; + key { [ n, N, n, N ] }; + key { [ m, M, m, M ] }; + key { [ comma, less, guillemotleft, multiply ] }; + key { [ period, greater, guillemotright, division ] }; + key { [ slash, question, slash, question ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/ro(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ru b/xorg-server/xkeyboard-config/symbols/sun_vndr/ru index ec19c9ba3..cfa27d08a 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ru +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ru @@ -1,111 +1,111 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - -partial alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]= "Russia"; - - key.type[group1]="FOUR_LEVEL"; - - - key { [ 1, exclam ] }; - key { [ 2, quotedbl, 2, at ] }; - key { [ 3, numerosign, 3, numbersign ] }; - key { [ 4, percent, 4, dollar ] }; - key { [ 5, colon, 5, percent ] }; - key { [ 7, period, 7, ampersand ] }; - key { [ 8, semicolon, 8, asterisk ] }; - key { [ slash, question, backslash, bar ] }; - key { [ ediaeresis, Ediaeresis, slash, question ] }; - key { [ backslash, bar ] }; - - key { [ Cyrillic_shorti, Cyrillic_SHORTI, q, Q ] }; - key { [ Cyrillic_tse, Cyrillic_TSE, w, W ] }; - key { [ Cyrillic_u, Cyrillic_U, e, E ] }; - key { [ Cyrillic_ka, Cyrillic_KA, r, R ] }; - key { [ Cyrillic_ie, Cyrillic_IE, t, T ] }; - key { [ Cyrillic_en, Cyrillic_EN, y, Y ] }; - key { [ Cyrillic_ghe, Cyrillic_GHE, u, U ] }; - key { [ Cyrillic_sha, Cyrillic_SHA, i, I ] }; - key { [ Cyrillic_shcha, Cyrillic_SHCHA, o, O ] }; - key { [ Cyrillic_ze, Cyrillic_ZE, p, P ] }; - key { [ Cyrillic_ha, Cyrillic_HA, bracketleft, braceleft ] }; - key { [Cyrillic_hardsign,Cyrillic_HARDSIGN, bracketright, braceright ] }; - key { [ Cyrillic_ef, Cyrillic_EF, a, A ] }; - key { [ Cyrillic_yeru, Cyrillic_YERU, s, S ] }; - key { [ Cyrillic_ve, Cyrillic_VE, d, D ] }; - key { [ Cyrillic_a, Cyrillic_A, f, F ] }; - key { [ Cyrillic_pe, Cyrillic_PE, g, G ] }; - key { [ Cyrillic_er, Cyrillic_ER, h, H ] }; - key { [ Cyrillic_o, Cyrillic_O, j, J ] }; - key { [ Cyrillic_el, Cyrillic_EL, k, K ] }; - key { [ Cyrillic_de, Cyrillic_DE, l, L ] }; - key { [ Cyrillic_zhe, Cyrillic_ZHE, semicolon, colon ] }; - key { [ Cyrillic_e, Cyrillic_E, apostrophe, quotedbl ] }; - key { [ Cyrillic_ya, Cyrillic_YA, z, Z ] }; - key { [ Cyrillic_che, Cyrillic_CHE, x, X ] }; - key { [ Cyrillic_es, Cyrillic_ES, c, C ] }; - key { [ Cyrillic_em, Cyrillic_EM, v, V ] }; - key { [ Cyrillic_i, Cyrillic_I, b, B ] }; - key { [ Cyrillic_te, Cyrillic_TE, n, N ] }; - key { [Cyrillic_softsign,Cyrillic_SOFTSIGN, m, M ] }; - key { [ Cyrillic_be, Cyrillic_BE, comma, less ] }; - key { [ Cyrillic_yu, Cyrillic_YU, period, greater ] }; - - include "level3(ralt_switch)" - -}; - - -partial default alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/ru(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]= "Russia"; + + key.type[group1]="FOUR_LEVEL"; + + + key { [ 1, exclam ] }; + key { [ 2, quotedbl, 2, at ] }; + key { [ 3, numerosign, 3, numbersign ] }; + key { [ 4, percent, 4, dollar ] }; + key { [ 5, colon, 5, percent ] }; + key { [ 7, period, 7, ampersand ] }; + key { [ 8, semicolon, 8, asterisk ] }; + key { [ slash, question, backslash, bar ] }; + key { [ ediaeresis, Ediaeresis, slash, question ] }; + key { [ backslash, bar ] }; + + key { [ Cyrillic_shorti, Cyrillic_SHORTI, q, Q ] }; + key { [ Cyrillic_tse, Cyrillic_TSE, w, W ] }; + key { [ Cyrillic_u, Cyrillic_U, e, E ] }; + key { [ Cyrillic_ka, Cyrillic_KA, r, R ] }; + key { [ Cyrillic_ie, Cyrillic_IE, t, T ] }; + key { [ Cyrillic_en, Cyrillic_EN, y, Y ] }; + key { [ Cyrillic_ghe, Cyrillic_GHE, u, U ] }; + key { [ Cyrillic_sha, Cyrillic_SHA, i, I ] }; + key { [ Cyrillic_shcha, Cyrillic_SHCHA, o, O ] }; + key { [ Cyrillic_ze, Cyrillic_ZE, p, P ] }; + key { [ Cyrillic_ha, Cyrillic_HA, bracketleft, braceleft ] }; + key { [Cyrillic_hardsign,Cyrillic_HARDSIGN, bracketright, braceright ] }; + key { [ Cyrillic_ef, Cyrillic_EF, a, A ] }; + key { [ Cyrillic_yeru, Cyrillic_YERU, s, S ] }; + key { [ Cyrillic_ve, Cyrillic_VE, d, D ] }; + key { [ Cyrillic_a, Cyrillic_A, f, F ] }; + key { [ Cyrillic_pe, Cyrillic_PE, g, G ] }; + key { [ Cyrillic_er, Cyrillic_ER, h, H ] }; + key { [ Cyrillic_o, Cyrillic_O, j, J ] }; + key { [ Cyrillic_el, Cyrillic_EL, k, K ] }; + key { [ Cyrillic_de, Cyrillic_DE, l, L ] }; + key { [ Cyrillic_zhe, Cyrillic_ZHE, semicolon, colon ] }; + key { [ Cyrillic_e, Cyrillic_E, apostrophe, quotedbl ] }; + key { [ Cyrillic_ya, Cyrillic_YA, z, Z ] }; + key { [ Cyrillic_che, Cyrillic_CHE, x, X ] }; + key { [ Cyrillic_es, Cyrillic_ES, c, C ] }; + key { [ Cyrillic_em, Cyrillic_EM, v, V ] }; + key { [ Cyrillic_i, Cyrillic_I, b, B ] }; + key { [ Cyrillic_te, Cyrillic_TE, n, N ] }; + key { [Cyrillic_softsign,Cyrillic_SOFTSIGN, m, M ] }; + key { [ Cyrillic_be, Cyrillic_BE, comma, less ] }; + key { [ Cyrillic_yu, Cyrillic_YU, period, greater ] }; + + include "level3(ralt_switch)" + +}; + + +partial default alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/ru(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/se b/xorg-server/xkeyboard-config/symbols/sun_vndr/se index 4efaf85fa..d27001466 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/se +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/se @@ -1,279 +1,279 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - -partial alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Sweden"; - - key { [ section, onehalf ] }; - key { [ less, greater, bar ] }; - key { [ 2, quotedbl, at ] }; - key { [ 3, numbersign, sterling ] }; - key { [ 4, currency, dollar ] }; - key { [ 6, ampersand ] }; - key { [ 7, slash, braceleft ] }; - key { [ 8, parenleft, bracketleft ] }; - key { [ 9, parenright, bracketright ] }; - key { [ 0, equal, braceright ] }; - key { [ plus, question, backslash ] }; - key { [ dead_acute, dead_grave ] }; - key { [ e, E, EuroSign ] }; - key { [ aring, Aring ] }; - key { [ dead_diaeresis, asciicircum, asciitilde ] }; - key { [ odiaeresis, Odiaeresis ] }; - key { [ adiaeresis, Adiaeresis ] }; - key { [ apostrophe, asterisk, grave ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - - include "level3(ralt_switch)" - include "kpdl(comma)" - -}; - -// Swedish layout for a Type 5/5c Sun keyboard -xkb_symbols "type5" { - include "sun_vndr/us(type5)+se(basic)" - - // Begin alphanumeric section - // These two are not supposed to be dead. - // A few others supposedly ARE dead, but don't care for now. - key { [ apostrophe, asterisk ], [ grave ] }; - key { [ ], [ asciitilde ] }; - - key { [ Shift_R ] }; - - key { [ Alt_L ] }; - key { [ Mode_switch ] }; - key { [ Meta_L ] }; - key { [ Meta_R ] }; - key { [ Multi_key ] }; - // End alphanumeric section - - // Begin "Function" section - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ F9 ] }; - key { [ F10 ] }; - key { [ F11 ], [ SunF36] }; - key { [ F12 ], [ SunF37] }; - key { [ Cancel ], [ F11 ] }; - key { [ Redo ], [ F12 ] }; - key { [ SunProps ], [ F13 ] }; - key { [ Undo ], [ F14 ] }; - key { [ SunFront ], [ F15 ] }; - key { [ SunCopy ], [ F16 ] }; - key { [ SunOpen ], [ F17 ] }; - key { [ SunPaste ], [ F18 ] }; - key { [ Find ], [ F19 ] }; - key { [ SunCut ], [ F20 ] }; - // End "Function" section - - // Begin "Editing" section - key { [ Print ], [ Sys_Req, SunSys_Req ] }; - key { [ Scroll_Lock ] }; - key { [ Pause ], [ Break ] }; - key { [ Left ] }; - key { [ Right ] }; - key { [ Up ] }; - key { [ Down ] }; - - key { [ Delete ] }; - key { [ Insert ] }; - key { [ Prior ] }; - key { [ Next ] }; - key { [ Home ] }; - key { [ End ] }; - key { [ Help ] }; - // End "Editing" section - - // Begin "Keypad" section - key { [ Num_Lock ] }; - key { [ KP_Divide ], [ F25 ] }; - key { [ KP_Multiply ], [ F26 ] }; - key { [ KP_Subtract ] }; - - key { [ KP_Home, KP_7 ], [ F27 ] }; - key { [ KP_Up, KP_8 ], [ F28 ] }; - key { [ KP_Prior, KP_9 ], [ F29 ] }; - key { [ KP_Add ] }; - - key { [ KP_Left, KP_4 ], [ F30 ] }; - key { [ KP_Begin, KP_5 ], [ F31 ] }; - key { [ KP_Right, KP_6 ], [ F32 ] }; - - key { [ KP_End, KP_1 ], [ F33 ] }; - key { [ KP_Down, KP_2 ], [ F34 ] }; - key { [ KP_Next, KP_3 ], [ F35 ] }; - key { [ KP_Enter ] }; - - key { [ KP_Insert, KP_0 ] }; - key { [ KP_Delete, KP_Decimal ] }; - // End "Keypad" section, - - // Begin "four keys up on the right" - key { [ SunAudioMute, SunVideoDegauss ] }; - key { [ SunAudioLowerVolume,SunVideoLowerBrightness ] }; - key { [ SunAudioRaiseVolume,SunVideoRaiseBrightness ] }; - key { [ SunPowerSwitch, SunPowerSwitchShift ] }; - // End "four keys up on the right" - - // Begin modifier mappings - modifier_map Shift { Shift_R }; - modifier_map Mod1 { Meta_L, Meta_R }; - modifier_map Mod2 { Num_Lock }; - modifier_map Mod3 { Mode_switch }; - modifier_map Mod4 { Alt_L }; - // End modifier mappings -}; - -// Swedish layout for a Type 4 Sun keyboard -xkb_symbols "type4" { - include "sun_vndr/us(type4basic)+se(basic)" - - // Begin alphanumeric section - // These two are not supposed to be dead. - // A few others supposedly ARE dead, but don't care for now. - key { [ apostrophe, asterisk ], [ grave ] }; - key { [ ], [ asciitilde ] }; - - key { [ asciitilde, asciicircum ] }; - - key { [ Shift_R ] }; - - key { [ Alt_L ] }; - key { [ Mode_switch ] }; - key { [ Meta_L ] }; - key { [ Meta_R ] }; - key { [ Multi_key ] }; - // End alphanumeric section - - // Begin "Function" section - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ F9 ] }; - key { [ F10 ] }; - key { [ F11 ], [ SunF36] }; - key { [ F12 ], [ SunF37] }; - key { [ Cancel ], [ F11 ] }; - key { [ Redo ], [ F12 ] }; - key { [ SunProps ], [ F13 ] }; - key { [ Undo ], [ F14 ] }; - key { [ SunFront ], [ F15 ] }; - key { [ SunCopy ], [ F16 ] }; - key { [ SunOpen ], [ F17 ] }; - key { [ SunPaste ], [ F18 ] }; - key { [ Find ], [ F19 ] }; - key { [ SunCut ], [ F20 ] }; - // End "Function" section - - // Begin "Editing" section - key { [ Linefeed ] }; - key { [ Delete ] }; - key { [ Print ], [ Sys_Req, SunSys_Req ] }; - key { [ Scroll_Lock ] }; - key { [ Pause ], [ Break ] }; - key { [ Help ] }; - // End "Editing" section - - // Begin "Keypad" section - key { [ Num_Lock ] }; - key { [ KP_Equal ] }; - key { [ KP_Divide ], [ F25 ] }; - key { [ KP_Multiply ], [ F26 ] }; - key { [ KP_Subtract ] }; - - key { [ KP_Home, KP_7 ], [ F27 ] }; - key { [ KP_Up, KP_8 ], [ F28 ] }; - key { [ KP_Prior, KP_9 ], [ F29 ] }; - key { [ KP_Add ] }; - - key { [ KP_Left, KP_4 ], [ F30 ] }; - key { [ KP_Begin, KP_5 ], [ F31 ] }; - key { [ KP_Right, KP_6 ], [ F32 ] }; - - key { [ KP_End, KP_1 ], [ F33 ] }; - key { [ KP_Down, KP_2 ], [ F34 ] }; - key { [ KP_Next, KP_3 ], [ F35 ] }; - key { [ KP_Enter ] }; - - key { [ KP_Insert, KP_0 ] }; - key { [ KP_Delete, KP_Decimal ] }; - // End "Keypad" section, - - // Begin modifier mappings - modifier_map Shift { Shift_R }; - modifier_map Mod1 { Alt_L }; - modifier_map Mod2 { Num_Lock }; - modifier_map Mod3 { Mode_switch }; - modifier_map Mod4 { Meta_L }; - modifier_map Mod5 { Meta_R }; - // End modifier mappings -}; - - -partial default alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/se(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Sweden"; + + key { [ section, onehalf ] }; + key { [ less, greater, bar ] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, numbersign, sterling ] }; + key { [ 4, currency, dollar ] }; + key { [ 6, ampersand ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, equal, braceright ] }; + key { [ plus, question, backslash ] }; + key { [ dead_acute, dead_grave ] }; + key { [ e, E, EuroSign ] }; + key { [ aring, Aring ] }; + key { [ dead_diaeresis, asciicircum, asciitilde ] }; + key { [ odiaeresis, Odiaeresis ] }; + key { [ adiaeresis, Adiaeresis ] }; + key { [ apostrophe, asterisk, grave ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" + +}; + +// Swedish layout for a Type 5/5c Sun keyboard +xkb_symbols "type5" { + include "sun_vndr/us(type5)+se(basic)" + + // Begin alphanumeric section + // These two are not supposed to be dead. + // A few others supposedly ARE dead, but don't care for now. + key { [ apostrophe, asterisk ], [ grave ] }; + key { [ ], [ asciitilde ] }; + + key { [ Shift_R ] }; + + key { [ Alt_L ] }; + key { [ Mode_switch ] }; + key { [ Meta_L ] }; + key { [ Meta_R ] }; + key { [ Multi_key ] }; + // End alphanumeric section + + // Begin "Function" section + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F10 ] }; + key { [ F11 ], [ SunF36] }; + key { [ F12 ], [ SunF37] }; + key { [ Cancel ], [ F11 ] }; + key { [ Redo ], [ F12 ] }; + key { [ SunProps ], [ F13 ] }; + key { [ Undo ], [ F14 ] }; + key { [ SunFront ], [ F15 ] }; + key { [ SunCopy ], [ F16 ] }; + key { [ SunOpen ], [ F17 ] }; + key { [ SunPaste ], [ F18 ] }; + key { [ Find ], [ F19 ] }; + key { [ SunCut ], [ F20 ] }; + // End "Function" section + + // Begin "Editing" section + key { [ Print ], [ Sys_Req, SunSys_Req ] }; + key { [ Scroll_Lock ] }; + key { [ Pause ], [ Break ] }; + key { [ Left ] }; + key { [ Right ] }; + key { [ Up ] }; + key { [ Down ] }; + + key { [ Delete ] }; + key { [ Insert ] }; + key { [ Prior ] }; + key { [ Next ] }; + key { [ Home ] }; + key { [ End ] }; + key { [ Help ] }; + // End "Editing" section + + // Begin "Keypad" section + key { [ Num_Lock ] }; + key { [ KP_Divide ], [ F25 ] }; + key { [ KP_Multiply ], [ F26 ] }; + key { [ KP_Subtract ] }; + + key { [ KP_Home, KP_7 ], [ F27 ] }; + key { [ KP_Up, KP_8 ], [ F28 ] }; + key { [ KP_Prior, KP_9 ], [ F29 ] }; + key { [ KP_Add ] }; + + key { [ KP_Left, KP_4 ], [ F30 ] }; + key { [ KP_Begin, KP_5 ], [ F31 ] }; + key { [ KP_Right, KP_6 ], [ F32 ] }; + + key { [ KP_End, KP_1 ], [ F33 ] }; + key { [ KP_Down, KP_2 ], [ F34 ] }; + key { [ KP_Next, KP_3 ], [ F35 ] }; + key { [ KP_Enter ] }; + + key { [ KP_Insert, KP_0 ] }; + key { [ KP_Delete, KP_Decimal ] }; + // End "Keypad" section, + + // Begin "four keys up on the right" + key { [ SunAudioMute, SunVideoDegauss ] }; + key { [ SunAudioLowerVolume,SunVideoLowerBrightness ] }; + key { [ SunAudioRaiseVolume,SunVideoRaiseBrightness ] }; + key { [ SunPowerSwitch, SunPowerSwitchShift ] }; + // End "four keys up on the right" + + // Begin modifier mappings + modifier_map Shift { Shift_R }; + modifier_map Mod1 { Meta_L, Meta_R }; + modifier_map Mod2 { Num_Lock }; + modifier_map Mod3 { Mode_switch }; + modifier_map Mod4 { Alt_L }; + // End modifier mappings +}; + +// Swedish layout for a Type 4 Sun keyboard +xkb_symbols "type4" { + include "sun_vndr/us(type4basic)+se(basic)" + + // Begin alphanumeric section + // These two are not supposed to be dead. + // A few others supposedly ARE dead, but don't care for now. + key { [ apostrophe, asterisk ], [ grave ] }; + key { [ ], [ asciitilde ] }; + + key { [ asciitilde, asciicircum ] }; + + key { [ Shift_R ] }; + + key { [ Alt_L ] }; + key { [ Mode_switch ] }; + key { [ Meta_L ] }; + key { [ Meta_R ] }; + key { [ Multi_key ] }; + // End alphanumeric section + + // Begin "Function" section + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F10 ] }; + key { [ F11 ], [ SunF36] }; + key { [ F12 ], [ SunF37] }; + key { [ Cancel ], [ F11 ] }; + key { [ Redo ], [ F12 ] }; + key { [ SunProps ], [ F13 ] }; + key { [ Undo ], [ F14 ] }; + key { [ SunFront ], [ F15 ] }; + key { [ SunCopy ], [ F16 ] }; + key { [ SunOpen ], [ F17 ] }; + key { [ SunPaste ], [ F18 ] }; + key { [ Find ], [ F19 ] }; + key { [ SunCut ], [ F20 ] }; + // End "Function" section + + // Begin "Editing" section + key { [ Linefeed ] }; + key { [ Delete ] }; + key { [ Print ], [ Sys_Req, SunSys_Req ] }; + key { [ Scroll_Lock ] }; + key { [ Pause ], [ Break ] }; + key { [ Help ] }; + // End "Editing" section + + // Begin "Keypad" section + key { [ Num_Lock ] }; + key { [ KP_Equal ] }; + key { [ KP_Divide ], [ F25 ] }; + key { [ KP_Multiply ], [ F26 ] }; + key { [ KP_Subtract ] }; + + key { [ KP_Home, KP_7 ], [ F27 ] }; + key { [ KP_Up, KP_8 ], [ F28 ] }; + key { [ KP_Prior, KP_9 ], [ F29 ] }; + key { [ KP_Add ] }; + + key { [ KP_Left, KP_4 ], [ F30 ] }; + key { [ KP_Begin, KP_5 ], [ F31 ] }; + key { [ KP_Right, KP_6 ], [ F32 ] }; + + key { [ KP_End, KP_1 ], [ F33 ] }; + key { [ KP_Down, KP_2 ], [ F34 ] }; + key { [ KP_Next, KP_3 ], [ F35 ] }; + key { [ KP_Enter ] }; + + key { [ KP_Insert, KP_0 ] }; + key { [ KP_Delete, KP_Decimal ] }; + // End "Keypad" section, + + // Begin modifier mappings + modifier_map Shift { Shift_R }; + modifier_map Mod1 { Alt_L }; + modifier_map Mod2 { Num_Lock }; + modifier_map Mod3 { Mode_switch }; + modifier_map Mod4 { Meta_L }; + modifier_map Mod5 { Meta_R }; + // End modifier mappings +}; + + +partial default alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/se(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/sk b/xorg-server/xkeyboard-config/symbols/sun_vndr/sk index ee49a7008..9c909763f 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/sk +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/sk @@ -1,109 +1,109 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - - -partial default alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Slovakia"; - - - key { [ semicolon, dead_abovering, quoteleft, asciitilde ] }; - key { [ plus, 1, exclam, asciitilde ] }; - key { [ lcaron, 2, at, dead_caron ] }; - key { [ scaron, 3, numbersign, dead_circumflex ] }; - key { [ ccaron, 4, dollar, dead_breve ] }; - key { [ tcaron, 5, percent, dead_abovering ] }; - key { [ zcaron, 6, asciicircum, dead_ogonek ] }; - key { [ yacute, 7, ampersand, grave ] }; - key { [ aacute, 8, asterisk, dead_abovedot ] }; - key { [ iacute, 9, parenleft, apostrophe ] }; - key { [ eacute, 0, parenright, dead_doubleacute ] }; - key { [ equal, percent, dead_diaeresis, backslash ] }; - key { [ dead_acute, dead_caron, dead_cedilla, minus ] }; - - key { [ q, Q, backslash ] }; - key { [ w, W, bar ] }; - key { [ e, E, EuroSign ] }; - key { [ z, Z ] }; - key { [ p, P, apostrophe ] }; - key { [ uacute, slash, division ] }; - key { [ adiaeresis, parenleft, multiply ] }; - - key { [ s, S, dstroke ] }; - key { [ d, D, Dstroke ] }; - key { [ f, F, bracketleft ] }; - key { [ g, G, bracketright ] }; - key { [ k, K, lstroke ] }; - key { [ l, L, Lstroke ] }; - key { [ ocircumflex, quotedbl, dollar ] }; - key { [ section, exclam, ssharp ] }; - key { [ ncaron, parenright, currency, currency ] }; - key { [ ncaron, parenright, backslash, bar ] }; - - key { [ backslash, bar, slash, brokenbar ] }; - key { [ y, Y, less ] }; - key { [ x, X, greater, numbersign ] }; - key { [ c, C, ampersand ] }; - key { [ v, V, at ] }; - key { [ b, B, braceleft ] }; - key { [ n, N, braceright ] }; - key { [ comma, question, less ] }; - key { [ period, colon, greater ] }; - key { [ minus, underscore, asterisk ] }; - - include "level3(ralt_switch)" - -}; - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/sk(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Slovakia"; + + + key { [ semicolon, dead_abovering, quoteleft, asciitilde ] }; + key { [ plus, 1, exclam, asciitilde ] }; + key { [ lcaron, 2, at, dead_caron ] }; + key { [ scaron, 3, numbersign, dead_circumflex ] }; + key { [ ccaron, 4, dollar, dead_breve ] }; + key { [ tcaron, 5, percent, dead_abovering ] }; + key { [ zcaron, 6, asciicircum, dead_ogonek ] }; + key { [ yacute, 7, ampersand, grave ] }; + key { [ aacute, 8, asterisk, dead_abovedot ] }; + key { [ iacute, 9, parenleft, apostrophe ] }; + key { [ eacute, 0, parenright, dead_doubleacute ] }; + key { [ equal, percent, dead_diaeresis, backslash ] }; + key { [ dead_acute, dead_caron, dead_cedilla, minus ] }; + + key { [ q, Q, backslash ] }; + key { [ w, W, bar ] }; + key { [ e, E, EuroSign ] }; + key { [ z, Z ] }; + key { [ p, P, apostrophe ] }; + key { [ uacute, slash, division ] }; + key { [ adiaeresis, parenleft, multiply ] }; + + key { [ s, S, dstroke ] }; + key { [ d, D, Dstroke ] }; + key { [ f, F, bracketleft ] }; + key { [ g, G, bracketright ] }; + key { [ k, K, lstroke ] }; + key { [ l, L, Lstroke ] }; + key { [ ocircumflex, quotedbl, dollar ] }; + key { [ section, exclam, ssharp ] }; + key { [ ncaron, parenright, currency, currency ] }; + key { [ ncaron, parenright, backslash, bar ] }; + + key { [ backslash, bar, slash, brokenbar ] }; + key { [ y, Y, less ] }; + key { [ x, X, greater, numbersign ] }; + key { [ c, C, ampersand ] }; + key { [ v, V, at ] }; + key { [ b, B, braceleft ] }; + key { [ n, N, braceright ] }; + key { [ comma, question, less ] }; + key { [ period, colon, greater ] }; + key { [ minus, underscore, asterisk ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/sk(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/tr b/xorg-server/xkeyboard-config/symbols/sun_vndr/tr index 4eb8d6511..18ff4f0b1 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/tr +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/tr @@ -1,92 +1,92 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - - -partial alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Turkey - (Q)"; - - key { [ quotedbl, eacute ] }; - key { [ 1, exclam ] }; - key { [ 2, apostrophe ] }; - key { [ 3, asciicircum, numbersign ] }; - key { [ 4, plus, dollar ] }; - key { [ 6, ampersand ] }; - key { [ 7, slash, braceleft ] }; - key { [ 8, parenleft, bracketleft ] }; - key { [ 9, parenright, bracketright ] }; - key { [ 0, equal, braceright ] }; - key { [ asterisk, question, backslash ] }; - key { [ minus, underscore ] }; - - key { [ q, Q, at ] }; - key { [ e, E, EuroSign ] }; - key { [ idotless, I ] }; - key { [ gbreve, Gbreve ] }; - key { [udiaeresis, Udiaeresis, asciitilde ] }; - - key { [ scedilla, Scedilla, acute ] }; - key { [ i, Iabovedot ] }; - key { [ comma, semicolon, grave ] }; - - key { [ less, greater, bar ] }; - key { [odiaeresis, Odiaeresis ] }; - key { [ ccedilla, Ccedilla ] }; - key { [ period, colon ] }; - - include "level3(ralt_switch)" - -}; - -partial default alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/tr(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + + +partial alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Turkey - (Q)"; + + key { [ quotedbl, eacute ] }; + key { [ 1, exclam ] }; + key { [ 2, apostrophe ] }; + key { [ 3, asciicircum, numbersign ] }; + key { [ 4, plus, dollar ] }; + key { [ 6, ampersand ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, equal, braceright ] }; + key { [ asterisk, question, backslash ] }; + key { [ minus, underscore ] }; + + key { [ q, Q, at ] }; + key { [ e, E, EuroSign ] }; + key { [ idotless, I ] }; + key { [ gbreve, Gbreve ] }; + key { [udiaeresis, Udiaeresis, asciitilde ] }; + + key { [ scedilla, Scedilla, acute ] }; + key { [ i, Iabovedot ] }; + key { [ comma, semicolon, grave ] }; + + key { [ less, greater, bar ] }; + key { [odiaeresis, Odiaeresis ] }; + key { [ ccedilla, Ccedilla ] }; + key { [ period, colon ] }; + + include "level3(ralt_switch)" + +}; + +partial default alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/tr(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv b/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv index 64037ac42..f098f9f27 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv @@ -1,261 +1,261 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// -// -//Copyright 1996, 1998 The Open Group -// -//All Rights Reserved. -// -//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. -// -// US/ASCII layout for a Type 4 Sun keyboard - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - - -xkb_symbols "type4basic" { - include "us(basic)" - - key { [ Shift_R ] }; - key { [ Alt_L ] }; - key { [ Mode_switch ] }; - key { [ Meta_L ] }; - key { [ Meta_R ] }; - key { [ Linefeed ] }; - key { [ Multi_key ] }; - // End alphanumeric section - - // Begin "Function" section - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ F9 ] }; - key { [ F10 ] }; - key { [ SunF36 ] }; - key { [ SunF37 ] }; - key { [ L1, L1 ], [ SunStop ] }; - key { [ L2, L2 ], [ SunAgain ] }; - key { [ L3, L3 ], [ SunProps ] }; - key { [ L4, L4 ], [ SunUndo ] }; - key { [ L5, L5 ], [ SunFront ] }; - key { [ L6, L6 ], [ SunCopy ] }; - key { [ L7, L7 ], [ SunOpen ] }; - key { [ L8, L8 ], [ SunPaste ] }; - key { [ L9, L9 ], [ SunFind ] }; - key { [ L10, L10 ], [ SunCut ] }; - // End "Function" section - - // Begin "Editing" section - key { [ R2, R2 ], [ Print ] }; - key { [ R3, R3 ], [ Scroll_Lock, Break ] }; - key { [ R1, R1 ], [ Pause ] }; - key { [ Delete ] }; - key { [ Help ] }; - - // End "Editing" section, begin "Keypad" - key { [ Num_Lock ] }; - key { [ R4, R4 ], [ KP_Equal ] }; - key { [ R5, R5 ], [ KP_Divide ] }; - key { [ R6, R6 ], [ KP_Multiply ] }; - key { [ KP_Subtract ] }; - - key { [ R7, R7 ], [ KP_7, Home ] }; - key { [ Up, R8 ], [ KP_8 ] }; -// key { [ R8, R8 ], [ KP_8 ] }; - key { [ R9, R9 ], [ KP_9, Prior ] }; - key { [ KP_Add ] }; - - key { [ Left, R10 ], [ KP_4 ] }; - key { [ R11, R11 ], [ KP_5 ] }; - key { [ Right, R12 ], [ KP_6 ] }; - - key { [ R13, R13 ], [ KP_1, End ] }; - key { [ Down, R14 ], [ KP_2 ] }; - key { [ R15, R15 ], [ KP_3, Next ] }; - key { [ KP_Enter ] }; - key { [ KP_Insert, KP_Insert], [ KP_0 ] }; - key { [ Delete, Delete ], [ KP_Decimal ] }; - // End "Keypad" section - - - // begin modifier mappings - modifier_map Shift { Shift_R, Shift_L }; - modifier_map Mod1 { Meta_L, Meta_R }; - modifier_map Mod2 { Num_Lock }; - modifier_map Mod3 { Mode_switch }; - modifier_map Mod4 { Alt_L }; -}; - -xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - - // A few alphanumeric keys are different - key { [ 4, dollar ], [ EuroSign ] }; - key { [ 5, percent ], [ EuroSign ] }; - key { [ e, E ], [ EuroSign ] }; -}; - -// US/ASCII layout for a Type 5 Sun keyboard -xkb_symbols "type5basic" { - include "us(basic)" - - key { [ Shift_R ] }; - key { [ Alt_L ] }; - key { [ Mode_switch ] }; - key { [ Meta_L ] }; - key { [ Meta_R ] }; - key { [ Multi_key ] }; - // End alphanumeric section - - // Begin "Function" section - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ F9 ] }; - key { [ F10 ] }; - key { [ SunF36 ] }; - key { [ SunF37 ] }; - key { [ L1, L1 ], [ SunStop ] }; - key { [ L2, L2 ], [ SunAgain ] }; - key { [ L3, L3 ], [ SunProps ] }; - key { [ L4, L4 ], [ SunUndo ] }; - key { [ L5, L5 ], [ SunFront ] }; - key { [ L6, L6 ], [ SunCopy ] }; - key { [ L7, L7 ], [ SunOpen ] }; - key { [ L8, L8 ], [ SunPaste ] }; - key { [ L9, L9 ], [ SunFind ] }; - key { [ L10, L10 ], [ SunCut ] }; - // End "Function" section - - // Begin "Editing" section - key { [ R2, R2 ], [ Print, SunSys_Req ] }; - key { [ R3, R3 ], [ Scroll_Lock ] }; - key { [ R1, R1 ], [ Pause, Break ] }; - key { [ Left ] }; - key { [ Right ] }; - key { [ Up ] }; - key { [ Down ] }; - - key { [ Delete ] }; - key { [ Insert ] }; - key { [ Prior ] }; - key { [ Next ] }; - key { [ Home ] }; - key { [ End ] }; - key { [ Help ] }; - - // End "Editing" section, begin "Keypad" - key { [ Num_Lock ] }; - key { [ R5, R5 ], [ KP_Divide ] }; - key { [ R6, R6 ], [ KP_Multiply ] }; - key { [ R4, R4 ], [ KP_Subtract ] }; - - key { [ R7, R7 ], [ KP_7, Home ] }; - key { [ Up, R8 ], [ KP_8 ] }; - key { [ R9, R9 ], [ KP_9, Prior ] }; - key { [ KP_Add ] }; - - key { [ Left, R10 ], [ KP_4 ] }; - key { [ R11, R11 ], [ KP_5 ] }; - key { [ Right, R12 ], [ KP_6 ] }; - - key { [ R13, R13 ], [ KP_1, End ] }; - key { [ Down, R14 ], [ KP_2 ] }; - key { [ R15, R15 ], [ KP_3 ] }; - key { [ KP_Enter ] }; - - key { [ KP_Insert, KP_Insert ], [ KP_0 ] }; - key { [ KP_Delete, KP_Delete ], [ KP_Decimal ] }; - // End "Keypad" section, - // begin "four keys up on the right" - - key { [ SunAudioMute, SunVideoDegauss ] }; - key { [ SunAudioLowerVolume, SunVideoLowerBrightness ] }; - key { [ SunAudioRaiseVolume, SunVideoRaiseBrightness ] }; - key { [ SunPowerSwitch, SunPowerSwitchShift ] }; - - // begin modifier mappings - modifier_map Shift { Shift_R }; - modifier_map Mod1 { Meta_L, Meta_R }; - modifier_map Mod2 { Num_Lock }; - modifier_map Mod3 { Alt_R }; - modifier_map Mod4 { Alt_L }; -}; - -xkb_symbols "type5" { - include "sun_vndr/us(type5basic)" - - // A few alphanumeric keys are different - key { [ 4, dollar ], [ EuroSign ] }; - key { [ 5, percent ], [ EuroSign ] }; - key { [ e, E ], [ EuroSign ] }; - key { [ backslash, bar ], [ brokenbar ] }; -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// +// +//Copyright 1996, 1998 The Open Group +// +//All Rights Reserved. +// +//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. +// +// US/ASCII layout for a Type 4 Sun keyboard + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + + +xkb_symbols "type4basic" { + include "us(basic)" + + key { [ Shift_R ] }; + key { [ Alt_L ] }; + key { [ Mode_switch ] }; + key { [ Meta_L ] }; + key { [ Meta_R ] }; + key { [ Linefeed ] }; + key { [ Multi_key ] }; + // End alphanumeric section + + // Begin "Function" section + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F10 ] }; + key { [ SunF36 ] }; + key { [ SunF37 ] }; + key { [ L1, L1 ], [ SunStop ] }; + key { [ L2, L2 ], [ SunAgain ] }; + key { [ L3, L3 ], [ SunProps ] }; + key { [ L4, L4 ], [ SunUndo ] }; + key { [ L5, L5 ], [ SunFront ] }; + key { [ L6, L6 ], [ SunCopy ] }; + key { [ L7, L7 ], [ SunOpen ] }; + key { [ L8, L8 ], [ SunPaste ] }; + key { [ L9, L9 ], [ SunFind ] }; + key { [ L10, L10 ], [ SunCut ] }; + // End "Function" section + + // Begin "Editing" section + key { [ R2, R2 ], [ Print ] }; + key { [ R3, R3 ], [ Scroll_Lock, Break ] }; + key { [ R1, R1 ], [ Pause ] }; + key { [ Delete ] }; + key { [ Help ] }; + + // End "Editing" section, begin "Keypad" + key { [ Num_Lock ] }; + key { [ R4, R4 ], [ KP_Equal ] }; + key { [ R5, R5 ], [ KP_Divide ] }; + key { [ R6, R6 ], [ KP_Multiply ] }; + key { [ KP_Subtract ] }; + + key { [ R7, R7 ], [ KP_7, Home ] }; + key { [ Up, R8 ], [ KP_8 ] }; +// key { [ R8, R8 ], [ KP_8 ] }; + key { [ R9, R9 ], [ KP_9, Prior ] }; + key { [ KP_Add ] }; + + key { [ Left, R10 ], [ KP_4 ] }; + key { [ R11, R11 ], [ KP_5 ] }; + key { [ Right, R12 ], [ KP_6 ] }; + + key { [ R13, R13 ], [ KP_1, End ] }; + key { [ Down, R14 ], [ KP_2 ] }; + key { [ R15, R15 ], [ KP_3, Next ] }; + key { [ KP_Enter ] }; + key { [ KP_Insert, KP_Insert], [ KP_0 ] }; + key { [ Delete, Delete ], [ KP_Decimal ] }; + // End "Keypad" section + + + // begin modifier mappings + modifier_map Shift { Shift_R, Shift_L }; + modifier_map Mod1 { Meta_L, Meta_R }; + modifier_map Mod2 { Num_Lock }; + modifier_map Mod3 { Mode_switch }; + modifier_map Mod4 { Alt_L }; +}; + +xkb_symbols "type4" { + include "sun_vndr/us(type4basic)" + + // A few alphanumeric keys are different + key { [ 4, dollar ], [ EuroSign ] }; + key { [ 5, percent ], [ EuroSign ] }; + key { [ e, E ], [ EuroSign ] }; +}; + +// US/ASCII layout for a Type 5 Sun keyboard +xkb_symbols "type5basic" { + include "us(basic)" + + key { [ Shift_R ] }; + key { [ Alt_L ] }; + key { [ Mode_switch ] }; + key { [ Meta_L ] }; + key { [ Meta_R ] }; + key { [ Multi_key ] }; + // End alphanumeric section + + // Begin "Function" section + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F10 ] }; + key { [ SunF36 ] }; + key { [ SunF37 ] }; + key { [ L1, L1 ], [ SunStop ] }; + key { [ L2, L2 ], [ SunAgain ] }; + key { [ L3, L3 ], [ SunProps ] }; + key { [ L4, L4 ], [ SunUndo ] }; + key { [ L5, L5 ], [ SunFront ] }; + key { [ L6, L6 ], [ SunCopy ] }; + key { [ L7, L7 ], [ SunOpen ] }; + key { [ L8, L8 ], [ SunPaste ] }; + key { [ L9, L9 ], [ SunFind ] }; + key { [ L10, L10 ], [ SunCut ] }; + // End "Function" section + + // Begin "Editing" section + key { [ R2, R2 ], [ Print, SunSys_Req ] }; + key { [ R3, R3 ], [ Scroll_Lock ] }; + key { [ R1, R1 ], [ Pause, Break ] }; + key { [ Left ] }; + key { [ Right ] }; + key { [ Up ] }; + key { [ Down ] }; + + key { [ Delete ] }; + key { [ Insert ] }; + key { [ Prior ] }; + key { [ Next ] }; + key { [ Home ] }; + key { [ End ] }; + key { [ Help ] }; + + // End "Editing" section, begin "Keypad" + key { [ Num_Lock ] }; + key { [ R5, R5 ], [ KP_Divide ] }; + key { [ R6, R6 ], [ KP_Multiply ] }; + key { [ R4, R4 ], [ KP_Subtract ] }; + + key { [ R7, R7 ], [ KP_7, Home ] }; + key { [ Up, R8 ], [ KP_8 ] }; + key { [ R9, R9 ], [ KP_9, Prior ] }; + key { [ KP_Add ] }; + + key { [ Left, R10 ], [ KP_4 ] }; + key { [ R11, R11 ], [ KP_5 ] }; + key { [ Right, R12 ], [ KP_6 ] }; + + key { [ R13, R13 ], [ KP_1, End ] }; + key { [ Down, R14 ], [ KP_2 ] }; + key { [ R15, R15 ], [ KP_3 ] }; + key { [ KP_Enter ] }; + + key { [ KP_Insert, KP_Insert ], [ KP_0 ] }; + key { [ KP_Delete, KP_Delete ], [ KP_Decimal ] }; + // End "Keypad" section, + // begin "four keys up on the right" + + key { [ SunAudioMute, SunVideoDegauss ] }; + key { [ SunAudioLowerVolume, SunVideoLowerBrightness ] }; + key { [ SunAudioRaiseVolume, SunVideoRaiseBrightness ] }; + key { [ SunPowerSwitch, SunPowerSwitchShift ] }; + + // begin modifier mappings + modifier_map Shift { Shift_R }; + modifier_map Mod1 { Meta_L, Meta_R }; + modifier_map Mod2 { Num_Lock }; + modifier_map Mod3 { Alt_R }; + modifier_map Mod4 { Alt_L }; +}; + +xkb_symbols "type5" { + include "sun_vndr/us(type5basic)" + + // A few alphanumeric keys are different + key { [ 4, dollar ], [ EuroSign ] }; + key { [ 5, percent ], [ EuroSign ] }; + key { [ e, E ], [ EuroSign ] }; + key { [ backslash, bar ], [ brokenbar ] }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/tw b/xorg-server/xkeyboard-config/symbols/sun_vndr/tw index 3f6569d2a..d2d3952e4 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/tw +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/tw @@ -1,78 +1,78 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - -// Taiwanese layout for a Type 6 Sun keyboard -partial -xkb_symbols "type6" { - // A few keys are different from US layout - only those are shown here - key { [ Henkan_Mode ] }; - key { [ backslash, bar, brokenbar ] }; - -}; - - -// Taiwanese layout for a Type 4 Sun keyboard - -xkb_symbols "type4" { - - key { [ backslash, bar, brokenbar ] }; - - key { [ Henkan_Mode ] }; - -}; - -// Taiwanese layout for a Type 5 Sun keyboard -xkb_symbols "type5" { - - // A few keys are different - key { [ Henkan_Mode ] }; - key { [ backslash, bar, brokenbar ] }; - -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +// Taiwanese layout for a Type 6 Sun keyboard +partial +xkb_symbols "type6" { + // A few keys are different from US layout - only those are shown here + key { [ Henkan_Mode ] }; + key { [ backslash, bar, brokenbar ] }; + +}; + + +// Taiwanese layout for a Type 4 Sun keyboard + +xkb_symbols "type4" { + + key { [ backslash, bar, brokenbar ] }; + + key { [ Henkan_Mode ] }; + +}; + +// Taiwanese layout for a Type 5 Sun keyboard +xkb_symbols "type5" { + + // A few keys are different + key { [ Henkan_Mode ] }; + key { [ backslash, bar, brokenbar ] }; + +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ua b/xorg-server/xkeyboard-config/symbols/sun_vndr/ua index b18fad4d7..98d39ecde 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ua +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ua @@ -1,117 +1,117 @@ -// -// Copyright 2010 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, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// 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 -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. -// - -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// - - -partial default alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Ukraine"; - - - key { [ grave, asciitilde, apostrophe, asciitilde ] }; - key { [ 1, exclam, 1, exclam ] }; - key { [ 2, at, 2, quotedbl ] }; - key { [ 3, numbersign, 3, numbersign ] }; - key { [ 4, dollar, 4, asterisk ] }; - key { [ 5, percent, 5, colon ] }; - key { [ 6, asciicircum, 6, comma ] }; - key { [ 7, ampersand, 7, period ] }; - key { [ 8, asterisk, 8, semicolon ] }; - key { [ 9, parenleft, 9, parenleft ] }; - key { [ 0, parenright, 0, parenright ] }; - key { [ minus, underscore, minus, underscore ] }; - key { [ equal, plus, equal, plus ] }; - - key { [ q, Q, Cyrillic_shorti, Cyrillic_SHORTI ] }; - key { [ w, W, Cyrillic_tse, Cyrillic_TSE ] }; - key { [ e, E, Cyrillic_u, Cyrillic_U ] }; - key { [ r, R, Cyrillic_ka, Cyrillic_KA ] }; - key { [ t, T, Cyrillic_ie, Cyrillic_IE ] }; - key { [ y, Y, Cyrillic_en, Cyrillic_EN ] }; - key { [ u, U, Cyrillic_ghe, Cyrillic_GHE ] }; - key { [ i, I, Cyrillic_sha, Cyrillic_SHA ] }; - key { [ o, O, Cyrillic_shcha, Cyrillic_SHCHA ] }; - key { [ p, P, Cyrillic_ze, Cyrillic_ZE ] }; - key { [ bracketleft, braceleft, Cyrillic_ha, Cyrillic_HA ] }; - key { [ bracketright, braceright, Ukrainian_yi, Ukrainian_YI ] }; - - key { [ a, A, Cyrillic_ef, Cyrillic_EF ] }; - key { [ s, S, Ukrainian_i, Ukrainian_I ] }; - key { [ d, D, Cyrillic_ve, Cyrillic_VE ] }; - key { [ f, F, Cyrillic_a, Cyrillic_A ] }; - key { [ g, G, Cyrillic_pe, Cyrillic_PE ] }; - key { [ h, H, Cyrillic_er, Cyrillic_ER ] }; - key { [ j, J, Cyrillic_o, Cyrillic_O ] }; - key { [ k, K, Cyrillic_el, Cyrillic_EL ] }; - key { [ l, L, Cyrillic_de, Cyrillic_DE ] }; - key { [ semicolon, colon, Cyrillic_zhe, Cyrillic_ZHE ] }; - key { [ apostrophe, quotedbl, Ukrainian_ie, Ukrainian_IE ] }; - key { [ backslash, bar, Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] }; - - key { [ less, greater, slash, bar ] }; - key { [ z, Z, Cyrillic_ya, Cyrillic_YA ] }; - key { [ x, X, Cyrillic_che, Cyrillic_CHE ] }; - key { [ c, C, Cyrillic_es, Cyrillic_ES ] }; - key { [ v, V, Cyrillic_em, Cyrillic_EM ] }; - key { [ n, N, Cyrillic_te, Cyrillic_TE ] }; - key { [ b, B, Cyrillic_i, Cyrillic_I ] }; - key { [ m, M, Cyrillic_softsign,Cyrillic_SOFTSIGN ] }; - key { [ comma, less, Cyrillic_be, Cyrillic_BE ] }; - key { [ period, greater, Cyrillic_yu, Cyrillic_YU ] }; - key { [ slash, question, slash, question ] }; - - include "level3(ralt_switch)" - -}; - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/ua(type6)" -}; +// +// Copyright 2010 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, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// 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 +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Ukraine"; + + + key { [ grave, asciitilde, apostrophe, asciitilde ] }; + key { [ 1, exclam, 1, exclam ] }; + key { [ 2, at, 2, quotedbl ] }; + key { [ 3, numbersign, 3, numbersign ] }; + key { [ 4, dollar, 4, asterisk ] }; + key { [ 5, percent, 5, colon ] }; + key { [ 6, asciicircum, 6, comma ] }; + key { [ 7, ampersand, 7, period ] }; + key { [ 8, asterisk, 8, semicolon ] }; + key { [ 9, parenleft, 9, parenleft ] }; + key { [ 0, parenright, 0, parenright ] }; + key { [ minus, underscore, minus, underscore ] }; + key { [ equal, plus, equal, plus ] }; + + key { [ q, Q, Cyrillic_shorti, Cyrillic_SHORTI ] }; + key { [ w, W, Cyrillic_tse, Cyrillic_TSE ] }; + key { [ e, E, Cyrillic_u, Cyrillic_U ] }; + key { [ r, R, Cyrillic_ka, Cyrillic_KA ] }; + key { [ t, T, Cyrillic_ie, Cyrillic_IE ] }; + key { [ y, Y, Cyrillic_en, Cyrillic_EN ] }; + key { [ u, U, Cyrillic_ghe, Cyrillic_GHE ] }; + key { [ i, I, Cyrillic_sha, Cyrillic_SHA ] }; + key { [ o, O, Cyrillic_shcha, Cyrillic_SHCHA ] }; + key { [ p, P, Cyrillic_ze, Cyrillic_ZE ] }; + key { [ bracketleft, braceleft, Cyrillic_ha, Cyrillic_HA ] }; + key { [ bracketright, braceright, Ukrainian_yi, Ukrainian_YI ] }; + + key { [ a, A, Cyrillic_ef, Cyrillic_EF ] }; + key { [ s, S, Ukrainian_i, Ukrainian_I ] }; + key { [ d, D, Cyrillic_ve, Cyrillic_VE ] }; + key { [ f, F, Cyrillic_a, Cyrillic_A ] }; + key { [ g, G, Cyrillic_pe, Cyrillic_PE ] }; + key { [ h, H, Cyrillic_er, Cyrillic_ER ] }; + key { [ j, J, Cyrillic_o, Cyrillic_O ] }; + key { [ k, K, Cyrillic_el, Cyrillic_EL ] }; + key { [ l, L, Cyrillic_de, Cyrillic_DE ] }; + key { [ semicolon, colon, Cyrillic_zhe, Cyrillic_ZHE ] }; + key { [ apostrophe, quotedbl, Ukrainian_ie, Ukrainian_IE ] }; + key { [ backslash, bar, Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] }; + + key { [ less, greater, slash, bar ] }; + key { [ z, Z, Cyrillic_ya, Cyrillic_YA ] }; + key { [ x, X, Cyrillic_che, Cyrillic_CHE ] }; + key { [ c, C, Cyrillic_es, Cyrillic_ES ] }; + key { [ v, V, Cyrillic_em, Cyrillic_EM ] }; + key { [ n, N, Cyrillic_te, Cyrillic_TE ] }; + key { [ b, B, Cyrillic_i, Cyrillic_I ] }; + key { [ m, M, Cyrillic_softsign,Cyrillic_SOFTSIGN ] }; + key { [ comma, less, Cyrillic_be, Cyrillic_BE ] }; + key { [ period, greater, Cyrillic_yu, Cyrillic_YU ] }; + key { [ slash, question, slash, question ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/ua(type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/typo b/xorg-server/xkeyboard-config/symbols/typo index 5cbf6be3e..ed4a2774b 100644 --- a/xorg-server/xkeyboard-config/symbols/typo +++ b/xorg-server/xkeyboard-config/symbols/typo @@ -1,51 +1,51 @@ -// typographic keyboard -// Sergei Stolyarov -// -// Initial contribution by Alexey Ten -// -// Based on the layout proposed by Ilya Birman, -// http://ilyabirman.ru/typography-layout/ -// - -// default layout -default partial -xkb_symbols "base" { -// 1st keyboard row - key { [NoSymbol, NoSymbol, NoSymbol, approxeq] }; - key { [NoSymbol, NoSymbol, onesuperior] }; - key { [NoSymbol, NoSymbol, twosuperior, onehalf] }; - key { [NoSymbol, NoSymbol, threesuperior, onethird] }; - key { [NoSymbol, NoSymbol, dollar, onequarter] }; - key { [NoSymbol, NoSymbol, U2030] }; - key { [NoSymbol, NoSymbol, ampersand] }; - key { [NoSymbol, NoSymbol, enfilledcircbullet, oneeighth] }; - key { [NoSymbol, NoSymbol, emdash, hyphen] }; - key { [NoSymbol, NoSymbol, notequal, plusminus] }; - -// 2nd keyboard row - key { [NoSymbol, NoSymbol, EuroSign] }; // "e" - key { [NoSymbol, NoSymbol, registered] }; // "r" - key { [NoSymbol, NoSymbol, trademark] }; // "t" - key { [NoSymbol, NoSymbol, yen] }; // "y" - key { [NoSymbol, NoSymbol, acute, doubleacute] }; // "p" - key { [NoSymbol, NoSymbol, bracketleft, braceleft ] }; // [ - key { [NoSymbol, NoSymbol, bracketright, braceright ] }; // ] - -// 3rd keyboard row - key { [NoSymbol, NoSymbol, U0301, NoSymbol] }; // "a" - key { [NoSymbol, NoSymbol, section]}; // "s" - key { [NoSymbol, NoSymbol, degree, division] }; // "d" - key { [NoSymbol, NoSymbol, sterling, NoSymbol] }; // "f" - key { [NoSymbol, NoSymbol, doublelowquotemark, singlelowquotemark] }; // "j" - key { [NoSymbol, NoSymbol, leftdoublequotemark, leftsinglequotemark] }; // "k" - key { [NoSymbol, NoSymbol, rightdoublequotemark, rightsinglequotemark] }; // "l" - key { [NoSymbol, NoSymbol, leftsinglequotemark, minutes] }; // ";" - key { [NoSymbol, NoSymbol, rightsinglequotemark, seconds] }; // "'" - -// 4th keyboard row - key { [NoSymbol, NoSymbol, multiply, U22C5] }; // "x" - key { [NoSymbol, NoSymbol, copyright, cent] }; // "c" - key { [NoSymbol, NoSymbol, guillemotleft, less] }; // "," - key { [NoSymbol, NoSymbol, guillemotright, greater] }; // "." - key { [NoSymbol, NoSymbol, ellipsis] }; // "/" -}; +// typographic keyboard +// Sergei Stolyarov +// +// Initial contribution by Alexey Ten +// +// Based on the layout proposed by Ilya Birman, +// http://ilyabirman.ru/typography-layout/ +// + +// default layout +default partial +xkb_symbols "base" { +// 1st keyboard row + key { [NoSymbol, NoSymbol, NoSymbol, approxeq] }; + key { [NoSymbol, NoSymbol, onesuperior] }; + key { [NoSymbol, NoSymbol, twosuperior, onehalf] }; + key { [NoSymbol, NoSymbol, threesuperior, onethird] }; + key { [NoSymbol, NoSymbol, dollar, onequarter] }; + key { [NoSymbol, NoSymbol, U2030] }; + key { [NoSymbol, NoSymbol, ampersand] }; + key { [NoSymbol, NoSymbol, enfilledcircbullet, oneeighth] }; + key { [NoSymbol, NoSymbol, emdash, hyphen] }; + key { [NoSymbol, NoSymbol, notequal, plusminus] }; + +// 2nd keyboard row + key { [NoSymbol, NoSymbol, EuroSign] }; // "e" + key { [NoSymbol, NoSymbol, registered] }; // "r" + key { [NoSymbol, NoSymbol, trademark] }; // "t" + key { [NoSymbol, NoSymbol, yen] }; // "y" + key { [NoSymbol, NoSymbol, acute, doubleacute] }; // "p" + key { [NoSymbol, NoSymbol, bracketleft, braceleft ] }; // [ + key { [NoSymbol, NoSymbol, bracketright, braceright ] }; // ] + +// 3rd keyboard row + key { [NoSymbol, NoSymbol, U0301, NoSymbol] }; // "a" + key { [NoSymbol, NoSymbol, section]}; // "s" + key { [NoSymbol, NoSymbol, degree, division] }; // "d" + key { [NoSymbol, NoSymbol, sterling, NoSymbol] }; // "f" + key { [NoSymbol, NoSymbol, doublelowquotemark, singlelowquotemark] }; // "j" + key { [NoSymbol, NoSymbol, leftdoublequotemark, leftsinglequotemark] }; // "k" + key { [NoSymbol, NoSymbol, rightdoublequotemark, rightsinglequotemark] }; // "l" + key { [NoSymbol, NoSymbol, leftsinglequotemark, minutes] }; // ";" + key { [NoSymbol, NoSymbol, rightsinglequotemark, seconds] }; // "'" + +// 4th keyboard row + key { [NoSymbol, NoSymbol, multiply, U22C5] }; // "x" + key { [NoSymbol, NoSymbol, copyright, cent] }; // "c" + key { [NoSymbol, NoSymbol, guillemotleft, less] }; // "," + key { [NoSymbol, NoSymbol, guillemotright, greater] }; // "." + key { [NoSymbol, NoSymbol, ellipsis] }; // "/" +}; diff --git a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/Makefile.am index 50be49bb4..e7b931bf0 100644 --- a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/Makefile.am +++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/Makefile.am @@ -1,4 +1,4 @@ -symbolsdir = $(xkb_base)/symbols/xfree68_vndr - -dist_symbols_DATA = \ -amiga ataritt +symbolsdir = $(xkb_base)/symbols/xfree68_vndr + +dist_symbols_DATA = \ +amiga ataritt diff --git a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga index 48ea37ca4..e9d43ff60 100644 --- a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga +++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga @@ -1,126 +1,126 @@ -default xkb_symbols "usa1" { - - name[Group1]= "usa1"; - key { [ Escape ] }; - - // Begin "Function" section - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ F9 ] }; - key { [ F10 ] }; - // End "Function" section - - // Alphanumeric section - key { [ quoteleft, asciitilde ] }; - key { [ 1, exclam ] }; - key { [ 2, at ] }; - key { [ 3, numbersign ] }; - key { [ 4, dollar ] }; - key { [ 5, percent ] }; - key { [ 6, asciicircum ] }; - key { [ 7, ampersand ] }; - key { [ 8, asterisk ] }; - key { [ 9, parenleft ] }; - key { [ 0, parenright ] }; - key { [ minus, underscore ] }; - key { [ equal, plus ] }; - key { [ backslash, bar ] }; - key { [ BackSpace ] }; - - key { [ Tab, ISO_Left_Tab ] }; - key { [ q, Q ] }; - key { [ w, W ] }; - key { [ e, E ] }; - key { [ r, R ] }; - key { [ t, T ] }; - key { [ y, Y ] }; - key { [ u, U ] }; - key { [ i, I ] }; - key { [ o, O ] }; - key { [ p, P ] }; - key { [ bracketleft, braceleft ] }; - key { [ bracketright, braceright ] }; - key { [ Return ] }; - - key { [ Control_L ] }; - key { [ Caps_Lock ] }; - key { [ a, A ] }; - key { [ s, S ] }; - key { [ d, D ] }; - key { [ f, F ] }; - key { [ g, G ] }; - key { [ h, H ] }; - key { [ j, J ] }; - key { [ k, K ] }; - key { [ l, L ] }; - key { [ semicolon, colon ] }; - key { [ quoteright, quotedbl ] }; - - key { [ Shift_L ] }; - key { [ z, Z ] }; - key { [ x, X ] }; - key { [ c, C ] }; - key { [ v, V ] }; - key { [ b, B ] }; - key { [ n, N ] }; - key { [ m, M ] }; - key { [ comma, less ] }; - key { [ period, greater ] }; - key { [ slash, question ] }; - key { [ Shift_R ] }; - - key { [ Alt_L, Meta_L ] }; - key { [ Mode_switch ] }; - key { [ space ] }; - key { [ Multi_key ] }; - key { [ Alt_R, Meta_R ] }; - // End alphanumeric section - - // Begin "Editing" section - key { [ Delete ] }; - key { [ Help ] }; - key { [ Up ] }; - key { [ Left ] }; - key { [ Down ] }; - key { [ Right ] }; - // End "Editing" section - - // Begin "Keypad" section - key { [ Num_Lock ] }; - key { [ Scroll_Lock ] }; - key { [ KP_Divide ] }; - key { [ KP_Multiply, Print ] }; - - key { [ KP_7, KP_Home ] }; - key { [ KP_8, KP_Up ] }; - key { [ KP_9, KP_Prior ] }; - key { [ KP_Subtract ] }; - - key { [ KP_4, KP_Left ] }; - key { [ KP_5 ] }; - key { [ KP_6, KP_Right ] }; - key { [ KP_Add ] }; - - key { [ KP_1, KP_End ] }; - key { [ KP_2, KP_Down ] }; - key { [ KP_3, KP_Next ] }; - - key { [ KP_0, KP_Insert ] }; - key { [ KP_Decimal, KP_Delete ] }; - key { [ KP_Enter ] }; - // End "Keypad" section - - // begin modifier mappings - modifier_map Shift { Shift_L, Shift_R }; - modifier_map Lock { Caps_Lock }; - modifier_map Control{ Control_L }; - modifier_map Mod1 { Alt_L, Alt_R }; - modifier_map Mod2 { Mode_switch }; - modifier_map Mod3 { Meta_L, Meta_R }; -}; +default xkb_symbols "usa1" { + + name[Group1]= "usa1"; + key { [ Escape ] }; + + // Begin "Function" section + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F10 ] }; + // End "Function" section + + // Alphanumeric section + key { [ quoteleft, asciitilde ] }; + key { [ 1, exclam ] }; + key { [ 2, at ] }; + key { [ 3, numbersign ] }; + key { [ 4, dollar ] }; + key { [ 5, percent ] }; + key { [ 6, asciicircum ] }; + key { [ 7, ampersand ] }; + key { [ 8, asterisk ] }; + key { [ 9, parenleft ] }; + key { [ 0, parenright ] }; + key { [ minus, underscore ] }; + key { [ equal, plus ] }; + key { [ backslash, bar ] }; + key { [ BackSpace ] }; + + key { [ Tab, ISO_Left_Tab ] }; + key { [ q, Q ] }; + key { [ w, W ] }; + key { [ e, E ] }; + key { [ r, R ] }; + key { [ t, T ] }; + key { [ y, Y ] }; + key { [ u, U ] }; + key { [ i, I ] }; + key { [ o, O ] }; + key { [ p, P ] }; + key { [ bracketleft, braceleft ] }; + key { [ bracketright, braceright ] }; + key { [ Return ] }; + + key { [ Control_L ] }; + key { [ Caps_Lock ] }; + key { [ a, A ] }; + key { [ s, S ] }; + key { [ d, D ] }; + key { [ f, F ] }; + key { [ g, G ] }; + key { [ h, H ] }; + key { [ j, J ] }; + key { [ k, K ] }; + key { [ l, L ] }; + key { [ semicolon, colon ] }; + key { [ quoteright, quotedbl ] }; + + key { [ Shift_L ] }; + key { [ z, Z ] }; + key { [ x, X ] }; + key { [ c, C ] }; + key { [ v, V ] }; + key { [ b, B ] }; + key { [ n, N ] }; + key { [ m, M ] }; + key { [ comma, less ] }; + key { [ period, greater ] }; + key { [ slash, question ] }; + key { [ Shift_R ] }; + + key { [ Alt_L, Meta_L ] }; + key { [ Mode_switch ] }; + key { [ space ] }; + key { [ Multi_key ] }; + key { [ Alt_R, Meta_R ] }; + // End alphanumeric section + + // Begin "Editing" section + key { [ Delete ] }; + key { [ Help ] }; + key { [ Up ] }; + key { [ Left ] }; + key { [ Down ] }; + key { [ Right ] }; + // End "Editing" section + + // Begin "Keypad" section + key { [ Num_Lock ] }; + key { [ Scroll_Lock ] }; + key { [ KP_Divide ] }; + key { [ KP_Multiply, Print ] }; + + key { [ KP_7, KP_Home ] }; + key { [ KP_8, KP_Up ] }; + key { [ KP_9, KP_Prior ] }; + key { [ KP_Subtract ] }; + + key { [ KP_4, KP_Left ] }; + key { [ KP_5 ] }; + key { [ KP_6, KP_Right ] }; + key { [ KP_Add ] }; + + key { [ KP_1, KP_End ] }; + key { [ KP_2, KP_Down ] }; + key { [ KP_3, KP_Next ] }; + + key { [ KP_0, KP_Insert ] }; + key { [ KP_Decimal, KP_Delete ] }; + key { [ KP_Enter ] }; + // End "Keypad" section + + // begin modifier mappings + modifier_map Shift { Shift_L, Shift_R }; + modifier_map Lock { Caps_Lock }; + modifier_map Control{ Control_L }; + modifier_map Mod1 { Alt_L, Alt_R }; + modifier_map Mod2 { Mode_switch }; + modifier_map Mod3 { Meta_L, Meta_R }; +}; diff --git a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt index 8c6277fb1..813311dcf 100644 --- a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt +++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt @@ -1,155 +1,155 @@ -default xkb_symbols "us" { - - name[Group1]= "US/ASCII"; - key { [ Escape ] }; - - // Alphanumeric section - key { [ 1, exclam ] }; - key { [ 2, at ] }; - key { [ 3, numbersign ] }; - key { [ 4, dollar ] }; - key { [ 5, percent ] }; - key { [ 6, asciicircum ] }; - key { [ 7, ampersand ] }; - key { [ 8, asterisk ] }; - key { [ 9, parenleft ] }; - key { [ 0, parenright ] }; - key { [ minus, underscore ] }; - key { [ equal, plus ] }; - key { [ quoteleft, asciitilde ] }; - key { [ BackSpace ] }; - - key { [ Tab, ISO_Left_Tab ] }; - key { [ q, Q ] }; - key { [ w, W ] }; - key { [ e, E ] }; - key { [ r, R ] }; - key { [ t, T ] }; - key { [ y, Y ] }; - key { [ u, U ] }; - key { [ i, I ] }; - key { [ o, O ] }; - key { [ p, P ] }; - key { [ bracketleft, braceleft ] }; - key { [ bracketright, braceright ] }; - key { [ Return ] }; - key { [ Delete ] }; - - key { [ Control_L ] }; - key { [ a, A ] }; - key { [ s, S ] }; - key { [ d, D ] }; - key { [ f, F ] }; - key { [ g, G ] }; - key { [ h, H ] }; - key { [ j, J ] }; - key { [ k, K ] }; - key { [ l, L ] }; - key { [ semicolon, colon ] }; - key { [ quoteright, quotedbl ] }; - key { [ backslash, bar ] }; - - key { [ Shift_L ] }; - key { [ z, Z ] }; - key { [ x, X ] }; - key { [ c, C ] }; - key { [ v, V ] }; - key { [ b, B ] }; - key { [ n, N ] }; - key { [ m, M ] }; - key { [ comma, less ] }; - key { [ period, greater ] }; - key { [ slash, question ] }; - key { [ Shift_R ] }; - - key { [ Meta_L ] }; - key { [ space ] }; - key { [ Caps_Lock ] }; - // End alphanumeric section - - // Begin "Function" section - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ F9 ] }; - key { [ F10 ] }; - // End "Function" section - - // Begin "Editing" section - key { [ Help ] }; - key { [ Undo ] }; - key { [ Insert ] }; - key { [ Up ] }; - key { [ Home, Clear ] }; - key { [ Left ] }; - key { [ Down ] }; - key { [ Right ] }; - // End "Editing" section - - // Begin "Keypad" section - key { [ KP_F1 ] }; - key { [ KP_F2 ] }; - key { [ KP_Divide ] }; - key { [ KP_Multiply ] }; - key { [ KP_7 ] }; - key { [ KP_8 ] }; - key { [ KP_9 ] }; - key { [ KP_Subtract ] }; - key { [ KP_4 ] }; - key { [ KP_5 ] }; - key { [ KP_6 ] }; - key { [ KP_Add ] }; - key { [ KP_1 ] }; - key { [ KP_2 ] }; - key { [ KP_3 ] }; - key { [ KP_0 ] }; - key { [ KP_Decimal ] }; - key { [ KP_Enter ] }; - // End "Keypad" section - - // begin modifier mappings - modifier_map Shift { Shift_L, Shift_R }; - modifier_map Lock { Caps_Lock }; - modifier_map Control{ Control_L }; - modifier_map Mod1 { Meta_L }; -}; - -xkb_symbols "de" { - include "ataritt(us)" - - name[Group1]= "German"; - - // Alphanumeric section - key { [ 2, quotedbl ] }; - key { [ 3, section ] }; - key { [ 6, ampersand ] }; - key { [ 7, slash ] }; - key { [ 8, parenleft ] }; - key { [ 9, parenright ] }; - key { [ 0, equal ] }; - key { [ ssharp, question ] }; - key { [ quoteright, quoteleft ] }; - key { [ numbersign, asciicircum ] }; - - key { [ z, Z ] }; - key { [ udiaeresis, Udiaeresis ], - [ at, backslash ] }; - key { [ plus, asterisk ] }; - - key { [ odiaeresis, Odiaeresis ], - [ bracketleft, braceleft ] }; - key { [ adiaeresis, Adiaeresis ], - [ bracketright, braceright ] }; - key { [ asciitilde, bar ] }; - - key { [ less, greater ] }; - key { [ y, Y ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; -}; +default xkb_symbols "us" { + + name[Group1]= "US/ASCII"; + key { [ Escape ] }; + + // Alphanumeric section + key { [ 1, exclam ] }; + key { [ 2, at ] }; + key { [ 3, numbersign ] }; + key { [ 4, dollar ] }; + key { [ 5, percent ] }; + key { [ 6, asciicircum ] }; + key { [ 7, ampersand ] }; + key { [ 8, asterisk ] }; + key { [ 9, parenleft ] }; + key { [ 0, parenright ] }; + key { [ minus, underscore ] }; + key { [ equal, plus ] }; + key { [ quoteleft, asciitilde ] }; + key { [ BackSpace ] }; + + key { [ Tab, ISO_Left_Tab ] }; + key { [ q, Q ] }; + key { [ w, W ] }; + key { [ e, E ] }; + key { [ r, R ] }; + key { [ t, T ] }; + key { [ y, Y ] }; + key { [ u, U ] }; + key { [ i, I ] }; + key { [ o, O ] }; + key { [ p, P ] }; + key { [ bracketleft, braceleft ] }; + key { [ bracketright, braceright ] }; + key { [ Return ] }; + key { [ Delete ] }; + + key { [ Control_L ] }; + key { [ a, A ] }; + key { [ s, S ] }; + key { [ d, D ] }; + key { [ f, F ] }; + key { [ g, G ] }; + key { [ h, H ] }; + key { [ j, J ] }; + key { [ k, K ] }; + key { [ l, L ] }; + key { [ semicolon, colon ] }; + key { [ quoteright, quotedbl ] }; + key { [ backslash, bar ] }; + + key { [ Shift_L ] }; + key { [ z, Z ] }; + key { [ x, X ] }; + key { [ c, C ] }; + key { [ v, V ] }; + key { [ b, B ] }; + key { [ n, N ] }; + key { [ m, M ] }; + key { [ comma, less ] }; + key { [ period, greater ] }; + key { [ slash, question ] }; + key { [ Shift_R ] }; + + key { [ Meta_L ] }; + key { [ space ] }; + key { [ Caps_Lock ] }; + // End alphanumeric section + + // Begin "Function" section + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F10 ] }; + // End "Function" section + + // Begin "Editing" section + key { [ Help ] }; + key { [ Undo ] }; + key { [ Insert ] }; + key { [ Up ] }; + key { [ Home, Clear ] }; + key { [ Left ] }; + key { [ Down ] }; + key { [ Right ] }; + // End "Editing" section + + // Begin "Keypad" section + key { [ KP_F1 ] }; + key { [ KP_F2 ] }; + key { [ KP_Divide ] }; + key { [ KP_Multiply ] }; + key { [ KP_7 ] }; + key { [ KP_8 ] }; + key { [ KP_9 ] }; + key { [ KP_Subtract ] }; + key { [ KP_4 ] }; + key { [ KP_5 ] }; + key { [ KP_6 ] }; + key { [ KP_Add ] }; + key { [ KP_1 ] }; + key { [ KP_2 ] }; + key { [ KP_3 ] }; + key { [ KP_0 ] }; + key { [ KP_Decimal ] }; + key { [ KP_Enter ] }; + // End "Keypad" section + + // begin modifier mappings + modifier_map Shift { Shift_L, Shift_R }; + modifier_map Lock { Caps_Lock }; + modifier_map Control{ Control_L }; + modifier_map Mod1 { Meta_L }; +}; + +xkb_symbols "de" { + include "ataritt(us)" + + name[Group1]= "German"; + + // Alphanumeric section + key { [ 2, quotedbl ] }; + key { [ 3, section ] }; + key { [ 6, ampersand ] }; + key { [ 7, slash ] }; + key { [ 8, parenleft ] }; + key { [ 9, parenright ] }; + key { [ 0, equal ] }; + key { [ ssharp, question ] }; + key { [ quoteright, quoteleft ] }; + key { [ numbersign, asciicircum ] }; + + key { [ z, Z ] }; + key { [ udiaeresis, Udiaeresis ], + [ at, backslash ] }; + key { [ plus, asterisk ] }; + + key { [ odiaeresis, Odiaeresis ], + [ bracketleft, braceleft ] }; + key { [ adiaeresis, Adiaeresis ], + [ bracketright, braceright ] }; + key { [ asciitilde, bar ] }; + + key { [ less, greater ] }; + key { [ y, Y ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; +}; -- cgit v1.2.3