Merge lp:~3v1n0/unity/flickerless-alt+f10-on-keydown into lp:unity

[Marco Trevisan (Treviño)]

Open the Menus Indicators on ButtonPress avoiding flickers

Now the indicator menus shows once Alt+F10 keybinding has been pressed, and is not anymore needed to release the Alt key.
Also, fixed the panel issue reported in bug #948522 that could happen when using menus. To avoid it we use now a timeout to filter the events that we can ignore not to make unity-panel-service crazy.

Open the Menus Indicators on ButtonPress avoiding flickers

UNBLOCK as requested by didrocks

[Tim Penhey (thumper)]

The code looks fine.

review: Approve

[Daniel van Vugt (vanvugt)]

3v1n0, your fix for this bug is missing the safety check to avoid crashing on Alt+Enter. Like we did for:
https://code.launchpad.net/~vanvugt/unity/fix-960957/+merge/98593

I wonder if that's going to be a problem?...

review: Needs Information

[Marco Trevisan (Treviño) (3v1n0)]

No, I thought about that while doing it, but I didn't include the check since it seems to cause troubles only on terminate cb, and we don't use that here.
On initiate, the action should be properly filled.

=== modified file 'manual-tests/PanelIndicators.txt'
--- manual-tests/PanelIndicators.txt	2011-12-08 04:48:50 +0000
+++ manual-tests/PanelIndicators.txt	2012-03-22 20:28:25 +0000
@@ -25,3 +25,24 @@
 
 Outcome
   Window buttons should appear.
+
+
+Open Indicators from Keyboard
+-----------------------------
+This test shows how indicators can be opened via keyboard bindings.
+
+#. Start a clean screen
+#. Press Alt+F10
+
+Outcome
+  The menu of the first indicator visible (looking left to right)
+  should pop-up on keydown (once F10 has been pressed).
+  Pressing Alt+F10 again or clicking in an empty area of the screen should close it.
+
+#. Start an application window with menus
+#. Press Alt+F10
+
+Outcome
+  The first menu of the window (looking left to right) should pop-up on keydown
+  (once F10 has been pressed). Pressing Alt+F10 again or clicking in an empty area
+  of the screenshould pop down it.

=== modified file 'plugins/unityshell/src/PanelController.cpp'
--- plugins/unityshell/src/PanelController.cpp	2012-03-21 12:31:11 +0000
+++ plugins/unityshell/src/PanelController.cpp	2012-03-22 20:28:25 +0000
@@ -43,8 +43,7 @@
   Impl();
   ~Impl();
 
-  void StartFirstMenuShow();
-  void EndFirstMenuShow();
+  void FirstMenuShow();
   void QueueRedraw();
 
   unsigned int GetTrayXid();
@@ -72,7 +71,6 @@
   std::vector<nux::BaseWindow*> windows_;
   float opacity_;
   bool opacity_maximized_toggle_;
-  bool open_menu_start_received_;
   int menus_fadein_;
   int menus_fadeout_;
   int menus_discovery_;
@@ -84,7 +82,6 @@
 Controller::Impl::Impl()
   : opacity_(1.0f)
   , opacity_maximized_toggle_(false)
-  , open_menu_start_received_(false)
   , menus_fadein_(0)
   , menus_fadeout_(0)
   , menus_discovery_(0)
@@ -121,27 +118,12 @@
   return geometries;
 }
 
