xkeyboard-config/symbols/sun_vndr us,1.5,1.6
"Sergey V. Oudaltsov" <xlibs-commit-u7BhqnqprCWvj1b/[email protected]> Tue, 12 Feb 2008 12:34:10 -0800 (PST)
| Newsgroups | gmane.comp.freedesktop.xlibs.cvs |
|---|---|
| Message-ID | <[email protected]> |
Committed by: svu
Update of /cvs/xkeyboard-config/xkeyboard-config/symbols/sun_vndr
In directory kemper:/tmp/cvs-serv18502/symbols/sun_vndr
Modified Files:
us
Log Message:
sun type6 support, b.fd.o#13664
Index: us
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/sun_vndr/us,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- us 17 Dec 2007 20:56:27 -0000 1.5
+++ us 12 Feb 2008 20:34:09 -0000 1.6
@@ -52,81 +52,49 @@
//
// Symbols shared by all Sun Keyboard layouts
+hidden
xkb_symbols "sunbasic" {
- include "srvr_ctrl(stdkeypad)"
+ include "srvr_ctrl(xfree86)"
+
+ // Needed for left function keys and volume keys
+ // Need to include this before us(basic) otherwise tilde is mapped to
+ // a jp key
+ include "inet(evdev)"
+
include "us(basic)"
+ include "pc(function)"
+ include "pc(editing)"
+ include "keypad(x11)"
+ include "sun_vndr/us(left_funkeys)"
+
+ include "capslock(capslock)"
+ //include "capslock(shiftlock)"
+
+ key <LFSH> { [ Shift_L ] };
key <RTSH> { [ Shift_R ] };
key <LALT> { [ Alt_L ] };
key <ALGR> { [ Mode_switch ] };
key <LMTA> { [ Meta_L ] };
key <RMTA> { [ Meta_R ] };
+ key <LCTL> { [ Control_L ] };
key <RCTL> { [ Control_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 ] };
- key <FK12> { [ F12 ] };
- key <STOP> { [ L1, L1 ], [ SunStop ] };
- key <AGAI> { [ L2, L2 ], [ SunAgain ] };
- key <PROP> { [ L3, L3 ], [ SunProps ] };
- key <UNDO> { [ L4, L4 ], [ SunUndo ] };
- key <FRNT> { [ L5, L5 ], [ SunFront ] };
- key <COPY> { [ L6, L6 ], [ SunCopy ] };
- key <OPEN> { [ L7, L7 ], [ SunOpen ] };
- key <PAST> { [ L8, L8 ], [ SunPaste ] };
- key <FIND> { [ L9, L9 ], [ SunFind ] };
- key <CUT> { [ L10, L10 ], [ SunCut ] };
- // End "Function" section
- // Begin "Editing" section
- key <DELE> { [ Delete ] };
- key <HELP> { [ Help ] };
+ key <TAB> { [ Tab, ISO_Left_Tab ] };
+ key <RTRN> { [ Return ] };
- // End "Editing" section, begin "Keypad"
+ key <ESC> { [ Escape ] };
- key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
+ key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
+ key <SPCE> { [ space ] };
- // This default section uses the same symbols as other XKB implementations
+ // By default, we use the same symbols as other XKB implementations
// for greater compatibility & AccessX MouseKeys support, but it is
// different than the traditional Sun key mappings that date back to the
// Sun Type 2 keyboard, in which the right side numpad were "R" function
- // keys. To restore the original behavior, comment out this section and
- // uncomment the section below that lists the R key mappings.
- key <KPDV> { [ KP_Divide ] };
- key <KPMU> { [ KP_Multiply ] };
- key <KPSU> { [ KP_Subtract ] };
-
- key <KP7> { [ KP_Home, KP_7 ] };
- key <KP8> { [ KP_Up, KP_8 ] };
- key <KP9> { [ KP_Prior, KP_9 ] };
- key <KPAD> { [ KP_Add ] };
-
- key <KP4> { [ KP_Left, KP_4 ] };
- key <KP5> { [ KP_Begin, KP_5 ] };
- key <KP6> { [ KP_Right, KP_6 ] };
-
- key <KP1> { [ KP_End, KP_1 ] };
- key <KP2> { [ KP_Down, KP_2 ] };
- key <KP3> { [ KP_Next, KP_3 ] };
- key <KPEN> { [ KP_Enter ] };
-
- key <KP0> { [ KP_Insert, KP_0 ] };
- key <KPDL> { [ KP_Delete, KP_Decimal ] };
-
-// End New Keypad section - Begin Sun traditional Keypad section
-
+ // keys. To restore the original behavior, uncomment the section below
+ // that lists the R key mappings.
// key <KP7> { [ R7, R7 ], [ KP_7, Home ] };
// key <KP8> { [ Up, R8 ], [ KP_8 ] };
// key <KP9> { [ R9, R9 ], [ KP_9, Prior ] };
@@ -145,8 +113,55 @@
// End "Keypad" section
- modifier_map Control{ Control_R };
+ modifier_map Control { Control_L, Control_R };
+ modifier_map Shift { Shift_R, Shift_L };
+ modifier_map Mod1 { Meta_L, Meta_R };
+ modifier_map Mod2 { Mode_switch };
+ modifier_map Mod3 { Num_Lock };
+ modifier_map Mod4 { Alt_L };
+};
+hidden
+xkb_symbols "left_funkeys" {
+ // Suppliment to inet(evdev) for added functionality of left-funkeys
+ key <STOP> { [ NoSymbol ], [ L1, L1 ] };
+ key <AGAI> { [ NoSymbol ], [ L2, L2 ] };
+ key <PROP> { [ NoSymbol ], [ L3, L3 ] };
+ key <UNDO> { [ NoSymbol ], [ L4, L4 ] };
+ key <FRNT> { [ NoSymbol ], [ L5, L5 ] };
+ key <COPY> { [ NoSymbol ], [ L6, L6 ] };
+ key <OPEN> { [ NoSymbol ], [ L7, L7 ] };
+ key <PAST> { [ NoSymbol ], [ L8, L8 ] };
+ key <FIND> { [ NoSymbol ], [ L9, L9 ] };
+ key <CUT> { [ NoSymbol ], [ L10, L10 ] };
+
+ // The above symbols were chosen for better compatibility withother xkb
+ // mappings. The old mappings are kepy below in case someone needs them
+ //key <STOP> { [ L1, L1 ], [ SunStop ] };
+ //key <AGAI> { [ L2, L2 ], [ SunAgain ] };
+ //key <PROP> { [ L3, L3 ], [ SunProps ] };
+ //key <UNDO> { [ L4, L4 ], [ SunUndo ] };
+ //key <FRNT> { [ L5, L5 ], [ SunFront ] };
+ //key <COPY> { [ L6, L6 ], [ SunCopy ] };
+ //key <OPEN> { [ L7, L7 ], [ SunOpen ] };
+ //key <PAST> { [ L8, L8 ], [ SunPaste ] };
+ //key <FIND> { [ L9, L9 ], [ SunFind ] };
+ //key <CUT> { [ L10, L10 ], [ SunCut ] };
+};
+
+hidden
+xkb_symbols "volumekeys" {
+ // Suppliment to inet(evdev) for added functionality of audio keys
+ key <MUTE> { [ NoSymbol, SunVideoDegauss ] };
+ key <VOL-> { [ NoSymbol, XF86MonBrightnessDown ] };
+ key <VOL+> { [ NoSymbol, XF86MonBrightnessUp ] };
+
+ // The above symbols were chosen for better compatibility withother xkb
+ // mappings. The old mappings are kepy below in case someone needs them
+ //key <MUTE> { [ SunAudioMute, SunVideoDegauss ] };
+ //key <VOL-> { [ SunAudioLowerVolume, SunVideoLowerBrightness ] };
+ //key <VOL+> { [ SunAudioRaiseVolume, SunVideoRaiseBrightness ] };
+ //key <POWR> { [ SunPowerSwitch, SunPowerSwitchShift ] };
};
// US/ASCII layout for a Type 4 Sun keyboard
@@ -167,14 +182,6 @@
// End "Editing" section, begin "Keypad"
key <KPEQ> { [ R4, KP_Equal ], [ KP_Equal ] };
-
- // begin modifier mappings
- modifier_map Shift { Shift_R, Shift_L };
- modifier_map Mod1 { Meta_L, Meta_R };
- modifier_map Mod2 { Mode_switch };
- modifier_map Mod3 { Num_Lock };
- modifier_map Mod4 { Alt_L };
-
};
xkb_symbols "type4" {
@@ -186,39 +193,13 @@
// US/ASCII layout for a Type 5 Sun keyboard
xkb_symbols "type5basic" {
include "sun_vndr/us(sunbasic)"
+ include "sun_vndr/us(volumekeys)"
// Begin "Editing" section
key <PRSC> { [ R2, R2 ], [ Print, SunSys_Req ] };
key <SCLK> { [ R3, R3 ], [ Scroll_Lock ] };
key <PAUS> { [ R1, R1 ], [ 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 "four keys up on the right"
- key <MUTE> { [ SunAudioMute, SunVideoDegauss ] };
- key <VOL-> { [ SunAudioLowerVolume, SunVideoLowerBrightness ] };
- key <VOL+> { [ SunAudioRaiseVolume, SunVideoRaiseBrightness ] };
- key <POWR> { [ SunPowerSwitch, SunPowerSwitchShift ] };
-
- // begin modifier mappings
- modifier_map Shift { Shift_R, Shift_L };
- modifier_map Mod1 { Meta_L, Meta_R };
- modifier_map Mod2 { Mode_switch };
- modifier_map Mod3 { Num_Lock };
- modifier_map Mod4 { Alt_L };
};
xkb_symbols "type5" {
@@ -231,11 +212,6 @@
key <BKSL> { [ backslash, bar ], [ brokenbar ] };
};
-xkb_symbols "type6" {
- include "sun_vndr/us(type5)"
-};
-
-
// US/ASCII layout for a Type 5 Sun keyboard
xkb_symbols "type5hobobasic" {
include "sun_vndr/us(type5basic)"
@@ -273,7 +249,14 @@
key <AB09> { [ period, greater], [ NoSymbol, NoSymbol], [ KP_Decimal] };
key <AB10> { [ slash, question], [ NoSymbol, NoSymbol], [ KP_Divide ] };
+};
+xkb_symbols "type6" {
+ include "sun_vndr/us(sunbasic)"
+ include "sun_vndr/us(volumekeys)"
+ include "eurosign(4)"
+
+ key <SYRQ> { [ SunSys_Req ]};
};
xkb_symbols "pc101" {