X Strike Force X.Org X11 SVN commit: r3181 - in trunk/data/xkb-data/debian: . patches
Author: barbier
Date: 2006-09-04 16:52:23 -0400 (Mon, 04 Sep 2006)
New Revision: 3181
Added:
trunk/data/xkb-data/debian/patches/fix_symbols_key_type.diff
trunk/data/xkb-data/debian/patches/generic_symbols_pc.diff
trunk/data/xkb-data/debian/patches/rearrange_options.diff
Modified:
trunk/data/xkb-data/debian/changelog
trunk/data/xkb-data/debian/patches/mac_level3.diff
trunk/data/xkb-data/debian/patches/resync_rules_base.diff
trunk/data/xkb-data/debian/patches/series
Log:
* debian/patches/rearrange_options.diff: New patch to modify options
order in rules/base so that altwin:meta_win can be overriden by
other options. Closes: #385355 Thanks Ben Mueller
* debian/patches/fix_symbols_key_type.diff: Several layouts did
define global key types, so keys for other groups were broken.
Closes: #373692, #385970 Thanks Robert Marlow and Jan Willem Stumpel
Modified: trunk/data/xkb-data/debian/changelog
===================================================================
--- trunk/data/xkb-data/debian/changelog 2006-09-04 20:48:43 UTC (rev 3180)
+++ trunk/data/xkb-data/debian/changelog 2006-09-04 20:52:23 UTC (rev 3181)
@@ -1,3 +1,15 @@
+xkeyboard-config (0.8-11) unstable; urgency=low
+
+ * debian/patches/rearrange_options.diff: New patch to modify options
+ order in rules/base so that altwin:meta_win can be overriden by
+ other options. Closes: #385355 Thanks Ben Mueller
+
+ * debian/patches/fix_symbols_key_type.diff: Several layouts did
+ define global key types, so keys for other groups were broken.
+ Closes: #373692, #385970 Thanks Robert Marlow and Jan Willem Stumpel
+
+ -- Denis Barbier <barbier@debian.org> Mon, 4 Sep 2006 21:50:00 +0200
+
xkeyboard-config (0.8-10) unstable; urgency=low
* Really fix Mac nodeadkeys variants, rules/base was not properly
Added: trunk/data/xkb-data/debian/patches/fix_symbols_key_type.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/fix_symbols_key_type.diff 2006-09-04 20:48:43 UTC (rev 3180)
+++ trunk/data/xkb-data/debian/patches/fix_symbols_key_type.diff 2006-09-04 20:52:23 UTC (rev 3181)
@@ -0,0 +1,174 @@
+Several layouts did define global key types, so keys for other groups were broken.
+Closes: #373692, #385970 Thanks Robert Marlow and Jan Willem Stumpel
+
+Submitted upstream: https://bugs.freedesktop.org/show_bug.cgi?id=8121
+
+Index: xkb-data/symbols/cd
+===================================================================
+--- xkb-data.orig/symbols/cd
++++ xkb-data/symbols/cd
+@@ -8,7 +8,7 @@
+
+ name[Group1]= "Congo, Democratic Republic of the";
+
+- key.type = "FOUR_LEVEL";
++ key.type[Group1] = "FOUR_LEVEL";
+
+ // Alphanumeric section
+ // TILDE, COMBINING TILDE
+Index: xkb-data/symbols/gr
+===================================================================
+--- xkb-data.orig/symbols/gr
++++ xkb-data/symbols/gr
+@@ -88,7 +88,7 @@
+
+ name[Group1] = "Greece - Extended";
+
+- key.type = "THREE_LEVEL";
++ key.type[Group1] = "THREE_LEVEL";
+
+ key <AE05> { [ 5, percent, EuroSign ] };
+
+@@ -108,7 +108,7 @@
+
+ name[Group1] = "Greece - Polytonic";
+
+- key.type = "THREE_LEVEL";
++ key.type[Group1] = "THREE_LEVEL";
+
+ key <AD11> { [ dead_tilde, dead_diaeresis, dead_macron ] };
+ key <AD12> { [ dead_iota, VoidSymbol, dead_breve ] };
+Index: xkb-data/symbols/il
+===================================================================
+--- xkb-data.orig/symbols/il
++++ xkb-data/symbols/il
+@@ -48,7 +48,7 @@
+ key <AB08> { [ hebrew_taw, greater ] };
+ key <AB09> { [ hebrew_finalzade, less ] };
+
+- key.type = "THREE_LEVEL";
++ key.type[Group1] = "THREE_LEVEL";
+
+ key <TLDE> { [ semicolon, asciitilde,0x10005b0 ]}; // Sheva
+ key <AB10> { [ period, question, 0x10005c3 ]}; // Sof Pasuq
+Index: xkb-data/symbols/jp
+===================================================================
+--- xkb-data.orig/symbols/jp
++++ xkb-data/symbols/jp
+@@ -10,7 +10,7 @@
+
+ // Alphanumeric section
+ key <HZTG> {
+- type="PC_SYSRQ",
++ type[Group1]="PC_SYSRQ",
+ symbols[Group1]= [ Zenkaku_Hankaku, Kanji ]
+ };
+ key <AE01> { [ kana_NU ] };
+@@ -69,18 +69,18 @@
+ key <NFER> { [ Muhenkan ] };
+
+ key <XFER> {
+- type="PC_SYSRQ",
++ type[Group1]="PC_SYSRQ",
+ symbols[Group1]= [ Henkan, Mode_switch ]
+ };
+ key <HKTG> {
+- type="PC_SYSRQ",
++ type[Group1]="PC_SYSRQ",
+ symbols[Group1]= [ Hiragana_Katakana, Romaji ]
+ };
+
+ // End alphanumeric section
+
+ key <PRSC> {
+- type= "PC_SYSRQ",
++ type[Group1]= "PC_SYSRQ",
+ symbols[Group1]= [ Print, Execute ]
+ };
+ };
+@@ -92,7 +92,7 @@
+ include "us"
+ // Alphanumeric section
+ key <HZTG> {
+- type="PC_SYSRQ",
++ type[Group1]="PC_SYSRQ",
+ symbols[Group1]= [ Zenkaku_Hankaku, Kanji ]
+ };
+
+@@ -121,16 +121,16 @@
+ key <NFER> { [ Muhenkan ] };
+
+ key <XFER> {
+- type="PC_SYSRQ",
++ type[Group1]="PC_SYSRQ",
+ symbols[Group1]= [ Henkan, Mode_switch ]
+ };
+ key <HKTG> {
+- type="PC_SYSRQ",
++ type[Group1]="PC_SYSRQ",
+ symbols[Group1]= [ Hiragana_Katakana, Romaji ]
+ };
+
+ key <PRSC> {
+- type= "PC_SYSRQ",
++ type[Group1]= "PC_SYSRQ",
+ symbols[Group1]= [ Print, Execute ]
+ };
+ };
+Index: xkb-data/symbols/la
+===================================================================
+--- xkb-data.orig/symbols/la
++++ xkb-data/symbols/la
+@@ -67,11 +67,11 @@
+ key <AB10> { [ 0x1000e9d, parenright ]};
+
+ override key <LFSH> {
+- type="PC_SYSRQ",
++ type[Group1]="PC_SYSRQ",
+ [ Shift_L, ISO_First_Group ]
+ };
+ override key <RTSH> {
+- type="PC_SYSRQ",
++ type[Group1]="PC_SYSRQ",
+ [ Shift_R, ISO_Last_Group ]
+ };
+ };
+Index: xkb-data/symbols/lk
+===================================================================
+--- xkb-data.orig/symbols/lk
++++ xkb-data/symbols/lk
+@@ -36,7 +36,7 @@
+ include "us"
+ // it is default - no details in the name
+ name[Group1] = "Sri Lanka";
+- key.type = "FOUR_LEVEL";
++ key.type[Group1] = "FOUR_LEVEL";
+
+ // q - p
+ key <AD01> { [ 0x01000d8d, 0x01000d8e, 0x01000dd8, 0x01000df2 ] };
+Index: xkb-data/symbols/ru
+===================================================================
+--- xkb-data.orig/symbols/ru
++++ xkb-data/symbols/ru
+@@ -165,7 +165,7 @@
+ include "ru(winkeys)"
+ name[Group1]= "Russia - Tatar";
+
+- key.type[group2]="FOUR_LEVEL";
++ key.type[group1]="FOUR_LEVEL";
+
+ key <TLDE> { [ 0x010004bb, 0x010004ba,
+ Cyrillic_io, Cyrillic_IO ] };
+Index: xkb-data/symbols/ca
+===================================================================
+--- xkb-data.orig/symbols/ca
++++ xkb-data/symbols/ca
+@@ -445,7 +445,7 @@
+ key <AB10> { [ eacute, Eacute, dead_acute, NoSymbol,
+ NoSymbol, dead_abovedot ] };
+
+- key <SPCE> { type= "FOUR_LEVEL", [ space, space, nobreakspace, NoSymbol ] };
++ key <SPCE> { type[Group1]= "FOUR_LEVEL", [ space, space, nobreakspace, NoSymbol ] };
+
+ modifier_map Control{ Control_L };
+
Added: trunk/data/xkb-data/debian/patches/generic_symbols_pc.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/generic_symbols_pc.diff 2006-09-04 20:48:43 UTC (rev 3180)
+++ trunk/data/xkb-data/debian/patches/generic_symbols_pc.diff 2006-09-04 20:52:23 UTC (rev 3181)
@@ -0,0 +1,342 @@
+Index: xkb-data/symbols/pc
+===================================================================
+--- xkb-data.orig/symbols/pc
++++ xkb-data/symbols/pc
+@@ -8,20 +8,10 @@
+
+ key <ESC> { [ Escape ] };
+
+- // Alphanumeric section
+- key <TLDE> { [ grave, asciitilde ] };
+- key <AE01> { [ 1, exclam ] };
+- key <AE02> { [ 2, at ] };
+- key <AE03> { [ 3, numbersign ] };
+- key <AE04> { [ 4, dollar ] };
+- key <AE05> { [ 5, percent ] };
+- key <AE06> { [ 6, asciicircum ] };
+- key <AE07> { [ 7, ampersand ] };
+- key <AE08> { [ 8, asterisk ] };
+- key <AE09> { [ 9, parenleft ] };
+- key <AE10> { [ 0, parenright ] };
+- key <AE11> { [ minus, underscore ] };
+- key <AE12> { [ equal, plus ] };
++ include "pc(alpha)"
++ include "pc(function)"
++ include "pc(editing)"
++ include "pc(keypad)"
+
+ key <BKSP> {
+ type="CTRL+ALT",
+@@ -34,10 +24,8 @@
+ key <CAPS> { [ Caps_Lock ] };
+
+ key <LFSH> { [ Shift_L ] };
+- key <BKSL> { [ backslash, bar ] };
+
+ key <LCTL> { [ Control_L ] };
+- key <SPCE> { [ space ] };
+
+ key <RTSH> { [ Shift_R ] };
+ key <LALT> { [ Alt_L ] };
+@@ -46,7 +34,89 @@
+
+ // End alphanumeric section
+
+- // Begin "Function" 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> };
++};
++
++// definition for the PC-AT type 101 key keyboard
++xkb_symbols "pc101" {
++ include "pc(basic)"
++ key <LALT> { [ Alt_L, Meta_L ] };
++ key <RALT> { [ Alt_R, Meta_R ] };
++
++};
++
++// definition for the extra key on 102-key keyboards
++xkb_symbols "pc102" {
++ include "pc(pc101)"
++};
++
++// definition for the extra keys on 104-key "Windows95" keyboards
++default
++xkb_symbols "pc104" {
++ include "pc(basic)"
++ key <LALT> { [ Alt_L, Meta_L ] };
++ key <RALT> { [ Alt_R, Meta_R ] };
++ key <LWIN> { [ Super_L ] };
++ key <RWIN> { [ Super_R ] };
++ key <MENU> { [ Menu ] };
++
++};
++
++// defintion which includes both the Windows95 keyboards _and_
++// the extra key on most European keyboards.
++xkb_symbols "pc105" {
++ include "pc(pc104)"
++};
++
++partial hidden alphanumeric_keys
++xkb_symbols "alpha" {
++
++ // Alphanumeric section
++ key <TLDE> { [ grave, asciitilde ] };
++ key <AE01> { [ 1, exclam ] };
++ key <AE02> { [ 2, at ] };
++ key <AE03> { [ 3, numbersign ] };
++ key <AE04> { [ 4, dollar ] };
++ key <AE05> { [ 5, percent ] };
++ key <AE06> { [ 6, asciicircum ] };
++ key <AE07> { [ 7, ampersand ] };
++ key <AE08> { [ 8, asterisk ] };
++ key <AE09> { [ 9, parenleft ] };
++ key <AE10> { [ 0, parenright ] };
++ key <AE11> { [ minus, underscore ] };
++ key <AE12> { [ equal, plus ] };
++
++ // the extra key on most European keyboards
++ key <LSGT> { [ less, greater, bar, brokenbar ] };
++
++ // these keys are common to all layouts
++ key <BKSL> { [ backslash, bar ] };
++ key <SPCE> { [ space ] };
++};
++
++partial hidden alphanumeric_keys
++xkb_symbols "function" {
+ key <FK01> {
+ type="CTRL+ALT",
+ symbols[Group1]= [ F1, XF86_Switch_VT_1 ]
+@@ -95,31 +165,10 @@
+ type="CTRL+ALT",
+ symbols[Group1]= [ F12, XF86_Switch_VT_12 ]
+ };
+- // End "Function" section
+-
+- // Begin "Editing" section
+- key <PRSC> {
+- type= "PC_SYSRQ",
+- symbols[Group1]= [ Print, Sys_Req ]
+- };
+- key <SCLK> { [ Scroll_Lock ] };
+- key <PAUS> {
+- type= "PC_BREAK",
+- symbols[Group1]= [ Pause, Break ]
+- };
+- 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"
++partial hidden alphanumeric_keys
++xkb_symbols "keypad" {
+ key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
+
+ // Ungrab cancels server/keyboard/pointer grabs
+@@ -162,85 +211,37 @@
+
+ key <KP0> { [ KP_Insert, KP_0 ] };
+ key <KPDL> { [ KP_Delete, KP_Decimal ] };
+- // End "Keypad" 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> };
+-};
+-
+-// definition for the PC-AT type 101 key keyboard
+-xkb_symbols "pc101" {
+- include "pc(basic)"
+- key <LALT> { [ Alt_L, Meta_L ] };
+- key <RALT> { [ Alt_R, Meta_R ] };
+-
+ };
+
+-// definition for the extra key on 102-key keyboards
+-xkb_symbols "pc102" {
+- include "pc(pc101)"
+- key <LSGT> { [ less, greater, bar, brokenbar ] };
+-};
+-
+-// definition for the extra keys on 104-key "Windows95" keyboards
+-default
+-xkb_symbols "pc104" {
+- include "pc(basic)"
+- key <LALT> { [ Alt_L, Meta_L ] };
+- key <RALT> { [ Alt_R, Meta_R ] };
+- key <LWIN> { [ Super_L ] };
+- key <RWIN> { [ Super_R ] };
+- key <MENU> { [ Menu ] };
+-
+-};
++partial hidden alphanumeric_keys
++xkb_symbols "editing" {
++ key <PRSC> {
++ type= "PC_SYSRQ",
++ symbols[Group1]= [ Print, Sys_Req ]
++ };
++ key <SCLK> { [ Scroll_Lock ] };
++ key <PAUS> {
++ type= "PC_BREAK",
++ symbols[Group1]= [ Pause, Break ]
++ };
++ key <INS> { [ Insert ] };
++ key <HOME> { [ Home ] };
++ key <PGUP> { [ Prior ] };
++ key <DELE> { [ Delete ] };
++ key <END> { [ End ] };
++ key <PGDN> { [ Next ] };
+
+-// defintion which includes both the Windows95 keyboards _and_
+-// the extra key on most European keyboards.
+-xkb_symbols "pc105" {
+- include "pc(pc104)"
+- key <LSGT> { [ less, greater, bar, brokenbar ] };
++ key <UP> { [ Up ] };
++ key <LEFT> { [ Left ] };
++ key <DOWN> { [ Down ] };
++ key <RGHT> { [ Right ] };
+ };
+
+ // common keys which can be overwritten in some layouts
++partial hidden alphanumeric_keys
+ xkb_symbols "common" {
+
+- // Alphanumeric section
+- key <TLDE> { [ grave, asciitilde ] };
+- key <AE01> { [ 1, exclam ] };
+- key <AE02> { [ 2, at ] };
+- key <AE03> { [ 3, numbersign ] };
+- key <AE04> { [ 4, dollar ] };
+- key <AE05> { [ 5, percent ] };
+- key <AE06> { [ 6, asciicircum ] };
+- key <AE07> { [ 7, ampersand ] };
+- key <AE08> { [ 8, asterisk ] };
+- key <AE09> { [ 9, parenleft ] };
+- key <AE10> { [ 0, parenright ] };
+- key <AE11> { [ minus, underscore ] };
+- key <AE12> { [ equal, plus ] };
+-
+- key <BKSL> { [ backslash, bar ] };
+- key <SPCE> { [ space ] };
++ include "pc(alpha)"
+
+ // "Keypad" section
+ key <KPDL> { [ KP_Delete, KP_Decimal ] };
+@@ -249,7 +250,31 @@
+ key <LWIN> { [ Super_L ] };
+ key <RWIN> { [ Super_R ] };
+ key <MENU> { [ Menu ] };
++};
+
+- // the extra key on most European keyboards
+- key <LSGT> { [ less, greater, bar, brokenbar ] };
++partial hidden alphanumeric_keys
++xkb_symbols "mac_keypad" {
++ key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
++ key <KPEQ> { [ equal ] };
++ key <KPDV> { [ KP_Divide ] };
++ key <KPMU> { [ KP_Multiply ] };
++
++ key <KP7> { [ KP_7, KP_Home ] };
++ key <KP8> { [ KP_8, KP_Up ] };
++ key <KP9> { [ KP_9, KP_Prior ] };
++ key <KPSU> { [ KP_Subtract ] };
++
++ key <KP4> { [ KP_4, KP_Left ] };
++ key <KP5> { [ KP_5, KP_Begin ] };
++ key <KP6> { [ KP_6, KP_Right ] };
++ key <KPAD> { [ KP_Add ] };
++
++ key <KP1> { [ KP_1, KP_End ] };
++ key <KP2> { [ KP_2, KP_Down ] };
++ key <KP3> { [ KP_3, KP_Next ] };
++ key <KPEN> { [ KP_Enter ] };
++
++ key <KP0> { [ KP_0, KP_Insert ] };
++ key <KPDL> { [ KP_Decimal, KP_Delete ] };
+ };
++
+Index: xkb-data/symbols/us
+===================================================================
+--- xkb-data.orig/symbols/us
++++ xkb-data/symbols/us
+@@ -13,20 +13,6 @@
+ include "pc(common)"
+
+ // Alphanumeric section
+- key <TLDE> { [ grave, asciitilde ] };
+- key <AE01> { [ 1, exclam ] };
+- key <AE02> { [ 2, at ] };
+- key <AE03> { [ 3, numbersign ] };
+- key <AE04> { [ 4, dollar ] };
+- key <AE05> { [ 5, percent ] };
+- key <AE06> { [ 6, asciicircum ] };
+- key <AE07> { [ 7, ampersand ] };
+- key <AE08> { [ 8, asterisk ] };
+- key <AE09> { [ 9, parenleft ] };
+- key <AE10> { [ 0, parenright ] };
+- key <AE11> { [ minus, underscore ] };
+- key <AE12> { [ equal, plus ] };
+-
+ key <AD01> { [ q, Q ] };
+ key <AD02> { [ w, W ] };
+ key <AD03> { [ e, E ] };
+@@ -63,7 +49,6 @@
+ key <AB09> { [ period, greater ] };
+ key <AB10> { [ slash, question ] };
+
+- key <BKSL> { [ backslash, bar ] };
+ // End alphanumeric section
+ };
+
Modified: trunk/data/xkb-data/debian/patches/mac_level3.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/mac_level3.diff 2006-09-04 20:48:43 UTC (rev 3180)
+++ trunk/data/xkb-data/debian/patches/mac_level3.diff 2006-09-04 20:52:23 UTC (rev 3181)
@@ -1367,7 +1367,15 @@
===================================================================
--- xkb-data.orig/symbols/macintosh_vndr/apple
+++ xkb-data/symbols/macintosh_vndr/apple
-@@ -49,12 +49,6 @@
+@@ -42,19 +42,13 @@
+ // 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" {
@@ -1381,3 +1389,29 @@
- replace key <KPEN> { [ Mode_switch ] };
- modifier_map Mod2 { Mode_switch };
};
+Index: xkb-data/symbols/inet
+===================================================================
+--- xkb-data.orig/symbols/inet
++++ xkb-data/symbols/inet
+@@ -2170,19 +2170,16 @@
+ // Apple keyboard
+ partial modifier_keys
+ xkb_symbols "apple" {
+- key <KPEQ> { [ KP_Equal ] };
++ include "macintosh_vndr/apple(extended)"
+ };
+
+ partial modifier_keys
+ xkb_symbols "apple_laptop" {
+- include "inet(apple)"
+-
+ // These keyboards only generate a <RALT> when pressing fn+Alt. This makes
+ // it impossible to get to the third shift level on keys that are on
+ // 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 };
++ include "macintosh_vndr/apple(laptop)"
+ };
+
+ partial alphanumeric_keys
Added: trunk/data/xkb-data/debian/patches/rearrange_options.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/rearrange_options.diff 2006-09-04 20:48:43 UTC (rev 3180)
+++ trunk/data/xkb-data/debian/patches/rearrange_options.diff 2006-09-04 20:52:23 UTC (rev 3181)
@@ -0,0 +1,36 @@
+A side effect of altwin:meta_win is that Alt keys are modified.
+altwin options are listed first so that other options, like
+lv3:lwin_switch, can modify Alt keys. Closes: #385355
+Thanks Ben Mueller
+
+Submitted upstream: https://bugs.freedesktop.org/show_bug.cgi?id=8124
+
+Index: xkb-data/rules/base.o_s.part
+===================================================================
+--- xkb-data.orig/rules/base.o_s.part
++++ xkb-data/rules/base.o_s.part
+@@ -1,3 +1,10 @@
++ altwin:menu = +altwin(menu)
++ altwin:meta_alt = +altwin(meta_alt)
++ altwin:meta_win = +altwin(meta_win)
++ altwin:left_meta_win = +altwin(left_meta_win)
++ altwin:super_win = +altwin(super_win)
++ altwin:hyper_win = +altwin(hyper_win)
++ altwin:alt_super_win = +altwin(alt_super_win)
+ grp:switch = +group(switch)
+ grp:lswitch = +group(lswitch)
+ grp:win_switch = +group(win_switch)
+@@ -38,13 +45,6 @@
+ ctrl:ctrl_ac = +ctrl(ctrl_ac)
+ ctrl:ctrl_aa = +ctrl(ctrl_aa)
+ ctrl:ctrl_ra = +ctrl(ctrl_ra)
+- altwin:menu = +altwin(menu)
+- altwin:meta_alt = +altwin(meta_alt)
+- altwin:meta_win = +altwin(meta_win)
+- altwin:left_meta_win = +altwin(left_meta_win)
+- altwin:super_win = +altwin(super_win)
+- altwin:hyper_win = +altwin(hyper_win)
+- altwin:alt_super_win = +altwin(alt_super_win)
+ compose:ralt = +compose(ralt)
+ compose:lwin = +compose(lwin)
+ compose:rwin = +compose(rwin)
Modified: trunk/data/xkb-data/debian/patches/resync_rules_base.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/resync_rules_base.diff 2006-09-04 20:48:43 UTC (rev 3180)
+++ trunk/data/xkb-data/debian/patches/resync_rules_base.diff 2006-09-04 20:52:23 UTC (rev 3181)
@@ -102,7 +102,21 @@
$mac $macvendorlayouts = pc(pc105)+macintosh_vndr/%l[1]%(v[1])
$pcmodels * = pc(%m)+%l[1]%(v[1])
* * = pc(pc105)+%l[1]%(v[1])
-@@ -990,8 +993,10 @@
+@@ -968,6 +971,13 @@
+
+ ! option = symbols
+ grp:shift_toggle = +group(shifts_toggle)
++ altwin:menu = +altwin(menu)
++ altwin:meta_alt = +altwin(meta_alt)
++ altwin:meta_win = +altwin(meta_win)
++ altwin:left_meta_win = +altwin(left_meta_win)
++ altwin:super_win = +altwin(super_win)
++ altwin:hyper_win = +altwin(hyper_win)
++ altwin:alt_super_win = +altwin(alt_super_win)
+ grp:switch = +group(switch)
+ grp:lswitch = +group(lswitch)
+ grp:win_switch = +group(win_switch)
+@@ -990,8 +1000,10 @@
grp:lctrl_toggle = +group(lctrl_toggle)
grp:rctrl_toggle = +group(rctrl_toggle)
grp:lalt_toggle = +group(lalt_toggle)
@@ -113,6 +127,20 @@
lv3:lalt_switch = +level3(lalt_switch)
lv3:alt_switch = +level3(alt_switch)
lv3:menu_switch = +level3(menu_switch)
+@@ -1006,13 +1018,6 @@
+ ctrl:ctrl_ac = +ctrl(ctrl_ac)
+ ctrl:ctrl_aa = +ctrl(ctrl_aa)
+ ctrl:ctrl_ra = +ctrl(ctrl_ra)
+- altwin:menu = +altwin(menu)
+- altwin:meta_alt = +altwin(meta_alt)
+- altwin:meta_win = +altwin(meta_win)
+- altwin:left_meta_win = +altwin(left_meta_win)
+- altwin:super_win = +altwin(super_win)
+- altwin:hyper_win = +altwin(hyper_win)
+- altwin:alt_super_win = +altwin(alt_super_win)
+ compose:ralt = +compose(ralt)
+ compose:lwin = +compose(lwin)
+ compose:rwin = +compose(rwin)
Index: xkb-data/rules/base.lst
===================================================================
--- xkb-data.orig/rules/base.lst
Modified: trunk/data/xkb-data/debian/patches/series
===================================================================
--- trunk/data/xkb-data/debian/patches/series 2006-09-04 20:48:43 UTC (rev 3180)
+++ trunk/data/xkb-data/debian/patches/series 2006-09-04 20:52:23 UTC (rev 3181)
@@ -4,8 +4,10 @@
macintosh-gb.diff
macintosh.diff
fix_symbols_hr.diff -p0
+fix_symbols_key_type.diff
mac_fnkeys.diff -p0
ralt_switch_multikey.diff
+rearrange_options.diff
microsoft.diff
inet.diff
mac_swap_kp.diff
@@ -13,4 +15,5 @@
latin_quotes.diff
mac_nodeadkeys.diff
#macbook_keycodes.diff
+#generic_symbols_pc.diff
resync_rules_base.diff
Reply to: