Merge lp:~brandontschaefer/unity/fix-896122 into lp:unity

[Brandon Schaefer]

Uses the window_focus_change signal to close the keynav when the focus is changed from the launcher; while still allowing the user to preform normal actions; such as moving a window or highlighting text etc.

Handles the quicklist problem by using a bool in the QuicklistView that gets set if the mouse is responsible for the call to QuicklistView::Hide(). If it is then in Launcher::RecvQuickliseClose() we call exitKeyNavMode().

The shortcuts get handled in Launcher::RecvKeyPressed. If the user presses alt or ctrl then exitKeyNavMode(), allowing those shortcuts to work. When super is pressed call StartKeyShowLauncher() then then exitKeyNavMode(); which makes the super and super + shortcut work correctly.

[Brandon Schaefer (brandontschaefer)]

Needs test cases.

[Sam Spilsbury (smspillaz)]

review: Approve

[Andrea Azzarone (azzar1)]

+1 for me.

review: Approve

[Tim Penhey (thumper)]

Launcher code rewritten and new patch landed. This isn't needed.

=== added file 'manual-tests/Launcher.txt'
--- manual-tests/Launcher.txt	1970-01-01 00:00:00 +0000
+++ manual-tests/Launcher.txt	2011-12-30 23:50:29 +0000
@@ -0,0 +1,54 @@
+Test Dash Key Focus
+-------------------
+This test shows that the search bar in the dash gets key focus when using the super key to start the dash on start up.
+
+#. Start on a fresh login
+#. Press the <super> key
+#. Wait for dash to appear
+#. Type "hello"
+
+Outcome
+  The dash will appear, and "hello" will be in the search box.
+
+Test Alt+F1 KeyNavMode Mouse Works
+-------------------------------
+This test shows that the mouse still works normally while keynav mode is active.
+
+#. Press Alt+F1 to enter keynav mode
+#. Using the mouse perform a normal action (such as dragging a window)
+
+Outcome
+  The keynav mode exits, along with the mouse performing the normal action 
+  the user expects. Such as highlighting text, moving a window, clicking out
+  of keynav mode, or clicking on a launcher icon. All these actions should 
+  also exit the keynav mode.
+
+Test Alt+F1 KeyNavMode Shortcuts
+-----------------------------
+This test shows that all the shortcuts work and also exits from keynav mode.
+
+#. Press Alt+F1 to enter keynav mode
+#. Press Super + a 
+#. Press Esc
+#. Press Alt+F1
+#. Press Alt + Tab
+#. Press Alt+F1
+#. Press Ctrl + Alt + t
+
+Outcome
+  The first shortcut opens the dash app lens, which it should open it and quit the
+  nav mode. The second shortcut switches between applications. The last one will open
+  a new terminal. This is to show all SUPER, ALT, and CTRL shortcuts work; while
+  closing the keynav mode.
+
+Test Alt+F1 NavMode Quicklist Click Exit 
+----------------------------------------
+This Test shows that clicking on a quicklist option quits keynav mode.
+
+#. Press Alt+F1 to enter keynav mode
+#. Press Right arrow
+#. Click on any option
+
+Outcome
+  No matter what option you click will exit keynav mode.
+
 
=== removed file 'manual-tests/launcher.txt'
--- manual-tests/launcher.txt	2011-11-29 02:48:26 +0000
+++ manual-tests/launcher.txt	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-Test Dash Key Focus
--------------------
-This test shows that the search bar in the dash gets key focus when using the super key to start the dash on start up.
-
-#. Start on a fresh login
-#. Press the <super> key
-#. Wait for dash to appear
-#. Type "hello"
-
-Outcome
-  The dash will appear, and "hello" will be in the search box.
 
=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2011-12-14 16:18:41 +0000
+++ plugins/unityshell/src/Launcher.cpp	2011-12-30 23:50:29 +0000
@@ -135,6 +135,7 @@
                    NUX_FILE_LINE_DECL)
   : View(NUX_FILE_LINE_PARAM)
   , m_ContentOffsetY(0)
+  , _keynav_next_focus_change(false)
   , m_BackgroundLayer(0)
   , _model(0)
   , _collection_window(NULL)
@@ -457,7 +458,8 @@
   if (_focus_keynav_handle > 0)
     g_source_remove(_focus_keynav_handle);
   _focus_keynav_handle = g_timeout_add(ANIM_DURATION_SHORT, &Launcher::MoveFocusToKeyNavModeTimeout, this);
-
+  
+  _keynav_next_focus_change = false;
 }
 
 gboolean
@@ -1687,6 +1689,17 @@
    */
   if (_hidemode != LAUNCHER_HIDE_NEVER)
     g_idle_add((GSourceFunc)CheckWindowOverLauncherSync, this);
+
+  // When keynav is activated wait for the next change in focus, then exit 
+  if (_keynav_next_focus_change)
+  {
+    _keynav_next_focus_change = false;
+    exitKeyNavMode();
+  }
+  else if (_keynav_activated)
+  {
+    _keynav_next_focus_change = true;
+  }
 }
 
 gboolean
@@ -2667,7 +2680,9 @@
       }
       break;
 
