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/de | 206 +++++++++++++++++++--------- 1 file changed, 141 insertions(+), 65 deletions(-) (limited to 'xorg-server/xkbdata.src/symbols/sun_vndr/de') diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/de b/xorg-server/xkbdata.src/symbols/sun_vndr/de index 230e0ca29..3b1301687 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/de +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/de @@ -1,65 +1,141 @@ -// $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 { [ less, braceleft ] }; - - key { [ greater, braceright ] }; - key { [ Delete ] }; - - key { [ 1, plus ], [exclam ] }; - key { [ 2, quotedbl ], [at ] }; - key { [ 3, asterisk ], [numbersign ] }; - 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 { [ SunFA_Circum, SunFA_Grave ] }; - key { [ e, E ], [EuroSign ] }; - key { [ Z ] }; - key { [ udiaeresis, egrave ] }; - key { [ SunFA_Diaeresis, SunFA_Acute ] }; - key { [ odiaeresis, eacute ] }; - key { [ adiaeresis, agrave ] }; - key { [ dollar, SunFA_Tilde ], [sterling ] }; - key { [ bracketright, bracketleft ], [ backslash ] }; - key { [ Y ] }; - key { [ M, NoSymbol ], [mu ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - key { [ SunAltGraph ] }; - key { [ SunCompose ] }; - - - -}; +// +// +// 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)" +}; + -- cgit v1.2.3