diff options
| -rw-r--r-- | geometry/sun | 11 | ||||
| -rw-r--r-- | symbols/sun_vndr/us | 60 |
2 files changed, 54 insertions, 17 deletions
diff --git a/geometry/sun b/geometry/sun index 1b8117a8..77a4f2a2 100644 --- a/geometry/sun +++ b/geometry/sun @@ -162,6 +162,7 @@ default xkb_geometry "type5" { // keyboard. I just took a similar layout (101 key PC keyboard) // and adjusted the sizes. + // Sun Type6 US keyboard (PN 320-1270, PN 320-1271) is identical. description= "Sun Type5 keyboard"; width= 515; @@ -459,6 +460,7 @@ xkb_geometry "type5unix" { // keyboard. I just took a similar layout (101 key PC keyboard) // and adjusted the sizes. + // Sun Type6 US/UNIX keyboard (PN 320-1272, PN 320-1273) is identical. description= "Sun Type5 Unix keyboard"; width= 515; @@ -467,9 +469,8 @@ xkb_geometry "type5unix" { shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } }; shape.cornerRadius= 1; shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } }; - shape "BKSP" { { [ 27,18] }, { [2,1], [25,17] } }; + shape "BKSP" { { [ 28,18] }, { [2,1], [26,17] } }; shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } }; - shape "BKSL" { { [ 27,18] }, { [2,1], [25,17] } }; shape "RTRN" { { [ 42,18] }, { [2,1], [40,17] } }; shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } }; shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } }; @@ -540,7 +541,7 @@ xkb_geometry "type5unix" { keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, - { <RTSH>, "RTSH", color="grey20" } + { <RTSH>, "RTSH" } }; }; row { @@ -584,7 +585,7 @@ xkb_geometry "type5unix" { }; row { top= 20; - keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } }; + keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD" } }; }; row { top= 39; @@ -592,7 +593,7 @@ xkb_geometry "type5unix" { }; row { top= 58; - keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } }; + keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD" } }; }; row { top= 77; diff --git a/symbols/sun_vndr/us b/symbols/sun_vndr/us index 430bbc7b..83207f4a 100644 --- a/symbols/sun_vndr/us +++ b/symbols/sun_vndr/us @@ -245,18 +245,54 @@ xkb_symbols "sun6" { key <COMP> { [ Multi_key ] }; // 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 <FK01> { + type="CTRL+ALT", + symbols[Group1]= [ F1, XF86_Switch_VT_1 ] + }; + key <FK02> { + type="CTRL+ALT", + symbols[Group1]= [ F2, XF86_Switch_VT_2 ] + }; + key <FK03> { + type="CTRL+ALT", + symbols[Group1]= [ F3, XF86_Switch_VT_3 ] + }; + key <FK04> { + type="CTRL+ALT", + symbols[Group1]= [ F4, XF86_Switch_VT_4 ] + }; + key <FK05> { + type="CTRL+ALT", + symbols[Group1]= [ F5, XF86_Switch_VT_5 ] + }; + key <FK06> { + type="CTRL+ALT", + symbols[Group1]= [ F6, XF86_Switch_VT_6 ] + }; + key <FK07> { + type="CTRL+ALT", + symbols[Group1]= [ F7, XF86_Switch_VT_7 ] + }; + key <FK08> { + type="CTRL+ALT", + symbols[Group1]= [ F8, XF86_Switch_VT_8 ] + }; + key <FK09> { + type="CTRL+ALT", + symbols[Group1]= [ F9, XF86_Switch_VT_9 ] + }; + key <FK10> { + type="CTRL+ALT", + symbols[Group1]= [ F10, XF86_Switch_VT_10 ] + }; + key <FK11> { + type="CTRL+ALT", + symbols[Group1]= [ F11, XF86_Switch_VT_11 ] + }; + key <FK12> { + type="CTRL+ALT", + symbols[Group1]= [ F12, XF86_Switch_VT_12 ] + }; // End "Function" section // Begin "Editing" section |