Merge lp:~brandontschaefer/unity/lp.1313885-fix into lp:unity

[Brandon Schaefer]

Workaround for Command lens, Alt+F1, Super+Tab short cuts by passing the lockscreen!

Workaround for Command lens, Alt+F1, Super+Tab short cuts by passing the lockscreen!

[lp:~brandontschaefer/unity/lp.1313885-fix]

3793. By Brandon Schaefer on 2014-04-28

* Fix style issue

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3792
http://jenkins.qa.ubuntu.com/job/unity-ci/903/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/439
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/435
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/437

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

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

This branch is a better fix:
https://code.launchpad.net/~3v1n0/unity/lockscreen-keys-disable/+merge/217528

(Rejecting!)

Unmerged revisions

3793. By Brandon Schaefer on 2014-04-28

* Fix style issue

3792. By Brandon Schaefer on 2014-04-28

* Workaround for the command lens popping up (as well as a couple other shortcuts).
* The real issue, is right clicking enough gets you to the windows panel menu. This
  will need some time to dig into.

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-04-17 18:53:52 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-04-28 23:10:22 +0000
@@ -2145,6 +2145,9 @@
 
 void UnityScreen::SendExecuteCommand()
 {
+  if (lockscreen_controller_->IsLocked())
+    return;
+
   if (hud_controller_->IsVisible())
   {
     hud_controller_->HideHud();
@@ -2196,6 +2199,9 @@
 
 bool UnityScreen::altTabInitiateCommon(CompAction* action, switcher::ShowMode show_mode)
 {
+  if (lockscreen_controller_->IsLocked())
+    return true;
+
   if (!grab_index_)
   {
     if (switcher_controller_->IsMouseDisabled())
@@ -2226,9 +2232,6 @@
 
 void UnityScreen::SetUpAndShowSwitcher(switcher::ShowMode show_mode)
 {
-  if(lockscreen_controller_->IsLocked())
-    return;
-
   RaiseInputWindows();
 
   if (!optionGetAltTabBiasViewport())
@@ -2356,6 +2359,9 @@
 
 bool UnityScreen::launcherSwitcherForwardInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
 {
+  if (lockscreen_controller_->IsLocked())
+    return true;
+
   if (!launcher_controller_->KeyNavIsActive())
   {
     int modifiers = action->key().modifiers();
@@ -2386,6 +2392,9 @@
 
 bool UnityScreen::launcherSwitcherPrevInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
 {
+  if (lockscreen_controller_->IsLocked())
+    return true;
+
   launcher_controller_->KeyNavPrevious();
 
   return true;
@@ -2393,6 +2402,9 @@
 
 bool UnityScreen::launcherSwitcherTerminate(CompAction* action, CompAction::State state, CompOption::Vector& options)
 {
+  if (lockscreen_controller_->IsLocked())
+    return true;
+
   bool accept_state = (state & CompAction::StateCancel) == 0;
   launcher_controller_->KeyNavTerminate(accept_state);
 
@@ -2415,6 +2427,9 @@
 
 void UnityScreen::OnLauncherStartKeyNav(GVariant* data)
 {
+  if (lockscreen_controller_->IsLocked())
+    return;
+
   // Put the launcher BaseWindow at the top of the BaseWindow stack. The
   // input focus coming from the XinputWindow will be processed by the
   // launcher BaseWindow only. Then the Launcher BaseWindow will decide