aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkbdata.src/symbols/sun_vndr/fr
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-02-28 20:02:05 +0000
committermarha <marha@users.sourceforge.net>2010-02-28 20:02:05 +0000
commit9370f043060a1d08bb51484a58c52db85a4ea656 (patch)
tree565341da769f2c77058ca0fb482ac39979fa0de3 /xorg-server/xkbdata.src/symbols/sun_vndr/fr
parent1ad46cbf3a9963f3d6d8c687480a80d359ec15f8 (diff)
downloadvcxsrv-9370f043060a1d08bb51484a58c52db85a4ea656.tar.gz
vcxsrv-9370f043060a1d08bb51484a58c52db85a4ea656.tar.bz2
vcxsrv-9370f043060a1d08bb51484a58c52db85a4ea656.zip
Git update xkeyboard-config 28-2-2010
Diffstat (limited to 'xorg-server/xkbdata.src/symbols/sun_vndr/fr')
-rw-r--r--xorg-server/xkbdata.src/symbols/sun_vndr/fr183
1 files changed, 97 insertions, 86 deletions
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/fr b/xorg-server/xkbdata.src/symbols/sun_vndr/fr
index 7aa23a71b..f52d1956b 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/fr
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/fr
@@ -1,86 +1,97 @@
-// $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.
-//
-// NOTE:
-// These are the French keyboard symbols
-// French Swiss symbols are in sw
-
-xkb_symbols "type4" {
- include "sun_vndr/us(type4basic)"
-
- key <BKSL> { [ bracketleft, braceleft ] };
- key <BRCR> { [ bracketright, braceright ] };
- key <DELE> { [ Delete ] };
-
- key <AE01> { [ ampersand, 1 ], [ ] };
- key <AE02> { [ eacute, 2 ], [ twosuperior ] };
- key <AE03> { [ quotedbl, 3 ], [ threesuperior ] };
- key <AE04> { [ quoteright, 4 ] };
- key <AE05> { [ parenleft, 5 ] };
- key <AE06> { [ section, 6 ], [ asciicircum ] };
- key <AE07> { [ egrave, 7 ] };
- key <AE08> { [ exclam, 8 ], [ sterling ] };
- key <AE09> { [ ccedilla, 9 ], [ backslash ] };
- key <AE10> { [ agrave, 0 ] };
- Key <AE11> { [ parenright, degree ], [ asciitilde ] };
- key <AE12> { [ minus, underscore ], [ numbersign ] };
-
- key <AD01> { [ a, A ] };
- key <AD02> { [ z, Z ] };
- key <AD03> { [ e, E ], [EuroSign ] };
- key <AD11> { [ SunFA_Circum, SunFA_Diaeresis ] };
- key <AD12> { [ quoteleft, dollar ], [ at ] };
-
- key <AC01> { [ q, Q ] };
- key <AC10> { [ m, M ], [ mu ] };
- key <AC11> { [ ugrave, percent ] };
- key <TLDE> { [ asterisk, bar ], [ currency ] };
-
- key <LSGT> { [ less, greater ] };
- key <AB01> { [ w, W ] };
-
- key <AB07> { [ comma, question ] };
- key <AB08> { [ semicolon, period ] };
- key <AB09> { [ colon, slash ] };
- key <AB10> { [ equal, plus ] };
-
- key <CAPS> { [ SunAltGraph ] };
- key <ALGR> { [ Caps_Lock ] };
-
-
-
-};
-
-xkb_symbols "type5" {
- include "fr"
-
- key <LSGT> { [ less, greater ] };
-};
-
-xkb_symbols "type6" {
- include "sun_vndr/us(type6)"
- include "fr"
-
- key <LSGT> { [ 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 default alphanumeric_keys
+xkb_symbols "type6" {
+
+ name[Group1]="France";
+
+ key <TLDE> { [ twosuperior ] };
+ key <AE01> { [ ampersand, 1 ] };
+ key <AE02> { [ eacute, 2, asciitilde ] };
+ key <AE03> { [ quotedbl, 3, numbersign ] };
+ key <AE04> { [ apostrophe, 4, braceleft ] };
+ key <AE05> { [ parenleft, 5, bracketleft ] };
+ key <AE06> { [ minus, 6, bar ] };
+ key <AE07> { [ egrave, 7, grave ] };
+ key <AE08> { [ underscore, 8, backslash ] };
+ key <AE09> { [ ccedilla, 9, asciicircum ] };
+ key <AE10> { [ agrave, 0, at ] };
+ key <AE11> { [ parenright, degree, bracketright ] };
+ key <AE12> { [ equal, plus, braceright ] };
+
+ key <AD01> { [ a, A ] };
+ key <AD02> { [ z, Z ] };
+ key <AD03> { [ e, E, EuroSign ] };
+ key <AD11> { [ dead_circumflex, dead_diaeresis ] };
+ key <AD12> { [ dollar, sterling, currency ] };
+
+ key <AC01> { [ q, Q ] };
+ key <AC10> { [ m, M ] };
+ key <AC11> { [ ugrave, percent ] };
+ key <BKSL> { [ asterisk, mu ] };
+
+ key <LSGT> { [ less, greater ] };
+ key <AB01> { [ w, W ] };
+ key <AB07> { [ comma, question ] };
+ key <AB08> { [ semicolon, period ] };
+ key <AB09> { [ colon, slash ] };
+ key <AB10> { [ exclam, section ] };
+
+ include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+ xkb_symbols "basic" {
+ include "sun_vndr/fr(type6)"
+};
+