-void Controller::Impl::StartFirstMenuShow()
-{
-  for (auto window: windows_)
-  {
-    PanelView* view = ViewForWindow(window);
-    view->StartFirstMenuShow();
-  }
-
-  open_menu_start_received_ = true;
-}
-
-void Controller::Impl::EndFirstMenuShow()
-{
-  if (!open_menu_start_received_)
-    return;
-  open_menu_start_received_ = false;
-
-  for (auto window: windows_)
-  {
-    PanelView* view = ViewForWindow(window);
-    view->EndFirstMenuShow();
+void Controller::Impl::FirstMenuShow()
+{
+  for (auto window: windows_)
+  {
+    if (ViewForWindow(window)->FirstMenuShow())
+      break;
   }
 }
 
@@ -317,14 +299,9 @@
   delete pimpl;
 }
 
-void Controller::StartFirstMenuShow()
-{
-  pimpl->StartFirstMenuShow();
-}
-
-void Controller::EndFirstMenuShow()
-{
-  pimpl->EndFirstMenuShow();
+void Controller::FirstMenuShow()
+{
+  pimpl->FirstMenuShow();
 }
 
 void Controller::SetOpacity(float opacity)

=== modified file 'plugins/unityshell/src/PanelController.h'
--- plugins/unityshell/src/PanelController.h	2012-03-21 12:31:11 +0000
+++ plugins/unityshell/src/PanelController.h	2012-03-22 20:28:25 +0000
@@ -39,8 +39,7 @@
   Controller();
   ~Controller();
 
-  void StartFirstMenuShow();
-  void EndFirstMenuShow();
+  void FirstMenuShow();
   void QueueRedraw();
 
   unsigned int GetTrayXid ();

=== modified file 'plugins/unityshell/src/PanelView.cpp'
--- plugins/unityshell/src/PanelView.cpp	2012-03-21 12:31:11 +0000
+++ plugins/unityshell/src/PanelView.cpp	2012-03-22 20:28:25 +0000
@@ -637,18 +637,17 @@
 //
 // Useful Public Methods
 //
-void PanelView::StartFirstMenuShow()
+bool PanelView::FirstMenuShow()
 {
-}
+  bool ret = false;
 
-void PanelView::EndFirstMenuShow()
-{
   if (!_menu_view->GetControlsActive())
-    return;
+    return ret;
 
-  bool ret;
   ret = _menu_view->ActivateIfSensitive();
   if (!ret) _indicators->ActivateIfSensitive();
+
+  return ret;
 }
 
 void

=== modified file 'plugins/unityshell/src/PanelView.h'
--- plugins/unityshell/src/PanelView.h	2012-03-21 12:31:11 +0000
+++ plugins/unityshell/src/PanelView.h	2012-03-22 20:28:25 +0000
@@ -66,8 +66,7 @@
   bool GetPrimary();
   void SetMonitor(int monitor);
 
-  void StartFirstMenuShow();
-  void EndFirstMenuShow();
+  bool FirstMenuShow();
 
   void SetOpacity(float opacity);
   void SetOpacityMaximizedToggle(bool enabled);

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-03-21 14:44:41 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-03-22 20:28:25 +0000
@@ -1606,10 +1606,24 @@
                                                 CompAction::State state,
                                                 CompOption::Vector& options)
 {
-  grab_index_ = screen->pushGrab (None, "unityshell");
-  // to receive the Terminate event
+  /* In order to avoid too many events when keeping the keybinding pressed,
+   * that would make the unity-panel-service to go crazy (see bug #948522)
+   * we need to filter them, just considering an event every 750 ms */
+  int event_time = options[7].value().i();  // XEvent time in millisec
+
+  if (event_time - first_menu_keypress_time_ < 750)
+  {
+    first_menu_keypress_time_ = event_time;
+    return false;
+  }
+
+  first_menu_keypress_time_ = event_time;
+
+  /* Even if we do nothing on key terminate, we must enable it, not to to hide
+   * the menus entries after that a menu has been shown and hidden via the
+   * keyboard and the Alt key is still pressed */
   action->setState(action->state() | CompAction::StateTermKey);
-  panel_controller_->StartFirstMenuShow();
+  panel_controller_->FirstMenuShow();
   return true;
 }
 
@@ -1617,9 +1631,7 @@
                                                  CompAction::State state,
                                                  CompOption::Vector& options)
 {
-  screen->removeGrab(grab_index_, NULL);
   action->setState (action->state() & (unsigned)~(CompAction::StateTermKey));
-  panel_controller_->EndFirstMenuShow();
   return true;
 }
 

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2012-03-21 12:31:11 +0000
+++ plugins/unityshell/src/unityshell.h	2012-03-22 20:28:25 +0000
@@ -338,6 +338,7 @@
   unsigned int           tray_paint_mask_;
   unsigned int           last_scroll_event_;
   int                    hud_keypress_time_;
+  int                    first_menu_keypress_time_;
 
   GLMatrix panel_shadow_matrix_;