-      // esc/left (close quicklist or exit laucher key-focus)
+      // alt/ctrl/esc/left (close quicklist or exit laucher key-focus)
+    case NUX_VK_MENU:
+    case NUX_VK_CONTROL:
     case NUX_VK_LEFT:
     case NUX_KP_LEFT:
     case NUX_VK_ESCAPE:
@@ -2714,6 +2729,15 @@
     exitKeyNavMode();
     break;
 
+    // When super is pressed
+    case NUX_VK_LWIN:
+    case NUX_VK_RWIN:
+    {
+      StartKeyShowLauncher();
+    }
+    exitKeyNavMode();
+    break;
+
     default:
       break;
   }
@@ -2736,6 +2760,11 @@
     SetHover(false);
     SetStateMouseOverLauncher(false);
   }
+
+  if (quicklist->MouseUsed())
+  {
+    exitKeyNavMode();
+  }
   // Cancel any prior state that was set before the Quicklist appeared.
   SetActionState(ACTION_NONE);
 
@@ -2807,6 +2836,12 @@
 
   if (_icon_mouse_down && (_icon_mouse_down == launcher_icon))
   {
+    // If icon clicked, exit key nav
+    if (_keynav_activated)
+    {
+      exitKeyNavMode();
+    }
+
     _icon_mouse_down->mouse_up.emit(nux::GetEventButton(button_flags));
 
     if (GetActionState() == ACTION_NONE)
 
=== modified file 'plugins/unityshell/src/Launcher.h'
--- plugins/unityshell/src/Launcher.h	2011-12-08 01:23:11 +0000
+++ plugins/unityshell/src/Launcher.h	2011-12-30 23:50:29 +0000
@@ -403,6 +403,7 @@
 
   bool          _shortcuts_shown;
   bool          _keynav_activated;
+  bool          _keynav_next_focus_change;
   guint64       _latest_shortcut;
 
   BacklightMode _backlight_mode;
 
=== modified file 'plugins/unityshell/src/QuicklistView.cpp'
--- plugins/unityshell/src/QuicklistView.cpp	2011-12-15 08:52:31 +0000
+++ plugins/unityshell/src/QuicklistView.cpp	2011-12-30 23:50:29 +0000
@@ -59,7 +59,7 @@
   , _anchorY(0)
   , _labelText(TEXT("QuicklistView 1234567890"))
   , _top_size(4)
-  , _mouse_down(false)
+  , _mouse_used(false)
   , _enable_quicklist_for_testing(false)
   , _texture_bg(nullptr)
   , _texture_mask(nullptr)
@@ -362,6 +362,7 @@
     GrabKeyboard();
     QueueDraw();
     _compute_blur_bkg = true;
+    _mouse_used = false;
   }
 }
 
@@ -635,12 +636,11 @@
 
 void QuicklistView::RecvItemMouseClick(QuicklistMenuItem* item, int x, int y)
 {
-  _mouse_down = false;
   if (IsVisible() && item->GetEnabled())
   {
     // Check if the mouse was released over an item and emit the signal
     CheckAndEmitItemSignal(x + item->GetBaseX(), y + item->GetBaseY());
-
+    _mouse_used = true; 
     Hide();
   }
 }
@@ -688,14 +688,11 @@
 
 void QuicklistView::RecvItemMouseRelease(QuicklistMenuItem* item, int x, int y)
 {
-  _mouse_down = false;
-
-
   if (IsVisible() && item->GetEnabled())
   {
     // Check if the mouse was released over an item and emit the signal
     CheckAndEmitItemSignal(x + item->GetBaseX(), y + item->GetBaseY());
-
+    _mouse_used = true;
     Hide();
   }
 }
@@ -788,6 +785,7 @@
 {
   if (IsVisible())
   {
+    _mouse_used = true;
     Hide();
   }
 }
@@ -804,6 +802,7 @@
 
 void QuicklistView::RecvMouseDownOutsideOfQuicklist(int x, int y, unsigned long button_flags, unsigned long key_flags)
 {
+  _mouse_used = true;
   Hide();
 }
 
@@ -1529,6 +1528,12 @@
   return true;
 }
 
+bool 
+QuicklistView::MouseUsed()
+{
+  return _mouse_used;
+}
+
 QuicklistMenuItem*
 QuicklistView::GetSelectedMenuItem()
 {
 
=== modified file 'plugins/unityshell/src/QuicklistView.h'
--- plugins/unityshell/src/QuicklistView.h	2011-12-15 08:52:31 +0000
+++ plugins/unityshell/src/QuicklistView.h	2011-12-30 23:50:29 +0000
@@ -97,6 +97,8 @@
                                unsigned int keysym,
                                const char* character);
 
+  bool MouseUsed();
+
   //Required for a11y
   QuicklistMenuItem* GetSelectedMenuItem();
   sigc::signal<void> selection_change;
@@ -152,7 +154,7 @@
   nux::NString          _labelText;
   int                   _top_size; // size of the segment from point 13 to 14. See figure in ql_compute_full_mask_path.
 
-  bool                  _mouse_down;
+  bool                  _mouse_used;
 
   //iIf true, suppress the Quicklist behaviour that is expected in Unity.
   // Keep the Quicklist on screen for testing and automation.