Merge lp:~thumper/unity/hud-alt-tap into lp:unity

[Tim Penhey]

Uses the new modifier-tap ability in compiz to only show the HUD if someone hasn't used another key with alt (or the associated key).

Uses the new modifier-tap ability in compiz to only show the HUD if someone hasn't used another key with alt (or the associated key).

Needs lp:compiz-core r3003 or above.

UNBLOCK

[Mirco Müller (macslow)]

I like these kind of lines :)

  LOG_ERROR(logger) << "this should never happen";

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/336/console reported an error when processing this lp:~thumper/unity/hud-alt-tap branch.
Not merging it.

[Tim Penhey (thumper)]

Moving this to work in progress until the compiz branch is ready.

[Thomi Richards (thomir-deactivatedaccount)]

My name is Thomi, and I approve this merge proposal.

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/365/console reported an error when processing this lp:~thumper/unity/hud-alt-tap branch.
Not merging it.

[Thomi Richards (thomir-deactivatedaccount)]

Still looks damn sexy.

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/368/console reported an error when processing this lp:~thumper/unity/hud-alt-tap branch.
Not merging it.

[Didier Roche-Tolomelli (didrocks)]

The bot will recognize its master ;)

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/370/console reported an error when processing this lp:~thumper/unity/hud-alt-tap branch.
Not merging it.

[Didier Roche-Tolomelli (didrocks)]

for the record: it took 17 minutes for compiz uploaded in the staging ppa once built to be available to the QA lab (proxy/mirroring issue?). Anyway, to avoid such skews, I think that shows that adding compiz to the autolanding process is needed.

=== modified file 'plugins/unityshell/src/LauncherController.cpp'
--- plugins/unityshell/src/LauncherController.cpp	2012-02-12 10:43:11 +0000
+++ plugins/unityshell/src/LauncherController.cpp	2012-02-29 03:53:18 +0000
@@ -908,9 +908,9 @@
   pimpl->launcher_label_show_handler_id_ = g_timeout_add(local::shortcuts_show_delay, show_shortcuts, pimpl);
 }
 
-void Controller::HandleLauncherKeyRelease()
+void Controller::HandleLauncherKeyRelease(bool was_tap)
 {
-  if (pimpl->TapTimeUnderLimit())
+  if (pimpl->TapTimeUnderLimit() && was_tap)
   {
     pimpl->SendHomeActivationRequest();
   }

=== modified file 'plugins/unityshell/src/LauncherController.h'
--- plugins/unityshell/src/LauncherController.h	2012-02-12 10:43:11 +0000
+++ plugins/unityshell/src/LauncherController.h	2012-02-29 03:53:18 +0000
@@ -60,7 +60,7 @@
   void SetShowDesktopIcon(bool show_desktop_icon);
 
   void HandleLauncherKeyPress();
-  void HandleLauncherKeyRelease();
+  void HandleLauncherKeyRelease(bool was_tap);
   bool HandleLauncherKeyEvent(Display *display, 
                               unsigned int key_sym, 
                               unsigned long key_code, 

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-02-28 08:29:22 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-02-29 03:53:18 +0000
@@ -89,7 +89,12 @@
 gboolean is_extension_supported(const gchar* extensions, const gchar* extension);
 gfloat get_opengl_version_f32(const gchar* version_string);
 
-}
+namespace local
+{
+// Tap duration in milliseconds.
+const int ALT_TAP_DURATION = 250;
+} // namespace local
+} // anon namespace
 
 UnityScreen::UnityScreen(CompScreen* screen)
   : BaseSwitchScreen (screen)
@@ -1501,11 +1506,11 @@
   if (state & CompAction::StateCancel)
     return false;
 
-  bool accept_state = (state & CompAction::StateCancel) == 0;
+  bool was_tap = state & CompAction::StateTermTapped;
 
   super_keypressed_ = false;
-  launcher_controller_->KeyNavTerminate(accept_state);
-  launcher_controller_->HandleLauncherKeyRelease();
+  launcher_controller_->KeyNavTerminate(true);
+  launcher_controller_->HandleLauncherKeyRelease(was_tap);
   EnableCancelAction(false);
 
   shortcut_controller_->SetEnabled(enable_shortcut_overlay_);
@@ -1770,41 +1775,55 @@
     PluginAdapter::Default ()->restoreInputFocus ();
 }
 
-bool UnityScreen::ShowHudInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
+bool UnityScreen::ShowHudInitiate(CompAction* action,
+                                  CompAction::State state,
+                                  CompOption::Vector& options)
 {
   // to receive the Terminate event
   if (state & CompAction::StateInitKey)
-    action->setState(action->state() | CompAction::StateTermKey);  
-
+    action->setState(action->state() | CompAction::StateTermKey);
   last_hud_show_time_ = g_get_monotonic_time();
 
   return false;
 }
 
