Attachment 41566 Details for Bug 30898 – suggestion2: revert previous fix and include caps(caps_lock) when option shift:both_capslock is specified

[patch] suggestion2: revert previous fix and include caps(caps_lock) when option shift:both_capslock is specified

patch2.diff (text/plain), 1.25 KB, created by Stephan Hilb on 2011-01-02 04:29:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stephan Hilb

Created: 2011-01-02 04:29:30 UTC

Size: 1.25 KB

patch

obsolete

>diff --git a/rules/base.o_c.part b/rules/base.o_c.part
>index 352f8b3..8d38578 100644
>--- a/rules/base.o_c.part
>+++ b/rules/base.o_c.part
>@@ -3,4 +3,4 @@
>   grp_led:scroll	=	+ledscroll(group_lock)
>   japan:kana_lock	=	+japan(kana_lock)
>   caps:shiftlock	=	+ledcaps(shift_lock)
>-
>+  shift:both_capslock = +caps(caps_lock)
>diff --git a/symbols/shift b/symbols/shift
>index cc97b5c..78951c1 100644
>--- a/symbols/shift
>+++ b/symbols/shift
>@@ -23,8 +23,7 @@ partial modifier_keys
> xkb_symbols "lshift_both_capslock" {
>   key <LFSH> {
>     type[Group1]="TWO_LEVEL",
>-    symbols[Group1] = [ Shift_L,                  Caps_Lock                ],
>-    actions[Group1] = [ SetMods(modifiers=Shift), LockMods(modifiers=Lock) ]
>+    symbols[Group1] = [ Shift_L,                       Caps_Lock                ]
>   };
> };
> // When pressed together with another Shift key, set or unset Lock.
>@@ -32,8 +31,7 @@ partial modifier_keys
> xkb_symbols "rshift_both_capslock" {
>   key <RTSH> {
>     type[Group1]="TWO_LEVEL",
>-    symbols[Group1] = [ Shift_R,                  Caps_Lock                ],
>-    actions[Group1] = [ SetMods(modifiers=Shift), LockMods(modifiers=Lock) ]
>+    symbols[Group1] = [ Shift_R,                       Caps_Lock                ]
>   };
> };
> partial modifier_keys

Actions: View | Splinter Review

Attachments on bug 30898: 41565 | 41566 | 41569 | 43531 | 43552 | 43869

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.