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

[Marco Trevisan (Treviño)]

[Iain Lane (laney)]

Thanks.

I haven't reviewed fully, but the version is not right - we need a "-" in there somewhere otherwise this is treated as a native package, which it isn't. I suggest "3.28.3+git20181011-0ubuntu18.04.1".

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Also, the fix for bug 1767648 (and hence bug 1779615) is not in disco or cosmic yet(?)

[Marco Trevisan (Treviño) (3v1n0)]

> Also, the fix for bug 1767648 (and hence bug 1779615) is not in disco or
> cosmic yet(?)

For both I'm preparing a landing in disco, don't worry (that's why I'm delaying the fixes on this a bit), so they were planned to land in disco already in the coming upload.

diff --git a/debian/changelog b/debian/changelog
index 360eba4..645be25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+mutter (3.28.3+git20190124-0ubuntu18.04.1) UNRELEASED; urgency=medium
+
+  * New upstream git snapshot based on 3.28.3 plus commits up to 4af8d9d47
+    (LP: #1811900)
+    - Fix crash in dual monitor setup and gdm activation (LP: #1790525,
+      LP: #1795774)
+    - Make possible to launch gnome-shell in wayland using nvidia and EGLDevice
+      backend (LP: #1805444)
+  * debian/libmutter-2-0.symbols: Add new symbols
+  * d/p/gpu-kms-Don-t-crash-if-drmModeGetResources-returns-N.patch,
+    d/p/native-gpu-Handle-drmModeSetCrtc-failing-gracefully.patch,
+    d/p/monitor-manager-Filter-out-low-screen-resolutions.patch,
+    d/p/window-wayland-Always-update-monitor-for-non-user-ops.patch,
+    d/p/window-Don-t-refuse-to-move-focus-to-the-grab-window.patch,
+    d/p/window-Explicitly-exclude-unmanaging-window-from-focus-ag.patch,
+    d/p/monitor-Use-current-monitor-mode-to-check-whether-active.patch,
+    d/p/core-Return-1-if-meta_window_get_monitor-is-called-on-an-.patch,
+    d/p/renderer-native-Fallback-to-non-planar-API-if-gbm_bo_get_.patch,
+    d/p/clutter-x11-Implement-keycode-lookup-from-keysyms-on-virt.patch,
+    d/p/clutter-Do-not-latch-modifiers-on-modifier-keys.patch:
+    - Removed as applied upstream
+  * d/p/clutter-Fix-offscreen-effect-painting-of-clones.patch:
+    - Fix offscreen-effect painting of clones in zoom mode (LP: #1767648,
+      LP: #1779615)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Thu, 24 Jan 2019 18:05:12 +0000
+
 mutter (3.28.3-2~ubuntu18.04.2) bionic; urgency=medium
 
   * d/p/renderer-native-Fallback-to-non-planar-API-if-gbm_bo_get_.patch:
diff --git a/debian/libmutter-2-0.symbols b/debian/libmutter-2-0.symbols
index e4203ad..1489074 100644
--- a/debian/libmutter-2-0.symbols
+++ b/debian/libmutter-2-0.symbols
@@ -545,7 +545,9 @@ libmutter-2.so.0 libmutter-2-0 #MINVER#
  meta_gpu_get_type@Base 3.28.2
  meta_gpu_has_hotplug_mode_update@Base 3.28.2
  meta_gpu_kms_apply_crtc_mode@Base 3.28.2
+ meta_gpu_kms_can_have_outputs@Base 3.28.3+git20190124
  meta_gpu_kms_error_quark@Base 3.28.2
+ meta_gpu_kms_flip_closure_container_free@Base 3.28.3+git20190124
  meta_gpu_kms_flip_crtc@Base 3.28.2
  meta_gpu_kms_get_fd@Base 3.28.2
  meta_gpu_kms_get_file_path@Base 3.28.2
@@ -556,6 +558,7 @@ libmutter-2.so.0 libmutter-2-0 #MINVER#
  meta_gpu_kms_new@Base 3.28.2
  meta_gpu_kms_set_power_save_mode@Base 3.28.2
  meta_gpu_kms_wait_for_flip@Base 3.28.2
+ meta_gpu_kms_wrap_flip_closure@Base 3.28.3+git20190124
  meta_gpu_read_current@Base 3.28.2
  meta_gpu_take_crtcs@Base 3.28.2
  meta_gpu_take_modes@Base 3.28.2
@@ -1238,14 +1241,17 @@ libmutter-2.so.0 libmutter-2-0 #MINVER#
  meta_warning@Base 3.28.2
  meta_wayland_actor_surface_calculate_scale@Base 3.28.2
  meta_wayland_actor_surface_get_type@Base 3.28.2
+ meta_wayland_actor_surface_queue_frame_callbacks@Base 3.28.3+git20190124
  meta_wayland_actor_surface_sync_actor_state@Base 3.28.2
  meta_wayland_buffer_attach@Base 3.28.2
  meta_wayland_buffer_create_snippet@Base 3.28.2
  meta_wayland_buffer_from_resource@Base 3.28.2
  meta_wayland_buffer_get_texture@Base 3.28.2
  meta_wayland_buffer_get_type@Base 3.28.2
+ meta_wayland_buffer_is_realized@Base 3.28.3+git20190124
  meta_wayland_buffer_is_y_inverted@Base 3.28.2
  meta_wayland_buffer_process_damage@Base 3.28.2
+ meta_wayland_buffer_realize@Base 3.28.3+git20190124
  meta_wayland_compositor_destroy_frame_callbacks@Base 3.28.2
  meta_wayland_compositor_flush_clients@Base 3.28.2
  meta_wayland_compositor_get_default@Base 3.28.2
@@ -1397,6 +1403,7 @@ libmutter-2.so.0 libmutter-2-0 #MINVER#
  meta_wayland_surface_apply_pending_state@Base 3.28.2
  meta_wayland_surface_assign_role@Base 3.28.2
  meta_wayland_surface_begin_grab_op@Base 3.28.2
+ meta_wayland_surface_cache_pending_frame_callbacks@Base 3.28.3+git20190124
  meta_wayland_surface_calculate_input_region@Base 3.28.2
  meta_wayland_surface_cancel_inhibit_shortcuts_dialog@Base 3.28.2
  meta_wayland_surface_clear_surface_actor@Base 3.28.2
diff --git a/debian/patches/bgo768531_workaround-startup-notifications.patch b/debian/patches/bgo768531_workaround-startup-notifications.patch
index bc6b697..26ac823 100644
--- a/debian/patches/bgo768531_workaround-startup-notifications.patch
+++ b/debian/patches/bgo768531_workaround-startup-notifications.patch
@@ -16,10 +16,10 @@ Applied-upstream: no
  1 file changed, 10 insertions(+)
 
 diff --git a/src/wayland/meta-wayland-gtk-shell.c b/src/wayland/meta-wayland-gtk-shell.c
-index 0ef9b83..891109a 100644
+index 474595b..5837567 100644
 --- a/src/wayland/meta-wayland-gtk-shell.c
 +++ b/src/wayland/meta-wayland-gtk-shell.c
-@@ -312,11 +312,21 @@ gtk_shell_set_startup_id (struct wl_client   *client,
+@@ -321,11 +321,21 @@ gtk_shell_set_startup_id (struct wl_client   *client,
                            struct wl_resource *resource,
                            const char         *startup_id)
  {
diff --git a/debian/patches/clutter-Do-not-latch-modifiers-on-modifier-keys.patch b/debian/patches/clutter-Do-not-latch-modifiers-on-modifier-keys.patch
 deleted file mode 100644
index 120171f..0000000
--- a/debian/patches/clutter-Do-not-latch-modifiers-on-modifier-keys.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Carlos Garnacho <[e-mail]>
-Date: Wed, 3 Oct 2018 22:43:21 +0200
-Subject: clutter: Do not latch modifiers on modifier keys
-
-If the user maps eg. Alt+F2 to a pad button, the MetaInputSettings will
-send the full Alt press, F2 press, F2 release, Alt release sequence.
-However the keycode corresponding to Alt is found in level 1, so the
-Shift modifier gets unintendedly latched in addition to the Alt key
-press/release pair.
-
-We could probably improve keycode lookup heuristics so level=0 (and
-no modifier latching) is preferred, but we can do without it altogether
-for modifier keys.
-
-Ubuntu-Bug: https://bugs.launchpad.net/oem-priority/+bug/1730211
-Applied-Upstream: yes, 3.30.1
----
- clutter/clutter/x11/clutter-virtual-input-device-x11.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/clutter/clutter/x11/clutter-virtual-input-device-x11.c b/clutter/clutter/x11/clutter-virtual-input-device-x11.c
-index b86ded0..e16ba3f 100644
---- a/clutter/clutter/x11/clutter-virtual-input-device-x11.c
-+++ b/clutter/clutter/x11/clutter-virtual-input-device-x11.c
-@@ -147,14 +147,16 @@ clutter_virtual_input_device_x11_notify_keyval (ClutterVirtualInputDevice *virtu
-       return;
-     }
- 
--  if (key_state == CLUTTER_KEY_STATE_PRESSED)
-+  if (!_clutter_keymap_x11_get_is_modifier (keymap, keycode) &&
-+      key_state == CLUTTER_KEY_STATE_PRESSED)
-     clutter_keymap_x11_latch_modifiers (keymap, level, TRUE);
- 
-   XTestFakeKeyEvent (clutter_x11_get_default_display (),
-                      (KeyCode) keycode,
-                      key_state == CLUTTER_KEY_STATE_PRESSED, 0);
- 
--  if (key_state == CLUTTER_KEY_STATE_RELEASED)
-+  if (!_clutter_keymap_x11_get_is_modifier (keymap, keycode) &&
-+      key_state == CLUTTER_KEY_STATE_RELEASED)
-     clutter_keymap_x11_latch_modifiers (keymap, level, FALSE);
- }
- 
diff --git a/debian/patches/clutter-Fix-offscreen-effect-painting-of-clones.patch b/debian/patches/clutter-Fix-offscreen-effect-painting-of-clones.patch
 new file mode 100644
index 0000000..faa2d7a
--- /dev/null
+++ b/debian/patches/clutter-Fix-offscreen-effect-painting-of-clones.patch
@@ -0,0 +1,629 @@
+From: Daniel van Vugt <[e-mail]>
+Date: Thu, 24 May 2018 11:51:22 +0200
+Subject: clutter: Fix offscreen-effect painting of clones
+
+`ClutterOffscreenEffect` had been getting the wrong bounding box in the
+case of clones and descendents of clones, causing visibly incorrect
+clipping. This was due to `clutter_actor_get_paint_box` only ever being
+given the source actor during a paint (which is correct) and not the clone.
+Even if we weren't painting a clone but an offscreened descendent of a
+clone (like in gnome-shell's desktop zoom), we would get the wrong result.
+
+Fortunately we don't need to know the actual clone/actor being painted so
+don't need to call the problematic `clutter_actor_get_paint_box` at all.
+The solution is to only keep untransformed rendering in the FBO and leave
+the correct transformation for later. The correct clone/actor's
+transformation is already set for us as the current cogl modelview matrix
+by `clutter_actor_paint`.
+
+Bonus optimization: This all means we don't need to keep `last_matrix_drawn`
+or force a full repaint every time some part of the transformation changes.
+Because the FBO contents are no longer affected by transformations. As it
+should be. In other words, offscreen-effected actors can now move around
+on screen without themselves being repainted.
+
+Special thanks to Mai Lavelle for identifying the cause of the problem.
+
+Fixes:
+https://bugzilla.gnome.org/show_bug.cgi?id=789050,
+https://bugzilla.gnome.org/show_bug.cgi?id=659523#c9,
+https://gitlab.gnome.org/GNOME/mutter/issues/196,
+https://gitlab.gnome.org/GNOME/mutter/issues/282,
+https://gitlab.gnome.org/GNOME/gnome-shell/issues/387,
+https://launchpad.net/bugs/1767648,
+https://launchpad.net/bugs/1779615
+
+Origin: https://gitlab.gnome.org/GNOME/mutter/commit/8655bc5d8d
+Bug-Ubuntu: https://launchpad.net/bugs/1767648, https://launchpad.net/bugs/1779615
+Applied-Upstream: yes
+---
+ clutter/clutter/clutter-actor-box-private.h        |  12 ++
+ clutter/clutter/clutter-actor-box.c                |  52 +++++++
+ clutter/clutter/clutter-offscreen-effect.c         | 172 +++++++++------------
+ clutter/clutter/clutter-paint-volume.c             |  48 +-----
+ clutter/tests/conform/Makefile.am                  |   1 -
+ .../tests/conform/actor-offscreen-limit-max-size.c | 119 --------------
+ clutter/tests/conform/actor-offscreen-redirect.c   |   7 +-
+ 7 files changed, 146 insertions(+), 265 deletions(-)
+ create mode 100644 clutter/clutter/clutter-actor-box-private.h
+ delete mode 100644 clutter/tests/conform/actor-offscreen-limit-max-size.c
+
+diff --git a/clutter/clutter/clutter-actor-box-private.h b/clutter/clutter/clutter-actor-box-private.h
+new file mode 100644
+index 0000000..e7aeb88
+--- /dev/null
++++ b/clutter/clutter/clutter-actor-box-private.h
+@@ -0,0 +1,12 @@
++#ifndef __CLUTTER_ACTOR_BOX_PRIVATE_H__
++#define __CLUTTER_ACTOR_BOX_PRIVATE_H__
++
++#include <clutter/clutter-types.h>
++
++G_BEGIN_DECLS
++
++void _clutter_actor_box_enlarge_for_effects (ClutterActorBox *box);
++
++G_END_DECLS
++
++#endif /* __CLUTTER_ACTOR_BOX_PRIVATE_H__ */
+diff --git a/clutter/clutter/clutter-actor-box.c b/clutter/clutter/clutter-actor-box.c
+index 2991066..319eec3 100644
+--- a/clutter/clutter/clutter-actor-box.c
++++ b/clutter/clutter/clutter-actor-box.c
+@@ -7,6 +7,7 @@
+ #include "clutter-types.h"
+ #include "clutter-interval.h"
+ #include "clutter-private.h"
++#include "clutter-actor-box-private.h"
+ 
+ /**
+  * clutter_actor_box_new:
+@@ -544,6 +545,57 @@ clutter_actor_box_set_size (ClutterActorBox *box,
+   box->y2 = box->y1 + height;
+ }
+ 
++void
++_clutter_actor_box_enlarge_for_effects (ClutterActorBox *box)
++{
++  float width, height;
++
++  /* The aim here is that for a given rectangle defined with floating point
++   * coordinates we want to determine a stable quantized size in pixels
++   * that doesn't vary due to the original box's sub-pixel position.
++   *
++   * The reason this is important is because effects will use this
++   * API to determine the size of offscreen framebuffers and so for
++   * a fixed-size object that may be animated accross the screen we
++   * want to make sure that the stage paint-box has an equally stable
++   * size so that effects aren't made to continuously re-allocate
++   * a corresponding fbo.
++   *
++   * The other thing we consider is that the calculation of this box is
++   * subject to floating point precision issues that might be slightly
++   * different to the precision issues involved with actually painting the
++   * actor, which might result in painting slightly leaking outside the
++   * user's calculated paint-volume. For this we simply aim to pad out the
++   * paint-volume by at least half a pixel all the way around.
++   */
++  width = box->x2 - box->x1;
++  height = box->y2 - box->y1;
++  width = CLUTTER_NEARBYINT (width);
++  height = CLUTTER_NEARBYINT (height);
++  /* XXX: NB the width/height may now be up to 0.5px too small so we
++   * must also pad by 0.25px all around to account for this. In total we
++   * must padd by at least 0.75px around all sides. */
++
++  /* XXX: The furthest that we can overshoot the bottom right corner by
++   * here is 1.75px in total if you consider that the 0.75 padding could
++   * just cross an integer boundary and so ceil will effectively add 1.
++   */
++  box->x2 = ceilf (box->x2 + 0.75);
++  box->y2 = ceilf (box->y2 + 0.75);
++
++  /* Now we redefine the top-left relative to the bottom right based on the
++   * rounded width/height determined above + a constant so that the overall
++   * size of the box will be stable and not dependant on the box's
++   * position.
++   *
++   * Adding 3px to the width/height will ensure we cover the maximum of
++   * 1.75px padding on the bottom/right and still ensure we have > 0.75px
++   * padding on the top/left.
++   */
++  box->x1 = box->x2 - width - 3;
++  box->y1 = box->y2 - height - 3;
++}
++
+ G_DEFINE_BOXED_TYPE_WITH_CODE (ClutterActorBox, clutter_actor_box,
+                                clutter_actor_box_copy,
+                                clutter_actor_box_free,
+diff --git a/clutter/clutter/clutter-offscreen-effect.c b/clutter/clutter/clutter-offscreen-effect.c
+index 5db40b7..a26275e 100644
+--- a/clutter/clutter/clutter-offscreen-effect.c
++++ b/clutter/clutter/clutter-offscreen-effect.c
+@@ -74,6 +74,8 @@
+ #include "clutter-debug.h"
+ #include "clutter-private.h"
+ #include "clutter-stage-private.h"
++#include "clutter-paint-volume-private.h"
++#include "clutter-actor-box-private.h"
+ 
+ struct _ClutterOffscreenEffectPrivate
+ {
+@@ -84,8 +86,10 @@ struct _ClutterOffscreenEffectPrivate
+   ClutterActor *actor;
+   ClutterActor *stage;
+ 
+-  gfloat x_offset;
+-  gfloat y_offset;
++  ClutterVertex position;
++
++  int fbo_offset_x;
++  int fbo_offset_y;
+ 
+   /* This is the calculated size of the fbo before being passed
+      through create_texture(). This needs to be tracked separately so
+@@ -95,16 +99,6 @@ struct _ClutterOffscreenEffectPrivate
+   int fbo_height;
+ 
+   gint old_opacity_override;
+-
+-  /* The matrix that was current the last time the fbo was updated. We
+-     need to keep track of this to detect when we can reuse the
+-     contents of the fbo without redrawing the actor. We need the
+-     actual matrix rather than just detecting queued redraws on the
+-     actor because any change in the parent hierarchy (even just a
+-     translation) could cause the actor to look completely different
+-     and it won't cause a redraw to be queued on the parent's
+-     children. */
+-  CoglMatrix last_matrix_drawn;
+ };
+ 
+ G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ClutterOffscreenEffect,
+@@ -224,15 +218,15 @@ clutter_offscreen_effect_pre_paint (ClutterEffect *effect)
+ {
+   ClutterOffscreenEffect *self = CLUTTER_OFFSCREEN_EFFECT (effect);
+   ClutterOffscreenEffectPrivate *priv = self->priv;
+-  ClutterActorBox box;
++  ClutterActorBox raw_box, box;
+   ClutterActor *stage;
+-  CoglMatrix projection;
++  CoglMatrix projection, old_modelview, modelview;
++  const ClutterPaintVolume *volume;
+   CoglColor transparent;
+   gfloat stage_width, stage_height;
+   gfloat fbo_width = -1, fbo_height = -1;
+-  gfloat width, height;
+-  gfloat xexpand, yexpand;
+-  int texture_width, texture_height;
++  ClutterVertex local_offset = { 0.f, 0.f, 0.f };
++  gfloat old_viewport[4];
+ 
+   if (!clutter_actor_meta_get_enabled (CLUTTER_ACTOR_META (effect)))
+     return FALSE;
+@@ -243,92 +237,82 @@ clutter_offscreen_effect_pre_paint (ClutterEffect *effect)
+   stage = _clutter_actor_get_stage_internal (priv->actor);
+   clutter_actor_get_size (stage, &stage_width, &stage_height);
+ 
+-  /* The paint box is the bounding box of the actor's paint volume in
+-   * stage coordinates. This will give us the size for the framebuffer
+-   * we need to redirect its rendering offscreen and its position will
+-   * be used to setup an offset viewport */
+-  if (clutter_actor_get_paint_box (priv->actor, &box))
++  /* Get the minimal bounding box for what we want to paint, relative to the
++   * parent of priv->actor. Note that we may actually be painting a clone of
++   * priv->actor so we need to be careful to avoid querying the transformation
++   * of priv->actor (like clutter_actor_get_paint_box would). Just stay in
++   * local coordinates for now...
++   */
++  volume = clutter_actor_get_paint_volume (priv->actor);
++  if (volume)
+     {
+-      clutter_actor_box_get_size (&box, &fbo_width, &fbo_height);
+-      clutter_actor_box_get_origin (&box, &priv->x_offset, &priv->y_offset);
++      ClutterPaintVolume mutable_volume;
+ 
+-      fbo_width = MIN (fbo_width, stage_width);
+-      fbo_height = MIN (fbo_height, stage_height);
++      _clutter_paint_volume_copy_static (volume, &mutable_volume);
++      _clutter_paint_volume_get_bounding_box (&mutable_volume, &raw_box);
++      clutter_paint_volume_free (&mutable_volume);
+     }
+   else
+     {
+-      fbo_width = stage_width;
+-      fbo_height = stage_height;
++      clutter_actor_get_allocation_box (priv->actor, &raw_box);
+     }
+ 
+-  if (fbo_width == stage_width)
+-    priv->x_offset = 0.0f;
+-  if (fbo_height == stage_height)
+-    priv->y_offset = 0.0f;
++  box = raw_box;
++  _clutter_actor_box_enlarge_for_effects (&box);
++
++  priv->fbo_offset_x = box.x1 - raw_box.x1;
++  priv->fbo_offset_y = box.y1 - raw_box.y1;
++
++  clutter_actor_box_get_size (&box, &fbo_width, &fbo_height);
+ 
+   /* First assert that the framebuffer is the right size... */
+   if (!update_fbo (effect, fbo_width, fbo_height))
+     return FALSE;
+ 
+-  texture_width = cogl_texture_get_width (priv->texture);
+-  texture_height = cogl_texture_get_height (priv->texture);
+-
+-  /* get the current modelview matrix so that we can copy it to the
+-   * framebuffer. We also store the matrix that was last used when we
+-   * updated the FBO so that we can detect when we don't need to
+-   * update the FBO to paint a second time */
+-  cogl_get_modelview_matrix (&priv->last_matrix_drawn);
++  cogl_get_modelview_matrix (&old_modelview);
+ 
+   /* let's draw offscreen */
+   cogl_push_framebuffer (priv->offscreen);
+ 
+-  /* Copy the modelview that would have been used if rendering onscreen */
+-  cogl_set_modelview_matrix (&priv->last_matrix_drawn);
++  /* We don't want the FBO contents to be transformed. That could waste memory
++   * (e.g. during zoom), or result in something that's not rectangular (clipped
++   * incorrectly). So drop the modelview matrix of the current paint chain.
++   * This is fine since paint_texture runs with the same modelview matrix,
++   * so it will come out correctly whenever that is used to put the FBO
++   * contents on screen...
++   */
++  clutter_actor_get_transform (priv->stage, &modelview);
++  cogl_set_modelview_matrix (&modelview);
+ 
+-  /* Set up the viewport so that it has the same size as the stage,
+-   * but offset it so that the actor of interest lands on our
+-   * framebuffer. */
+-  clutter_actor_get_size (priv->stage, &width, &height);
++  /* Save the original viewport for calculating priv->position */
++  _clutter_stage_get_viewport (CLUTTER_STAGE (priv->stage),
++                               &old_viewport[0],
++                               &old_viewport[1],
++                               &old_viewport[2],
++                               &old_viewport[3]);
+ 
+-  /* Expand the viewport if the actor is partially off-stage,
+-   * otherwise the actor will end up clipped to the stage viewport
++  /* Set up the viewport so that it has the same size as the stage (avoid
++   * distortion), but translated to account for the FBO offset...
+    */
+-  xexpand = 0.f;
+-  if (priv->x_offset < 0.f)
+-    xexpand = -priv->x_offset;
+-  if (priv->x_offset + texture_width > width)
+-    xexpand = MAX (xexpand, (priv->x_offset + texture_width) - width);
+-
+-  yexpand = 0.f;
+-  if (priv->y_offset < 0.f)
+-    yexpand = -priv->y_offset;
+-  if (priv->y_offset + texture_height > height)
+-    yexpand = MAX (yexpand, (priv->y_offset + texture_height) - height);
+-
+-  /* Set the viewport */
+-  cogl_set_viewport (-(priv->x_offset + xexpand), -(priv->y_offset + yexpand),
+-                     width + (2 * xexpand), height + (2 * yexpand));
++  cogl_set_viewport (-priv->fbo_offset_x,
++                     -priv->fbo_offset_y,
++                     stage_width,
++                     stage_height);
+ 
+   /* Copy the stage's projection matrix across to the framebuffer */
+   _clutter_stage_get_projection_matrix (CLUTTER_STAGE (priv->stage),
+                                         &projection);
+ 
+-  /* If we've expanded the viewport, make sure to scale the projection
+-   * matrix accordingly (as it's been initialised to work with the
+-   * original viewport and not our expanded one).
++  /* Now save the global position of the effect (not just of the actor).
++   * It doesn't appear anyone actually uses this yet, but get_target_rect is
++   * documented as returning it. So we should...
+    */
+-  if (xexpand > 0.f || yexpand > 0.f)
+-    {
+-      gfloat new_width, new_height;
+-
+-      new_width = width + (2 * xexpand);
+-      new_height = height + (2 * yexpand);
+-
+-      cogl_matrix_scale (&projection,
+-                         width / new_width,
+-                         height / new_height,
+-                         1);
+-    }
++  _clutter_util_fully_transform_vertices (&old_modelview,
++                                          &projection,
++                                          old_viewport,
++                                          &local_offset,
++                                          &priv->position,
++                                          1);
+ 
+   cogl_set_projection_matrix (&projection);
+ 
+@@ -385,13 +369,14 @@ clutter_offscreen_effect_paint_texture (ClutterOffscreenEffect *effect)
+ 
+   cogl_push_matrix ();
+ 
+-  /* Now reset the modelview to put us in stage coordinates so
+-   * we can drawn the result of our offscreen render as a textured
+-   * quad... */
+-
+-  cogl_matrix_init_identity (&modelview);
+-  _clutter_actor_apply_modelview_transform (priv->stage, &modelview);
+-  cogl_matrix_translate (&modelview, priv->x_offset, priv->y_offset, 0.0f);
++  /* The current modelview matrix is *almost* perfect already. It's only
++   * missing a correction for the expanded FBO and offset rendering within...
++   */
++  cogl_get_modelview_matrix (&modelview);
++  cogl_matrix_translate (&modelview,
++                         priv->fbo_offset_x,
++                         priv->fbo_offset_y,
++                         0.0f);
+   cogl_set_modelview_matrix (&modelview);
+ 
+   /* paint the target material; this is virtualized for
+@@ -428,16 +413,11 @@ clutter_offscreen_effect_paint (ClutterEffect           *effect,
+ {
+   ClutterOffscreenEffect *self = CLUTTER_OFFSCREEN_EFFECT (effect);
+   ClutterOffscreenEffectPrivate *priv = self->priv;
+-  CoglMatrix matrix;
+-
+-  cogl_get_modelview_matrix (&matrix);
+ 
+-  /* If we've already got a cached image for the same matrix and the
+-     actor hasn't been redrawn then we can just use the cached image
+-     in the fbo */
+-  if (priv->offscreen == NULL ||
+-      (flags & CLUTTER_EFFECT_PAINT_ACTOR_DIRTY) ||
+-      !cogl_matrix_equal (&matrix, &priv->last_matrix_drawn))
++  /* If we've already got a cached image and the actor hasn't been redrawn
++   * then we can just use the cached image in the FBO.
++   */
++  if (priv->offscreen == NULL || (flags & CLUTTER_EFFECT_PAINT_ACTOR_DIRTY))
+     {
+       /* Chain up to the parent paint method which will call the pre and
+          post paint functions to update the image */
+@@ -663,8 +643,8 @@ clutter_offscreen_effect_get_target_rect (ClutterOffscreenEffect *effect,
+     return FALSE;
+ 
+   clutter_rect_init (rect,
+-                     priv->x_offset,
+-                     priv->y_offset,
++                     priv->position.x,
++                     priv->position.y,
+                      cogl_texture_get_width (priv->texture),
+                      cogl_texture_get_height (priv->texture));
+ 
+diff --git a/clutter/clutter/clutter-paint-volume.c b/clutter/clutter/clutter-paint-volume.c
+index f340513..836812b 100644
+--- a/clutter/clutter/clutter-paint-volume.c
++++ b/clutter/clutter/clutter-paint-volume.c
+@@ -37,6 +37,7 @@
+ #include "clutter-paint-volume-private.h"
+ #include "clutter-private.h"
+ #include "clutter-stage-private.h"
++#include "clutter-actor-box-private.h"
+ 
+ G_DEFINE_BOXED_TYPE (ClutterPaintVolume, clutter_paint_volume,
+                      clutter_paint_volume_copy,
+@@ -1140,8 +1141,6 @@ _clutter_paint_volume_get_stage_paint_box (ClutterPaintVolume *pv,
+   CoglMatrix modelview;
+   CoglMatrix projection;
+   float viewport[4];
+-  float width;
+-  float height;
+ 
+   _clutter_paint_volume_copy_static (pv, &projected_pv);
+ 
+@@ -1181,50 +1180,7 @@ _clutter_paint_volume_get_stage_paint_box (ClutterPaintVolume *pv,
+       return;
+     }
+ 
+-  /* The aim here is that for a given rectangle defined with floating point
+-   * coordinates we want to determine a stable quantized size in pixels
+-   * that doesn't vary due to the original box's sub-pixel position.
+-   *
+-   * The reason this is important is because effects will use this
+-   * API to determine the size of offscreen framebuffers and so for
+-   * a fixed-size object that may be animated accross the screen we
+-   * want to make sure that the stage paint-box has an equally stable
+-   * size so that effects aren't made to continuously re-allocate
+-   * a corresponding fbo.
+-   *
+-   * The other thing we consider is that the calculation of this box is
+-   * subject to floating point precision issues that might be slightly
+-   * different to the precision issues involved with actually painting the
+-   * actor, which might result in painting slightly leaking outside the
+-   * user's calculated paint-volume. For this we simply aim to pad out the
+-   * paint-volume by at least half a pixel all the way around.
+-   */
+-  width = box->x2 - box->x1;
+-  height = box->y2 - box->y1;
+-  width = CLUTTER_NEARBYINT (width);
+-  height = CLUTTER_NEARBYINT (height);
+-  /* XXX: NB the width/height may now be up to 0.5px too small so we
+-   * must also pad by 0.25px all around to account for this. In total we
+-   * must padd by at least 0.75px around all sides. */
+-
+-  /* XXX: The furthest that we can overshoot the bottom right corner by
+-   * here is 1.75px in total if you consider that the 0.75 padding could
+-   * just cross an integer boundary and so ceil will effectively add 1.
+-   */
+-  box->x2 = ceilf (box->x2 + 0.75);
+-  box->y2 = ceilf (box->y2 + 0.75);
+-
+-  /* Now we redefine the top-left relative to the bottom right based on the
+-   * rounded width/height determined above + a constant so that the overall
+-   * size of the box will be stable and not dependant on the box's
+-   * position.
+-   *
+-   * Adding 3px to the width/height will ensure we cover the maximum of
+-   * 1.75px padding on the bottom/right and still ensure we have > 0.75px
+-   * padding on the top/left.
+-   */
+-  box->x1 = box->x2 - width - 3;
+-  box->y1 = box->y2 - height - 3;
++  _clutter_actor_box_enlarge_for_effects (box);
+ 
+   clutter_paint_volume_free (&projected_pv);
+ }
+diff --git a/clutter/tests/conform/Makefile.am b/clutter/tests/conform/Makefile.am
+index 9cef08b..afa9dad 100644
+--- a/clutter/tests/conform/Makefile.am
++++ b/clutter/tests/conform/Makefile.am
+@@ -25,7 +25,6 @@ actor_tests = \
+ 	actor-iter \
+ 	actor-layout \
+ 	actor-meta \
+-	actor-offscreen-limit-max-size \
+ 	actor-offscreen-redirect \
+ 	actor-paint-opacity \
+ 	actor-pick \
+diff --git a/clutter/tests/conform/actor-offscreen-limit-max-size.c b/clutter/tests/conform/actor-offscreen-limit-max-size.c
+deleted file mode 100644
+index 943c7d8..0000000
+--- a/clutter/tests/conform/actor-offscreen-limit-max-size.c
++++ /dev/null
+@@ -1,119 +0,0 @@
+-#define CLUTTER_ENABLE_EXPERIMENTAL_API
+-#include <clutter/clutter.h>
+-
+-#define STAGE_WIDTH (300)
+-#define STAGE_HEIGHT (300)
+-
+-typedef struct
+-{
+-  ClutterActor *stage;
+-
+-  ClutterActor *actor_group1;
+-  ClutterEffect *blur_effect1;
+-
+-  ClutterActor *actor_group2;
+-  ClutterEffect *blur_effect2;
+-} Data;
+-
+-static void
+-check_results (ClutterStage *stage, gpointer user_data)
+-{
+-  Data *data = user_data;
+-  gfloat width, height;
+-  ClutterRect rect;
+-
+-  clutter_offscreen_effect_get_target_rect (CLUTTER_OFFSCREEN_EFFECT (data->blur_effect1),
+-                                            &rect);
+-
+-  width = clutter_rect_get_width (&rect);
+-  height = clutter_rect_get_height (&rect);
+-
+-  if (g_test_verbose ())
+-    g_print ("Checking effect1 size: %.2f x %.2f\n",
+-             clutter_rect_get_width (&rect),
+-             clutter_rect_get_height (&rect));
+-
+-  g_assert_cmpint (width, <, STAGE_WIDTH);
+-  g_assert_cmpint (height, <, STAGE_HEIGHT);
+-
+-  clutter_offscreen_effect_get_target_rect (CLUTTER_OFFSCREEN_EFFECT (data->blur_effect2),
+-                                            &rect);
+-
+-  width = clutter_rect_get_width (&rect);
+-  height = clutter_rect_get_height (&rect);
+-
+-  if (g_test_verbose ())
+-    g_print ("Checking effect2 size: %.2f x %.2f\n", width, height);
+-
+-  g_assert_cmpint (width, ==, STAGE_WIDTH);
+-  g_assert_cmpint (height, ==, STAGE_HEIGHT);
+-
+-
+-  clutter_main_quit ();
+-}
+-
+-static ClutterActor *
+-create_actor (gfloat x, gfloat y,
+-              gfloat width, gfloat height,
+-              const ClutterColor *color)
+-{
+-  return g_object_new (CLUTTER_TYPE_ACTOR,
+-                       "x", x,
+-                       "y", y,
+-                       "width", width,
+-                       "height", height,
+-                       "background-color", color,
+-                       NULL);
+-}
+-
+-static void
+-actor_offscreen_limit_max_size (void)
+-{
+-  Data data;
+-
+-  if (!cogl_features_available (COGL_FEATURE_OFFSCREEN))
+-    return;
+-
+-  data.stage = clutter_test_get_stage ();
+-  g_signal_connect (data.stage, "after-paint",
+-                    G_CALLBACK (check_results), &data);
+-  clutter_actor_set_size (data.stage, STAGE_WIDTH, STAGE_HEIGHT);
+-
+-  data.actor_group1 = clutter_actor_new ();
+-  clutter_actor_add_child (data.stage, data.actor_group1);
+-  data.blur_effect1 = clutter_blur_effect_new ();
+-  clutter_actor_add_effect (data.actor_group1, data.blur_effect1);
+-  clutter_actor_add_child (data.actor_group1,
+-                           create_actor (10, 10,
+-                                         100, 100,
+-                                         CLUTTER_COLOR_Blue));
+-  clutter_actor_add_child (data.actor_group1,
+-                           create_actor (100, 100,
+-                                         100, 100,
+-                                         CLUTTER_COLOR_Gray));
+-
+-  data.actor_group2 = clutter_actor_new ();
+-  clutter_actor_add_child (data.stage, data.actor_group2);
+-  data.blur_effect2 = clutter_blur_effect_new ();
+-  clutter_actor_add_effect (data.actor_group2, data.blur_effect2);
+-  clutter_actor_add_child (data.actor_group2,
+-                           create_actor (-10, -10,
+-                                         100, 100,
+-                                         CLUTTER_COLOR_Yellow));
+-  clutter_actor_add_child (data.actor_group2,
+-                           create_actor (250, 10,
+-                                         100, 100,
+-                                         CLUTTER_COLOR_ScarletRed));
+-  clutter_actor_add_child (data.actor_group2,
+-                           create_actor (10, 250,
+-                                         100, 100,
+-                                         CLUTTER_COLOR_Yellow));
+-
+-  clutter_actor_show (data.stage);
+-
+-  clutter_main ();
+-}
+-
+-CLUTTER_TEST_SUITE (
+-  CLUTTER_TEST_UNIT ("/actor/offscreen/limit-max-size", actor_offscreen_limit_max_size)
+-)
+diff --git a/clutter/tests/conform/actor-offscreen-redirect.c b/clutter/tests/conform/actor-offscreen-redirect.c
+index 63d5e6c..9dbb7d2 100644
+--- a/clutter/tests/conform/actor-offscreen-redirect.c
++++ b/clutter/tests/conform/actor-offscreen-redirect.c
+@@ -189,10 +189,11 @@ verify_redraws (gpointer user_data)
+   clutter_actor_queue_redraw (data->child);
+   verify_redraw (data, 1);
+ 
+-  /* Modifying the transformation on the parent should cause a
+-     redraw */
++  /* Modifying the transformation on the parent should not cause a redraw,
++     since the FBO stores pre-transformed rendering that can be reused with
++     any transformation. */
+   clutter_actor_set_anchor_point (data->parent_container, 0, 1);
+-  verify_redraw (data, 1);
++  verify_redraw (data, 0);
+ 
+   /* Redrawing an unrelated actor shouldn't cause a redraw */
+   clutter_actor_set_position (data->unrelated_actor, 0, 1);
diff --git a/debian/patches/clutter-x11-Implement-keycode-lookup-from-keysyms-on-virt.patch b/debian/patches/clutter-x11-Implement-keycode-lookup-from-keysyms-on-virt.patch
 deleted file mode 100644
index ccb4263..0000000
--- a/debian/patches/clutter-x11-Implement-keycode-lookup-from-keysyms-on-virt.patch
+++ /dev/null
@@ -1,316 +0,0 @@
-From: Carlos Garnacho <[e-mail]>
-Date: Fri, 29 Jun 2018 14:31:23 +0200
-Subject: clutter/x11: Implement keycode lookup from keysyms on virtual key
- devices
-
-Unfortunately XKeysymToKeycode() falls short in that it coalesces keysyms
-into keycodes pertaining to the first level (i.e. lowercase). Add a
-ClutterKeymapX11 method (much alike its GdkKeymap counterpart) to look up
-all matches for the given keysym.
-
-Two other helper methods have been added so the virtual device can fetch
-the current keyboard group, and latch modifiers for key emission. Combining
-all this, the virtual device is now able to handle keycodes in further
-levels.
-
-Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/135
-
-(cherry picked from commit 85284acb000ddc70afcf716b6c198b4b5bf5741e)
-
-Ubuntu-Bug: https://bugs.launchpad.net/oem-priority/+bug/1730211
-Applied-Upstream: yes, 3.28.4
----
- clutter/clutter/x11/clutter-keymap-x11.c           | 178 ++++++++++++++++++++-
- clutter/clutter/x11/clutter-keymap-x11.h           |   8 +
- .../clutter/x11/clutter-virtual-input-device-x11.c |  22 ++-
- 3 files changed, 204 insertions(+), 4 deletions(-)
-
-diff --git a/clutter/clutter/x11/clutter-keymap-x11.c b/clutter/clutter/x11/clutter-keymap-x11.c
-index 914e314..c34e676 100644
---- a/clutter/clutter/x11/clutter-keymap-x11.c
-+++ b/clutter/clutter/x11/clutter-keymap-x11.c
-@@ -38,6 +38,14 @@
- 
- typedef struct _ClutterKeymapX11Class   ClutterKeymapX11Class;
- typedef struct _DirectionCacheEntry     DirectionCacheEntry;
-+typedef struct _ClutterKeymapKey        ClutterKeymapKey;
-+
-+struct _ClutterKeymapKey
-+{
-+  guint keycode;
-+  guint group;
-+  guint level;
-+};
- 
- struct _DirectionCacheEntry
- {
-@@ -59,6 +67,7 @@ struct _ClutterKeymapX11
- 
-   ClutterModifierType num_lock_mask;
-   ClutterModifierType scroll_lock_mask;
-+  ClutterModifierType level3_shift_mask;
- 
-   PangoDirection current_direction;
- 
-@@ -69,6 +78,7 @@ struct _ClutterKeymapX11
-   Atom current_group_atom;
-   guint current_cache_serial;
-   DirectionCacheEntry group_direction_cache[4];
-+  int current_group;
- #endif
- 
-   guint caps_lock_state : 1;
-@@ -198,6 +208,9 @@ get_xkb (ClutterKeymapX11 *keymap_x11)
-   if (keymap_x11->scroll_lock_mask == 0)
-     keymap_x11->scroll_lock_mask = XkbKeysymToModifiers (backend_x11->xdpy,
-                                                          XK_Scroll_Lock);
-+  if (keymap_x11->level3_shift_mask == 0)
-+    keymap_x11->level3_shift_mask = XkbKeysymToModifiers (backend_x11->xdpy,
-+                                                          XK_ISO_Level3_Shift);
- 
-   return keymap_x11->xkb_desc;
- }
-@@ -469,6 +482,7 @@ static void
- clutter_keymap_x11_init (ClutterKeymapX11 *keymap)
- {
-   keymap->current_direction = PANGO_DIRECTION_NEUTRAL;
-+  keymap->current_group = -1;
- }
- 
- static ClutterTranslateReturn
-@@ -498,7 +512,8 @@ clutter_keymap_x11_translate_event (ClutterEventTranslator *translator,
-         {
-         case XkbStateNotify:
-           CLUTTER_NOTE (EVENT, "Updating keyboard state");
--          update_direction (keymap_x11, XkbStateGroup (&xkb_event->state));
-+          keymap_x11->current_group = XkbStateGroup (&xkb_event->state);
-+          update_direction (keymap_x11, keymap_x11->current_group);
-           update_locked_mods (keymap_x11, xkb_event->state.locked_mods);
-           retval = CLUTTER_TRANSLATE_REMOVE;
-           break;
-@@ -665,3 +680,164 @@ _clutter_keymap_x11_get_direction (ClutterKeymapX11 *keymap)
- #endif
-     return PANGO_DIRECTION_NEUTRAL;
- }
-+
-+static gboolean
-+clutter_keymap_x11_get_entries_for_keyval (ClutterKeymapX11  *keymap_x11,
-+                                           guint              keyval,
-+                                           ClutterKeymapKey **keys,
-+                                           gint              *n_keys)
-+{
-+#ifdef HAVE_XKB
-+  if (CLUTTER_BACKEND_X11 (keymap_x11->backend)->use_xkb)
-+    {
-+      XkbDescRec *xkb = get_xkb (keymap_x11);
-+      GArray *retval;
-+      gint keycode;
-+
-+      keycode = keymap_x11->min_keycode;
-+      retval = g_array_new (FALSE, FALSE, sizeof (ClutterKeymapKey));
-+
-+      while (keycode <= keymap_x11->max_keycode)
-+        {
-+          gint max_shift_levels = XkbKeyGroupsWidth (xkb, keycode);
-+          gint group = 0;
-+          gint level = 0;
-+          gint total_syms = XkbKeyNumSyms (xkb, keycode);
-+          gint i = 0;
-+          KeySym *entry;
-+
-+          /* entry is an array with all syms for group 0, all
-+           * syms for group 1, etc. and for each group the
-+           * shift level syms are in order
-+           */
-+          entry = XkbKeySymsPtr (xkb, keycode);
-+
-+          while (i < total_syms)
-+            {
-+              g_assert (i == (group * max_shift_levels + level));
-+
-+              if (entry[i] == keyval)
-+                {
-+                  ClutterKeymapKey key;
-+
-+                  key.keycode = keycode;
-+                  key.group = group;
-+                  key.level = level;
-+
-+                  g_array_append_val (retval, key);
-+
-+                  g_assert (XkbKeySymEntry (xkb, keycode, level, group) ==
-+                            keyval);
-+                }
-+
-+              ++level;
-+
-+              if (level == max_shift_levels)
-+                {
-+                  level = 0;
-+                  ++group;
-+                }
-+
-+              ++i;
-+            }
-+
-+          ++keycode;
-+        }
-+
-+      if (retval->len > 0)
-+        {
-+          *keys = (ClutterKeymapKey*) retval->data;
-+          *n_keys = retval->len;
-+        }
-+      else
-+        {
-+          *keys = NULL;
-+          *n_keys = 0;
-+        }
-+
-+      g_array_free (retval, retval->len > 0 ? FALSE : TRUE);
-+
-+      return *n_keys > 0;
-+    }
-+  else
-+#endif
-+    {
-+      return FALSE;
-+    }
-+}
-+
-+void
-+clutter_keymap_x11_latch_modifiers (ClutterKeymapX11 *keymap_x11,
-+                                    uint32_t          level,
-+                                    gboolean          enable)
-+{
-+#ifdef HAVE_XKB
-+  ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (keymap_x11->backend);
-+  uint32_t modifiers[] = {
-+    0,
-+    ShiftMask,
-+    keymap_x11->level3_shift_mask,
-+    keymap_x11->level3_shift_mask | ShiftMask,
-+  };
-+  uint32_t value = 0;
-+
-+  if (!backend_x11->use_xkb)
-+    return;
-+
-+  level = CLAMP (level, 0, G_N_ELEMENTS (modifiers) - 1);
-+
-+  if (enable)
-+    value = modifiers[level];
-+  else
-+    value = 0;
-+
-+  XkbLatchModifiers (clutter_x11_get_default_display (),
-+                     XkbUseCoreKbd, modifiers[level],
-+                     value);
-+#endif
-+}
-+
-+static uint32_t
-+clutter_keymap_x11_get_current_group (ClutterKeymapX11 *keymap_x11)
-+{
-+  ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (keymap_x11->backend);
-+  XkbStateRec state_rec;
-+
-+  if (keymap_x11->current_group >= 0)
-+    return keymap_x11->current_group;
-+
-+  XkbGetState (backend_x11->xdpy, XkbUseCoreKbd, &state_rec);
-+  return XkbStateGroup (&state_rec);
-+}
-+
-+gboolean
-+clutter_keymap_x11_keycode_for_keyval (ClutterKeymapX11 *keymap_x11,
-+                                       guint             keyval,
-+                                       guint            *keycode_out,
-+                                       guint            *level_out)
-+{
-+  ClutterKeymapKey *keys;
-+  gint i, n_keys, group;
-+  gboolean found = FALSE;
-+
-+  g_return_val_if_fail (keycode_out != NULL, FALSE);
-+  g_return_val_if_fail (level_out != NULL, FALSE);
-+
-+  group = clutter_keymap_x11_get_current_group (keymap_x11);
-+
-+  if (!clutter_keymap_x11_get_entries_for_keyval (keymap_x11, keyval, &keys, &n_keys))
-+    return FALSE;
-+
-+  for (i = 0; i < n_keys && !found; i++)
-+    {
-+      if (keys[i].group == group)
-+        {
-+          *keycode_out = keys[i].keycode;
-+          *level_out = keys[i].level;
-+          found = TRUE;
-+        }
-+    }
-+
-+  g_free (keys);
-+  return found;
-+}
-diff --git a/clutter/clutter/x11/clutter-keymap-x11.h b/clutter/clutter/x11/clutter-keymap-x11.h
-index ad673a2..4b5b403 100644
---- a/clutter/clutter/x11/clutter-keymap-x11.h
-+++ b/clutter/clutter/x11/clutter-keymap-x11.h
-@@ -51,6 +51,14 @@ gboolean _clutter_keymap_x11_get_is_modifier     (ClutterKeymapX11    *keymap,
- 
- PangoDirection _clutter_keymap_x11_get_direction (ClutterKeymapX11    *keymap);
- 
-+gboolean clutter_keymap_x11_keycode_for_keyval (ClutterKeymapX11 *keymap_x11,
-+                                                guint             keyval,
-+                                                guint            *keycode_out,
-+                                                guint            *level_out);
-+void     clutter_keymap_x11_latch_modifiers (ClutterKeymapX11 *keymap_x11,
-+                                             uint32_t          level,
-+                                             gboolean          enable);
-+
- G_END_DECLS
- 
- #endif /* __CLUTTER_KEYMAP_X11_H__ */
-diff --git a/clutter/clutter/x11/clutter-virtual-input-device-x11.c b/clutter/clutter/x11/clutter-virtual-input-device-x11.c
-index 416c944..b86ded0 100644
---- a/clutter/clutter/x11/clutter-virtual-input-device-x11.c
-+++ b/clutter/clutter/x11/clutter-virtual-input-device-x11.c
-@@ -32,6 +32,8 @@
- 
- #include "clutter-virtual-input-device.h"
- #include "x11/clutter-virtual-input-device-x11.h"
-+#include "x11/clutter-backend-x11.h"
-+#include "x11/clutter-keymap-x11.h"
- 
- struct _ClutterVirtualInputDeviceX11
- {
-@@ -135,11 +137,25 @@ clutter_virtual_input_device_x11_notify_keyval (ClutterVirtualInputDevice *virtu
- 						uint32_t                   keyval,
- 						ClutterKeyState            key_state)
- {
--  KeyCode keycode;
-+  ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (clutter_get_default_backend ());
-+  ClutterKeymapX11 *keymap = backend_x11->keymap;
-+  uint32_t keycode, level;
-+
-+  if (!clutter_keymap_x11_keycode_for_keyval (keymap, keyval, &keycode, &level))
-+    {
-+      g_warning ("No keycode found for keyval %x in current group", keyval);
-+      return;
-+    }
-+
-+  if (key_state == CLUTTER_KEY_STATE_PRESSED)
-+    clutter_keymap_x11_latch_modifiers (keymap, level, TRUE);
- 
--  keycode = XKeysymToKeycode (clutter_x11_get_default_display (), keyval);
-   XTestFakeKeyEvent (clutter_x11_get_default_display (),
--                     keycode, key_state == CLUTTER_KEY_STATE_PRESSED, 0);
-+                     (KeyCode) keycode,
-+                     key_state == CLUTTER_KEY_STATE_PRESSED, 0);
-+
-+  if (key_state == CLUTTER_KEY_STATE_RELEASED)
-+    clutter_keymap_x11_latch_modifiers (keymap, level, FALSE);
- }
- 
- static void
diff --git a/debian/patches/core-Return-1-if-meta_window_get_monitor-is-called-on-an-.patch b/debian/patches/core-Return-1-if-meta_window_get_monitor-is-called-on-an-.patch
 deleted file mode 100644
index 171c91a..0000000
--- a/debian/patches/core-Return-1-if-meta_window_get_monitor-is-called-on-an-.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Sam Spilsbury <[e-mail]>
-Date: Tue, 10 Oct 2017 11:39:40 -0500
-Subject: core: Return -1 if meta_window_get_monitor is called on an unmanaged
- window
-
-As opposed to crashing. In this case, letting the caller deal with
-it is the best policy, since this is public API.
-
-Fixes #78834
-
-Forwarded: yes
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=788834
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/bionic/+source/gnome-shell/+bug/1724439
----
- src/core/window.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/window.c b/src/core/window.c
-index cc0813a..f9094a3 100644
---- a/src/core/window.c
-+++ b/src/core/window.c
-@@ -3752,11 +3752,16 @@ maybe_move_attached_dialog (MetaWindow *window,
-  *
-  * Gets index of the monitor that this window is on.
-  *
-- * Return Value: The index of the monitor in the screens monitor list
-+ * Return Value: The index of the monitor in the screens monitor list, or -1
-+ * if the window has been recently unmanaged and does not have
-+ * a monitor.
-  */
- int
- meta_window_get_monitor (MetaWindow *window)
- {
-+  if (!window->monitor)
-+    return -1;
-+
-   return window->monitor->number;
- }
- 
diff --git a/debian/patches/debian/skip-failing-tests-325.patch b/debian/patches/debian/skip-failing-tests-325.patch
index a443ddf..54d8f62 100644
--- a/debian/patches/debian/skip-failing-tests-325.patch
+++ b/debian/patches/debian/skip-failing-tests-325.patch
@@ -11,13 +11,13 @@ Applied-upstream: no
  1 file changed, 1 deletion(-)
 
 diff --git a/clutter/tests/conform/Makefile.am b/clutter/tests/conform/Makefile.am
-index bca10dc..a2b7bee 100644
+index 840e120..2bd7f4d 100644
 --- a/clutter/tests/conform/Makefile.am
 +++ b/clutter/tests/conform/Makefile.am
-@@ -26,7 +26,6 @@ actor_tests = \
+@@ -25,7 +25,6 @@ actor_tests = \
+ 	actor-iter \
  	actor-layout \
  	actor-meta \
- 	actor-offscreen-limit-max-size \
 -	actor-offscreen-redirect \
  	actor-paint-opacity \
  	actor-size \
diff --git a/debian/patches/debian/skip-failing-tests.patch b/debian/patches/debian/skip-failing-tests.patch
index 68cdca6..205962c 100644
--- a/debian/patches/debian/skip-failing-tests.patch
+++ b/debian/patches/debian/skip-failing-tests.patch
@@ -12,11 +12,11 @@ Applied-upstream: no
  1 file changed, 2 deletions(-)
 
 diff --git a/clutter/tests/conform/Makefile.am b/clutter/tests/conform/Makefile.am
-index 9cef08b..bca10dc 100644
+index afa9dad..840e120 100644
 --- a/clutter/tests/conform/Makefile.am
 +++ b/clutter/tests/conform/Makefile.am
-@@ -28,8 +28,6 @@ actor_tests = \
- 	actor-offscreen-limit-max-size \
+@@ -27,8 +27,6 @@ actor_tests = \
+ 	actor-meta \
  	actor-offscreen-redirect \
  	actor-paint-opacity \
 -	actor-pick \
diff --git a/debian/patches/gpu-kms-Don-t-crash-if-drmModeGetResources-returns-N.patch b/debian/patches/gpu-kms-Don-t-crash-if-drmModeGetResources-returns-N.patch
 deleted file mode 100644
index 9bc47f9..0000000
--- a/debian/patches/gpu-kms-Don-t-crash-if-drmModeGetResources-returns-N.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Aaron Plattner <[e-mail]>
-Date: Thu, 19 Jul 2018 10:51:34 -0700
-Subject: gpu-kms: Don't crash if drmModeGetResources returns NULL
-
-DRM drivers can be opened by meta_launcher_open_restricted() even if they don't
-implement modesetting. However, drmModeGetResources() will return NULL.
-
-Check whether that happened in meta_gpu_kms_new() and return with an error
-instead of crashing.
-
-Fixes #223.
-
-Applied-Upstream: https://gitlab.gnome.org/GNOME/mutter/commit/62660bbd15
-Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/223
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1767956
----
- src/backends/native/meta-gpu-kms.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/backends/native/meta-gpu-kms.c b/src/backends/native/meta-gpu-kms.c
-index 613a607..259cd71 100644
---- a/src/backends/native/meta-gpu-kms.c
-+++ b/src/backends/native/meta-gpu-kms.c
-@@ -801,6 +801,13 @@ meta_gpu_kms_new (MetaMonitorManagerKms  *monitor_manager_kms,
-    */
-   drm_resources = drmModeGetResources (kms_fd);
- 
-+  if (!drm_resources)
-+    {
-+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "No resources");
-+      meta_launcher_close_restricted (launcher, kms_fd);
-+      return NULL;
-+    }
-+
-   n_connectors = drm_resources->count_connectors;
- 
-   drmModeFreeResources (drm_resources);
diff --git a/debian/patches/monitor-Use-current-monitor-mode-to-check-whether-active.patch b/debian/patches/monitor-Use-current-monitor-mode-to-check-whether-active.patch
 deleted file mode 100644
index 9badb76..0000000
--- a/debian/patches/monitor-Use-current-monitor-mode-to-check-whether-active.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From: =?utf-8?q?Jonas_=C3=85dahl?= <[e-mail]>
-Date: Tue, 31 Jul 2018 13:18:51 +0200
-Subject: monitor: Use current monitor mode to check whether active
-
-For historical reasons meta_monitor_is_active() checked whether it is
-active by checking whether the main output have a CRTC assigned and
-whether that CRTC has a current mode. At a later point, the MetaMonitor
-got its own mode abstraction (MetaMonitorMode), but
-meta_monitor_is_active() was never updated to use this.
-
-An issue with checking the main output's CRTC state is that, if there is
-some CRTC mode combination that for some reason isn't properly detected
-by the MetaMonitorMode abstraction (e.g. some tiling configuration not
-yet handled), meta_monitor_is_active() would return TRUE, even though no
-(abstracted) mode was set. This would cause confusion here and there,
-leading to NULL pointer dereferences due to the assumption that if a
-monitor is active, it has an active mode.
-
-Instead, change meta_monitor_is_active() to directly check the current
-monitor mode, and log a warning if the main output still happen to have
-a CRTC with a mode assigned to it. This way, when an not undrestood CRTC
-mode combination is encountered, instead of dereferencing NULL pointers,
-simply assume the monitor is not active, which means that it will not be
-managed or rendered by mutter at all.
-
-https://gitlab.gnome.org/GNOME/mutter/issues/130
-
-(cherry picked from commit 4d465eac0806eb1ead375e2852d4a9d6bc24524f)
-
-Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/130
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1723615
-Applied-Upstream: 3.28.4, commit:https://gitlab.gnome.org/GNOME/mutter/commit/d0d80780
----
- src/backends/meta-monitor.c | 22 ++++++++++++++++------
- 1 file changed, 16 insertions(+), 6 deletions(-)
-
-diff --git a/src/backends/meta-monitor.c b/src/backends/meta-monitor.c
-index 92c61c0..60f3674 100644
---- a/src/backends/meta-monitor.c
-+++ b/src/backends/meta-monitor.c
-@@ -203,13 +203,9 @@ meta_monitor_get_main_output (MetaMonitor *monitor)
- gboolean
- meta_monitor_is_active (MetaMonitor *monitor)
- {
--  MetaOutput *output;
--  MetaCrtc *crtc;
--
--  output = meta_monitor_get_main_output (monitor);
--  crtc = meta_output_get_assigned_crtc (output);
-+  MetaMonitorPrivate *priv = meta_monitor_get_instance_private (monitor);
- 
--  return crtc && crtc->current_mode;
-+  return !!priv->current_mode;
- }
- 
- gboolean
-@@ -1411,6 +1407,18 @@ meta_monitor_get_current_mode (MetaMonitor *monitor)
-   return priv->current_mode;
- }
- 
-+static gboolean
-+is_current_mode_known (MetaMonitor *monitor)
-+{
-+  MetaOutput *output;
-+  MetaCrtc *crtc;
-+
-+  output = meta_monitor_get_main_output (monitor);
-+  crtc = meta_output_get_assigned_crtc (output);
-+
-+  return meta_monitor_is_active (monitor) == (crtc && crtc->current_mode);
-+}
-+
- void
- meta_monitor_derive_current_mode (MetaMonitor *monitor)
- {
-@@ -1430,6 +1438,8 @@ meta_monitor_derive_current_mode (MetaMonitor *monitor)
-     }
- 
-   priv->current_mode = current_mode;
-+
-+  g_warn_if_fail (is_current_mode_known (monitor));
- }
- 
- void
diff --git a/debian/patches/monitor-manager-Filter-out-low-screen-resolutions.patch b/debian/patches/monitor-manager-Filter-out-low-screen-resolutions.patch
 deleted file mode 100644
index f1ae69c..0000000
--- a/debian/patches/monitor-manager-Filter-out-low-screen-resolutions.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From: Andrea Azzarone <[e-mail]>
-Date: Mon, 16 Jul 2018 18:09:40 +0200
-Subject: monitor-manager: Filter out low screen resolutions
-
-Avoid exporting through org.gnome.Mutter.DisplayConfig.GetCurrentState
-excessively-low screen resolutions setting both a minimum width and a minimum
-height. GetCurrentState is e.g. used by Gnome Control Center to build a list of
-selectable resolutions.
-
-Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=793223
-
-(cherry picked from commit 649c26e05a67c52a4f5acf6b4aa3b1217e9bc9c0)
-
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-control-center/+bug/1772831
-Bug-GNOME: https://bugzilla.gnome.org/show_bug.cgi?id=793223
-Applied-Upstream: 3.28.4, commit:https://gitlab.gnome.org/GNOME/mutter/commit/0c5e61a2a
----
- src/backends/meta-monitor-manager.c |  4 ++++
- src/backends/meta-monitor.c         | 19 +++++++++++++++++--
- src/backends/meta-monitor.h         |  2 ++
- 3 files changed, 23 insertions(+), 2 deletions(-)
-
-diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
-index 5bd34ad..c4c1db5 100644
---- a/src/backends/meta-monitor-manager.c
-+++ b/src/backends/meta-monitor-manager.c
-@@ -1323,9 +1323,13 @@ meta_monitor_manager_handle_get_current_state (MetaDBusDisplayConfig *skeleton,
-           GVariantBuilder mode_properties_builder;
-           MetaCrtcModeFlag mode_flags;
- 
-+          if (!meta_monitor_mode_should_be_advertised (monitor_mode))
-+            continue;
-+
-           mode_id = meta_monitor_mode_get_id (monitor_mode);
-           meta_monitor_mode_get_resolution (monitor_mode,
-                                             &mode_width, &mode_height);
-+
-           refresh_rate = meta_monitor_mode_get_refresh_rate (monitor_mode);
- 
-           preferred_scale =
-diff --git a/src/backends/meta-monitor.c b/src/backends/meta-monitor.c
-index 9833066..92c61c0 100644
---- a/src/backends/meta-monitor.c
-+++ b/src/backends/meta-monitor.c
-@@ -1553,6 +1553,22 @@ meta_monitor_calculate_mode_scale (MetaMonitor     *monitor,
-   return calculate_scale (monitor, monitor_mode);
- }
- 
-+static gboolean
-+is_logical_size_large_enough (gint width, gint height)
-+{
-+  return width >= MINIMUM_LOGICAL_WIDTH &&
-+         height >= MINIMUM_LOGICAL_HEIGHT;
-+}
-+
-+gboolean
-+meta_monitor_mode_should_be_advertised (MetaMonitorMode *monitor_mode)
-+{
-+  g_return_val_if_fail (monitor_mode != NULL, FALSE);
-+
-+  return is_logical_size_large_enough (monitor_mode->spec.width,
-+                                       monitor_mode->spec.height);
-+}
-+
- static float
- get_closest_scale_factor_for_resolution (float width,
-                                          float height,
-@@ -1573,8 +1589,7 @@ get_closest_scale_factor_for_resolution (float width,
- 
-   if (scale < MINIMUM_SCALE_FACTOR ||
-       scale > MAXIMUM_SCALE_FACTOR ||
--      floorf (scaled_w) < MINIMUM_LOGICAL_WIDTH ||
--      floorf (scaled_h) < MINIMUM_LOGICAL_HEIGHT)
-+      !is_logical_size_large_enough (floorf (scaled_w), floorf (scaled_h)))
-     goto out;
- 
-   if (floorf (scaled_w) == scaled_w && floorf (scaled_h) == scaled_h)
-diff --git a/src/backends/meta-monitor.h b/src/backends/meta-monitor.h
-index bc79778..213ff2c 100644
---- a/src/backends/meta-monitor.h
-+++ b/src/backends/meta-monitor.h
-@@ -219,6 +219,8 @@ gboolean meta_monitor_mode_foreach_output (MetaMonitor        *monitor,
-                                            gpointer            user_data,
-                                            GError            **error);
- 
-+gboolean meta_monitor_mode_should_be_advertised (MetaMonitorMode *monitor_mode);
-+
- MetaMonitorSpec * meta_monitor_spec_clone (MetaMonitorSpec *monitor_id);
- 
- gboolean meta_monitor_spec_equals (MetaMonitorSpec *monitor_id,
diff --git a/debian/patches/native-gpu-Handle-drmModeSetCrtc-failing-gracefully.patch b/debian/patches/native-gpu-Handle-drmModeSetCrtc-failing-gracefully.patch
 deleted file mode 100644
index 650a2d8..0000000
--- a/debian/patches/native-gpu-Handle-drmModeSetCrtc-failing-gracefully.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: =?utf-8?q?Jonas_=C3=85dahl?= <[e-mail]>
-Date: Tue, 24 Apr 2018 09:26:33 +0000
-Subject: native/gpu: Handle drmModeSetCrtc() failing gracefully
-
-If drmModeSetCrtc() is called with no fb, mode or connectors for some
-CRTC it may still fail, and we should handle that gracefully instead of
-assuming it failed to set a non-disabled state.
-
-Closes https://gitlab.gnome.org/GNOME/mutter/issues/70
-
-
-(cherry picked from commit 6e953e2725d5d5b10d14c7bd479bd99f6853addc)
-
-Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/70
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1754949
-Applied-Upstream: https://gitlab.gnome.org/GNOME/mutter/commit/44682a2cc555
----
- src/backends/native/meta-gpu-kms.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/backends/native/meta-gpu-kms.c b/src/backends/native/meta-gpu-kms.c
-index 259cd71..1d1c288 100644
---- a/src/backends/native/meta-gpu-kms.c
-+++ b/src/backends/native/meta-gpu-kms.c
-@@ -143,7 +143,10 @@ meta_gpu_kms_apply_crtc_mode (MetaGpuKms *gpu_kms,
-                       connectors, n_connectors,
-                       mode) != 0)
-     {
--      g_warning ("Failed to set CRTC mode %s: %m", crtc->current_mode->name);
-+      if (mode)
-+        g_warning ("Failed to set CRTC mode %s: %m", crtc->current_mode->name);
-+      else
-+        g_warning ("Failed to disable CRTC");
-       g_free (connectors);
-       return FALSE;
-     }
diff --git a/debian/patches/renderer-native-Fallback-to-non-planar-API-if-gbm_bo_get_.patch b/debian/patches/renderer-native-Fallback-to-non-planar-API-if-gbm_bo_get_.patch
 deleted file mode 100644
index a25fca3..0000000
--- a/debian/patches/renderer-native-Fallback-to-non-planar-API-if-gbm_bo_get_.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: =?utf-8?q?Alex_Villac=C3=ADs_Lasso?= <[e-mail]>
-Date: Fri, 27 Jul 2018 16:08:52 +0000
-Subject: renderer/native: Fallback to non-planar API if
- gbm_bo_get_handle_for_plane fails
-
-Commit c0d9b08ef9bf2be865aad9bf1bc74ba24c655d9f replaced the old GBM API calls
-with the multi-plane GBM API. However, the call to gbm_bo_get_handle_for_plane
-fails for some DRI drivers (in particular i915). Due to missing error checks,
-the subsequent call to drmModeAddFB[2] fails and the screen output locks up.
-
-This commit adds the missing error checks and falls back to the old GBM API
-(non-planar) if necessary.
-
-v5: test success of gbm_bo_get_handle_for_plane instead of errno
-
-This commit adopts solution proposed by Daniel van Vugt to check the return
-value of gbm_bo_get_handle_for_plane on plane 0 and fall back to old
-non-planar method if the call fails. This removes the errno check (for
-ENOSYS) that could abort if mesa ever sets a different value.
-
-Related to: https://gitlab.gnome.org/GNOME/mutter/issues/127
-
-(cherry picked from commit f7af32a3eaefabbea3ebbda3a93eff98dd105ab9)
-
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1727356
-Applied-Upstream: yes, 3.28.4
----
- src/backends/native/meta-renderer-native.c | 21 ++++++++++++++++-----
- 1 file changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c
-index fc6b223..59003b3 100644
---- a/src/backends/native/meta-renderer-native.c
-+++ b/src/backends/native/meta-renderer-native.c
-@@ -1607,12 +1607,23 @@ gbm_get_next_fb_id (MetaGpuKms         *gpu_kms,
-       return FALSE;
-     }
- 
--  for (i = 0; i < gbm_bo_get_plane_count (next_bo); i++)
-+  if (gbm_bo_get_handle_for_plane (next_bo, 0).s32 == -1)
-     {
--      strides[i] = gbm_bo_get_stride_for_plane (next_bo, i);
--      handles[i] = gbm_bo_get_handle_for_plane (next_bo, i).u32;
--      offsets[i] = gbm_bo_get_offset (next_bo, i);
--      modifiers[i] = gbm_bo_get_modifier (next_bo);
-+      /* Failed to fetch handle to plane, falling back to old method */
-+      strides[0] = gbm_bo_get_stride (next_bo);
-+      handles[0] = gbm_bo_get_handle (next_bo).u32;
-+      offsets[0] = 0;
-+      modifiers[0] = DRM_FORMAT_MOD_INVALID;
-+    }
-+  else
-+    {
-+      for (i = 0; i < gbm_bo_get_plane_count (next_bo); i++)
-+        {
-+          strides[i] = gbm_bo_get_stride_for_plane (next_bo, i);
-+          handles[i] = gbm_bo_get_handle_for_plane (next_bo, i).u32;
-+          offsets[i] = gbm_bo_get_offset (next_bo, i);
-+          modifiers[i] = gbm_bo_get_modifier (next_bo);
-+        }
-     }
- 
-   kms_fd = meta_gpu_kms_get_fd (gpu_kms);
diff --git a/debian/patches/series b/debian/patches/series
index 5bd9ae6..198db5a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,18 +1,8 @@
-gpu-kms-Don-t-crash-if-drmModeGetResources-returns-N.patch
-native-gpu-Handle-drmModeSetCrtc-failing-gracefully.patch
-monitor-manager-Filter-out-low-screen-resolutions.patch
-window-wayland-Always-update-monitor-for-non-user-ops.patch
-window-Don-t-refuse-to-move-focus-to-the-grab-window.patch
-window-Explicitly-exclude-unmanaging-window-from-focus-ag.patch
-monitor-Use-current-monitor-mode-to-check-whether-active.patch
 theme-use-gtk_render_icon_suface-to-paint-button-icon.patch
 theme-load-icons-as-Gtk-does-with-fallback-and-RTL-suppor.patch
 clutter-Smooth-out-master-clock-to-smooth-visuals.patch
-core-Return-1-if-meta_window_get_monitor-is-called-on-an-.patch
+clutter-Fix-offscreen-effect-painting-of-clones.patch
 bgo768531_workaround-startup-notifications.patch
-renderer-native-Fallback-to-non-planar-API-if-gbm_bo_get_.patch
-clutter-x11-Implement-keycode-lookup-from-keysyms-on-virt.patch
-clutter-Do-not-latch-modifiers-on-modifier-keys.patch
 debian/synaptics-support.patch
 debian/skip-failing-tests.patch
 debian/skip-failing-tests-325.patch
diff --git a/debian/patches/window-Don-t-refuse-to-move-focus-to-the-grab-window.patch b/debian/patches/window-Don-t-refuse-to-move-focus-to-the-grab-window.patch
 deleted file mode 100644
index ec37087..0000000
--- a/debian/patches/window-Don-t-refuse-to-move-focus-to-the-grab-window.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: =?utf-8?q?Florian_M=C3=BCllner?= <[e-mail]>
-Date: Fri, 25 May 2018 18:18:23 +0000
-Subject: window: Don't refuse to move focus to the grab window
-
-We refuse to move focus while a grab operation is in place. While this
-generally makes sense, there's no reason why the window that owns the
-grab shouldn't be given the regular input focus as well - we pretty
-much assume that the grab window is also the focus window anyway.
-
-In fact there's a strong reason for allowing the focus change here:
-If the grab window isn't the focus window, it probably has a modal
-transient that is focused instead, and a likely reason for the focus
-request is that the transient is being unmanaged and we must move
-the focus elsewhere.
-
-https://gitlab.gnome.org/GNOME/mutter/issues/15
-
-
-(cherry picked from commit 148da24f9510ebd23d750b8224aa0ab3a549e69e)
-
-Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/15
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1422253
-Applied-Upstream: 3.28.4, commit:https://gitlab.gnome.org/GNOME/mutter/commit/513cc535
----
- src/core/window.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/core/window.c b/src/core/window.c
-index 743326c..5b1eb5b 100644
---- a/src/core/window.c
-+++ b/src/core/window.c
-@@ -4620,6 +4620,7 @@ meta_window_focus (MetaWindow  *window,
-               window->desc, window->input, window->take_focus);
- 
-   if (window->display->grab_window &&
-+      window->display->grab_window != window &&
-       window->display->grab_window->all_keys_grabbed &&
-       !window->display->grab_window->unmanaging)
-     {
diff --git a/debian/patches/window-Explicitly-exclude-unmanaging-window-from-focus-ag.patch b/debian/patches/window-Explicitly-exclude-unmanaging-window-from-focus-ag.patch
 deleted file mode 100644
index fa98757..0000000
--- a/debian/patches/window-Explicitly-exclude-unmanaging-window-from-focus-ag.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: =?utf-8?q?Florian_M=C3=BCllner?= <[e-mail]>
-Date: Fri, 25 May 2018 21:24:17 +0200
-Subject: window: Explicitly exclude unmanaging window from focus again
-
-Since commit b3b9d9e16 we no longer have to pass the unmanaging window
-to make sure we don't try to focus it again, however the parameter also
-influences the focus policy by giving ancestors preference over the normal
-stack order.
-
-https://gitlab.gnome.org/GNOME/mutter/issues/15
-
-(cherry picked from commit d99442d6e6b7c9b383863cc754db609398d4e65b)
-
-Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/15
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1422253
-Applied-Upstream: 3.28.4, commit:https://gitlab.gnome.org/GNOME/mutter/commit/137f2223
----
- src/core/window.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/window.c b/src/core/window.c
-index 5b1eb5b..cc0813a 100644
---- a/src/core/window.c
-+++ b/src/core/window.c
-@@ -1469,7 +1469,9 @@ meta_window_unmanage (MetaWindow  *window,
-       meta_topic (META_DEBUG_FOCUS,
-                   "Focusing default window since we're unmanaging %s\n",
-                   window->desc);
--      meta_workspace_focus_default_window (window->screen->active_workspace, NULL, timestamp);
-+      meta_workspace_focus_default_window (window->screen->active_workspace,
-+                                           window,
-+                                           timestamp);
-     }
-   else
-     {
diff --git a/debian/patches/window-wayland-Always-update-monitor-for-non-user-ops.patch b/debian/patches/window-wayland-Always-update-monitor-for-non-user-ops.patch
 deleted file mode 100644
index ce279ed..0000000
--- a/debian/patches/window-wayland-Always-update-monitor-for-non-user-ops.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Olivier Fourdan <[e-mail]>
-Date: Mon, 18 Jun 2018 12:39:11 +0200
-Subject: window/wayland: Always update monitor for non-user ops
-
-meta_window_wayland_update_main_monitor() would skip the monitor update
-if the difference in scale between the old and the new monitor would
-cause another monitor change.
-
-While this is suitable when the monitor change results from a user
-interactively moving the surface between monitors of different scales,
-this can leave dangling pointers to freed monitors when this is
-triggered by a change of monitor configuration.
-
-Make sure we update the monitor unconditionally if not from a user
-operation.
-
-Closes: https://gitlab.gnome.org/GNOME/mutter/issues/189
-
-(cherry picked from commit a3da4b8d5bd217c0262fd9361036877d155a300f)
-
-Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/189
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1784398
-Applied-Upstream: 3.28.4, commit:https://gitlab.gnome.org/GNOME/mutter/commit/d74a04606
----
- src/wayland/meta-window-wayland.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/wayland/meta-window-wayland.c b/src/wayland/meta-window-wayland.c
-index 705bc49..8bafb25 100644
---- a/src/wayland/meta-window-wayland.c
-+++ b/src/wayland/meta-window-wayland.c
-@@ -413,6 +413,12 @@ meta_window_wayland_update_main_monitor (MetaWindow *window,
-       return;
-     }
- 
-+  if (!user_op)
-+    {
-+      window->monitor = to;
-+      return;
-+    }
-+
-   from_scale = meta_logical_monitor_get_scale (from);
-   to_scale = meta_logical_monitor_get_scale (to);
-