* 02_remove_ungrad_workaround2.patch:

 - part 2 of the patch, enabling pressing alt + keys in some additional cases (bzr r55.3.613)

3 files changed, 92 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 797c5bce3..e3ec351a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+unity (5.6.0-0ubuntu4) UNRELEASED; urgency=low
+
+ * 02_remove_ungrad_workaround2.patch:
+ - part 2 of the patch, enabling pressing alt + keys in some additional
+ cases
+
+ -- Didier Roche <didrocks@ubuntu.com> Wed, 14 Mar 2012 12:03:24 +0100
+
 unity (5.6.0-0ubuntu3) precise; urgency=low
 
 * debian/control:
diff --git a/debian/patches/02_remove_ungrad_workaround2.patch b/debian/patches/02_remove_ungrad_workaround2.patch
new file mode 100644
index 000000000..ab6be3ad0
--- /dev/null
+++ b/debian/patches/02_remove_ungrad_workaround2.patch
@@ -0,0 +1,83 @@
+=== added file 'manual-tests/AltCombos.txt'
+--- a/manual-tests/AltCombos.txt	1970-01-01 00:00:00 +0000
++++ b/manual-tests/AltCombos.txt	2012-03-14 09:20:23 +0000
+@@ -0,0 +1,10 @@
++Alt+Arrow keys not passed to application
++----------------------------------------
++Tests that Alt+ArrowKey events are correctly passed to the active window
++when Unity is not responding to them.
++
++#. Open gnome-terminal
++#. While holding Alt, tap arrow keys: Up, Down, Right, Left
++
++Outcome
++ The terminal should show the keycodes were received as text "ABCD".
+
+=== modified file 'plugins/unityshell/src/unityshell.cpp'
+--- a/plugins/unityshell/src/unityshell.cpp	2012-03-13 20:44:08 +0000
++++ b/plugins/unityshell/src/unityshell.cpp	2012-03-14 09:20:23 +0000
+@@ -1767,33 +1767,45 @@
+ bool UnityScreen::altTabPrevAllInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
+ {
+ if (switcher_controller_->Visible())
++ {
+ switcher_controller_->Prev();
++ return true;
++ }
+ 
+- return true;
++ return false;
+ }
+ 
+ bool UnityScreen::altTabPrevInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
+ {
+ if (switcher_controller_->Visible())
++ {
+ switcher_controller_->Prev();
++ return true;
++ }
+ 
+- return true;
++ return false;
+ }
+ 
+ bool UnityScreen::altTabDetailStartInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
+ {
+ if (switcher_controller_->Visible())
++ {
+ switcher_controller_->SetDetail(true);
++ return true;
++ }
+ 
+- return true;
++ return false;
+ }
+ 
+ bool UnityScreen::altTabDetailStopInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
+ {
+ if (switcher_controller_->Visible())
++ {
+ switcher_controller_->SetDetail(false);
++ return true;
++ }
+ 
+- return true;
++ return false;
+ }
+ 
+ bool UnityScreen::altTabNextWindowInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
+@@ -1813,9 +1825,12 @@
+ bool UnityScreen::altTabPrevWindowInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
+ {
+ if (switcher_controller_->Visible())
++ {
+ switcher_controller_->PrevDetail();
++ return true;
++ }
+ 
+- return true;
++ return false;
+ }
+ 
+ bool UnityScreen::launcherSwitcherForwardInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
+
diff --git a/debian/patches/series b/debian/patches/series
index 5810543af..addaadbff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_remove_ungrab_workaround.patch
+02_remove_ungrad_workaround2.patch