Merge lp:~townsend/unity/fix-lp1413165-trusty into lp:unity/7.2

[Christopher Townsend]

Draw osk above unity shell.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3821
http://jenkins.qa.ubuntu.com/job/unity-7.2-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-armhf-ci/10
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-i386-ci/10/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-7.2-ci/10/rebuild

review: Needs Fixing (continuous-integration)

[Stephen M. Webb (bregma)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3821
http://jenkins.qa.ubuntu.com/job/unity-7.2-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-armhf-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-i386-ci/12

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-7.2-ci/12/rebuild

review: Approve (continuous-integration)

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2015-03-16 17:30:24 +0000
+++ plugins/unityshell/src/unityshell.cpp	2015-05-15 19:50:26 +0000
@@ -2976,10 +2976,14 @@
     }
   }
 
-  if (uScreen->doShellRepaint &&
-      window == uScreen->firstWindowAboveShell &&
-      !uScreen->forcePaintOnTop() &&
-      !uScreen->fullscreenRegion.contains(window->geometry()))
+  if (uScreen->doShellRepaint && window == uScreen->onboard_)
+  {
+    uScreen->paintDisplay();
+  }
+  else if (uScreen->doShellRepaint &&
+           window == uScreen->firstWindowAboveShell &&
+           !uScreen->forcePaintOnTop() &&
+           !uScreen->fullscreenRegion.contains(window->geometry()))
   {
     uScreen->paintDisplay();
   }
@@ -3203,6 +3207,11 @@
           }));
         }
       }
+      else if (WindowManager::Default().IsOnscreenKeyboard(window->id()))
+      {
+        uScreen->onboard_ = window;
+        uScreen->RaiseOSK();
+      }
     /* Fall through an re-evaluate wraps on map and unmap too */
     case CompWindowNotifyUnmap:
       if (uScreen->optionGetShowMinimizedWindows() && window->mapNum() &&
@@ -4122,7 +4131,7 @@
   if (window->state() & CompWindowStateFullscreenMask)
     uScreen->fullscreen_windows_.push_back(window);
 
-  if (window->type() == CompWindowTypeUtilMask && window->resName() == "onboard")
+  if (WindowManager::Default().IsOnscreenKeyboard(window->id()) && window->isViewable())
   {
     uScreen->onboard_ = window;
     uScreen->RaiseOSK();

=== modified file 'tests/MockWindowManager.h'
--- tests/MockWindowManager.h	2013-08-08 14:43:50 +0000
+++ tests/MockWindowManager.h	2015-05-15 19:50:26 +0000
@@ -100,6 +100,7 @@
     MOCK_METHOD0(RestoreInputFocus, bool());
 
     MOCK_CONST_METHOD1(GetWindowName, std::string(Window));
+    MOCK_CONST_METHOD1(IsOnscreenKeyboard, bool(Window));
 
     MOCK_METHOD1(AddProperties, void(GVariantBuilder*));
 };

=== modified file 'unity-shared/StandaloneWindowManager.cpp'
--- unity-shared/StandaloneWindowManager.cpp	2014-04-02 21:42:12 +0000
+++ unity-shared/StandaloneWindowManager.cpp	2015-05-15 19:50:26 +0000
@@ -603,6 +603,11 @@
   return "";
 }
 
+bool StandaloneWindowManager::IsOnscreenKeyboard(Window window_id) const
+{
+  return false;
+}
+
 std::string StandaloneWindowManager::GetStringProperty(Window, Atom) const
 {
   return std::string();

=== modified file 'unity-shared/StandaloneWindowManager.h'
--- unity-shared/StandaloneWindowManager.h	2014-12-16 19:27:36 +0000
+++ unity-shared/StandaloneWindowManager.h	2015-05-15 19:50:26 +0000
@@ -160,6 +160,7 @@
   virtual bool RestoreInputFocus();
 
   virtual std::string GetWindowName(Window window_id) const;
+  virtual bool IsOnscreenKeyboard(Window window_id) const;
   virtual std::string GetStringProperty(Window window_id, Atom) const;
   virtual std::vector<long> GetCardinalProperty(Window window_id, Atom) const;
 

=== modified file 'unity-shared/WindowManager.h'
--- unity-shared/WindowManager.h	2014-12-16 19:27:36 +0000
+++ unity-shared/WindowManager.h	2015-05-15 19:50:26 +0000
@@ -165,6 +165,7 @@
   virtual bool RestoreInputFocus() = 0;
 
   virtual std::string GetWindowName(Window window_id) const = 0;
+  virtual bool IsOnscreenKeyboard(Window window_id) const = 0;
 
   virtual std::string GetStringProperty(Window, Atom) const = 0;
   virtual std::vector<long> GetCardinalProperty(Window, Atom) const = 0;

=== modified file 'unity-shared/XWindowManager.cpp'
--- unity-shared/XWindowManager.cpp	2014-12-08 22:38:02 +0000
+++ unity-shared/XWindowManager.cpp	2015-05-15 19:50:26 +0000
@@ -36,6 +36,7 @@
 {
 Atom _NET_WM_VISIBLE_NAME = 0;
 Atom XA_COMPOUND_TEXT = 0;
+Atom ONSCREEN_KEYBOARD = 0;
 }
 }
 
@@ -43,6 +44,7 @@
 {
   atom::_NET_WM_VISIBLE_NAME = XInternAtom(screen->dpy(), "_NET_WM_VISIBLE_NAME", False);
   atom::XA_COMPOUND_TEXT = XInternAtom(screen->dpy(), "COMPOUND_TEXT", False);
+  atom::ONSCREEN_KEYBOARD = XInternAtom(screen->dpy(), "ONSCREEN_KEYBOARD", False);
 }
 
 std::string XWindowManager::GetStringProperty(Window window_id, Atom atom) const
@@ -162,6 +164,16 @@
   return GetStringProperty(window_id, XA_WM_NAME);
 }
 
+bool XWindowManager::IsOnscreenKeyboard(Window window_id) const
+{
+  std::vector<long> values = GetCardinalProperty(window_id, atom::ONSCREEN_KEYBOARD);
+
+  if (values.empty())
+    return false;
+
+  return values[0] != 0;
+}
+
 void XWindowManager::UnGrabMousePointer(Time timestamp, int button, int x, int y)
 {
   Display* dpy = nux::GetGraphicsDisplay()->GetX11Display();

=== modified file 'unity-shared/XWindowManager.h'
--- unity-shared/XWindowManager.h	2014-02-14 03:05:02 +0000
+++ unity-shared/XWindowManager.h	2015-05-15 19:50:26 +0000
@@ -34,6 +34,7 @@
   void UnGrabMousePointer(Time, int button, int x, int y);
 
   std::string GetWindowName(Window window_id) const;
+  bool IsOnscreenKeyboard(Window window_id) const;
   std::string GetStringProperty(Window window_id, Atom atom) const;
   std::vector<long> GetCardinalProperty(Window, Atom) const;
 };