Attachment 6985 Details for Bug 8280 – Fix all Mac layouts to use the same template (modifiers, special keys, etc)

[patch] Fix all Mac layouts to use the same template (modifiers, special keys, etc)

mac_normalize.diff (text/plain), 17.96 KB, created by Denis Barbier on 2006-09-14 13:25:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Denis Barbier

Created: 2006-09-14 13:25:44 UTC

Size: 17.96 KB

patch

obsolete

>diff --git a/rules/base.ml1_s.part b/rules/base.ml1_s.part
>index 7f63e2e..bef256b 100644
>--- a/rules/base.ml1_s.part
>+++ b/rules/base.ml1_s.part
>@@ -2,9 +2,9 @@
>   amiga		*			=	xfree68_vndr/amiga(usa1)+%l[1]%(v[1])
>   sun4		*			=	latin+sun_vndr/us(sun4)+%l[1]%(v[1])
>   sun5		*			=	latin+sun_vndr/us(sun5)+%l[1]%(v[1])
>-  macintosh_old	us			=	macintosh_vndr/us(extended)
>-  macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(extended)+macintosh_vndr/%l[1]%(v[1])
>-  macintosh_old	*			=	macintosh_vndr/us(extended)+%l[1]%(v[1])
>+  macintosh_old	us			=	macintosh_vndr/us(oldmac)
>+  macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
>+  macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l[1]%(v[1])
>  $macs		$macvendorlayouts	=	pc(pc105)+macintosh_vndr/%l[1]%(v[1])
>  $pcmodels	*			=	pc(%m)+%l[1]%(v[1])
>   *		*			=	pc(pc105)+%l[1]%(v[1])
>diff --git a/rules/base.ml_s.part b/rules/base.ml_s.part
>index f3156ed..ad2111c 100644
>--- a/rules/base.ml_s.part
>+++ b/rules/base.ml_s.part
>@@ -8,11 +8,11 @@
>   sun5		*			=	latin+sun_vndr/us(sun5)+%l%(v)
>   pc98		nec_vndr/jp		=	nec_vndr/jp(pc98)
>   abnt2		br			=	pc(pc104)+br
>-  macintosh_old	us			=	macintosh_vndr/us(extended)
>-  macintosh_old	en_US			=	macintosh_vndr/us(extended)
>-  macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)
>-  macintosh_old	$nonlatin		=	macintosh_vndr/us(extended)+%l%(v):2
>-  macintosh_old	*			=	macintosh_vndr/us(extended)+%l%(v)
>+  macintosh_old	us			=	macintosh_vndr/us(oldmac)
>+  macintosh_old	en_US			=	macintosh_vndr/us(oldmac)
>+  macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l%(v)
>+  macintosh_old	$nonlatin		=	macintosh_vndr/us(oldmac)+%l%(v):2
>+  macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l%(v)
>  $macbooks	*			=	pc(pc105)+%l%(v)
>  $macs		en_US			=	pc(pc105)+macintosh_vndr/us(extended)
>  $macs		$macvendorlayouts	=	pc(pc105)+macintosh_vndr/%l%(v)
>diff --git a/symbols/macintosh_vndr/apple b/symbols/macintosh_vndr/apple
>index 0a1d844..3887caf 100644
>--- a/symbols/macintosh_vndr/apple
>+++ b/symbols/macintosh_vndr/apple
>@@ -42,19 +42,13 @@ xkb_symbols "laptop" {
>     // the fn-keypad, so use the Enter key (right of <SPC>) for Mode_switch,
>     // and use fn+Enter (Apple's code for Menu) for KP_Enter.
>     replace key <KPEN> { [ ISO_Level3_Shift ] };
>-    modifier_map Mod2  { ISO_Level3_Shift };	
>+    modifier_map Mod5  { ISO_Level3_Shift };	
>     // Linux kernel bug with Menu on macs means this doesn't work yet
> //    replace key <MENU> { [ KP_Enter ] }; // should be keycode 117
> };
> 
> partial modifier_keys
> xkb_symbols "laptop_bad_switch" {
>+    // Kept for backward compatibility
>     include "macintosh_vndr/apple(laptop)"
>-
>-    // Before XFree86 4.3, most keymaps were configured to generate the 
>-    // third-level shift from the second group as opposed to the third-level
>-    // of the first group. These keymaps require this mapping to work as
>-    // expected.
>-    replace key <KPEN> { [ Mode_switch ] };
>-    modifier_map Mod2  { Mode_switch };	
> };
>diff --git a/symbols/macintosh_vndr/ch b/symbols/macintosh_vndr/ch
>index 7034746..54d0683 100644
>--- a/symbols/macintosh_vndr/ch
>+++ b/symbols/macintosh_vndr/ch
>@@ -68,6 +68,7 @@ xkb_symbols "extended" {
>     key <BKSL> { [	dollar,	sterling, 	paragraph,	enfilledcircbullet	]	};
> 
>     include "keypad(comma)"
>+    include "level3(ralt_switch)"
> };
> 
> partial alphanumeric_keys 
>@@ -97,5 +98,5 @@ xkb_symbols "fr" {
> 
> partial alphanumeric_keys
> xkb_symbols "nodeadkeys" {
>-    include "macintosh_vndr/fr_CH" // for consistent naming
>+    include "macintosh_vndr/ch(fr)" // for consistent naming
> };
>diff --git a/symbols/macintosh_vndr/de b/symbols/macintosh_vndr/de
>index a44f8bf..dadcf22 100644
>--- a/symbols/macintosh_vndr/de
>+++ b/symbols/macintosh_vndr/de
>@@ -9,6 +9,8 @@ xkb_symbols "basic" {
>     // Describes the differences between a very simple US/ASCII
>     // keyboard and a very simple German keybaord
> 
>+    include "latin"
>+
>     // Alphanumeric section
>     name[Group1]= "German";
>     key <TLDE> {	[ dead_circumflex,	degree,    notsign 			]	};
>@@ -53,12 +55,8 @@ xkb_symbols "basic" {
>     key <BKSL> {	[ numbersign,	apostrophe,  dead_grave			]	};
> 
>     include "keypad(comma)"
>+    include "level3(ralt_switch)"
> 
>-    // begin modifier mappings
>-//    modifier_map Shift  { Shift_L };
>-//    modifier_map Lock   { Caps_Lock };
>-//    modifier_map Control{ Control_L };
>-//    modifier_map Mod3	{ Mode_switch };
> };
> 
> partial alphanumeric_keys 
>diff --git a/symbols/macintosh_vndr/dk b/symbols/macintosh_vndr/dk
>index 364453f..1110385 100644
>--- a/symbols/macintosh_vndr/dk
>+++ b/symbols/macintosh_vndr/dk
>@@ -7,6 +7,8 @@ xkb_symbols "basic" {
>     // keyboard and a Danish keyboard with dead key support
>     // and all of ISO-8859-1 characters available.
> 
>+    include "latin"
>+
>     name[Group1]= "Danish";
> 
>     key <TLDE> {	[  onehalf,         section,    threequarters,       paragraph	]};
>@@ -41,9 +43,9 @@ xkb_symbols "basic" {
>     key <AE12> {   	[ dead_acute,      dead_grave,              bar,       brokenbar	]};
>     key <AD12> {   	[ dead_diaeresis, dead_circumflex,       dead_tilde,      dead_caron      ]};
> 
>-
>     // End alphanumeric section
> 
>+    include "level3(ralt_switch)"
> };
> 
> 
>diff --git a/symbols/macintosh_vndr/es b/symbols/macintosh_vndr/es
>index ce789cd..ca04917 100644
>--- a/symbols/macintosh_vndr/es
>+++ b/symbols/macintosh_vndr/es
>@@ -5,6 +5,8 @@ xkb_symbols "basic" {
>     // Describes the differences between a very simple mac_US
>     // keyboard and a very simple Spanish keybaord
> 
>+    include "latin"
>+
>     name[Group1]= "Spanish";
> 
>     key <TLDE> {	[     bracketleft,    bracketright,        braceleft,      braceright	]	};
>@@ -33,4 +35,5 @@ xkb_symbols "basic" {
> 
>     // End alphanumeric section
> 
>+    include "level3(ralt_switch)"
> };
>diff --git a/symbols/macintosh_vndr/fr b/symbols/macintosh_vndr/fr
>index 88c9089..7526924 100644
>--- a/symbols/macintosh_vndr/fr
>+++ b/symbols/macintosh_vndr/fr
>@@ -41,9 +41,7 @@ xkb_symbols "extended" {
>     key <AE10> {	[      agrave,    0,       oslash,    VoidSymbol	]	}; // MISSING: Oslash
>     key <AE11> {	[  parenright, degree, braceright,  bracketright	]	};
>     key <AE12> {	[       minus, underscore, emdash,        endash	]	}; // CHECK dashes
>-    key <BKSP> {	[   BackSpace,    VoidSymbol,       Delete,	  VoidSymbol	]	};
> 
>-    key	 <TAB> {	[	  Tab,	ISO_Left_Tab	]	};
>     key <AD01> {	[           a,  A,           ae,          AE	]	};
>     key <AD02> {	[           z,  Z,  Acircumflex,       Aring		]	};
>     key <AD03> {	[           e,  E,  ecircumflex, Ecircumflex	]	};
>@@ -57,7 +55,6 @@ xkb_symbols "extended" {
>     key <AD11> {	[dead_circumflex,dead_diaeresis, ocircumflex, Ocircumflex	]	};
>     key <AD12> {	[      dollar, asterisk,   EuroSign, yen		]	}; // eherlent : EuroSign in Latin9
> 
>-    key <CAPS> {	[	Caps_Lock		]	};
>     key <AC01> {	[         q, Q, acircumflex,         Agrave		]	};
>     key <AC02> {	[         s, S,      Ograve,     VoidSymbol	]	};
>     key <AC03> {	[         d, D,  VoidSymbol,     VoidSymbol	]	};
>@@ -70,7 +67,6 @@ xkb_symbols "extended" {
>     key <AC10> {	[         m, M,          mu,         Oacute	]	};
>     key <AC11> {	[    ugrave,percent, Ugrave,    ucircumflex	]	}; // MISSING: per-mille
>     key <BKSL> {	[ dead_grave, sterling,  at,     numbersign	]	};
>-    key <RTRN> {	[    Return			]	};
> 
>     key <LSGT> {	[      less, greater, VoidSymbol, VoidSymbol	]	};
>     key <AB01> {	[         w, W, VoidSymbol,   VoidSymbol	]	};	// MISSING: half-guillemot (single angle bracket)
>@@ -87,49 +83,6 @@ xkb_symbols "extended" {
>     key <SPCE> {	[     space,  space, nobreakspace,   nobreakspace	]	};
>     // End alphanumeric section
> 
>-    // Begin modifier mappings
>-    key <LWIN> {	[  Alt_L, 	Meta_L	]	};
>-    key <LFSH> {	[  Shift_L		]	};
>-    key <LCTL> {	[  Control_L		]	};
>-    key <LALT> {	[  Mode_switch		]	};
>-    key <RMTA> {	[  Meta_R		]	};
>-    key <RTSH> {	[  Shift_R		]	};
>-    key <RCTL> {	[  Control_R		]	};
>-    key <RALT> {	[  script_switch	]	};
>-    // End modifier mappings
>-
>-    // 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 <FK13> {	[  F13, Print		]	};
>-    key <FK14> {	[  F14, Scroll_Lock	]	};
>-    key <FK15> {	[  F15, Pause		]	};
>-    // End "Function" section
>-
>-    // Begin "Editing" section
>-    key	 <INS> {	[  Insert		]	};
>-    key <HOME> {	[  Home			]	};
>-    key <PGUP> {	[  Prior		]	};
>-    key <DELE> {	[  Delete		]	};
>-    key	 <END> {	[  End			]	};
>-    key <PGDN> {	[  Next			]	};
>-
>-    key	  <UP> {	[  Up			]	};
>-    key <LEFT> {	[  Left			]	};
>-    key <DOWN> {	[  Down			]	};
>-    key <RGHT> {	[  Right		]	};
>-    // End "Editing" section
>-
>     // Begin "Keypad" section
>     key <KPCL> {	[  Clear		]	};
>     key <KPEQ> {	[  KP_Equal		]	};
>@@ -155,15 +108,7 @@ xkb_symbols "extended" {
>     key <KPDL> {	[  comma,KP_Decimal	]	};
>  // End "Keypad" section
> 
>-
>-    // begin modifier mappings
>-    modifier_map Shift	{ Shift_L,   Shift_R   };
>-    modifier_map Lock	{ Caps_Lock	       };
>-    modifier_map Control{ Control_L, Control_R };
>-    modifier_map Mod1	{ Meta_L, Meta_R       };
>-    modifier_map Mod2   { Alt_L, Alt_R         };
>-    modifier_map Mod3	{ Mode_switch	       };
>-    // end modifier mappings
>+    include "level3(ralt_switch)"
> };
> 
> 
>diff --git a/symbols/macintosh_vndr/gb b/symbols/macintosh_vndr/gb
>index faa12d2..5a9b40a 100644
>--- a/symbols/macintosh_vndr/gb
>+++ b/symbols/macintosh_vndr/gb
>@@ -6,13 +6,15 @@ xkb_symbols "basic" {
>     // Describes the differences between a very simple en_US
>     // keyboard and a very simple U.K. keyboard layout
> 
>+    include "latin"
> 
>     name[Group1]= "Great Britain";
> 
>-    key <AE03> {	[	3,	sterling,	numbersign ]	};
>+    key <AE03> {	[               3,        sterling,       numbersign	]	};
> 
>     // End alphanumeric section
>     
>+    include "level3(ralt_switch)"
> };
> 
> 
>diff --git a/symbols/macintosh_vndr/is b/symbols/macintosh_vndr/is
>index e4e8548..0f8636f 100644
>--- a/symbols/macintosh_vndr/is
>+++ b/symbols/macintosh_vndr/is
>@@ -118,23 +118,7 @@ xkb_symbols "basic" {
> 	key <AB09> {	[	period,		colon, 	greaterthanequal,guillemotright	]	};
> 	key <AB10> {	[	thorn,		Thorn, 	U2019,		U201d		]	};
> 
>-	// Special keys and modifiers
>-	key <LWIN> {	[	Alt_L,		Meta_L		]	};
>-	key <LFSH> {	[	Shift_L				]	};
>-	key <LCTL> {	[	Control_L			]	};
>-	key <LALT> {	[	Mode_switch			]	};
>-	key <RMTA> {	[	Meta_R				]	};
>-	key <RTSH> {	[	Shift_R				]	};
>-	key <RCTL> {	[	Control_R			]	};
>-	key <RALT> {	[	script_switch			]	};
>-
>-	// And now to map those modifiers ...
>-	modifier_map Shift	{ Shift_L,	Shift_R };
>-	modifier_map Lock	{ Caps_Lock		};
>-	modifier_map Control	{ Control_L, Control_R	};
>-	modifier_map Mod1	{ Meta_L, Meta_R	};
>-	//modifier_map Mod2	{ Alt_L, Alt_R		};
>-	modifier_map Mod3	{ Mode_switch		};
>+    include "level3(ralt_switch)"
> };
> 
> partial alphanumeric_keys
>diff --git a/symbols/macintosh_vndr/it b/symbols/macintosh_vndr/it
>index d7e6ba2..b369055 100644
>--- a/symbols/macintosh_vndr/it
>+++ b/symbols/macintosh_vndr/it
>@@ -61,5 +61,6 @@ xkb_symbols "extended" {
>     key <KPDL> {	[ KP_Decimal , KP_Delete	]	};
>     // End "Keypad" section
> 
>+    include "level3(ralt_switch)"
> };
> 
>diff --git a/symbols/macintosh_vndr/nl b/symbols/macintosh_vndr/nl
>index 888a65c..e6fbd07 100644
>--- a/symbols/macintosh_vndr/nl
>+++ b/symbols/macintosh_vndr/nl
>@@ -5,8 +5,12 @@ xkb_symbols "basic" {
>     // Describes the differences between a very simple mac_US
>     // keyboard and a very simple netherland keybaord
> 
>+    include "latin"
>+
>     name[Group1]= "Netherland";
> 
>+    include "level3(ralt_switch)"
>+
> // do just nothing
> 
> };
>diff --git a/symbols/macintosh_vndr/no b/symbols/macintosh_vndr/no
>index 85e5f69..1469a4c 100644
>--- a/symbols/macintosh_vndr/no
>+++ b/symbols/macintosh_vndr/no
>@@ -6,6 +6,8 @@ xkb_symbols "basic" {
>     // Describes the differences between a very simple en_US
>     // keyboard and a very simple Norwegian keybaord
> 
>+    include "latin"
>+
>     name[Group1]= "Norwegian";
> 
>     key <TLDE> {	[             bar,         section      ]	};
>@@ -32,6 +34,7 @@ xkb_symbols "basic" {
> 
>     // End alphanumeric section
> 
>+    include "level3(ralt_switch)"
> };
> 
> 
>diff --git a/symbols/macintosh_vndr/pt b/symbols/macintosh_vndr/pt
>index 6c4553a..5071a73 100644
>--- a/symbols/macintosh_vndr/pt
>+++ b/symbols/macintosh_vndr/pt
>@@ -8,6 +8,8 @@ xkb_symbols "basic" {
>     // Describes the differences between a very simple en_US
>     // keyboard and a very simple Portuguese keybaord
> 
>+    include "latin"
>+
>     name[Group1]= "Portuguese";
> 
>     key <LSGT> {	[	     less,	   greater, 	      bar,       brokenbar	]	};
>@@ -31,6 +33,7 @@ xkb_symbols "basic" {
>     key <AD12> {	[      dead_acute,      dead_grave 	]	};
>     // End alphanumeric section
> 
>+    include "level3(ralt_switch)"
> };
> 
> partial alphanumeric_keys 
>diff --git a/symbols/macintosh_vndr/se b/symbols/macintosh_vndr/se
>index 37d1fc8..de05337 100644
>--- a/symbols/macintosh_vndr/se
>+++ b/symbols/macintosh_vndr/se
>@@ -6,6 +6,8 @@ xkb_symbols "basic" {
>     // Describes the differences between a very simple en_US
>     // keyboard and a very simple Swedish(Sweden) keybaord
> 
>+    include "latin"
>+
>     name[Group1]= "Swedish";
> 
>     key <TLDE> {	[         section,         degree	]	};
>@@ -32,6 +34,7 @@ xkb_symbols "basic" {
>     key <LSGT> {        [            less,         greater,              bar,       brokenbar      ]       };
> 
>     include "keypad(comma)"
>+    include "level3(ralt_switch)"
> };
> 
> 
>diff --git a/symbols/macintosh_vndr/us b/symbols/macintosh_vndr/us
>index a6f972a..f896ed7 100644
>--- a/symbols/macintosh_vndr/us
>+++ b/symbols/macintosh_vndr/us
>@@ -67,38 +67,6 @@ xkb_symbols "extended" {
>     key <SPCE> {	[  space			]	};
>     // 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 <FK13> {	[  Print	]	};
>-    key <FK14> {	[  Scroll_Lock	]	};
>-    key <FK15> {	[  Pause	]	};
>-    // End "Function" section
>-
>-    // Begin "Editing" section
>-    key  <INS> {	[  Insert	]	};
>-    key <HOME> {	[  Home		]	};
>-    key <PGUP> {	[  Prior	]	};
>-    key <DELE> {	[  Delete	]	};
>-    key  <END> {	[  End		]	};
>-    key <PGDN> {	[  Next		]	};
>-
>-    key   <UP> {	[  Up		]	};
>-    key <LEFT> {	[  Left		]	};
>-    key <DOWN> {	[  Down		]	};
>-    key <RGHT> {	[  Right	]	};
>-    // End "Editing" section
>-
>     // Begin "Keypad" section
>     key <NMLK> {	[  Num_Lock,	Pointer_EnableKeys	]	};
>     key <KPEQ> {	[  equal				]	};
>@@ -124,27 +92,6 @@ xkb_symbols "extended" {
>     key <KPDL> { 	[  KP_Decimal,	KP_Delete		]	};
>     // End "Keypad" section
> 
>-    // Begin "Modifier" section
>-    key <LFSH> {	[  Shift_L	]	};
>-    key <RTSH> {	[  Shift_R	]	};
>-    key <LCTL> {	[  Control_L	]	};
>-    key <RCTL> {	[  Control_R	]	};
>-    key <LALT> {	[  Alt_L, Meta_L ]	};
>-    key <RALT> {	[  Alt_R, Meta_R ]	};
>-    key <LWIN> {	[  Super_L	]	};
>-    key <RWIN> {	[  Super_R	]	};
>-    // End "Modifier" section
>-
>-    // begin modifier mappings
>-    modifier_map Shift  { Shift_L , Shift_R };
>-    modifier_map Lock   { Caps_Lock };
>-    modifier_map Control{ Control_L, Control_R };
>-    modifier_map Mod1   { Alt_L, Alt_R, Meta_L, Meta_R };
>-    modifier_map Mod2   { Num_Lock };
>-    modifier_map Mod4   { Super_L, Super_R };
>-    modifier_map Mod5   { Scroll_Lock };
>-    // end modifier mappings
>-
>     include "compose(rwin)"
>     include "macintosh_vndr/apple(extended)"
> 
>@@ -202,3 +149,77 @@ xkb_symbols "extended" {
> //    modifier_map Mod3   { Mode_switch };
> 
> };
>+
>+hidden
>+xkb_symbols "oldmac" {
>+
>+    include "macintosh_vndr/us(extended)"
>+
>+    // 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 <FK13> {	[  Print	]	};
>+    key <FK14> {	[  Scroll_Lock	]	};
>+    key <FK15> {	[  Pause	]	};
>+    // End "Function" section
>+
>+    // Begin "Editing" section
>+    key  <INS> {	[  Insert	]	};
>+    key <HOME> {	[  Home		]	};
>+    key <PGUP> {	[  Prior	]	};
>+    key <DELE> {	[  Delete	]	};
>+    key  <END> {	[  End		]	};
>+    key <PGDN> {	[  Next		]	};
>+
>+    key   <UP> {	[  Up		]	};
>+    key <LEFT> {	[  Left		]	};
>+    key <DOWN> {	[  Down		]	};
>+    key <RGHT> {	[  Right	]	};
>+    // End "Editing" section
>+
>+    // Begin "Modifier" section
>+    key <LFSH> {	[  Shift_L	]	};
>+    key <RTSH> {	[  Shift_R	]	};
>+    key <LCTL> {	[  Control_L	]	};
>+    key <RCTL> {	[  Control_R	]	};
>+    key <LALT> {	[  Alt_L, Meta_L ]	};
>+    key <RALT> {	[  Alt_R, Meta_R ]	};
>+    key <LWIN> {	[  Super_L	]	};
>+    key <RWIN> {	[  Super_R	]	};
>+    // End "Modifier" section
>+
>+    // begin modifier mappings
>+    modifier_map Shift  { Shift_L, Shift_R };
>+    modifier_map Lock   { Caps_Lock, ISO_Lock };
>+    modifier_map Control{ Control_L, Control_R };
>+    modifier_map Mod2   { Num_Lock };
>+
>+    //  Fake keys for virtual<->real modifiers mapping 
>+    key <LVL3> {	[ ISO_Level3_Shift	]	};
>+    key <MDSW> {	[ Mode_switch 		]	};
>+    modifier_map Mod5   { <LVL3>, <MDSW> };
>+
>+    key <ALT>  {	[ NoSymbol, Alt_L	]	};
>+    modifier_map Mod1   { <ALT>, <LALT> };
>+
>+    key <META> {	[ NoSymbol, Meta_L	]	};
>+    modifier_map Mod1   { <META> };
>+
>+    key <SUPR> {	[ NoSymbol, Super_L	]	};
>+    modifier_map Mod4   { <SUPR> };
>+
>+    key <HYPR> {	[ NoSymbol, Hyper_L	]	};
>+    modifier_map Mod4   { <HYPR> };
>+    // end modifier mappings
>+
>+};

Actions: View | Splinter Review

Attachments on bug 8280: 6984 | 6985 | 6986 | 6996 | 6997

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.