Merge lp:~unity-team/nux/x-sru2 into lp:nux/xenial

[Marco Trevisan (Treviño)]

Releasing SRU2 for Xenial

[Andrea Azzarone (azzar1)]

+1

review: Approve

[lp:~unity-team/nux/x-sru2]

881. By Marco Trevisan (Treviño) on 2017-08-16

InputMethodIBus: don't set CAPS_LOCK modifier when hitting super

=== modified file 'Nux/InputMethodIBus.cpp'
--- Nux/InputMethodIBus.cpp	2015-04-22 16:48:10 +0000
+++ Nux/InputMethodIBus.cpp	2017-08-16 22:02:12 +0000
@@ -472,6 +472,7 @@
               case XK_Super_L:
               case XK_Super_R:
                 ev.key_modifiers |= KEY_MODIFIER_SUPER;
+                break;
               case XK_Caps_Lock:
                 ev.key_modifiers |= KEY_MODIFIER_CAPS_LOCK;
                 break;
 
=== modified file 'Nux/TextEntry.cpp'
--- Nux/TextEntry.cpp	2014-03-05 03:42:22 +0000
+++ Nux/TextEntry.cpp	2017-08-16 22:02:12 +0000
@@ -452,22 +452,25 @@
 
         handled = true;
       }
-      else if (((keyval == NUX_VK_x) && ctrl && !shift) || ((keyval == NUX_VK_DELETE) && shift && !ctrl))
+      else if (((keyval == NUX_VK_x || keyval == NUX_VK_X) && ctrl && !shift) ||
+               ((keyval == NUX_VK_DELETE) && shift && !ctrl))
       {
         CutClipboard();
         handled = true;
       }
-      else if (((keyval == NUX_VK_c) && ctrl && (!shift)) || ((keyval == NUX_VK_INSERT) && ctrl && (!shift)))
+      else if (((keyval == NUX_VK_c || keyval == NUX_VK_C) && ctrl && !shift) ||
+               ((keyval == NUX_VK_INSERT) && ctrl && !shift))
       {
         CopyClipboard();
         handled = true;
       }
-      else if (((keyval == NUX_VK_v) && ctrl && (!shift)) || ((keyval == NUX_VK_INSERT) && shift && (!ctrl)))
+      else if (((keyval == NUX_VK_v || keyval == NUX_VK_V) && ctrl && !shift) ||
+               ((keyval == NUX_VK_INSERT) && shift && !ctrl))
       {
         PasteClipboard();
         handled = true;
       }
-      else if ((keyval == NUX_VK_a) && ctrl)
+      else if ((keyval == NUX_VK_a || keyval == NUX_VK_A) && ctrl)
       {
         SelectAll();
         handled = true;
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-07-05 10:54:15 +0000
+++ debian/changelog	2017-08-16 22:02:12 +0000
@@ -1,3 +1,10 @@
+nux (4.0.8+16.04.20160705-0ubuntu2) UNRELEASED; urgency=medium
+
+  * TextEntry: Make sure Ctr+{C,V,X,A} work with caps-lock on (LP:
+    #1664205)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Tue, 04 Jul 2017 17:50:40 +0200
+
 nux (4.0.8+16.04.20160705-0ubuntu1) xenial; urgency=medium
 
   * unity_support_test: add llvmpipe as software-rendererd (LP: