Merge lp:~aacid/unity-2d/unity-2d-shell_eat_shortcut_key_events into lp:~unity-2d-team/unity-2d/unity-2d-shell

[Albert Astals Cid]

Eat hotkey events if they match

Fixes "When dash is active, pressing 'Super+S' to invoke spread is getting 's' character being entered in Dash search box"

[Albert Astals Cid (aacid)]

There is a test in https://code.launchpad.net/~aacid/unity-2d/unity-2d_test_super_s_does_not_type_s/+merge/90068

[lp:~aacid/unity-2d/unity-2d-shell_eat_shortcut_key_events]

931. By Albert Astals Cid on 2012-01-25

merge

[Michał Sawicz (saviq)]

The test doesn't fail on top of current unity-2d-shell, here's an adapdted diff:

=== zmodyfikowano plik tests/places/places-tests.rb
--- tests/places/places-tests.rb 2012-01-25 12:03:31 +0000
+++ tests/places/places-tests.rb 2012-01-25 12:45:28 +0000
@@ -111,4 +111,40 @@
         @app.Dash()['active']
     }
   end
+
+ # Test case objectives:
+ # * Check that Super+s does not type s
+ # Pre-conditions
+ # * Desktop with no running applications
+ # Test steps
+ # * Verify dash is not showing
+ # * Press Alt+F2
+ # * Verify dash is showing
+ # * Verify there is no text in the search entry
+ # * Press Super+s
+ # * Verify there is no text in the search entry
+ # Post-conditions
+ # * None
+ # References
+ # * None
+ test "Super+s does not type s" do
+ verify_equal("false", 0, 'There should not be a Dash declarative view on startup') {
+ @app.Dash()['active']
+ }
+ XDo::Keyboard.alt_F2 #Must use uppercase F to indicate function keys
+ verify_equal("true", TIMEOUT, 'There should be a Dash declarative view after pressing Alt+F2') {
+ @app.Dash()['active']
+ }
+ verify_equal("", TIMEOUT, 'There should be no text in the Search Entry') {
+ @app.Dash().SearchEntry().QDeclarativeTextInput()['text']
+ }
+ XDo::Keyboard.super_s
+ verify_not(0, "Text of the Search Entry should not be an 's'") {
+ verify_equal( "s", 1 ) {
+ @app.Dash().SearchEntry().QDeclarativeTextInput()['text']
+ }
+ }
+ sleep 1
+ XDo::Keyboard.escape
+ end
 end

review: Needs Fixing

[Michał Sawicz (saviq)]

Actually this works fine, it's the test that needs fixing...

review: Approve

=== modified file 'libunity-2d-private/src/hotkeymonitor.cpp'
--- libunity-2d-private/src/hotkeymonitor.cpp	2011-10-14 07:07:09 +0000
+++ libunity-2d-private/src/hotkeymonitor.cpp	2012-01-25 12:28:04 +0000
@@ -95,13 +95,15 @@
     if (event->type == KeyRelease || event->type == KeyPress)
     {
         XKeyEvent* key = (XKeyEvent*) event;
-        HotkeyMonitor::instance().processKeyEvent(key->keycode, key->state,
-                                                  event->type == KeyPress);
+        if (HotkeyMonitor::instance().processKeyEvent(key->keycode, key->state,
+                                                      event->type == KeyPress)) {
+            return true;
+        }
     }
     return false;
 }
 
-void
+bool
 HotkeyMonitor::processKeyEvent(uint x11Keycode, uint x11Modifiers,
                                bool isPressEvent)
 {
@@ -113,9 +115,11 @@
         }
 
         if (hotkey->processNativeEvent(x11Keycode, x11Modifiers, isPressEvent)) {
-            return;
+            return true;
         }
     }
+
+    return false;
 }
 
 #include "hotkeymonitor.moc"

=== modified file 'libunity-2d-private/src/hotkeymonitor.h'
--- libunity-2d-private/src/hotkeymonitor.h	2011-10-14 07:07:09 +0000
+++ libunity-2d-private/src/hotkeymonitor.h	2012-01-25 12:28:04 +0000
@@ -42,7 +42,7 @@
     HotkeyMonitor(QObject* parent=0);
 
     static bool keyEventFilter(void* message);
-    void processKeyEvent(uint x11Keycode, uint x11Modifiers,
+    bool processKeyEvent(uint x11Keycode, uint x11Modifiers,
                          bool isPressEvent);
 
     QList<Hotkey*> m_hotkeys;