From 92bd40b3fc3830028340969f2cc5c6a0720c4450 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 16 Jan 2013 08:28:39 +0100 Subject: libxtrans fontconfig glproto libX11 libXau libXext libXft libXinerama libXmu libfontenc mesa xkeyboard-config libxtrans: d9f3728ff74ceb956f6cf8dc24b38611f9a4868a fontconfig: ec5ca08c807585a9230f83c95f7cca6b7065b142 glproto: 8e3407e02980d088e20041e79bdcdd3737e7827e libX11: f57fd760cba92ad846917f21e94e73e9c846185f libXau: 1a8a1b2c68967b48c07b56142799b1020f017027 libXext: 8eee1236041d46a21faba32e0d27c26985267d89 libXft: c5e760a239afc62a1c75e0509868e35957c8df52 libXinerama: 470b9356af961ff7d3968b164aa73872b49a5dcc libXmu: 474d22468c90f99104873b4c5fd7b0f0d2cbf823 libfontenc: 0c3518df24192f18f15ce91c2868560a5973a3dc mesa: 3c00a52f7e02007f40fa53a06fad517bed0328ff xkeyboard-config: 8a117fbd4a029b952afcfe362931628dccf496e4 --- .../xkeyboard-config/symbols/sun_vndr/solaris | 235 ++++++--------------- 1 file changed, 67 insertions(+), 168 deletions(-) (limited to 'xorg-server/xkeyboard-config/symbols/sun_vndr/solaris') diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/solaris b/xorg-server/xkeyboard-config/symbols/sun_vndr/solaris index c435744ee..d8289506e 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/solaris +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/solaris @@ -1,6 +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 @@ -27,187 +26,87 @@ // 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 -// -// Default map provides backwards compatibility with Sun keyboards from -// long ago and the key mappings still used in Solaris Xsun today - -partial default +partial xkb_symbols "defaults_common" { - // Left side keys were labeled L1-L10 on Sun Type 2 & Type 3 keyboards - // and the names have stuck (you can spot a longtime Sun admin when you - // hear them say to hit "L1-A" to enter the OpenBoot PROM) - // These names get mapped to the keysyms F11-F20 - key { [ L1, L1 ], [ SunStop ] }; - key { [ L2, L2 ], [ SunAgain ] }; - key { [ L3, L3 ], [ SunProps ] }; - key { [ L4, L4 ], [ SunUndo ] }; - key { [ L5, L5 ], [ SunFront ] }; - key { [ L6, L6 ], [ SunCopy ] }; - key { [ L7, L7 ], [ SunOpen ] }; - key { [ L8, L8 ], [ SunPaste ] }; - key { [ L9, L9 ], [ SunFind ] }; - key { [ L10, L10 ], [ SunCut ] }; - - // And on the right side, the function keys were labeled R1-R15, - // which get mapped to the keysyms F21-F35 - // This includes the keys that became the numeric keypad - key { [ R1, R1 ], [ Pause ] }; - key { [ R2, R2 ], [ Print ] }; - key { [ R3, R3 ], [ Scroll_Lock, Break ] }; - - key { [ KP_Equal ], [ R4, KP_Equal ] }; - key { [ KP_Divide ], [ R5, KP_Divide ] }; - key { [ KP_Multiply ], [ R6, KP_Multiply ] }; - - key { [ KP_Home, KP_7, R7 ], [ R7, KP_7, Home ] }; - key { [ KP_Up, KP_8, R8 ], [ R8, KP_8, Up ] }; - key { [ KP_Prior, KP_9, R9 ], [ R9, KP_9, Prior ] }; - - key { [ KP_Left, KP_4, R10 ], [ R10, KP_4, Left ] }; - key { [ KP_Begin, KP_5, R11 ], [ R11, KP_5 ] }; - key { [ KP_Right, KP_6, R12 ], [ R12, KP_6, Right ] }; - - key { [ KP_End, KP_1, R13 ], [ R13, KP_1, End ] }; - key { [ KP_Down, KP_2, R14 ], [ R14, KP_2, Down ] }; - key { [ KP_Next, KP_3, R15 ], [ R15, KP_3, Next ] }; - - // F11 & F12 are mapped to SunF36 and SunF37 since they were added - // after F11-F35 were already assigned on Sun keyboards - key { [ SunF36 ], [ F11 ] }; - key { [ SunF37 ], [ F12 ] }; - - // These were added to the keyboard much later and simply got mapped - // to their logical names - key { [ Help ] }; - key { [ SunAudioMute, SunVideoDegauss ] }; - key { [ SunAudioLowerVolume,SunVideoLowerBrightness ] }; - key { [ SunAudioRaiseVolume,SunVideoRaiseBrightness ] }; - key { [ XF86Sleep, XF86Hibernate ] }; - -// key { [ Alt_L ] }; -// key { [ Meta_L ] }; -// key { [ Meta_R ] }; -// key { [ Multi_key ] }; + key { [ XF86AudioMute ] }; + key { [ XF86AudioLowerVolume ] }; + key { [ XF86AudioRaiseVolume ] }; + key { [ XF86PowerOff ] }; + key { [ Cancel ] }; + key { [ Redo ] }; + key { [ SunProps ] }; + key { [ Undo ] }; + key { [ SunFront ] }; + key { [ XF86Copy ] }; + key { [ SunOpen ] }; + key { [ XF86Paste ] }; + key { [ Find ] }; + key { [ XF86Cut ] }; + key { [ Help ] }; + key { [ Linefeed ] }; + + key { [ Alt_L, Alt_L ] }; + key { [ Meta_L ] }; + key { [ Meta_R ] }; + +// The following is needed for virtual hotkeys + + key { [ XF86Sleep ] }; + key { [ XF86ScreenSaver ] }; + key { [ XF86Display ] }; + +// Common Sun Modifiers + + modifier_map Shift { Shift_R, Shift_L }; + modifier_map Mod2 { Num_Lock }; + modifier_map Mod4 { Meta_L, Meta_R }; + }; partial default xkb_symbols "defaults" { + include "sun_vndr/solaris(defaults_common)" -// key { [ Mode_switch ] }; -// key { [ Mode_switch ] }; - - // begin modifier mappings -// modifier_map Shift { Shift_R, Shift_L }; -// modifier_map Mod1 { Alt_L }; -// modifier_map Mod2 { Num_Lock }; -// modifier_map Mod3 { Alt_R, Mode_switch }; -// modifier_map Mod4 { Meta_L, Meta_R }; + + modifier_map Mod1 { Alt_L }; + }; -partial default +partial xkb_symbols "defaults_type7jp" { + include "sun_vndr/solaris(defaults_common)" - // begin modifier mappings - modifier_map Shift { Shift_R, Shift_L }; - modifier_map Mod1 { Alt_L , Alt_R}; - modifier_map Mod2 { Num_Lock }; - modifier_map Mod3 { Mode_switch }; - modifier_map Mod4 { Meta_L, Meta_R }; -}; -// Map the keys to the actual key names instead of the ancient Sun function -// keys -partial -xkb_symbols "keynames" { - key { [ F11 ], [ SunF36 ] }; - key { [ F12 ], [ SunF37 ] }; - - key { [ Cancel ], [ F11 ] }; - key { [ Redo ], [ F12 ] }; - key { [ SunProps ], [ F13 ] }; - key { [ Undo ], [ F14 ] }; - key { [ SunFront ], [ F15 ] }; - key { [ SunCopy ], [ F16 ] }; - key { [ SunOpen ], [ F17 ] }; - key { [ SunPaste ], [ F18 ] }; - key { [ Find ], [ F19 ] }; - key { [ SunCut ], [ F20 ] }; - - key { [ Help ] }; - - key { [ Pause ] }; - key { [ Print ] }; - key { [ Scroll_Lock, Break ] }; - - key { [ KP_Home, KP_7 ] }; - key { [ KP_Up, KP_8 ] }; - key { [ KP_Prior, KP_9 ] }; - - key { [ KP_Left, KP_4 ] }; - key { [ KP_Begin, KP_5 ] }; - key { [ KP_Right, KP_6 ] }; - - key { [ KP_End, KP_1 ] }; - key { [ KP_Down, KP_2 ] }; - key { [ KP_Next, KP_3 ] }; - - key { [ KP_Enter ] }; - key { [ KP_Equal ] }; - - key { [ SunAudioMute, SunVideoDegauss ] }; - key { [ SunAudioLowerVolume, SunVideoLowerBrightness ] }; - key { [ SunAudioRaiseVolume, SunVideoRaiseBrightness ] }; - key { [ SunPowerSwitch, SunPowerSwitchShift ] }; - - key { [ Alt_L ] }; - key { [ Mode_switch ] }; - key { [ Mode_switch ] }; - key { [ Meta_L ] }; - key { [ Meta_R ] }; - key { [ Multi_key ] }; + modifier_map Mod1 { Alt_L, Alt_R }; }; -// Map the keys to the XFree86 key names instead of the Sun key names partial -xkb_symbols "xf86keynames" { - key { [ XF86Stop ], [ F11 ] }; - key { [ Redo ], [ F12 ] }; - key { [ SunProps ], [ F13 ] }; - key { [ Undo ], [ F14 ] }; - key { [ SunFront ], [ F15 ] }; - key { [ XF86Copy ], [ F16 ] }; - key { [ XF86Open ], [ F17 ] }; - key { [ XF86Paste ], [ F18 ] }; - key { [ Find ], [ F19 ] }; - key { [ XF86Cut ], [ F20 ] }; - - key { [ XF86AudioMute, SunVideoDegauss ] }; - key { [ XF86AudioLowerVolume,SunVideoLowerBrightness ] }; - key { [ XF86AudioRaiseVolume,SunVideoRaiseBrightness ] }; - key { [ XF86Sleep, XF86PowerDown ] }; +xkb_symbols "sun_compat" { + + key { [ L1, L1, SunStop ] }; + key { [ L2, L2, SunAgain ] }; + key { [ L3, L3, SunProps ] }; + key { [ L4, L4, SunUndo ] }; + key { [ L5, L5, SunFront ] }; + key { [ L6, L6, SunCopy ] }; + key { [ L7, L7, SunOpen ] }; + key { [ L8, L8, SunPaste ] }; + key { [ L9, L9, SunFind ] }; + key { [ L10, L10, SunCut ] }; + +// F11 & F12 are mapped to SunF36 and SunF37 since they were added +// after F11-F35 were already assigned on Sun keyboards + key { [ SunF36 ], [ F11 ] }; + key { [ SunF37 ], [ F12 ] }; + +// These were added to the keyboard much later and simply got mapped +// to their logical names + key { [ Help ] }; + key { [ SunAudioMute, SunVideoDegauss ] }; + key { [ SunAudioLowerVolume, SunVideoLowerBrightness ] }; + key { [ SunAudioRaiseVolume, SunVideoRaiseBrightness ] }; + key { [ XF86Sleep, XF86Hibernate ] }; }; -- cgit v1.2.3