Merge lp:~townsend/unity/fix-switcher-mouse into lp:unity

[Christopher Townsend]

Fix where the mouse_disabled_ variable was unintialized which would cause the Switcher to not work correctly with the mouse and arrow keys.
Fix the mouse filter list to account for only motion and button click/release so arrow key navigation will still work in the Switcher when mouse interaction is disabled.

Fix where the mouse_disabled_ variable was unintialized which would cause the Switcher to not work correctly with the mouse and arrow keys.
Fix the mouse filter list to account for only motion and button click/release so arrow key navigation will still work in the Switcher when mouse interaction is disabled.

[Brandon Schaefer (brandontschaefer)]

Sweet, looks good to me!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'launcher/SwitcherController.cpp'
--- launcher/SwitcherController.cpp	2013-11-21 16:06:58 +0000
+++ launcher/SwitcherController.cpp	2014-02-12 20:29:25 +0000
@@ -77,6 +77,7 @@
   , visible_(false)
   , monitor_(0)
   , show_desktop_disabled_(false)
+  , mouse_disabled_(false)
   , detail_mode_(DetailMode::TAB_NEXT_WINDOW)
   , impl_(new Controller::Impl(this, 20, create_window))
 {}

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-01-31 23:47:28 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-02-12 20:29:25 +0000
@@ -1895,8 +1895,11 @@
       break;
   }
 
-  if (switcher_controller_->IsMouseDisabled() && switcher_controller_->Visible())
+  if ((event->type == MotionNotify || event->type == ButtonPress || event->type == ButtonRelease) &&
+      switcher_controller_->IsMouseDisabled() && switcher_controller_->Visible())
+  {
     skip_other_plugins = true;
+  }
 
   if (!skip_other_plugins &&
       screen->otherGrabExist("deco", "move", "switcher", "resize", nullptr))