Merge ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic

[Marco Trevisan (Treviño)]

upstream/3.28.x should be pulled from salsa (or my lp repo)

Bionic branch for mutter is at:
 https://code.launchpad.net/~canonical-desktop-team/ubuntu/+source/mutter/+git/mutter

[Iain Lane (laney)]

Cheers. I commented on IRC, but for the record - please make sure the bug has SRU information.

review: Needs Fixing

diff --git a/debian/changelog b/debian/changelog
index 69849e0..3a0f865 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnome-shell (3.28.3-0ubuntu0.18.04.3) UNRELEASED; urgency=medium
+
+  * d/p/popupMenu-Don-t-handle-key-presses-directly-if-there-are-.patch
+    -  Don't handle key presses directly if there are modifiers (LP: #1784671)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Wed, 01 Aug 2018 16:52:22 +0200
+
 gnome-shell (3.28.3-0ubuntu0.18.04.2) bionic; urgency=medium
 
   * debian/patches/js-fix-invalid-access-errors.patch:
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 00514af..bb36f7c 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
 debian-branch=ubuntu/bionic
-upstream-branch=upstream/latest
+upstream-branch=upstream/3.28.x
 debian-tag=ubuntu/%(version)s
 upstream-vcs-tag=%(version)s
 pristine-tar=True
diff --git a/debian/patches/popupMenu-Don-t-handle-key-presses-directly-if-there-are-.patch b/debian/patches/popupMenu-Don-t-handle-key-presses-directly-if-there-are-.patch
new file mode 100644
index 0000000..5690583
--- /dev/null
+++ b/debian/patches/popupMenu-Don-t-handle-key-presses-directly-if-there-are-.patch
@@ -0,0 +1,44 @@
+From: Andrea Azzarone <[e-mail]>
+Date: Thu, 21 Jun 2018 16:40:43 +0000
+Subject: popupMenu: Don't handle key presses directly if there are modifiers
+
+Key events involved in a keyboard shortcut are not completely consumed by
+Mutter. That means that if the popupMenu is bound to a shortcut (e.g.
+Alt<Space>) and the user keeps the keys pressed, the same key-event will be
+delivered to the popupMenu. We can workaround this issue filtering out all the
+events where a a modifier is down (except capslock).
+
+Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/372
+
+(cherry picked from commit 2e90c5fa4b35ebe26c694223966834ee949cfce3)
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1784671
+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/372
+Applied-Upstream: 3.28.4, commit:https://gitlab.gnome.org/GNOME/gnome-shell/commit/445eed40
+---
+ js/ui/popupMenu.js | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
+index 83194d7..f449d6e 100644
+--- a/js/ui/popupMenu.js
++++ b/js/ui/popupMenu.js
+@@ -141,8 +141,17 @@ var PopupBaseMenuItem = new Lang.Class({
+     },
+ 
+     _onKeyPressEvent(actor, event) {
+-        let symbol = event.get_key_symbol();
++        let state = event.get_state();
+ 
++        // if user has a modifier down (except capslock)
++        // then don't handle the key press here
++        state &= ~Clutter.ModifierType.LOCK_MASK;
++        state &= Clutter.ModifierType.MODIFIER_MASK;
++
++        if (state)
++            return Clutter.EVENT_PROPAGATE;
++
++        let symbol = event.get_key_symbol();
+         if (symbol == Clutter.KEY_space || symbol == Clutter.KEY_Return) {
+             this.activate(event);
+             return Clutter.EVENT_STOP;
diff --git a/debian/patches/series b/debian/patches/series
index 8f14220..3e0fd79 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,3 +21,4 @@ js-ui-Choose-some-actors-to-cache-on-the-GPU.patch
 authPrompt-Unset-preemptiveAnswer-on-reset.patch
 authPrompt-Do-not-enable-sensitivity-if-retries-are-disal.patch
 gdm-util-Always-allow-to-retry-login-in-unlock-mode.patch
+popupMenu-Don-t-handle-key-presses-directly-if-there-are-.patch
diff --git a/debian/patches/shell-ignore-invalid-window-monitor-index.patch b/debian/patches/shell-ignore-invalid-window-monitor-index.patch
index 895d157..4d223de 100644
--- a/debian/patches/shell-ignore-invalid-window-monitor-index.patch
+++ b/debian/patches/shell-ignore-invalid-window-monitor-index.patch
@@ -36,10 +36,10 @@ Forwarded: yes
  3 files changed, 12 insertions(+), 7 deletions(-)
 
 diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
-index e13c7b7..14f6e7b 100644
+index 5fcdf98..dd47676 100644
 --- a/js/ui/keyboard.js
 +++ b/js/ui/keyboard.js
-@@ -939,6 +939,12 @@ var Keyboard = new Lang.Class({
+@@ -919,6 +919,12 @@ var Keyboard = new Lang.Class({
          if (this.actor == null)
              return;
          let monitor = Main.layoutManager.keyboardMonitor;
@@ -52,7 +52,7 @@ index e13c7b7..14f6e7b 100644
          let maxHeight = monitor.height / 3;
          this.actor.width = monitor.width;
          this.actor.height = maxHeight;
-@@ -1001,6 +1007,8 @@ var Keyboard = new Lang.Class({
+@@ -981,6 +987,8 @@ var Keyboard = new Lang.Class({
          if (!this._enabled)
              return;