X Strike Force X.Org X11 SVN commit: r1068 - in trunk/debian: . patches patches/general
Author: barbier
Date: 2006-01-11 17:32:07 -0500 (Wed, 11 Jan 2006)
New Revision: 1068
Added:
trunk/debian/patches/general/087_xkb_ralt_switch_multikey.diff
Modified:
trunk/debian/changelog
trunk/debian/patches/series
Log:
Add general/087_xkb_ralt_switch_multikey.diff to enable again the
lv3:ralt_switch_multikey option. Thanks Klaus Ethgen (closes: #345409)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-01-11 22:08:33 UTC (rev 1067)
+++ trunk/debian/changelog 2006-01-11 22:32:07 UTC (rev 1068)
@@ -25,6 +25,8 @@
* Add general/013_xkb_drop_rules_xorg_duplicates.diff to remove duplicate
definitions from /etc/X11/xkb/rules/xorg, and update
general/091_xkb_implement_compose:caps.diff
+ * Add general/087_xkb_ralt_switch_multikey.diff to enable again the
+ lv3:ralt_switch_multikey option. Thanks Klaus Ethgen (closes: #345409)
-- Denis Barbier <barbier@debian.org> Wed, 11 Jan 2006 23:07:44 +0100
Added: trunk/debian/patches/general/087_xkb_ralt_switch_multikey.diff
===================================================================
--- trunk/debian/patches/general/087_xkb_ralt_switch_multikey.diff 2006-01-11 22:08:33 UTC (rev 1067)
+++ trunk/debian/patches/general/087_xkb_ralt_switch_multikey.diff 2006-01-11 22:32:07 UTC (rev 1068)
@@ -0,0 +1,63 @@
+The lv3:ralt_switch_multikey option was available in previous releases
+and has even been the default, so keep it.
+
+Index: xc/programs/xkbcomp/rules/xorg
+===================================================================
+--- xc/programs/xkbcomp/rules/xorg.orig
++++ xc/programs/xkbcomp/rules/xorg
+@@ -914,6 +914,7 @@
+ lv3:switch = +level3(switch)
+ lv3:ralt_switch = +level3(ralt_switch)
+ lv3:lalt_switch = +level3(lalt_switch)
++ lv3:ralt_switch_multikey = +level3(ralt_switch_multikey)
+ lv3:alt_switch = +level3(alt_switch)
+ lv3:menu_switch = +level3(menu_switch)
+ lv3:win_switch = +level3(win_switch)
+Index: xc/programs/xkbcomp/rules/xorg.lst
+===================================================================
+--- xc/programs/xkbcomp/rules/xorg.lst.orig
++++ xc/programs/xkbcomp/rules/xorg.lst
+@@ -371,6 +371,7 @@
+ lv3:alt_switch Press any of Alt keys to choose 3rd level.
+ lv3:lalt_switch Press Left Alt key to choose 3rd level.
+ lv3:ralt_switch Press Right Alt key to choose 3rd level.
++ lv3:ralt_switch_multikey Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key
+ ctrl Control key position
+ ctrl:nocaps Make CapsLock an additional Control.
+ ctrl:swapcaps Swap Control and CapsLock.
+Index: xc/programs/xkbcomp/rules/xorg.xml
+===================================================================
+--- xc/programs/xkbcomp/rules/xorg.xml.orig
++++ xc/programs/xkbcomp/rules/xorg.xml
+@@ -7344,6 +7344,12 @@
+ <description xml:lang="vi">Nhấn phím Alt bên phải để chọn ngôn ngữ thứ 3.</description>
+ </configItem>
+ </option>
++ <option>
++ <configItem>
++ <name>lv3:ralt_switch_multikey</name>
++ <description>Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key</description>
++ </configItem>
++ </option>
+ </group>
+ <group allowMultipleSelection="false">
+ <!-- Tweaking the position of the "Ctrl" key -->
+Index: xc/programs/xkbcomp/symbols/level3
+===================================================================
+--- xc/programs/xkbcomp/symbols/level3.orig
++++ xc/programs/xkbcomp/symbols/level3
+@@ -18,6 +18,14 @@
+ modifier_map Mod5 { ISO_Level3_Shift };
+ };
+
++partial modifier_keys
++xkb_symbols "ralt_switch_multikey" {
++ key <RALT> {
++ type[Group1]="TWO_LEVEL",
++ symbols[Group1] = [ ISO_Level3_Shift, Multi_key ]
++ };
++};
++
+ // using the level(alt_switch) map, either Alt key temporarily chooses
+ // the third shift level. (Mostly be used to imitate Mac OS functionality.)
+ partial modifier_keys
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2006-01-11 22:08:33 UTC (rev 1067)
+++ trunk/debian/patches/series 2006-01-11 22:32:07 UTC (rev 1068)
@@ -55,6 +55,7 @@
general/084_xkb_implement_grp:sclk_toggle.diff -p0
general/085_sessreg_implement_hostname_hashing.diff -p0
general/086_enable_ca_variants.diff -p0
+general/087_xkb_ralt_switch_multikey.diff -p0
general/090_xkb_fix_uk_macintosh_problems.diff -p0
general/091_xkb_implement_compose:caps.diff -p0
general/093_xkb_fix_macintosh_problems.diff -p0
Reply to: