svn merge ^/branches/released .

1 files changed, 280 insertions, 75 deletions

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/se b/xorg-server/xkbdata.src/symbols/sun_vndr/se
index 3daf12525..ec41629cb 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/se
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/se
@@ -1,75 +1,280 @@
-// $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" {
-    key <BKSL> { [ section, onehalf	]			};
-    key <BRCR> { [ asciitilde, asciicircum ]			};
-    key <AE02> { [ 2, quotedbl		], [ at			] };
-    key <AE03> { [ 3, numbersign	], [ sterling		] };
-    key <AE04> { [ 4, currency		], [ dollar		] };
-    key <AE05> { [ 5, percent           ], [ degree           	] };
-    key <AE06> { [ 6, ampersand         ], [ notsign          	] };
-    key <AE07> { [ 7, slash             ], [ braceleft		] };
-    key <AE08> { [ 8, parenleft         ], [ bracketleft 	]};
-    key <AE09> { [ 9, parenright        ], [ bracketright     	] };
-    key <AE10> { [ 0, equal             ], [ braceright        	] };
-    key <AE11> { [ plus, question 	], [ backslash       	] };
-    key <AE12> { [ SunFA_Acute, SunFA_Grave ]			  };
-
-    key <AD03> { [ e, E                 ], [ EuroSign         ] };
-    key <AD11> { [ Aring ]					};
-    key <AD12> { [ SunFA_Diaeresis, SunFA_Circum ], [ SunFA_Tilde ] };
-
-    key <AC10> { [ Odiaeresis		]			};
-    key <AC11> { [ Adiaeresis		]			};
-    key <TLDE> { [ quoteright, asterisk	], [ quoteleft 		]};
-
-    key <LCTL> { [ Caps_Lock ] };
-    key <CAPS> { [ Control_L ] };
-    key <LSGT> { [ less, greater	]			};
-    key <AB08> { [ comma, semicolon	]			};
-    key <AB09> { [ period, colon	]			};
-    key <AB10> { [ minus, underscore	]			};
-};
-
-
-xkb_symbols "type5" {
-    include "se"
-
-    key <TLDE> { [ section, onehalf	]			};
-    key <AE07> { [ 7, slash             ], [ braceleft		] };
-    key <AE08> { [ 8, parenleft         ], [ bracketleft 	]};
-    key <AE09> { [ 9, parenright        ], [ bracketright     	] };
-    key <AE10> { [ 0, equal             ], [ braceright        	] };
-    key <AE11> { [ plus, question 	], [ backslash       	] };
-
-    key <AD12> { [ SunFA_Diaeresis, asciicircum ], [ asciitilde ] };
-    key <BKSL> { [ quoteright, asterisk	], [ quoteleft 		]};
-};
-  
-partial 
-xkb_symbols "type6" {
-    include "se(Sundeadkeys)"
-
-    key <AD12> { [ SunFA_Diaeresis, asciicircum ], [ asciitilde, caron ] };
-};
+//

+// 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]="Sweden";

+

+    key <TLDE> { [         section,         onehalf                ] };

+    key <LSGT> { [            less,         greater,           bar ] };

+    key <AE02> { [               2,        quotedbl,            at ] };

+    key <AE03> { [               3,      numbersign,      sterling ] };

+    key <AE04> { [               4,        currency,        dollar ] };

+    key <AE06> { [               6,       ampersand                ] };

+    key <AE07> { [               7,           slash,     braceleft ] };

+    key <AE08> { [               8,       parenleft,   bracketleft ] };

+    key <AE09> { [               9,      parenright,  bracketright ] };

+    key <AE10> { [               0,           equal,    braceright ] };

+    key <AE11> { [            plus,        question,     backslash ] };

+    key <AE12> { [      dead_acute,      dead_grave                ] };

+    key <AD03> { [               e,               E,      EuroSign ] };

+    key <AD11> { [           aring,           Aring                ] };

+    key <AD12> { [  dead_diaeresis,     asciicircum,    asciitilde ] };

+    key <AC10> { [      odiaeresis,      Odiaeresis                ] };

+    key <AC11> { [      adiaeresis,      Adiaeresis                ] };

+    key <BKSL> { [      apostrophe,        asterisk,         grave ] };

+    key <AB08> { [           comma,       semicolon                ] };

+    key <AB09> { [          period,           colon                ] };

+    key <AB10> { [           minus,      underscore                ] };

+

+        include "level3(ralt_switch)"

+        include "kpdl(comma)"

+

+};

+

+// Swedish layout for a Type 5/5c Sun keyboard

