Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/xorg-old/patches-6.8.2-r10/0425_all_6.7.0-sun-type6-keyboard.patch

    Contents of /trunk/xorg-old/patches-6.8.2-r10/0425_all_6.7.0-sun-type6-keyboard.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 167 - (show annotations) (download)
    Tue May 8 20:58:51 2007 UTC (17 years ago) by niro
    File size: 9190 byte(s) 
    -import
    1 diff -urN xc.orig/programs/Xserver/hw/xfree86/common/xf86Events.c xc/programs/Xserver/hw/xfree86/common/xf86Events.c
    2 --- xc.orig/programs/Xserver/hw/xfree86/common/xf86Events.c 2004-07-30 13:56:53.000000000 -0700
    3 +++ xc/programs/Xserver/hw/xfree86/common/xf86Events.c 2004-09-02 11:45:52.000000000 -0700
    4 @@ -495,6 +495,14 @@
    5 if (xf86Info.scanPrefix == 0) {
    6
    7 switch (scanCode) {
    8 +
    9 + case 0x5d: scanCode = 0xD7; break; /* AGAI, SunAgain */
    10 + case 0x5e: scanCode = 0xD8; break; /* PROP, SunProps */
    11 + case 0x5f: scanCode = 0xD9; break; /* UNDO, SunUndo */
    12 + case 0x62: scanCode = 0xDA; break; /* FRNT, SunFront */
    13 + case 0x64: scanCode = 0xDC; break; /* OPEN, SunOpen */
    14 + case 0x65: scanCode = 0xDD; break; /* PAST, SunPaste */
    15 +
    16 case KEY_Prefix0:
    17 case KEY_Prefix1:
    18 #if defined(PCCONS_SUPPORT) || defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) || defined(WSCONS_SUPPORT)
    19 @@ -604,6 +612,22 @@
    20 case KEY_F6: scanCode = KEY_F16; break;
    21 case KEY_F7: scanCode = KEY_F17; break;
    22 case KEY_KP_Plus: scanCode = KEY_KP_DEC; break;
    23 + /* NE: again for Type 6. Map prefixed scancodes to keycodes
    24 + xkb/keycodes/xfree86(type6) -10 */
    25 + case 0x68: scanCode = 0xD6; break; /* SunStop */
    26 + case 0x78: scanCode = 0xDB; break; /* SunCopy */
    27 + case 0x65: scanCode = 0xDE; break; /* SunFind */
    28 + case 0x3c: scanCode = 0xDF; break; /* SunCut */
    29 + case 0x62: scanCode = 0xE0; break; /* SunHelp */
    30 + case 0x5f: scanCode = 0xD9; break; /* UNDO, SunUndo */
    31 + case 0x64: scanCode = 0xDC; break; /* OPEN, SunOpen */
    32 +
    33 + /* NE: these are only -8 (GLYPH_OFFSET) */
    34 + case 0x26: scanCode = 157; break; /* SunMute */
    35 + case 0x25: scanCode = 151; break; /* VOL- */
    36 + case 0x1e: scanCode = 150; break; /* VOL+ */
    37 + case 0x5e: scanCode = 152; break; /* SunPower */
    38 +
    39 /*
    40 * Ignore virtual shifts (E0 2A, E0 AA, E0 36, E0 B6)
    41 */
    42 diff -urN xc.orig/programs/xkbcomp/keycodes/xfree86 xc/programs/xkbcomp/keycodes/xfree86
    43 --- xc.orig/programs/xkbcomp/keycodes/xfree86 2004-09-01 12:06:44.000000000 -0700
    44 +++ xc/programs/xkbcomp/keycodes/xfree86 2004-09-02 11:52:13.000000000 -0700
    45 @@ -411,3 +411,36 @@
    46 <AC12> = 51;
    47 <KPPT> = 134;
    48 };
    49 +
    50 +// For Sun/Type6 keyboards
    51 +xkb_keycodes "type6" {
    52 + include "xfree86(xfree86)"
    53 +
    54 + alias <LMTA> = <LWIN>;
    55 + alias <RMTA> = <RWIN>;
    56 +
    57 + alias <COMP> = <MENU>;
    58 + alias <ALGR> = <RALT>;
    59 +
    60 +// again, from sun/type5
    61 + <STOP> = 222;
    62 + <AGAI> = 223;
    63 + <PROP> = 224;
    64 + <UNDO> = 225;
    65 + <FRNT> = 226;
    66 + <COPY> = 227;
    67 + <OPEN> = 228;
    68 + <PAST> = 229;
    69 + <FIND> = 230;
    70 + <CUT> = 231;
    71 +
    72 + <HELP> = 232;
    73 + <MUTE> = 165;
    74 + <VOL-> = 159;
    75 + <VOL+> = 158;
    76 + <POWR> = 160;
    77 +
    78 + indicator 1 = "Caps Lock";
    79 + indicator 2 = "Num Lock";
    80 + indicator 3 = "Scroll Lock";
    81 +};
    82 diff -urN xc.orig/programs/xkbcomp/rules/xorg xc/programs/xkbcomp/rules/xorg
    83 --- xc.orig/programs/xkbcomp/rules/xorg 2004-04-23 12:54:52.000000000 -0700
    84 +++ xc/programs/xkbcomp/rules/xorg 2004-09-02 11:45:52.000000000 -0700
    85 @@ -25,6 +25,7 @@
    86 powerpcps2 = powerpcps2
    87 pc98 = xfree98(pc98)
    88 abnt2 = xfree86(abnt2)
    89 + sun_type6_usb = xfree86(type6)
    90 jp106 = xfree86(jp106)
    91 * = xfree86
    92
    93 @@ -57,6 +58,7 @@
    94 pc98 = nec(pc98)
    95 abnt2 = pc(abnt2)
    96 $mac = macintosh(macintosh)
    97 + sun_type6_usb = sun(type5)
    98 * = pc(pc104)
    99
    100 ! model variant layout = symbols
    101 @@ -75,6 +77,7 @@
    102 $mac en_US = macintosh/us(extended)
    103 $mac * = macintosh/us(extended)+macintosh/%l%(v)
    104 $pcmodels intl = us(%mcompose)
    105 + sun_type6_usb * = us(sun_type6_usb)
    106 * intl = us(pc104compose)
    107 * jp = jp
    108 $pcmodels $oldlayouts = en_US(%m)+%l%(v)
    109 diff -urN xc.orig/programs/xkbcomp/symbols/us xc/programs/xkbcomp/symbols/us
    110 --- xc.orig/programs/xkbcomp/symbols/us 2004-09-02 03:48:49.000000000 -0700
    111 +++ xc/programs/xkbcomp/symbols/us 2004-09-02 11:45:52.000000000 -0700
    112 @@ -321,6 +321,108 @@
    113 modifier_map Mod4 { Super_L, Super_R };
    114 };
    115
    116 +// definition for Sun Type 6 USB
    117 +xkb_symbols "sun_type6_usb" {
    118 + include "us(basic)"
    119 +
    120 + key <RTSH> { [ Shift_R ] };
    121 + key <LALT> { [ Alt_L ] };
    122 + key <RCTL> { [ Control_R ] };
    123 + key <RALT> { [ Alt_R ] };
    124 + key <LMTA> { [ Meta_L ] };
    125 + key <RMTA> { [ Meta_R ] };
    126 + key <COMP> { [ Multi_key ] };
    127 +
    128 + // Begin "Function" section
    129 + key <FK01> { [ F1 ] };
    130 + key <FK02> { [ F2 ] };
    131 + key <FK03> { [ F3 ] };
    132 + key <FK04> { [ F4 ] };
    133 + key <FK05> { [ F5 ] };
    134 + key <FK06> { [ F6 ] };
    135 + key <FK07> { [ F7 ] };
    136 + key <FK08> { [ F8 ] };
    137 + key <FK09> { [ F9 ] };
    138 + key <FK10> { [ F10 ] };
    139 + key <FK11> { [ F11 ] };
    140 + key <FK12> { [ F12 ] };
    141 + // End "Function" section
    142 +
    143 + // Begin "Editing" section
    144 + key <PRSC> {
    145 + type= "PC_SYSRQ",
    146 + symbols[Group1]= [ Print, Execute ]
    147 + };
    148 + key <SCLK> { [ Scroll_Lock ] };
    149 + key <PAUS> {
    150 + type= "PC_BREAK",
    151 + symbols[Group1]= [ Pause, Break ]
    152 + };
    153 + key <INS> { [ Insert ] };
    154 + key <HOME> { [ Home ] };
    155 + key <PGUP> { [ Prior ] };
    156 + key <DELE> { [ Delete ] };
    157 + key <END> { [ End ] };
    158 + key <PGDN> { [ Next ] };
    159 +
    160 + key <UP> { [ Up ] };
    161 + key <LEFT> { [ Left ] };
    162 + key <DOWN> { [ Down ] };
    163 + key <RGHT> { [ Right ] };
    164 +
    165 + // End "Editing" section, begin "Keypad"
    166 + key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
    167 + key <KPDV> { [ KP_Divide ] };
    168 + key <KPMU> { [ KP_Multiply ] };
    169 + key <KPSU> { [ KP_Subtract ] };
    170 +
    171 + key <KP7> { [ KP_Home, KP_7 ] };
    172 + key <KP8> { [ KP_Up, KP_8 ] };
    173 + key <KP9> { [ KP_Prior, KP_9 ] };
    174 + key <KPAD> { [ KP_Add ] };
    175 +
    176 + key <KP4> { [ KP_Left, KP_4 ] };
    177 + key <KP5> { [ KP_Begin, KP_5 ] };
    178 + key <KP6> { [ KP_Right, KP_6 ] };
    179 +
    180 + key <KP1> { [ KP_End, KP_1 ] };
    181 + key <KP2> { [ KP_Down, KP_2 ] };
    182 + key <KP3> { [ KP_Next, KP_3 ] };
    183 + key <KPEN> { [ KP_Enter ] };
    184 +
    185 + key <KP0> { [ KP_Insert, KP_0 ] };
    186 + key <KPDL> { [ KP_Delete, KP_Decimal ] };
    187 + // End "Keypad" section
    188 +
    189 + key <MUTE> { [ SunAudioMute, SunVideoDegauss ] };
    190 + key <VOL-> { [ SunAudioLowerVolume,SunVideoLowerBrightness ] };
    191 + key <VOL+> { [ SunAudioRaiseVolume,SunVideoRaiseBrightness ] };
    192 + key <POWR> { [ SunPowerSwitch, SunPowerSwitchShift ] };
    193 +
    194 + // from symbols/sun/us(type5)
    195 + key <STOP> { [ Cancel ], [ F11 ] };
    196 + key <AGAI> { [ Redo ], [ F12 ] };
    197 + key <PROP> { [ SunProps ], [ F13 ] };
    198 + key <UNDO> { [ Undo ], [ F14 ] };
    199 + key <FRNT> { [ SunFront ], [ F15 ] };
    200 + key <COPY> { [ SunCopy ], [ F16 ] };
    201 + key <OPEN> { [ SunOpen ], [ F17 ] };
    202 + key <PAST> { [ SunPaste ], [ F18 ] };
    203 + key <FIND> { [ Find ], [ F19 ] };
    204 + key <CUT> { [ SunCut ], [ F20 ] };
    205 +
    206 + key <HELP> { [ Help ] };
    207 +
    208 + // begin modifier mappings
    209 +// XXX should Shift_L be here too?
    210 + modifier_map Shift { Shift_R };
    211 + modifier_map Mod1 { Alt_L, Alt_R };
    212 + modifier_map Mod2 { Num_Lock };
    213 + modifier_map Mod3 { Multi_key };
    214 + modifier_map Mod4 { Meta_L, Meta_R };
    215 + modifier_map Mod5 { Scroll_Lock };
    216 +};
    217 +
    218 // definition of Euro-style, Right "logo" key == [Mode_switch, Multi_key]
    219 xkb_symbols "pc104euro" {
    220 include "us(pc104)"