aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/symbols/sun_vndr/es
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-01-16 08:45:43 +0100
committermarha <marha@users.sourceforge.net>2013-01-16 08:45:43 +0100
commitb8219a4680768e14b7fe4930adf86e9be261b31f (patch)
tree193855ef8d48765d67cc11153a15e3c1e2568e50 /xorg-server/xkeyboard-config/symbols/sun_vndr/es
parent15cdb95b194cb051a5d469cc9eb73eb0eed4db41 (diff)
parent811d1bcf6d61ea49551abdd7f2294c5af2776913 (diff)
downloadvcxsrv-b8219a4680768e14b7fe4930adf86e9be261b31f.tar.gz
vcxsrv-b8219a4680768e14b7fe4930adf86e9be261b31f.tar.bz2
vcxsrv-b8219a4680768e14b7fe4930adf86e9be261b31f.zip
Merge remote-tracking branch 'origin/released'
* origin/released: Switched to xcalc-1.0.5 Switched to bdftopcf-1.0.4 libxtrans fontconfig glproto libX11 libXau libXext libXft libXinerama libXmu libfontenc mesa xkeyboard-config
Diffstat (limited to 'xorg-server/xkeyboard-config/symbols/sun_vndr/es')
-rw-r--r--xorg-server/xkeyboard-config/symbols/sun_vndr/es120
1 files changed, 46 insertions, 74 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/es b/xorg-server/xkeyboard-config/symbols/sun_vndr/es
index 6d28bc541..60557f579 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/es
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/es
@@ -1,5 +1,5 @@
//
-// Copyright 2010 Sun Microsystems, Inc. All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the
@@ -26,32 +26,13 @@
// 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" {
+xkb_symbols "sun_type6" {
+
+ name[Group1]="Spanish (Sun Type 6/7)";
- name[Group1]="Spain";
+ include "sun_vndr/us(sun_type6)"
key <TLDE> { [ masculine, ordfeminine, backslash ] };
key <LSGT> { [ less, greater ] };
@@ -78,68 +59,59 @@ xkb_symbols "type6" {
key <AB10> { [ minus, underscore ] };
include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+ xkb_symbols "basic" {
+ include "sun_vndr/es(sun_type6)"
+};
+
+partial alphanumeric_keys
+ xkb_symbols "Sundeadkeys" {
+ include "es(Sundeadkeys)"
+};
+partial alphanumeric_keys
+ xkb_symbols "sundeadkeys" {
+ include "es(sundeadkeys)"
};
+partial alphanumeric_keys
+ xkb_symbols "nodeadkeys" {
+ include "es(nodeadkeys)"
+};
+
+partial alphanumeric_keys
+ xkb_symbols "dvorak" {
+ include "es(dvorak)"
+};
partial alphanumeric_keys
-xkb_symbols "type4" {
-
- name[Group1]="Spain - Sun type 4";
+ xkb_symbols "cat" {
+ include "es(cat)"
+};
- key <BKSL> { [ bracketleft, braceleft, guillemotleft ] };
- key <BRCR> { [ bracketright, braceright, guillemotright ] };
- key <AE02> { [ 2, quotedbl, at ] };
- key <AE03> { [ 3, periodcentered, numbersign ] };
- key <AE05> { [ 5, percent, degree ] };
- key <AE06> { [ 6, ampersand, notsign ] };
- key <AE07> { [ 7, slash ] };
- key <AE08> { [ 8, parenleft ] };
- key <AE09> { [ 9, parenright, backslash ] };
- key <AE10> { [ 0, equal, bar ] };
- key <AE11> { [ quoteright, question, quoteleft ] };
- key <AE12> { [ exclamdown, questiondown ] };
- key <AD03> { [ e, E, EuroSign ] };
- key <AD09> { [ o, O, masculine ] };
- key <AD11> { [ dead_grave, dead_circumflex, asciicircum ] };
- key <AD12> { [ plus, asterisk, asciitilde ] };
- key <AC01> { [ a, A, ordfeminine ] };
- key <AC10> { [ ntilde, Ntilde ] };
- key <AC11> { [ dead_acute, dead_diaeresis ] };
- key <TLDE> { [ ccedilla, Ccedilla ] };
- key <RALT> { [ Alt_R ] };
- key <LCTL> { [ Caps_Lock ] };
- key <CAPS> { [ Control_L ] };
- key <LSGT> { [ less, greater ] };
- key <AB08> { [ comma, semicolon ] };
- key <AB09> { [ period, colon ] };
- key <AB10> { [ minus, underscore ] };
-
+partial alphanumeric_keys
+ xkb_symbols "ast" {
+ include "es(ast)"
};
-
partial alphanumeric_keys
-xkb_symbols "type5" {
- include "sun_vndr/es(type4)"
+ xkb_symbols "mac" {
+ include "es(mac)"
+};
- name[Group1]="Spain - Sun type 5";
-
- key <AE03> { [ 3, periodcentered, numbersign ] };
- key <AE04> { [ 4, dollar, asciicircum ] };
- key <AE05> { [ 5, percent, asciitilde ] };
- key <AE07> { [ 7, slash, braceleft ]};
- key <AE08> { [ 8, parenleft, bracketleft ]};
- key <AE09> { [ 9, parenright, bracketright ]};
- key <AE10> { [ 0, equal, braceright ]};
- key <AE11> { [ quoteright, question, quoteleft ] };
- key <AD11> { [ dead_grave, dead_circumflex, bracketleft ] };
- key <AD12> { [ dead_acute, dead_diaeresis, braceleft ] };
-
- include "level3(ralt_switch)"
+partial alphanumeric_keys
+ xkb_symbols "olpc" {
+ include "es(olpc)"
};
+partial alphanumeric_keys
+ xkb_symbols "deadtilde" {
+ include "es(deadtilde)"
+};
partial alphanumeric_keys
- xkb_symbols "basic" {
- include "sun_vndr/es(type6)"
+ xkb_symbols "olpc2" {
+ include "es(olpc2)"
};