-bool UnityScreen::ShowHudTerminate(CompAction* action, CompAction::State state, CompOption::Vector& options)
+bool UnityScreen::ShowHudTerminate(CompAction* action,
+                                   CompAction::State state,
+                                   CompOption::Vector& options)
 {
-  if (optionGetShowHud().key().toString() == action->key().toString())
-  {
-    if (switcher_controller_->Visible())
-      return false; // early exit if the switcher is open
-
-    gint64 current_time = g_get_monotonic_time();
-    if (current_time - last_hud_show_time_ < 150 * 1000)
-    {
-      if (hud_controller_->IsVisible())
-      {
-        ubus_manager_.SendMessage(UBUS_HUD_CLOSE_REQUEST);
-      }
-      else
-      {
-        hud_controller_->ShowHud();
-      }
-      last_hud_show_time_ = 0;
-    }
-  }
+  // Remember StateCancel and StateCommit will be broadcast to all actions
+  // so we need to verify that we are actually being toggled...
+  if (!(state & CompAction::StateTermKey))
+    return false;
 
   action->setState(action->state() & ~CompAction::StateTermKey);
 
+  // And only respond to key taps
+  if (!(state & CompAction::StateTermTapped))
+    return false;
+
+  gint64 current_time = g_get_monotonic_time();
+  if (current_time - last_hud_show_time_ > (local::ALT_TAP_DURATION * 1000))
+  {
+    LOG_DEBUG(logger) << "Tap too long";
+    return false;
+  }
+
+  if (switcher_controller_->Visible())
+  {
+    LOG_ERROR(logger) << "this should never happen";
+    return false; // early exit if the switcher is open
+  }
+
+  if (hud_controller_->IsVisible())
+  {
+    ubus_manager_.SendMessage(UBUS_HUD_CLOSE_REQUEST);
+  }
+  else
+  {
+    hud_controller_->ShowHud();
+  }
+
   return false;
 }
 

=== modified file 'tests/autopilot/autopilot/emulators/unity/hud.py'
--- tests/autopilot/autopilot/emulators/unity/hud.py	2012-02-27 20:57:20 +0000
+++ tests/autopilot/autopilot/emulators/unity/hud.py	2012-02-29 03:53:18 +0000
@@ -28,6 +28,6 @@
         self.refresh_state()
         return self.visible
 
-    def toggle_reveal(self):
+    def toggle_reveal(self, tap_delay=0.1):
         """Tap the 'Alt' key to toggle the hud visibility."""
-        self.keybinding("hud/reveal", 0.1)
+        self.keybinding("hud/reveal", tap_delay)

=== modified file 'tests/autopilot/autopilot/tests/test_hud.py'
--- tests/autopilot/autopilot/tests/test_hud.py	2012-02-20 01:12:01 +0000
+++ tests/autopilot/autopilot/tests/test_hud.py	2012-02-29 03:53:18 +0000
@@ -33,26 +33,44 @@
                 num_active += 1
         return num_active
 
+    def test_initially_hidden(self):
+        hud = self.get_hud_controller()
+        self.assertFalse(hud.is_visible())
+
+    def test_reveal_hud(self):
+        hud = self.get_hud_controller()
+        hud.toggle_reveal()
+        self.addCleanup(hud.toggle_reveal)
+        self.assertTrue(hud.is_visible())
+
+    def test_slow_tap_not_reveal_hud(self):
+        hud = self.get_hud_controller()
+        hud.toggle_reveal(tap_delay=0.3)
+        self.assertFalse(hud.is_visible())
+
+    def test_alt_f4_doesnt_show_hud(self):
+        hud = self.get_hud_controller()
+        self.start_app('Calculator')
+        sleep(1)
+        # Do a very fast Alt+F4
+        self.keyboard.press_and_release("Alt+F4", 0.05)
+        self.assertFalse(hud.is_visible())
+
     def test_reveal_hud_with_no_apps(self):
         """Hud must show even with no visible applications."""
-        controller = self.get_hud_controller()
-
-        self.assertFalse(controller.visible)
-        kb = Keyboard()
-        kb.press_and_release("Ctrl+Alt+d")
-        self.addCleanup(kb.press_and_release, "Ctrl+Alt+d")
-        sleep(1)
-
-        # we need a *fast* keypress to reveal the hud:
-        kb.press_and_release("Alt", delay=0.1)
-        sleep(1)
-        controller.refresh_state()
-        self.assertTrue(controller.visible)
-
-        kb.press_and_release("Alt", delay=0.1)
-        sleep(1)
-        controller.refresh_state()
-        self.assertFalse(controller.visible)
+        hud = self.get_hud_controller()
+
+        self.keyboard.press_and_release("Ctrl+Alt+d")
+        self.addCleanup(self.keyboard.press_and_release, "Ctrl+Alt+d")
+        sleep(1)
+
+        hud.toggle_reveal()
+        sleep(1)
+        self.assertTrue(hud.is_visible())
+
+        hud.toggle_reveal()
+        sleep(1)
+        self.assertFalse(hud.is_visible())
 
     def test_multiple_hud_reveal_does_not_break_launcher(self):
         """Multiple Hud reveals must not cause the launcher to set multiple
@@ -61,15 +79,12 @@
         """
         hud_controller = self.get_hud_controller()
         launcher = Launcher()
-        bamf = Bamf()
 
         # We need an app to switch to:
-        bamf.launch_application("gucharmap.desktop")
-        self.addCleanup(call, ["killall", "gucharmap"])
-
+        self.start_app('Character Map')
         # We need an application to play with - I'll use the calculator.
-        bamf.launch_application("gcalctool.desktop")
-        self.addCleanup(call, ["killall", "gcalctool"])
+        self.start_app('Calculator')
+        sleep(1)
 
         # before we start, make sure there's only one active icon:
         num_active = self.get_num_active_launcher_icons(launcher)