Attachment 3475 Details for Bug 3952 – reattached diff

reattached diff

type6.xorg682.diff (text/plain), 4.58 KB, created by Hanno Hecker on 2005-10-03 22:44:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hanno Hecker

Created: 2005-10-03 22:44:00 UTC

Size: 4.58 KB

patch

obsolete

>--- programs/xkbcomp/rules/xorg.orig	Tue Aug  2 13:17:53 2005
>+++ programs/xkbcomp/rules/xorg	Tue Aug  2 13:18:09 2005
>@@ -26,6 +26,7 @@
>   pc98		=	xfree98(pc98)
>   abnt2		=	xfree86(abnt2)
>   jp106		=	xfree86(jp106)
>+  sun6          =       xfree86(type6)
>   *		=	xfree86
> 
> ! $azerty = be fr fr-latin9
>@@ -60,12 +61,14 @@
>   *		=       pc(pc104)
> 
> ! model		variant		layout	=	symbols
>+ sun6		nodeadkeys	*	=	en_US(pc105)+%l(%v)+pc/type6(%l)
>  $maclaptop	nodeadkeys	*	=	macintosh/us(extended)+macintosh/%l%(v)+apple(laptop_bad_switch)
>  $mac		nodeadkeys	*	=	macintosh/us(extended)+macintosh/%l%(v)
>  $pcmodels	nodeadkeys  $oldlayouts	=	en_US(%m%_v)+%l%(v)
>   *		nodeadkeys  $oldlayouts	=	en_US(pc105%_v)+%l%(v)
> 
> ! model		layout	=	symbols
>+  sun6          *	=	en_US(pc105)+%l+pc/type6(%l)
>   pc98		nec/jp	=	nec/jp(pc98)
>   abnt2		br	=	pc/pc(pc104)+pc/br
>  $maclaptop	us	=	macintosh/us(extended)+apple(laptop_bad_switch)
>--- programs/xkbcomp/rules/xorg.lst.orig	Tue Aug  2 13:21:12 2005
>+++ programs/xkbcomp/rules/xorg.lst	Tue Aug  2 13:21:49 2005
>@@ -100,6 +100,7 @@
>   trust		Trust Wireless Keyboard Classic
>   trustda	Trust Direct Access Keyboard
>   yahoo		Yahoo! Internet Keyboard
>+  sun6		SUN USB (Type6) Keyboard connected to PC
> 
> 
> // The entries here should be ordered as follows:
>--- programs/xkbcomp/keycodes/xfree86.orig	Tue Aug  2 13:20:16 2005
>+++ programs/xkbcomp/keycodes/xfree86	Tue Aug  2 13:20:51 2005
>@@ -411,3 +411,26 @@
>     <AC12> = 51;
>     <KPPT> = 134;
> };
>+
>+xkb_keycodes "type6" {
>+    include "xfree86(xfree86)"
>+       <LMTA> = 115;
>+       <RMTA> = 116;
>+       <COMP> = 117;
>+       <STOP> = 232;
>+       <AGAI> = 182;
>+       <PROP> = 183;
>+       <UNDO> = 184;
>+       <FRNT> = 189;
>+       <COPY> = 248;
>+       <OPEN> = 191;
>+       <PAST> = 192;
>+       <FIND> = 229;
>+       <CUT> = 188;
>+       <HELP> = 226;
>+       <MUTE> = 166;
>+       <VOL-> = 165;
>+       <VOL+> = 158;
>+       <POWR> = 222;
>+};
>+
>--- programs/xkbcomp/symbols/pc/type6.orig	Tue Aug  2 13:19:03 2005
>+++ programs/xkbcomp/symbols/pc/type6	Tue Aug  2 13:19:24 2005
>@@ -0,0 +1,55 @@
>+partial alphanumeric_keys
>+xkb_symbols "type6" {
>+    key <LMTA> { [      Meta_L          ]       };
>+    key <RMTA> { [      Meta_R          ]       };
>+    key <COMP> { [      Multi_key       ]       };
>+    key <STOP> { [ F11  ],      [ Cancel        ]       };
>+    key <AGAI> { [ F12  ],      [ Redo          ]       };
>+    key <PROP> { [ F13  ],      [ SunProps      ]       };
>+    key <UNDO> { [ F14  ],      [ Undo          ]       };
>+    key <FRNT> { [ F15  ],      [ SunFront      ]       };
>+    key <COPY> { [ F16  ],      [ SunCopy       ]       };
>+    key <OPEN> { [ F17  ],      [ SunOpen       ]       };
>+    key <PAST> { [ F18  ],      [ SunPaste      ]       };
>+    key <FIND> { [ F19  ],      [ Find          ]       };
>+    key <CUT>  { [ F20  ],      [ SunCut        ]       };
>+    key <MUTE> { [  SunAudioMute,       SunVideoDegauss         ]       };
>+    key <VOL-> { [  SunAudioLowerVolume,SunVideoLowerBrightness ]       };
>+    key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness ]       };
>+    key <POWR> { [  SunPowerSwitch,     SunPowerSwitchShift     ]       };
>+    key <HELP> { [ Help                         ]                       };
>+};
>+
>+partial alphanumeric_keys
>+xkb_symbols "us" {
>+    include "pc/type6"
>+    //  Fake keys for virtual<->real modifiers mapping 
>+    key <LVL3> {        [ ISO_Level3_Shift      ]       };
>+    key <MDSW> {        [ Mode_switch           ]       };
>+    modifier_map Mod5   { <LVL3>, <MDSW> };
>+};
>+
>+partial alphanumeric_keys
>+xkb_symbols "de" {
>+    include "pc/type6"
>+    key <LSGT> {    [      less,    greater,	bar,	brokenbar     ]   };
>+    //  Fake keys for virtual<->real modifiers mapping 
>+    key <LVL3> {        [ ISO_Level3_Shift      ]       };
>+    key <MDSW> {        [ Mode_switch           ]       };
>+    modifier_map Mod5   { <LVL3>, <MDSW> };
>+};
>+
>+xkb_symbols "fr_CH" {
>+    include "pc/type6"
>+    key <LSGT> {    [      less,    greater,	bar,	brokenbar     ]   };
>+    //  Fake keys for virtual<->real modifiers mapping 
>+    key <LVL3> {        [ ISO_Level3_Shift      ]       };
>+    key <MDSW> {        [ Mode_switch           ]       };
>+    modifier_map Mod5   { <LVL3>, <MDSW> };
>+    override key <AE04> {        [         4,    ccedilla ],
>+                                 [ asciicircum            ]     };
>+    override key <AE05> {        [         5,    percent  ], 
>+                                 [ asciitilde             ]      };
>+    override key <AE10> {        [         0,    equal    ],
>+                                 [ grave                  ]      };
>+};

Actions: View

Attachments on bug 3952: 3475 | 3813

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.