Attachment 141076 Details for Bug 193922 – Differences between our CVS/devel patch and the one in freedesktop bugzilla

[patch] Differences between our CVS/devel patch and the one in freedesktop bugzilla

devel-freedesktop.diff (text/plain), 1.93 KB, created by Matěj Cepl on 2006-11-13 17:28:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matěj Cepl

Created: 2006-11-13 17:28:52 UTC

Size: 1.93 KB

patch

obsolete

>diff -u xkeyboard-config-0.8/symbols/level3 xkb-data/symbols/level3
>--- xkeyboard-config-0.8/symbols/level3	2006-08-15 11:45:34.000000000 +0200
>+++ xkb-data/symbols/level3
>@@ -10,15 +10,19 @@
> // third engraved symbol
> default partial modifier_keys
> xkb_symbols "ralt_switch" {
>-  // key <RALT> {
>-    // type[Group1]="ONE_LEVEL",
>-    // symbols[Group1] = [ ISO_Level3_Shift ]
>-    // };
>-  // modifier_map Mod5   { ISO_Level3_Shift };
>-    key <RALT>  { type[Group1]="TWO_LEVEL",
>-                  [ ISO_Level3_Shift, Multi_key ]   };
>-    modifier_map Mod5   { <RALT> };
>+  key <RALT> {
>+    type[Group1]="ONE_LEVEL",
>+    symbols[Group1] = [ ISO_Level3_Shift ]
>+    };
>+  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 ]
>+    };
> };
> 
> // special case or right Alt switch - for use with grp:alts_toggle
>only in patch2:
>unchanged:
>--- xkb-data.orig/rules/base.o_s.part
>+++ xkb-data/rules/base.o_s.part
>@@ -23,6 +23,7 @@
>   grp:sclk_toggle	=	+group(sclk_toggle)
>   lv3:switch		=	+level3(switch)
>   lv3:ralt_switch	=	+level3(ralt_switch)
>+  lv3:ralt_switch_multikey	=	+level3(ralt_switch_multikey)
>   lv3:lalt_switch	=	+level3(lalt_switch)
>   lv3:alt_switch	=	+level3(alt_switch)
>   lv3:menu_switch	=	+level3(menu_switch)
>only in patch2:
>unchanged:
>--- xkb-data.orig/rules/base.xml.in
>+++ xkb-data/rules/base.xml.in
>@@ -2841,6 +2841,12 @@
>           <_description>Press Right Alt key to choose 3rd level.</_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">
>

Actions: View | Diff

Attachments on bug 193922: 134203 | 140701 | 141075 | 141076 | 141077 | 141079