From 9370f043060a1d08bb51484a58c52db85a4ea656 Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 28 Feb 2010 20:02:05 +0000 Subject: Git update xkeyboard-config 28-2-2010 --- xorg-server/xkbdata.src/symbols/sun_vndr/no | 216 +++++++++++++++++++--------- 1 file changed, 145 insertions(+), 71 deletions(-) (limited to 'xorg-server/xkbdata.src/symbols/sun_vndr/no') diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/no b/xorg-server/xkbdata.src/symbols/sun_vndr/no index aad44cc20..1d1d43449 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/no +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/no @@ -1,71 +1,145 @@ -// $XdotOrg: $ -// -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - -xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - // A few keys are different - - 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, SunFA_Grave], [SunFA_Acute] }; - key { [ e, E ], [EuroSign ] }; - key { [ Aring ] }; - key { [ SunFA_Diaeresis, SunFA_Circum],[SunFA_Tilde] }; - key { [ Caps_Lock ] }; - key { [ Ooblique ] }; - key { [ AE ] }; - key { [ quoteright, asterisk ], [quoteleft ] }; - key { [ less, greater ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - key { [ Control_L ] }; - -}; - -xkb_symbols "type5" { - include "no" - - 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 ] }; -}; - - - +// +// 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)" +}; + -- cgit v1.2.3