Merge lp:~brandontschaefer/unity/dash-osk-fix into lp:unity/6.0

[Brandon Schaefer]

On screen keyboard now work with the Dash, when it is outside the Dashs' geo.

=== Problem ===
When you click outside of the dashs geo it will close. If you have have an OSK and click on it, where it is outside of the dashs geo it will close the dash. (This makes OSK uses vs the dash).

=== Fix ===
Take the overlay and check if any windows are above it that are AlwaysOnTop. If there is one then check if the mouse in its geo. If the mouse click is in its geo then do not close th dash.

=== Test ===
Manual test

[Łukasz Zemczak (sil2100)]

Tested, fixes the problem for me. Could we maybe do an AP test from this one in any way? Since the test steps seem automate-able. But for now, I think it's cool.

review: Approve

=== modified file 'manual-tests/Dash.txt'
--- manual-tests/Dash.txt	2012-09-13 10:56:42 +0000
+++ manual-tests/Dash.txt	2012-10-05 17:03:21 +0000
@@ -113,6 +113,25 @@
   The screen should look the same as if you had never opened the dash.
 
 
+Test that when an on screen keyboard is used it will not close the Dash.
+------------------------------------------------------------------------
+This tests shows that an on screen keyboards will not close the dash when clicking on it.
+see lp:1058705)
+
+Setup:
+Open the on screen keyboard Onboard.
+#. Move Onboard to the bottom right of the screen.
+#. Open the Dash
+#. Ensure the Dash is not in fullscreen mode.
+#. Ensure that Onboard is outside of the Dash.
+
+Actions:
+#. Use Onboard to type "Hello" in the Dash.
+
+Expected Results:
+  The Dash should stay open, and allow use of the on screen keyboard.
+
+
 Filter Results Tests
 ========================
 These tests show that the dash "All" button works well.

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-10-04 14:08:31 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-10-05 17:03:21 +0000
@@ -1503,9 +1503,13 @@
       if (dash_controller_->IsVisible())
       {
         nux::Point pt(event->xbutton.x_root, event->xbutton.y_root);
-        nux::Geometry dash_geo = dash_controller_->GetInputWindowGeometry();
-
-        if (!dash_geo.IsInside(pt) && !DoesPointIntersectUnityGeos(pt))
+        nux::Geometry const& dash_geo = dash_controller_->GetInputWindowGeometry();
+
+        Window dash_xid = dash_controller_->window()->GetInputWindowId();
+        Window top_xid = wm->GetTopWindowAbove(dash_xid);
+        nux::Geometry const& on_top_geo = wm->GetWindowGeometry(top_xid);
+
+        if (!dash_geo.IsInside(pt) && !DoesPointIntersectUnityGeos(pt) && !on_top_geo.IsInside(pt))
         {
           dash_controller_->HideDash(false);
         }
@@ -1514,9 +1518,13 @@
       if (hud_controller_->IsVisible())
       {
         nux::Point pt(event->xbutton.x_root, event->xbutton.y_root);
-        nux::Geometry hud_geo = hud_controller_->GetInputWindowGeometry();
-
-        if (!hud_geo.IsInside(pt) && !DoesPointIntersectUnityGeos(pt))
+        nux::Geometry const& hud_geo = hud_controller_->GetInputWindowGeometry();
+
+        Window hud_xid = dash_controller_->window()->GetInputWindowId();
+        Window top_xid = wm->GetTopWindowAbove(hud_xid);
+        nux::Geometry const& on_top_geo = wm->GetWindowGeometry(top_xid);
+
+        if (!hud_geo.IsInside(pt) && !DoesPointIntersectUnityGeos(pt) && !on_top_geo.IsInside(pt))
         {
           hud_controller_->HideHud(false);
         }

=== modified file 'unity-shared/PluginAdapter.h'
--- unity-shared/PluginAdapter.h	2012-10-01 19:12:00 +0000
+++ unity-shared/PluginAdapter.h	2012-10-05 17:03:21 +0000
@@ -173,6 +173,8 @@
 
   void MoveResizeWindow(guint32 xid, nux::Geometry geometry);
 
+  Window GetTopWindowAbove(Window xid) const;
+
 protected:
   PluginAdapter(CompScreen* screen);
   void AddProperties(GVariantBuilder* builder);

=== modified file 'unity-shared/PluginAdapterCompiz.cpp'
--- unity-shared/PluginAdapterCompiz.cpp	2012-10-01 19:12:00 +0000
+++ unity-shared/PluginAdapterCompiz.cpp	2012-10-05 17:03:21 +0000
@@ -594,6 +594,31 @@
   return 0;
 }
 
+Window PluginAdapter::GetTopWindowAbove(Window xid) const
+{
+  CompWindow* window;
+  CompPoint screen_vp = m_Screen->vp();
+
+  auto const& windows = m_Screen->windows();
+  for (auto it = windows.rbegin(); it != windows.rend(); ++it)
+  {
+    window = *it;
+    if (window->defaultViewport() == screen_vp &&
+        window->isViewable() && window->isMapped() &&
+        !window->minimized() && !window->inShowDesktopMode() &&
+        !(window->type() & CompWindowTypeSplashMask) &&
+        !(window->type() & CompWindowTypeDockMask))
+    {
+      return window->id();
+    }
+    else if (window->id() == xid)
+    {
+      return 0;
+    }
+  }
+  return 0;
+}
+
 bool
 PluginAdapter::IsWindowClosable(guint32 xid) const
 {