+xkb_symbols "type5" {

+    include "sun_vndr/us(type5)+se(basic)"

+

+    // Begin alphanumeric section

+    // These two are not supposed to be dead.

+    // A few others supposedly ARE dead, but don't care for now.

+    key <AC12> { [ apostrophe, asterisk ],      [       grave ] };

+    key <AD12> { [                      ],      [  asciitilde ] };

+

+    key <RTSH> { [      Shift_R         ]       };

+

+    key <LALT> { [      Alt_L           ]       };

+    key <ALGR> { [      Mode_switch     ]       };

+    key <LMTA> { [      Meta_L          ]       };

+    key <RMTA> { [      Meta_R          ]       };

+    key <COMP> { [      Multi_key       ]       };

+    // End alphanumeric section

+

+    // Begin "Function" section

+    key <FK01> { [ F1           ]                       };

+    key <FK02> { [ F2           ]                       };

+    key <FK03> { [ F3           ]                       };

+    key <FK04> { [ F4           ]                       };

+    key <FK05> { [ F5           ]                       };

+    key <FK06> { [ F6           ]                       };

+    key <FK07> { [ F7           ]                       };

+    key <FK08> { [ F8           ]                       };

+    key <FK09> { [ F9           ]                       };

+    key <FK10> { [ F10          ]                       };

+    key <FK11> { [ F11          ],      [ SunF36]       };

+    key <FK12> { [ F12          ],      [ SunF37]       };

+    key <STOP> { [ Cancel       ],      [ F11   ]       };

+    key <AGAI> { [ Redo         ],      [ F12   ]       };

+    key <PROP> { [ SunProps     ],      [ F13   ]       };

+    key <UNDO> { [ Undo         ],      [ F14   ]       };

+    key <FRNT> { [ SunFront     ],      [ F15   ]       };

+    key <COPY> { [ SunCopy      ],      [ F16   ]       };

+    key <OPEN> { [ SunOpen      ],      [ F17   ]       };

+    key <PAST> { [ SunPaste     ],      [ F18   ]       };

+    key <FIND> { [ Find         ],      [ F19   ]       };

+    key <CUT>  { [ SunCut       ],      [ F20   ]       };

+    // End "Function" section

+

+    // Begin "Editing" section

+    key <PRSC> { [ Print        ],      [ Sys_Req, SunSys_Req ] };

+    key <SCLK> { [ Scroll_Lock  ]                       };

+    key <PAUS> { [ Pause        ],      [ Break ]       };

+    key <LEFT> { [ Left         ]                       };

+    key <RGHT> { [ Right        ]                       };

+    key <UP>   { [ Up           ]                       };

+    key <DOWN> { [ Down         ]                       };

+

+    key <DELE> { [ Delete       ]                       };

+    key <INS>  { [ Insert       ]                       };

+    key <PGUP> { [ Prior        ]                       };

+    key <PGDN> { [ Next         ]                       };

+    key <HOME> { [ Home         ]                       };

+    key <END>  { [ End          ]                       };

+    key <HELP> { [ Help         ]                       };

+    // End "Editing" section

+    

+    // Begin "Keypad" section

+    key <NMLK> { [ Num_Lock             ]                               };

+    key <KPDV> { [ KP_Divide            ],      [       F25     ]       };

+    key <KPMU> { [ KP_Multiply          ],      [       F26     ]       };

+    key <KPSU> { [ KP_Subtract          ]                               };

+

+    key  <KP7> { [  KP_Home,    KP_7    ],      [       F27     ]       };

+    key  <KP8> { [  KP_Up,      KP_8    ],      [       F28     ]       };

+    key  <KP9> { [  KP_Prior,   KP_9    ],      [       F29     ]       };

+    key <KPAD> { [      KP_Add          ]                               };

+

+    key  <KP4> { [  KP_Left,    KP_4    ],      [       F30     ]       };

+    key  <KP5> { [  KP_Begin,   KP_5    ],      [       F31     ]       };

+    key  <KP6> { [  KP_Right,   KP_6    ],      [       F32     ]       };

+

+    key  <KP1> { [  KP_End,     KP_1    ],      [       F33     ]       };

+    key  <KP2> { [  KP_Down,    KP_2    ],      [       F34     ]       };

+    key  <KP3> { [  KP_Next,    KP_3    ],      [       F35     ]       };

+    key <KPEN> { [      KP_Enter        ]                               };

+

+    key  <KP0> { [  KP_Insert,  KP_0    ]                               };

+    key <KPDL> { [  KP_Delete,  KP_Decimal ]                            };

+    // End "Keypad" section, 

+

+    // Begin "four keys up on the right"

+    key <MUTE> { [  SunAudioMute,       SunVideoDegauss         ]       };

+    key <VOL-> { [  SunAudioLowerVolume,SunVideoLowerBrightness ]       };

+    key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness ]       };

+    key <POWR> { [  SunPowerSwitch,     SunPowerSwitchShift     ]       };

+    // End "four keys up on the right"

+

+    // Begin modifier mappings

+    modifier_map Shift  { Shift_R };

+    modifier_map Mod1   { Meta_L, Meta_R };

+    modifier_map Mod2   { Num_Lock };

+    modifier_map Mod3   { Mode_switch };

