Merge lp:~3v1n0/unity/im-text-entry-ibus-friendly-5.0 into lp:unity/5.0

[Marco Trevisan (Treviño)]

IMTextEntry: don't ingore ctrl/alt keypress to make ibus still working

Remove the filter for Ctrl/Alt keybindings to avoid ibus issues..

[Brandon Schaefer (brandontschaefer)]

Looks good. +1

review: Approve

=== modified file 'plugins/unityshell/src/IMTextEntry.cpp'
--- plugins/unityshell/src/IMTextEntry.cpp	2012-06-19 17:04:29 +0000
+++ plugins/unityshell/src/IMTextEntry.cpp	2012-06-22 00:24:29 +0000
@@ -67,7 +67,6 @@
   bool shift = event.GetKeyModifierState(KEY_MODIFIER_SHIFT);
   bool ctrl = event.GetKeyModifierState(KEY_MODIFIER_CTRL);
   bool super = event.GetKeyModifierState(KEY_MODIFIER_SUPER);
-  bool alt = event.GetKeyModifierState(KEY_MODIFIER_ALT);
 
   if ((ctrl && !shift && keyval == NUX_VK_x) ||    // Ctrl + X
       (shift && !ctrl && keyval == NUX_VK_DELETE)) // Shift + Del
@@ -83,17 +82,7 @@
   {
     Paste();
   }
-  else if (ctrl)
-  {
-    if (keyval == NUX_VK_LEFT || keyval == NUX_VK_RIGHT || // Ctrl + Move keys
-        keyval == NUX_VK_HOME || keyval == NUX_VK_END || // Ctrl + Home / End
-        keyval == NUX_VK_BACKSPACE || keyval == NUX_VK_DELETE || // Ctrl + Backspace / Delete
-        keyval == NUX_VK_a) // Ctrl + A
-    {
-      return true;
-    }
-  }
-  else if (!alt && !super)
+  else if (!super)
   {
     return true;
   }

=== modified file 'tests/test_im_text_entry.cpp'
--- tests/test_im_text_entry.cpp	2012-06-20 12:29:23 +0000
+++ tests/test_im_text_entry.cpp	2012-06-22 00:24:29 +0000
@@ -156,38 +156,6 @@
   EXPECT_TRUE(text_entry.TryHandleSpecial(selectall));
 }
 
-TEST(TestIMTextEntry, CtrlKeybindings)
-{
-  MockTextEntry text_entry;
-
-  std::vector<unsigned long> allowed_keys { NUX_VK_a, NUX_VK_BACKSPACE,
-                                            NUX_VK_LEFT, NUX_VK_RIGHT,
-                                            NUX_VK_HOME, NUX_VK_END,
-                                            NUX_VK_BACKSPACE, NUX_VK_DELETE };
-
-  for (unsigned long keysym = 0; keysym < XK_VoidSymbol; ++keysym)
-  {
-    bool should_be_handled = false;
-
-    if (std::find(allowed_keys.begin(), allowed_keys.end(), keysym) != allowed_keys.end())
-      should_be_handled = true;
-
-    TestEvent event(KEY_MODIFIER_CTRL, keysym);
-    EXPECT_EQ(text_entry.TryHandleSpecial(event), should_be_handled);
-  }
-}
-
-TEST(TestIMTextEntry, AltKeybindings)
-{
-  MockTextEntry text_entry;
-
-  for (unsigned long keysym = 0; keysym < XK_VoidSymbol; ++keysym)
-  {
-    TestEvent event(KEY_MODIFIER_ALT, keysym);
-    EXPECT_FALSE(text_entry.TryHandleSpecial(event));
-  }
-}
-
 TEST(TestIMTextEntry, SuperKeybindings)
 {
   MockTextEntry text_entry;