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/gb | 150 +++++++++++++++++++--------- 1 file changed, 103 insertions(+), 47 deletions(-) (limited to 'xorg-server/xkbdata.src/symbols/sun_vndr/gb') diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/gb b/xorg-server/xkbdata.src/symbols/sun_vndr/gb index 3cb25fc1d..d21a116cf 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/gb +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/gb @@ -1,47 +1,103 @@ -// $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 { [ 1, exclam ], [brokenbar ] }; - key { [ 3, sterling ], [numbersign ] }; - key { [ 4, dollar ], [EuroSign ] }; - key { [ minus, underscore ], [notsign ] }; - key { [ e, E ], [EuroSign ] }; - - -}; - -partial -xkb_symbols "type5" { - include "gb(Sundeadkeys)" - - key { [ quoteleft, notsign ], [ brokenbar ] }; - key { [ e, E ], [ EuroSign ] }; -}; - -partial -xkb_symbols "type6" { - include "sun_vndr/gb(type5)" -}; +// +// 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)" +}; + -- cgit v1.2.3