+    modifier_map Mod4   { Alt_L };

+    // End modifier mappings

+};

+

+// Swedish layout for a Type 4 Sun keyboard

+xkb_symbols "type4" {

+    include "sun_vndr/us(type4basic)+se(basic)"

+

+    // Begin alphanumeric section

+    // These two are not supposed to be dead.

+    // A few others supposedly ARE dead, but don't care for now.

+    key <AC12> { [ apostrophe, asterisk ],      [       grave ] };

+    key <AD12> { [                      ],      [  asciitilde ] };

+

+    key <AF14> { [      asciitilde,     asciicircum     ] };

+

+    key <RTSH> { [      Shift_R         ]       };

+

+    key <LALT> { [      Alt_L           ]       };

+    key <ALGR> { [      Mode_switch     ]       };

+    key <LMTA> { [      Meta_L          ]       };

+    key <RMTA> { [      Meta_R          ]       };

+    key <COMP> { [      Multi_key       ]       };

+    // End alphanumeric section

+

+    // Begin "Function" section

+    key <FK01> { [ F1           ]                       };

+    key <FK02> { [ F2           ]                       };

+    key <FK03> { [ F3           ]                       };

+    key <FK04> { [ F4           ]                       };

+    key <FK05> { [ F5           ]                       };

+    key <FK06> { [ F6           ]                       };

+    key <FK07> { [ F7           ]                       };

+    key <FK08> { [ F8           ]                       };

+    key <FK09> { [ F9           ]                       };

+    key <FK10> { [ F10          ]                       };

+    key <FK11> { [ F11          ],      [ SunF36]       };

+    key <FK12> { [ F12          ],      [ SunF37]       };

+    key <STOP> { [ Cancel       ],      [ F11   ]       };

+    key <AGAI> { [ Redo         ],      [ F12   ]       };

+    key <PROP> { [ SunProps     ],      [ F13   ]       };

+    key <UNDO> { [ Undo         ],      [ F14   ]       };

+    key <FRNT> { [ SunFront     ],      [ F15   ]       };

+    key <COPY> { [ SunCopy      ],      [ F16   ]       };

+    key <OPEN> { [ SunOpen      ],      [ F17   ]       };

+    key <PAST> { [ SunPaste     ],      [ F18   ]       };

+    key <FIND> { [ Find         ],      [ F19   ]       };

+    key <CUT>  { [ SunCut       ],      [ F20   ]       };

+    // End "Function" section

+

+    // Begin "Editing" section

+    key <LNFD> { [ Linefeed     ]       };

+    key <DELE> { [ Delete       ]                       };

+    key <PRSC> { [ Print        ],      [ Sys_Req, SunSys_Req ] };

+    key <SCLK> { [ Scroll_Lock  ]                       };

+    key <PAUS> { [ Pause        ],      [ Break ]       };

+    key <HELP> { [ Help         ]                       };

+    // End "Editing" section

+    

+   // Begin "Keypad" section

+    key <NMLK> { [ Num_Lock             ]                               };

+    key <KPEQ> { [ KP_Equal             ]                               };

+    key <KPDV> { [ KP_Divide            ],      [       F25     ]       };

+    key <KPMU> { [ KP_Multiply          ],      [       F26     ]       };

+    key <KPSU> { [ KP_Subtract          ]                               };

+

+    key  <KP7> { [  KP_Home,    KP_7    ],      [       F27     ]       };

+    key  <KP8> { [  KP_Up,      KP_8    ],      [       F28     ]       };

+    key  <KP9> { [  KP_Prior,   KP_9    ],      [       F29     ]       };

+    key <KPAD> { [      KP_Add          ]                               };

+

+    key  <KP4> { [  KP_Left,    KP_4    ],      [       F30     ]       };

+    key  <KP5> { [  KP_Begin,   KP_5    ],      [       F31     ]       };

+    key  <KP6> { [  KP_Right,   KP_6    ],      [       F32     ]       };

+

+    key  <KP1> { [  KP_End,     KP_1    ],      [       F33     ]       };

+    key  <KP2> { [  KP_Down,    KP_2    ],      [       F34     ]       };

+    key  <KP3> { [  KP_Next,    KP_3    ],      [       F35     ]       };

+    key <KPEN> { [      KP_Enter        ]                               };

+

+    key  <KP0> { [  KP_Insert,  KP_0    ]                               };

+    key <KPDL> { [  KP_Delete,  KP_Decimal ]                            };

+    // End "Keypad" section, 

+

+    // Begin modifier mappings

+    modifier_map Shift  { Shift_R };

+    modifier_map Mod1   { Alt_L };

+    modifier_map Mod2   { Num_Lock };

+    modifier_map Mod3   { Mode_switch };

+    modifier_map Mod4   { Meta_L };

+    modifier_map Mod5   { Meta_R };

+    // End modifier mappings

+};

+

+

+partial default alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/se(type6)"

+};

+