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

[Marco Trevisan (Treviño)]

Prepared packages at https://bileto.ubuntu.com/#/ticket/3699

[Daniel van Vugt (vanvugt)]

Looks like what I was expecting...

review: Approve

[Daniel van Vugt (vanvugt)]

Listing things that this release does not change and calling them "changes" is a bit confusing. Maybe don't list such things...

+mutter (3.32.0+git20190410-1ubuntu1) disco; urgency=medium
+
+ * Merge with debian git snapshot (LP: #1820542), remaining changes:
+ + debian/control:
+ - Update VCS flags to point to launchpad
+ - Update maintainer to ubuntu
+ + debian/gbp.conf: update branch to point to ubuntu/master
+ + debian/patches/x11-Add-support-for-fractional-scaling-using-Randr.patch:
+ - X11: Add support for fractional scaling using Randr

review: Needs Fixing

diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
index fd38338..803f76a 100644
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -4007,12 +4007,12 @@ clutter_actor_paint (ClutterActor *self)
                   pick_mode == CLUTTER_PICK_NONE))
     _clutter_actor_draw_paint_volume (self);
 
-done:
   /* If we make it here then the actor has run through a complete
      paint run including all the effects so it's no longer dirty */
   if (pick_mode == CLUTTER_PICK_NONE)
     priv->is_dirty = FALSE;
 
+done:
   if (clip_set)
     {
       CoglFramebuffer *fb = _clutter_stage_get_active_framebuffer (stage);
diff --git a/clutter/clutter/clutter-device-manager-private.h b/clutter/clutter/clutter-device-manager-private.h
index 60cb99d..2364fd2 100644
--- a/clutter/clutter/clutter-device-manager-private.h
+++ b/clutter/clutter/clutter-device-manager-private.h
@@ -167,10 +167,6 @@ struct _ClutterInputDeviceClass
   gboolean (* is_grouped) (ClutterInputDevice *device,
                            ClutterInputDevice *other_device);
 
-  gboolean (* get_physical_size) (ClutterInputDevice *device,
-                                  gdouble            *width,
-                                  gdouble            *height);
-
   /* Keyboard accessbility */
   void (* process_kbd_a11y_event) (ClutterEvent               *event,
                                    ClutterInputDevice         *device,
diff --git a/clutter/clutter/clutter-input-device.c b/clutter/clutter/clutter-input-device.c
index 5de169c..0697e3a 100644
--- a/clutter/clutter/clutter-input-device.c
+++ b/clutter/clutter/clutter-input-device.c
@@ -2284,15 +2284,3 @@ clutter_input_device_is_grouped (ClutterInputDevice *device,
 
   return CLUTTER_INPUT_DEVICE_GET_CLASS (device)->is_grouped (device, other_device);
 }
-
-gboolean
-clutter_input_device_get_physical_size (ClutterInputDevice *device,
-                                        gdouble            *width,
-                                        gdouble            *height)
-{
-  g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (device), FALSE);
-
-  return CLUTTER_INPUT_DEVICE_GET_CLASS (device)->get_physical_size (device,
-                                                                     width,
-                                                                     height);
-}
diff --git a/clutter/clutter/clutter-input-device.h b/clutter/clutter/clutter-input-device.h
index 8dd2a54..c121fe1 100644
--- a/clutter/clutter/clutter-input-device.h
+++ b/clutter/clutter/clutter-input-device.h
@@ -171,10 +171,6 @@ void                      clutter_input_device_set_mapping_mode (ClutterInputDev
 CLUTTER_EXPORT
 gboolean                  clutter_input_device_is_grouped       (ClutterInputDevice *device,
                                                                  ClutterInputDevice *other_device);
-CLUTTER_EXPORT
-gboolean                  clutter_input_device_get_physical_size (ClutterInputDevice *device,
-								  gdouble            *width,
-								  gdouble            *height);
 
 G_END_DECLS
 
diff --git a/clutter/clutter/evdev/clutter-input-device-evdev.c b/clutter/clutter/evdev/clutter-input-device-evdev.c
index 8caf095..b52689e 100644
--- a/clutter/clutter/evdev/clutter-input-device-evdev.c
+++ b/clutter/clutter/evdev/clutter-input-device-evdev.c
@@ -676,7 +676,7 @@ stop_toggle_slowkeys (ClutterInputDeviceEvdev *device)
 }
 
 static void
-handle_togglekeys_press (ClutterEvent            *event,
+handle_enablekeys_press (ClutterEvent            *event,
                          ClutterInputDeviceEvdev *device)
 {
   if (event->key.keyval == XKB_KEY_Shift_L || event->key.keyval == XKB_KEY_Shift_R)
@@ -698,7 +698,7 @@ handle_togglekeys_press (ClutterEvent            *event,
 }
 
 static void
-handle_togglekeys_release (ClutterEvent            *event,
+handle_enablekeys_release (ClutterEvent            *event,
                            ClutterInputDeviceEvdev *device)
 {
   if (event->key.keyval == XKB_KEY_Shift_L || event->key.keyval == XKB_KEY_Shift_R)
@@ -1132,9 +1132,14 @@ clutter_input_device_evdev_process_kbd_a11y_event (ClutterEvent               *e
   if (event->key.flags & CLUTTER_EVENT_FLAG_INPUT_METHOD)
     goto emit_event;
 
-  if (!device_evdev->a11y_flags & CLUTTER_A11Y_KEYBOARD_ENABLED)
+  if (!(device_evdev->a11y_flags & CLUTTER_A11Y_KEYBOARD_ENABLED))
     goto emit_event;
 
+  if (event->type == CLUTTER_KEY_PRESS)
+    handle_enablekeys_press (event, device_evdev);
+  else
+    handle_enablekeys_release (event, device_evdev);
+
   if (device_evdev->a11y_flags & CLUTTER_A11Y_MOUSE_KEYS_ENABLED)
     {
       if (event->type == CLUTTER_KEY_PRESS &&
@@ -1145,14 +1150,6 @@ clutter_input_device_evdev_process_kbd_a11y_event (ClutterEvent               *e
         return; /* swallow event */
     }
 
-  if (device_evdev->a11y_flags & CLUTTER_A11Y_TOGGLE_KEYS_ENABLED)
-    {
-      if (event->type == CLUTTER_KEY_PRESS)
-        handle_togglekeys_press (event, device_evdev);
-      else
-        handle_togglekeys_release (event, device_evdev);
-    }
-
   if ((device_evdev->a11y_flags & CLUTTER_A11Y_BOUNCE_KEYS_ENABLED) &&
       (get_debounce_delay (device) != 0))
     {
@@ -1266,18 +1263,6 @@ clutter_input_device_evdev_release_touch_state (ClutterInputDeviceEvdev *device,
                        GINT_TO_POINTER (touch_state->device_slot));
 }
 
-static gboolean
-clutter_input_device_evdev_get_physical_size (ClutterInputDevice *device,
-                                              gdouble            *width,
-                                              gdouble            *height)
-{
-  struct libinput_device *libinput_device;
-
-  libinput_device = clutter_evdev_input_device_get_libinput_device (device);
-
-  return libinput_device_get_size (libinput_device, width, height) == 0;
-}
-
 static void
 clutter_input_device_evdev_class_init (ClutterInputDeviceEvdevClass *klass)
 {
@@ -1293,7 +1278,6 @@ clutter_input_device_evdev_class_init (ClutterInputDeviceEvdevClass *klass)
   klass->get_group_n_modes = clutter_input_device_evdev_get_group_n_modes;
   klass->is_grouped = clutter_input_device_evdev_is_grouped;
   klass->process_kbd_a11y_event = clutter_input_device_evdev_process_kbd_a11y_event;
-  klass->get_physical_size = clutter_input_device_evdev_get_physical_size;
 
   obj_props[PROP_DEVICE_MATRIX] =
     g_param_spec_boxed ("device-matrix",
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index 879ea16..671d790 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -1,3 +1,4 @@
+clutter_clutter_includesubdir = join_paths(clutter_includesubdir, 'clutter')
 clutter_clutter_includedir = join_paths(clutter_includedir, 'clutter')
 
 clutter_headers = [
@@ -577,16 +578,16 @@ if have_introspection
 endif
 
 install_headers(clutter_headers,
-  subdir: clutter_clutter_includedir)
+  subdir: clutter_clutter_includesubdir)
 
 install_headers(cally_headers,
-  subdir: join_paths(clutter_includedir, 'cally'))
+  subdir: join_paths(clutter_includesubdir, 'cally'))
 
 install_headers(clutter_deprecated_headers,
-  subdir: join_paths(clutter_clutter_includedir, 'deprecated'))
+  subdir: join_paths(clutter_clutter_includesubdir, 'deprecated'))
 
 install_headers(clutter_x11_headers,
-  subdir: join_paths(clutter_clutter_includedir, 'x11'))
+  subdir: join_paths(clutter_clutter_includesubdir, 'x11'))
 
 pkg.generate(libmutter_clutter,
   name: 'Mutters Clutter',
diff --git a/clutter/clutter/x11/clutter-input-device-xi2.c b/clutter/clutter/x11/clutter-input-device-xi2.c
index 92d3637..1254aca 100644
--- a/clutter/clutter/x11/clutter-input-device-xi2.c
+++ b/clutter/clutter/x11/clutter-input-device-xi2.c
@@ -180,56 +180,6 @@ clutter_input_device_xi2_is_mode_switch_button (ClutterInputDevice *device,
   return button_group == (int) group;
 }
 
-static gboolean
-clutter_input_device_xi2_get_physical_size (ClutterInputDevice *device,
-                                            gdouble            *width,
-                                            gdouble            *height)
-{
-  Display *xdisplay;
-  XIDeviceInfo *dev_info;
-  gdouble w = 0, h = 0;
-  int i, n_info, device_id;
-
-  xdisplay = clutter_x11_get_default_display ();
-  device_id = clutter_input_device_get_device_id (device);
-
-  clutter_x11_trap_x_errors ();
-  dev_info = XIQueryDevice (xdisplay, device_id, &n_info);
-  if (clutter_x11_untrap_x_errors ())
-    return FALSE;
-
-  if (!dev_info)
-    return FALSE;
-
-  for (i = 0; i < dev_info->num_classes; i++)
-    {
-      XIValuatorClassInfo *valuator;
-      gdouble *value;
-
-      if (dev_info->classes[i]->type != XIValuatorClass)
-        continue;
-
-      valuator = (XIValuatorClassInfo *) dev_info->classes[i];
-
-      if (valuator->label == XInternAtom (xdisplay, "Abs X", True) ||
-          valuator->label == XInternAtom (xdisplay, "Abs MT Position X", True))
-        value = &w;
-      else if (valuator->label == XInternAtom (xdisplay, "Abs Y", True) ||
-               valuator->label == XInternAtom (xdisplay, "Abs MT Position Y", True))
-        value = &h;
-      else
-        continue;
-
-      *value = (valuator->max -  valuator->min) * 1000 / valuator->resolution;
-    }
-
-  XIFreeDeviceInfo (dev_info);
-  *width = w;
-  *height = h;
-
-  return (w > 0 && h > 0);
-}
-
 static void
 clutter_input_device_xi2_class_init (ClutterInputDeviceXI2Class *klass)
 {
@@ -243,7 +193,6 @@ clutter_input_device_xi2_class_init (ClutterInputDeviceXI2Class *klass)
   device_class->is_grouped = clutter_input_device_xi2_is_grouped;
   device_class->get_group_n_modes = clutter_input_device_xi2_get_group_n_modes;
   device_class->is_mode_switch_button = clutter_input_device_xi2_is_mode_switch_button;
-  device_class->get_physical_size = clutter_input_device_xi2_get_physical_size;
 }
 
 static void
diff --git a/clutter/meson.build b/clutter/meson.build
index 053cfa7..1397be1 100644
--- a/clutter/meson.build
+++ b/clutter/meson.build
@@ -1,4 +1,5 @@
-clutter_includedir = join_paths(pkgincludedir, 'clutter')
+clutter_includesubdir = join_paths(pkgname, 'clutter')
+clutter_includedir = join_paths(includedir, clutter_includesubdir)
 clutter_srcdir = join_paths(top_srcdir, 'clutter')
 clutter_builddir = join_paths(builddir, 'clutter')
 
diff --git a/cogl/cogl-gles2/meson.build b/cogl/cogl-gles2/meson.build
index d446ca4..fbe3eb1 100644
--- a/cogl/cogl-gles2/meson.build
+++ b/cogl/cogl-gles2/meson.build
@@ -27,9 +27,9 @@ libmutter_cogl_gles2 = shared_library('mutter-cogl-gles2-' + libmutter_api_versi
   install: true,
 )
 
-cogl_gles2_includedir = join_paths(cogl_includedir, 'cogl-gles2/GLES2')
+cogl_gles2_includesubdir = join_paths(cogl_includesubdir, 'cogl-gles2/GLES2')
 install_headers(cogl_gles2_public_headers,
-  subdir: cogl_gles2_includedir)
+  subdir: cogl_gles2_includesubdir)
 
 pkg.generate(libmutter_cogl_gles2,
   name: 'CoglGles2',
diff --git a/cogl/cogl-pango/meson.build b/cogl/cogl-pango/meson.build
index fb4d261..787ec01 100644
--- a/cogl/cogl-pango/meson.build
+++ b/cogl/cogl-pango/meson.build
@@ -70,8 +70,8 @@ if have_introspection
   )
 endif
 
-cogl_pango_includedir = join_paths(cogl_includedir, 'cogl-pango')
-install_headers(cogl_pango_public_headers, subdir: cogl_pango_includedir)
+cogl_pango_includesubdir = join_paths(cogl_includesubdir, 'cogl-pango')
+install_headers(cogl_pango_public_headers, subdir: cogl_pango_includesubdir)
 
 pkg.generate(libmutter_cogl_pango,
   name: 'CoglPango',
diff --git a/cogl/cogl-path/meson.build b/cogl/cogl-path/meson.build
index 6faba67..e086a62 100644
--- a/cogl/cogl-path/meson.build
+++ b/cogl/cogl-path/meson.build
@@ -1,3 +1,4 @@
+cogl_path_includesubdir = join_paths(cogl_includesubdir, 'cogl-path')
 cogl_path_includedir = join_paths(cogl_includedir, 'cogl-path')
 
 cogl_path_public_headers = [
@@ -76,7 +77,7 @@ libmutter_cogl_path_dep = declare_dependency(
 )
 
 install_headers(cogl_path_public_headers,
-  subdir: cogl_path_includedir)
+  subdir: cogl_path_includesubdir)
 
 pkg.generate(libmutter_cogl_path,
   name: 'CoglPath',
diff --git a/cogl/cogl/cogl-texture-2d-sliced.h b/cogl/cogl/cogl-texture-2d-sliced.h
index 8d43fc5..12ce710 100644
--- a/cogl/cogl/cogl-texture-2d-sliced.h
+++ b/cogl/cogl/cogl-texture-2d-sliced.h
@@ -78,7 +78,7 @@ typedef struct _CoglTexture2DSliced CoglTexture2DSliced;
 GType cogl_texture_2d_sliced_get_gtype (void);
 
 /**
- * cogl_texture_2d_sliced_new_with_size:
+ * cogl_texture_2d_sliced_new_with_size: (skip)
  * @ctx: A #CoglContext
  * @width: The virtual width of your sliced texture.
  * @height: The virtual height of your sliced texture.
@@ -125,7 +125,7 @@ cogl_texture_2d_sliced_new_with_size (CoglContext *ctx,
                                       int max_waste);
 
 /**
- * cogl_texture_2d_sliced_new_from_file:
+ * cogl_texture_2d_sliced_new_from_file: (skip)
  * @ctx: A #CoglContext
  * @filename: the file to load
  * @max_waste: The threshold of how wide a strip of wasted texels
@@ -173,7 +173,7 @@ cogl_texture_2d_sliced_new_from_file (CoglContext *ctx,
                                       CoglError **error);
 
 /**
- * cogl_texture_2d_sliced_new_from_data:
+ * cogl_texture_2d_sliced_new_from_data: (skip)
  * @ctx: A #CoglContext
  * @width: width of texture in pixels
  * @height: height of texture in pixels
diff --git a/cogl/cogl/cogl-texture-2d.h b/cogl/cogl/cogl-texture-2d.h
index 85cadba..29b8b2d 100644
--- a/cogl/cogl/cogl-texture-2d.h
+++ b/cogl/cogl/cogl-texture-2d.h
@@ -86,7 +86,7 @@ gboolean
 cogl_is_texture_2d (void *object);
 
 /**
- * cogl_texture_2d_new_with_size:
+ * cogl_texture_2d_new_with_size: (skip)
  * @ctx: A #CoglContext
  * @width: Width of the texture to allocate
  * @height: Height of the texture to allocate
@@ -120,7 +120,7 @@ cogl_texture_2d_new_with_size (CoglContext *ctx,
                                int height);
 
 /**
- * cogl_texture_2d_new_from_file:
+ * cogl_texture_2d_new_from_file: (skip)
  * @ctx: A #CoglContext
  * @filename: the file to load
  * @error: A #CoglError to catch exceptional errors or %NULL
@@ -154,7 +154,7 @@ cogl_texture_2d_new_from_file (CoglContext *ctx,
                                CoglError **error);
 
 /**
- * cogl_texture_2d_new_from_data:
+ * cogl_texture_2d_new_from_data: (skip)
  * @ctx: A #CoglContext
  * @width: width of texture in pixels
  * @height: height of texture in pixels
@@ -231,6 +231,9 @@ cogl_texture_2d_new_from_data (CoglContext *ctx,
 CoglTexture2D *
 cogl_texture_2d_new_from_bitmap (CoglBitmap *bitmap);
 
+/**
+ * cogl_egl_texture_2d_new_from_image: (skip)
+ */
 #if defined (COGL_HAS_EGL_SUPPORT) && defined (EGL_KHR_image_base)
 /* NB: The reason we require the width, height and format to be passed
  * even though they may seem redundant is because GLES 1/2 don't
@@ -247,6 +250,9 @@ typedef gboolean (*CoglTexture2DEGLImageExternalAlloc) (CoglTexture2D *tex_2d,
                                                         gpointer user_data,
                                                         GError **error);
 
+/**
+ * cogl_texture_2d_new_from_egl_image_external: (skip)
+ */
 CoglTexture2D *
 cogl_texture_2d_new_from_egl_image_external (CoglContext *ctx,
                                              int width,
diff --git a/cogl/cogl/cogl-texture-driver.h b/cogl/cogl/cogl-texture-driver.h
index f77c548..a6e7d4f 100644
--- a/cogl/cogl/cogl-texture-driver.h
+++ b/cogl/cogl/cogl-texture-driver.h
@@ -172,15 +172,6 @@ struct _CoglTextureDriver
                          int depth);
 
   /*
-   * This driver abstraction is needed because GLES doesn't support setting
-   * a texture border color.
-   */
-  void
-  (* try_setting_gl_border_color) (CoglContext *ctx,
-                                   GLuint gl_target,
-                                   const GLfloat *transparent_color);
-
-  /*
    * It may depend on the driver as to what texture targets may be used when
    * creating a foreign texture. E.g. OpenGL supports ARB_texture_rectangle
    * but GLES doesn't
diff --git a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
index fbb55de..35b87f7 100644
--- a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
+++ b/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
@@ -485,19 +485,6 @@ _cogl_texture_driver_size_supported (CoglContext *ctx,
   return new_width != 0;
 }
 
-static void
-_cogl_texture_driver_try_setting_gl_border_color
-                                       (CoglContext *ctx,
-                                        GLuint gl_target,
-                                        const GLfloat *transparent_color)
-{
-  /* Use a transparent border color so that we can leave the
-     color buffer alone when using texture co-ordinates
-     outside of the texture */
-  GE( ctx, glTexParameterfv (gl_target, GL_TEXTURE_BORDER_COLOR,
-                             transparent_color) );
-}
-
 static gboolean
 _cogl_texture_driver_allows_foreign_gl_target (CoglContext *ctx,
                                                GLenum gl_target)
@@ -541,7 +528,6 @@ _cogl_texture_driver_gl =
     _cogl_texture_driver_gl_get_tex_image,
     _cogl_texture_driver_size_supported,
     _cogl_texture_driver_size_supported_3d,
-    _cogl_texture_driver_try_setting_gl_border_color,
     _cogl_texture_driver_allows_foreign_gl_target,
     _cogl_texture_driver_find_best_gl_get_data_format
   };
diff --git a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c
index 6f2cf6e..23158d5 100644
--- a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c
+++ b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c
@@ -429,6 +429,12 @@ _cogl_driver_update_features (CoglContext *context,
   return TRUE;
 }
 
+static gboolean
+_cogl_driver_texture_2d_is_get_data_supported (CoglTexture2D *tex_2d)
+{
+  return FALSE;
+}
+
 const CoglDriverVtable
 _cogl_driver_gles =
   {
@@ -453,7 +459,7 @@ _cogl_driver_gles =
     _cogl_texture_2d_gl_get_gl_handle,
     _cogl_texture_2d_gl_generate_mipmap,
     _cogl_texture_2d_gl_copy_from_bitmap,
-    NULL, /* texture_2d_is_get_data_supported */
+    _cogl_driver_texture_2d_is_get_data_supported,
     NULL, /* texture_2d_get_data */
     _cogl_gl_flush_attributes_state,
     _cogl_clip_stack_gl_flush,
diff --git a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c b/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
index 17f529e..f773f93 100644
--- a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
+++ b/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
@@ -590,15 +590,6 @@ _cogl_texture_driver_size_supported (CoglContext *ctx,
   return width <= max_size && height <= max_size;
 }
 
-static void
-_cogl_texture_driver_try_setting_gl_border_color
-                                            (CoglContext *ctx,
-                                             GLuint gl_target,
-                                             const GLfloat *transparent_color)
-{
-  /* FAIL! */
-}
-
 static gboolean
 _cogl_texture_driver_allows_foreign_gl_target (CoglContext *ctx,
                                                GLenum gl_target)
@@ -636,7 +627,6 @@ _cogl_texture_driver_gles =
     _cogl_texture_driver_gl_get_tex_image,
     _cogl_texture_driver_size_supported,
     _cogl_texture_driver_size_supported_3d,
-    _cogl_texture_driver_try_setting_gl_border_color,
     _cogl_texture_driver_allows_foreign_gl_target,
     _cogl_texture_driver_find_best_gl_get_data_format
   };
diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
index 5d80e87..cb94042 100644
--- a/cogl/cogl/meson.build
+++ b/cogl/cogl/meson.build
@@ -1,3 +1,4 @@
+cogl_cogl_includesubdir = join_paths(cogl_includesubdir, 'cogl')
 cogl_cogl_includedir = join_paths(cogl_includedir, 'cogl')
 
 cdata = configuration_data()
@@ -89,6 +90,8 @@ cogl_headers = [
   'cogl-pipeline-layer-state.h',
   'cogl-primitives.h',
   'cogl-texture.h',
+  'cogl-texture-2d.h',
+  'cogl-texture-2d-sliced.h',
   'cogl-types.h',
   'cogl.h',
 ]
@@ -117,10 +120,8 @@ cogl_nonintrospected_headers = [
   'cogl-matrix-stack.h',
   'cogl-poll.h',
   'cogl-texture-3d.h',
-  'cogl-texture-2d.h',
   'cogl-texture-2d-gl.h',
   'cogl-texture-rectangle.h',
-  'cogl-texture-2d-sliced.h',
   'cogl-sub-texture.h',
   'cogl-atlas-texture.h',
   'cogl-meta-texture.h',
@@ -514,16 +515,16 @@ install_headers([
     cogl_headers,
     cogl_nonintrospected_headers,
   ],
-  subdir: cogl_cogl_includedir)
+  subdir: cogl_cogl_includesubdir)
 
 install_headers([
     cogl_deprecated_headers,
     cogl_deprecated_nonintrospected_headers,
   ],
-  subdir: join_paths(cogl_cogl_includedir, 'deprecated'))
+  subdir: join_paths(cogl_cogl_includesubdir, 'deprecated'))
 
 install_headers(cogl_gl_prototype_headers,
-  subdir: join_paths(cogl_cogl_includedir, 'gl-prototypes'))
+  subdir: join_paths(cogl_cogl_includesubdir, 'gl-prototypes'))
 
 pkg.generate(libmutter_cogl,
   name: 'Cogl',
diff --git a/cogl/meson.build b/cogl/meson.build
index d76b865..356d596 100644
--- a/cogl/meson.build
+++ b/cogl/meson.build
@@ -1,4 +1,5 @@
-cogl_includedir = join_paths(pkgincludedir, 'cogl')
+cogl_includesubdir = join_paths(pkgname, 'cogl')
+cogl_includedir = join_paths(includedir, cogl_includesubdir)
 cogl_srcdir = join_paths(top_srcdir, 'cogl')
 cogl_builddir = join_paths(builddir, 'cogl')
 
diff --git a/debian/changelog b/debian/changelog
index 5825020..7471ed8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,43 @@
+mutter (3.32.0+git20190410-1ubuntu1) disco; urgency=medium
+
+  * Merge with debian git snapshot (LP: #1820542), remaining changes:
+    + debian/control:
+      - Update VCS flags to point to launchpad
+      - Update maintainer to ubuntu
+    + debian/gbp.conf: update branch to point to ubuntu/master
+    + debian/patches/x11-Add-support-for-fractional-scaling-using-Randr.patch:
+      - X11: Add support for fractional scaling using Randr
+  * d/p/x11-Add-support-for-fractional-scaling-using-Randr.patch:
+    - Refreshed.
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Wed, 10 Apr 2019 20:12:29 -0500
+
+mutter (3.32.0+git20190410-1) experimental; urgency=medium
+
+  * New upstream snapshot up to commit
+    b2d0184c6efa164ad5dd7a2ca8b10cf13acf5b4c. Fixes Launchpad bugs:
+    + GNOME Shell task bar menus not updated with external monitor primary and
+      laptop screen fractionally scaled (LP: #1803319)
+    + (In Xorg sessions only) apps launched from gnome shell do not get input
+      focus (LP: #1817924)
+    + Touch input is offset with two screens (even appearing on the wrong
+      screen) in Xorg sessions (LP: #1821933)
+    + gnome-shell crashed with SIGABRT. Assertion failure in
+      meta_gpu_kms_flip_crtc: "monitor_manager->power_save_mode ==
+      META_POWER_SAVE_ON" (LP: #1820331)
+  * debian/patches/various: Drop upstream cherry-picks. We had cherry-picked
+    the stable branch into Debian patches in the previous upload, but that
+    would get out of hand if we carried on. Instead we are using a tarball
+    snapshot. So drop the cherry-picks.
+  * Update symbols. A typo was fixed in a public symbol. This is an ABI break,
+    but upstream didn't consider this worthy of a SONAME change. A codesearch
+    / github / web search doesn't reveal any external users either, so we will
+    eat this to avoid another transition.
+  * Use debhelper-compat 12 and BD on dh-sequence-{gnome,gir}. We were missing
+    a direct BD on the providers. Thanks, Lintian.
+
+ -- Iain Lane <[e-mail]>  Wed, 10 Apr 2019 16:36:23 +0100
+
 mutter (3.32.0-1ubuntu2) disco; urgency=medium
 
   * debian/patches/x11-Add-support-for-fractional-scaling-using-Randr.patch:
diff --git a/debian/compat b/debian/compat
 deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index 02668fc..ebbb4d0 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,9 @@ Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: Iain Lane <[e-mail]>, Jeremy Bicha <[e-mail]>
-Build-Depends: debhelper (>= 11),
+Build-Depends: debhelper-compat (= 12),
+               dh-sequence-gir,
+               dh-sequence-gnome,
                at-spi2-core <!nocheck>,
                dbus <!nocheck>,
                dmz-cursor-theme <!nocheck>,
diff --git a/debian/control.in b/debian/control.in
index 3c5bd2f..b8cb5fa 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,7 +4,9 @@ Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 11),
+Build-Depends: debhelper-compat (= 12),
+               dh-sequence-gir,
+               dh-sequence-gnome,
                at-spi2-core <!nocheck>,
                dbus <!nocheck>,
                dmz-cursor-theme <!nocheck>,
diff --git a/debian/libmutter-4-0.symbols b/debian/libmutter-4-0.symbols
index 5d8f044..c0f1939 100644
--- a/debian/libmutter-4-0.symbols
+++ b/debian/libmutter-4-0.symbols
@@ -419,7 +419,7 @@ libmutter-4.so.0 libmutter-4-0 #MINVER#
  meta_rectangle_get_type@Base 3.28.2
  meta_rectangle_horiz_overlap@Base 3.28.2
  meta_rectangle_intersect@Base 3.28.2
- meta_rectangle_is_adjecent_to@Base 3.28.2
+ meta_rectangle_is_adjacent_to@Base 3.32.0+git20190410
  meta_rectangle_overlap@Base 3.28.2
  meta_rectangle_overlaps_with_region@Base 3.28.2
  meta_rectangle_resize_with_gravity@Base 3.28.2
@@ -1513,7 +1513,6 @@ libmutter-clutter-4.so.0 libmutter-4-0 #MINVER#
  clutter_input_device_get_n_mode_groups@Base 3.29.4
  clutter_input_device_get_n_rings@Base 3.29.4
  clutter_input_device_get_n_strips@Base 3.29.4
- clutter_input_device_get_physical_size@Base 3.31.90
  clutter_input_device_get_pointer_actor@Base 3.29.4
  clutter_input_device_get_pointer_stage@Base 3.29.4
  clutter_input_device_get_product_id@Base 3.29.4
diff --git a/debian/patches/bell-Always-flash-window-instead-of-frame.patch b/debian/patches/bell-Always-flash-window-instead-of-frame.patch
 deleted file mode 100644
index 91614ab..0000000
--- a/debian/patches/bell-Always-flash-window-instead-of-frame.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From: =?utf-8?q?Florian_M=C3=BCllner?= <[e-mail]>
-Date: Wed, 6 Mar 2019 23:51:41 +0100
-Subject: bell: Always flash window instead of frame
-
-Traditionally visual alerts were implemented by flashing the focus
-window's frame. As that only works for windows that we decorate,
-flashing the whole window was added as a fallback for client-decorated
-windows.
-
-However that introduces some confusing inconsistency, better to just
-always flash the entire window.
-
-https://gitlab.gnome.org/GNOME/mutter/issues/491
-
-Origin: upstream, commit:8d62da2dc4c710246425ea89c09f41e7713371f
-Applied-Upstream: 3.32.1
----
- src/core/bell.c | 66 +++------------------------------------------------------
- 1 file changed, 3 insertions(+), 63 deletions(-)
-
-diff --git a/src/core/bell.c b/src/core/bell.c
-index cd96275..aa334d6 100644
---- a/src/core/bell.c
-+++ b/src/core/bell.c
-@@ -34,10 +34,8 @@
-  * function then checks what kind of visual flash you like, and calls either
-  * bell_flash_fullscreen()-- which calls bell_flash_screen() to do
-  * its work-- or bell_flash_frame(), which flashes the focussed window
-- * using bell_flash_window_frame(), unless there is no such window, in
-- * which case it flashes the screen instead. bell_flash_window_frame()
-- * flashes the frame and calls bell_unflash_frame() as a timeout to
-- * remove the flash.
-+ * using bell_flash_window(), unless there is no such window, in
-+ * which case it flashes the screen instead.
-  *
-  * The visual bell was the result of a discussion in Bugzilla here:
-  * <http://bugzilla.gnome.org/show_bug.cgi?id=99886>.
-@@ -135,62 +133,6 @@ bell_flash_fullscreen (MetaDisplay *display)
-   meta_compositor_flash_display (display->compositor, display);
- }
- 
--/**
-- * bell_unflash_frame:
-- * @data: The frame to unflash, cast to a gpointer so it can go into
-- *        a callback function.
-- *
-- * Makes a frame be not flashed; this is the timeout half of
-- * bell_flash_window_frame(). This is done simply by clearing the
-- * flash flag and queuing a redraw of the frame.
-- *
-- * If the configure script found we had no XKB, this does not exist.
-- *
-- * Returns: Always FALSE, so we don't get called again.
-- */
--
--/*
-- * Bug: This is the parallel to bell_flash_window_frame(), so it should
-- * really be called meta_bell_unflash_window_frame().
-- */
--static gboolean
--bell_unflash_frame (gpointer data)
--{
--  MetaFrame *frame = (MetaFrame *) data;
--  frame->is_flashing = 0;
--  meta_frame_queue_draw (frame);
--  return FALSE;
--}
--
--/**
-- * bell_flash_window_frame:
-- * @window: The window to flash
-- *
-- * Makes a frame flash and then return to normal shortly afterwards.
-- * This is done by setting a flag so that the theme
-- * code will temporarily draw the frame as focussed if it's unfocussed and
-- * vice versa, and then queueing a redraw. Lastly, we create a timeout so
-- * that the flag can be unset and the frame re-redrawn.
-- *
-- * If the configure script found we had no XKB, this does not exist.
-- */
--static void
--bell_flash_window_frame (MetaWindow *window)
--{
--  guint id;
--  g_assert (window->frame != NULL);
--  window->frame->is_flashing = 1;
--  meta_frame_queue_draw (window->frame);
--  /* Since this idle is added after the Clutter clock source, with
--   * the same priority, it will be executed after it as well, so
--   * we are guaranteed to get at least one frame drawn in the
--   * flashed state, no matter how loaded we are.
--   */
--  id = g_timeout_add_full (META_PRIORITY_REDRAW, 100,
--        bell_unflash_frame, window->frame, NULL);
--  g_source_set_name_by_id (id, "[mutter] bell_unflash_frame");
--}
--
- static void
- bell_flash_window (MetaWindow *window)
- {
-@@ -209,9 +151,7 @@ static void
- bell_flash_frame (MetaDisplay *display,
-                   MetaWindow  *window)
- {
--  if (window && window->frame)
--    bell_flash_window_frame (window);
--  else if (window)
-+  if (window)
-     bell_flash_window (window);
-   else
-     bell_flash_fullscreen (display);
diff --git a/debian/patches/boxes-Actually-check-for-rectangle-containment.patch b/debian/patches/boxes-Actually-check-for-rectangle-containment.patch
 deleted file mode 100644
index b3af31e..0000000
--- a/debian/patches/boxes-Actually-check-for-rectangle-containment.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Pablo Barciela <[e-mail]>
-Date: Sun, 3 Mar 2019 16:05:55 +0100
-Subject: boxes: Actually check for rectangle containment
-
-Fixes condition duplicated:
-
-          /* If a contains b, just remove b */
-          if (meta_rectangle_contains_rect (a, b))
-            {
-              delete_me = other;
-            }
-          /* If b contains a, just remove a */
-          else if (meta_rectangle_contains_rect (a, b))
-            {
-              delete_me = compare;
-            }
-
-Closes https://gitlab.gnome.org/GNOME/mutter/issues/480
-
-Origin: upstream, commit:18164779c07c12c5acfcddde7834980c7521aac
-Applied-Upstream: 3.32.1
----
- src/core/boxes.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/boxes.c b/src/core/boxes.c
-index 4ab07d2..87f2d5d 100644
---- a/src/core/boxes.c
-+++ b/src/core/boxes.c
-@@ -468,7 +468,7 @@ merge_spanning_rects_in_region (GList *region)
-               delete_me = other;
-             }
-           /* If b contains a, just remove a */
--          else if (meta_rectangle_contains_rect (a, b))
-+          else if (meta_rectangle_contains_rect (b, a))
-             {
-               delete_me = compare;
-             }
diff --git a/debian/patches/cogl-Introspect-CoglTexture2D-Sliced.patch b/debian/patches/cogl-Introspect-CoglTexture2D-Sliced.patch
 deleted file mode 100644
index 55a9e05..0000000
--- a/debian/patches/cogl-Introspect-CoglTexture2D-Sliced.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From: =?utf-8?q?Florian_M=C3=BCllner?= <[e-mail]>
-Date: Wed, 6 Mar 2019 18:50:33 +0100
-Subject: cogl: Introspect CoglTexture2D(Sliced)
-
-gnome-shell cannot use CoglTexture if gjs can't tell that an object
-in question implements the CoglTexture interface.
-
-https://gitlab.gnome.org/GNOME/gnome-shell/issues/1020
-https://gitlab.gnome.org/GNOME/mutter/merge_requests/482
-
-Origin: upstream, commit:aca31c81494435a6c3f2266b664bfc727a23fbe
-Applied-Upstream: 3.32.1
----
- cogl/cogl/cogl-texture-2d-sliced.h |  6 +++---
- cogl/cogl/cogl-texture-2d.h        | 12 +++++++++---
- cogl/cogl/meson.build              |  4 ++--
- 3 files changed, 14 insertions(+), 8 deletions(-)
-
-diff --git a/cogl/cogl/cogl-texture-2d-sliced.h b/cogl/cogl/cogl-texture-2d-sliced.h
-index 8d43fc5..12ce710 100644
---- a/cogl/cogl/cogl-texture-2d-sliced.h
-+++ b/cogl/cogl/cogl-texture-2d-sliced.h
-@@ -78,7 +78,7 @@ typedef struct _CoglTexture2DSliced CoglTexture2DSliced;
- GType cogl_texture_2d_sliced_get_gtype (void);
- 
- /**
-- * cogl_texture_2d_sliced_new_with_size:
-+ * cogl_texture_2d_sliced_new_with_size: (skip)
-  * @ctx: A #CoglContext
-  * @width: The virtual width of your sliced texture.
-  * @height: The virtual height of your sliced texture.
-@@ -125,7 +125,7 @@ cogl_texture_2d_sliced_new_with_size (CoglContext *ctx,
-                                       int max_waste);
- 
- /**
-- * cogl_texture_2d_sliced_new_from_file:
-+ * cogl_texture_2d_sliced_new_from_file: (skip)
-  * @ctx: A #CoglContext
-  * @filename: the file to load
-  * @max_waste: The threshold of how wide a strip of wasted texels
-@@ -173,7 +173,7 @@ cogl_texture_2d_sliced_new_from_file (CoglContext *ctx,
-                                       CoglError **error);
- 
- /**
-- * cogl_texture_2d_sliced_new_from_data:
-+ * cogl_texture_2d_sliced_new_from_data: (skip)
-  * @ctx: A #CoglContext
-  * @width: width of texture in pixels
-  * @height: height of texture in pixels
-diff --git a/cogl/cogl/cogl-texture-2d.h b/cogl/cogl/cogl-texture-2d.h
-index 85cadba..29b8b2d 100644
---- a/cogl/cogl/cogl-texture-2d.h
-+++ b/cogl/cogl/cogl-texture-2d.h
-@@ -86,7 +86,7 @@ gboolean
- cogl_is_texture_2d (void *object);
- 
- /**
-- * cogl_texture_2d_new_with_size:
-+ * cogl_texture_2d_new_with_size: (skip)
-  * @ctx: A #CoglContext
-  * @width: Width of the texture to allocate
-  * @height: Height of the texture to allocate
-@@ -120,7 +120,7 @@ cogl_texture_2d_new_with_size (CoglContext *ctx,
-                                int height);
- 
- /**
-- * cogl_texture_2d_new_from_file:
-+ * cogl_texture_2d_new_from_file: (skip)
-  * @ctx: A #CoglContext
-  * @filename: the file to load
-  * @error: A #CoglError to catch exceptional errors or %NULL
-@@ -154,7 +154,7 @@ cogl_texture_2d_new_from_file (CoglContext *ctx,
-                                CoglError **error);
- 
- /**
-- * cogl_texture_2d_new_from_data:
-+ * cogl_texture_2d_new_from_data: (skip)
-  * @ctx: A #CoglContext
-  * @width: width of texture in pixels
-  * @height: height of texture in pixels
-@@ -231,6 +231,9 @@ cogl_texture_2d_new_from_data (CoglContext *ctx,
- CoglTexture2D *
- cogl_texture_2d_new_from_bitmap (CoglBitmap *bitmap);
- 
-+/**
-+ * cogl_egl_texture_2d_new_from_image: (skip)
-+ */
- #if defined (COGL_HAS_EGL_SUPPORT) && defined (EGL_KHR_image_base)
- /* NB: The reason we require the width, height and format to be passed
-  * even though they may seem redundant is because GLES 1/2 don't
-@@ -247,6 +250,9 @@ typedef gboolean (*CoglTexture2DEGLImageExternalAlloc) (CoglTexture2D *tex_2d,
-                                                         gpointer user_data,
-                                                         GError **error);
- 
-+/**
-+ * cogl_texture_2d_new_from_egl_image_external: (skip)
-+ */
- CoglTexture2D *
- cogl_texture_2d_new_from_egl_image_external (CoglContext *ctx,
-                                              int width,
-diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
-index 5d80e87..626e8fa 100644
---- a/cogl/cogl/meson.build
-+++ b/cogl/cogl/meson.build
-@@ -89,6 +89,8 @@ cogl_headers = [
-   'cogl-pipeline-layer-state.h',
-   'cogl-primitives.h',
-   'cogl-texture.h',
-+  'cogl-texture-2d.h',
-+  'cogl-texture-2d-sliced.h',
-   'cogl-types.h',
-   'cogl.h',
- ]
-@@ -117,10 +119,8 @@ cogl_nonintrospected_headers = [
-   'cogl-matrix-stack.h',
-   'cogl-poll.h',
-   'cogl-texture-3d.h',
--  'cogl-texture-2d.h',
-   'cogl-texture-2d-gl.h',
-   'cogl-texture-rectangle.h',
--  'cogl-texture-2d-sliced.h',
-   'cogl-sub-texture.h',
-   'cogl-atlas-texture.h',
-   'cogl-meta-texture.h',
diff --git a/debian/patches/cogl-Remove-unused-CoglTextureDriver-try_setting_gl_borde.patch b/debian/patches/cogl-Remove-unused-CoglTextureDriver-try_setting_gl_borde.patch
 deleted file mode 100644
index b4e5f3b..0000000
--- a/debian/patches/cogl-Remove-unused-CoglTextureDriver-try_setting_gl_borde.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From: Adam Jackson <[e-mail]>
-Date: Wed, 6 Mar 2019 12:15:40 -0500
-Subject: cogl: Remove unused CoglTextureDriver::try_setting_gl_border_color
-
-https://gitlab.gnome.org/GNOME/mutter/merge_requests/480
-
-Origin: upstream, commit:555a2c8eba115425a81d7b84f3ca2163493c0d4
-Applied-Upstream: 3.32.1
----
- cogl/cogl/cogl-texture-driver.h                     |  9 ---------
- cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c     | 14 --------------
- cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c | 10 ----------
- 3 files changed, 33 deletions(-)
-
-diff --git a/cogl/cogl/cogl-texture-driver.h b/cogl/cogl/cogl-texture-driver.h
-index f77c548..a6e7d4f 100644
---- a/cogl/cogl/cogl-texture-driver.h
-+++ b/cogl/cogl/cogl-texture-driver.h
-@@ -171,15 +171,6 @@ struct _CoglTextureDriver
-                          int height,
-                          int depth);
- 
--  /*
--   * This driver abstraction is needed because GLES doesn't support setting
--   * a texture border color.
--   */
--  void
--  (* try_setting_gl_border_color) (CoglContext *ctx,
--                                   GLuint gl_target,
--                                   const GLfloat *transparent_color);
--
-   /*
-    * It may depend on the driver as to what texture targets may be used when
-    * creating a foreign texture. E.g. OpenGL supports ARB_texture_rectangle
-diff --git a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
-index fbb55de..35b87f7 100644
---- a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
-+++ b/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
-@@ -485,19 +485,6 @@ _cogl_texture_driver_size_supported (CoglContext *ctx,
-   return new_width != 0;
- }
- 
--static void
--_cogl_texture_driver_try_setting_gl_border_color
--                                       (CoglContext *ctx,
--                                        GLuint gl_target,
--                                        const GLfloat *transparent_color)
--{
--  /* Use a transparent border color so that we can leave the
--     color buffer alone when using texture co-ordinates
--     outside of the texture */
--  GE( ctx, glTexParameterfv (gl_target, GL_TEXTURE_BORDER_COLOR,
--                             transparent_color) );
--}
--
- static gboolean
- _cogl_texture_driver_allows_foreign_gl_target (CoglContext *ctx,
-                                                GLenum gl_target)
-@@ -541,7 +528,6 @@ _cogl_texture_driver_gl =
-     _cogl_texture_driver_gl_get_tex_image,
-     _cogl_texture_driver_size_supported,
-     _cogl_texture_driver_size_supported_3d,
--    _cogl_texture_driver_try_setting_gl_border_color,
-     _cogl_texture_driver_allows_foreign_gl_target,
-     _cogl_texture_driver_find_best_gl_get_data_format
-   };
-diff --git a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c b/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
-index 17f529e..f773f93 100644
---- a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
-+++ b/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
-@@ -590,15 +590,6 @@ _cogl_texture_driver_size_supported (CoglContext *ctx,
-   return width <= max_size && height <= max_size;
- }
- 
--static void
--_cogl_texture_driver_try_setting_gl_border_color
--                                            (CoglContext *ctx,
--                                             GLuint gl_target,
--                                             const GLfloat *transparent_color)
--{
--  /* FAIL! */
--}
--
- static gboolean
- _cogl_texture_driver_allows_foreign_gl_target (CoglContext *ctx,
-                                                GLenum gl_target)
-@@ -636,7 +627,6 @@ _cogl_texture_driver_gles =
-     _cogl_texture_driver_gl_get_tex_image,
-     _cogl_texture_driver_size_supported,
-     _cogl_texture_driver_size_supported_3d,
--    _cogl_texture_driver_try_setting_gl_border_color,
-     _cogl_texture_driver_allows_foreign_gl_target,
-     _cogl_texture_driver_find_best_gl_get_data_format
-   };
diff --git a/debian/patches/frame-Remove-flashing-support.patch b/debian/patches/frame-Remove-flashing-support.patch
 deleted file mode 100644
index efbaf14..0000000
--- a/debian/patches/frame-Remove-flashing-support.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From: =?utf-8?q?Florian_M=C3=BCllner?= <[e-mail]>
-Date: Wed, 6 Mar 2019 23:56:33 +0100
-Subject: frame: Remove flashing support
-
-It's now unused.
-
-https://gitlab.gnome.org/GNOME/mutter/issues/491
-
-Origin: upstream, commit:bd33e7b0027f51307657938db3b4cc1a8d03dde
-Applied-Upstream: 3.32.1
----
- src/core/bell.c   | 16 ----------------
- src/core/bell.h   | 11 -----------
- src/core/frame.c  |  6 ------
- src/core/frame.h  |  1 -
- src/meta/common.h |  8 +++-----
- src/ui/theme.c    |  2 --
- 6 files changed, 3 insertions(+), 41 deletions(-)
-
-diff --git a/src/core/bell.c b/src/core/bell.c
-index aa334d6..d7000b2 100644
---- a/src/core/bell.c
-+++ b/src/core/bell.c
-@@ -207,19 +207,3 @@ meta_bell_notify (MetaDisplay *display,
- 
-   return TRUE;
- }
--
--/**
-- * meta_bell_notify_frame_destroy:
-- * @frame: The frame which is being destroyed
-- *
-- * Deals with a frame being destroyed. This is important because if we're
-- * using a visual bell, we might be flashing the edges of the frame, and
-- * so we'd have a timeout function waiting ready to un-flash them. If the
-- * frame's going away, we can tell the timeout not to bother.
-- */
--void
--meta_bell_notify_frame_destroy (MetaFrame *frame)
--{
--  if (frame->is_flashing)
--    g_source_remove_by_funcs_user_data (&g_timeout_funcs, frame);
--}
-diff --git a/src/core/bell.h b/src/core/bell.h
-index 9205b08..f86cbb7 100644
---- a/src/core/bell.h
-+++ b/src/core/bell.h
-@@ -41,14 +41,3 @@ MetaBell * meta_bell_new (MetaDisplay *display);
-  */
- gboolean meta_bell_notify (MetaDisplay *display,
-                            MetaWindow  *window);
--
--/**
-- * meta_bell_notify_frame_destroy:
-- * @frame: The frame which is being destroyed
-- *
-- * Deals with a frame being destroyed. This is important because if we're
-- * using a visual bell, we might be flashing the edges of the frame, and
-- * so we'd have a timeout function waiting ready to un-flash them. If the
-- * frame's going away, we can tell the timeout not to bother.
-- */
--void meta_bell_notify_frame_destroy (MetaFrame *frame);
-diff --git a/src/core/frame.c b/src/core/frame.c
-index 7eea0a3..7699461 100644
---- a/src/core/frame.c
-+++ b/src/core/frame.c
-@@ -60,7 +60,6 @@ meta_window_ensure_frame (MetaWindow *window)
-   frame->right_width = 0;
-   frame->current_cursor = 0;
- 
--  frame->is_flashing = FALSE;
-   frame->borders_cached = FALSE;
- 
-   meta_verbose ("Frame geometry %d,%d  %dx%d\n",
-@@ -177,8 +176,6 @@ meta_window_destroy_frame (MetaWindow *window)
- 
-   meta_frame_calc_borders (frame, &borders);
- 
--  meta_bell_notify_frame_destroy (frame);
--
-   /* Unparent the client window; it may be destroyed,
-    * thus the error trap.
-    */
-@@ -298,9 +295,6 @@ meta_frame_get_flags (MetaFrame *frame)
-   if (frame->window->fullscreen)
-     flags |= META_FRAME_FULLSCREEN;
- 
--  if (frame->is_flashing)
--    flags |= META_FRAME_IS_FLASHING;
--
-   if (frame->window->wm_state_above)
-     flags |= META_FRAME_ABOVE;
- 
-diff --git a/src/core/frame.h b/src/core/frame.h
-index 73a7b4b..c0bacbe 100644
---- a/src/core/frame.h
-+++ b/src/core/frame.h
-@@ -49,7 +49,6 @@ struct _MetaFrame
-   int bottom_height;
- 
-   guint need_reapply_frame_shape : 1;
--  guint is_flashing : 1; /* used by the visual bell flash */
-   guint borders_cached : 1;
- 
-   MetaUIFrame *ui_frame;
-diff --git a/src/meta/common.h b/src/meta/common.h
-index 02e2802..670097b 100644
---- a/src/meta/common.h
-+++ b/src/meta/common.h
-@@ -63,7 +63,6 @@
-  * @META_FRAME_ALLOWS_SHADE: frame allows shade
-  * @META_FRAME_ALLOWS_MOVE: frame allows move
-  * @META_FRAME_FULLSCREEN: frame allows fullscreen
-- * @META_FRAME_IS_FLASHING: frame is flashing
-  * @META_FRAME_ABOVE: frame is above
-  * @META_FRAME_TILED_LEFT: frame is tiled to the left
-  * @META_FRAME_TILED_RIGHT: frame is tiled to the right
-@@ -83,10 +82,9 @@ typedef enum
-   META_FRAME_ALLOWS_SHADE             = 1 << 10,
-   META_FRAME_ALLOWS_MOVE              = 1 << 11,
-   META_FRAME_FULLSCREEN               = 1 << 12,
--  META_FRAME_IS_FLASHING              = 1 << 13,
--  META_FRAME_ABOVE                    = 1 << 14,
--  META_FRAME_TILED_LEFT               = 1 << 15,
--  META_FRAME_TILED_RIGHT              = 1 << 16
-+  META_FRAME_ABOVE                    = 1 << 13,
-+  META_FRAME_TILED_LEFT               = 1 << 14,
-+  META_FRAME_TILED_RIGHT              = 1 << 15
- } MetaFrameFlags;
- 
- /**
-diff --git a/src/ui/theme.c b/src/ui/theme.c
-index 53d7ef5..b7618d9 100644
---- a/src/ui/theme.c
-+++ b/src/ui/theme.c
-@@ -1186,8 +1186,6 @@ meta_style_info_set_flags (MetaStyleInfo  *style_info,
-   int i;
- 
-   backdrop = !(flags & META_FRAME_HAS_FOCUS);
--  if (flags & META_FRAME_IS_FLASHING)
--    backdrop = !backdrop;
- 
-   if (flags & META_FRAME_MAXIMIZED)
-     class_name = "maximized";
diff --git a/debian/patches/keybindings-Fix-theoretical-memory-leak-while-ungrabbing.patch b/debian/patches/keybindings-Fix-theoretical-memory-leak-while-ungrabbing.patch
 deleted file mode 100644
index 9f4e0f6..0000000
--- a/debian/patches/keybindings-Fix-theoretical-memory-leak-while-ungrabbing.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Benjamin Berg <[e-mail]>
-Date: Wed, 6 Mar 2019 14:07:02 +0100
-Subject: keybindings: Fix theoretical memory leak while ungrabbing
-
-In the unlikely event that one tries to ungrab an action which does not
-exist, a small leak could occur. Fix this by using g_autofree.
-
-https://gitlab.gnome.org/GNOME/mutter/merge_requests/478
-
-Origin: upstream, commit:0ceeb28481ec74073241d0c2f6af8795f070905
-Applied-Upstream: 3.32.1
----
- src/core/keybindings.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/core/keybindings.c b/src/core/keybindings.c
-index 5ffe411..478d4d8 100644
---- a/src/core/keybindings.c
-+++ b/src/core/keybindings.c
-@@ -1654,7 +1654,7 @@ meta_display_ungrab_accelerator (MetaDisplay *display,
-   MetaKeyBindingManager *keys = &display->key_binding_manager;
-   MetaKeyBinding *binding;
-   MetaKeyGrab *grab;
--  char *key;
-+  g_autofree char *key = NULL;
-   MetaResolvedKeyCombo resolved_combo = { NULL, 0 };
- 
-   g_return_val_if_fail (action != META_KEYBINDING_ACTION_NONE, FALSE);
-@@ -1683,7 +1683,6 @@ meta_display_ungrab_accelerator (MetaDisplay *display,
-     }
- 
-   g_hash_table_remove (external_grabs, key);
--  g_free (key);
-   resolved_key_combo_reset (&resolved_combo);
- 
-   return TRUE;
diff --git a/debian/patches/meson-add-back-default_driver-option.patch b/debian/patches/meson-add-back-default_driver-option.patch
index 2aa1054..b79207c 100644
--- a/debian/patches/meson-add-back-default_driver-option.patch
+++ b/debian/patches/meson-add-back-default_driver-option.patch
@@ -29,10 +29,10 @@ index 56946b2..ae53310 100644
 +
  #define COGL_CONFIG_H_INCLUDED 1
 diff --git a/cogl/meson.build b/cogl/meson.build
-index d76b865..a6c22ff 100644
+index 356d596..2ab83bd 100644
 --- a/cogl/meson.build
 +++ b/cogl/meson.build
-@@ -9,6 +9,10 @@ cdata.set('HAVE_COGL_GL', have_gl)
+@@ -10,6 +10,10 @@ cdata.set('HAVE_COGL_GL', have_gl)
  cdata.set('HAVE_COGL_GLES2', have_gles2)
  cdata.set('ENABLE_UNIT_TESTS', have_cogl_tests)
  
@@ -44,7 +44,7 @@ index d76b865..a6c22ff 100644
    input: 'cogl-config.h.meson',
    output: 'cogl-config.h',
 diff --git a/meson.build b/meson.build
-index dc210e6..cafbde4 100644
+index 6ce9e59..bebe8eb 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -210,6 +210,8 @@ if have_wayland_eglstream
diff --git a/debian/patches/meta-monitor-Remove-useless-variable.patch b/debian/patches/meta-monitor-Remove-useless-variable.patch
 deleted file mode 100644
index c32082a..0000000
--- a/debian/patches/meta-monitor-Remove-useless-variable.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: =?utf-8?q?Florian_M=C3=BCllner?= <[e-mail]>
-Date: Tue, 5 Mar 2019 01:26:35 +0100
-Subject: meta-monitor: Remove useless variable
-
-Since commit f76b3edf9cdf, the variable is never set to TRUE and
-we can simply remove it.
-
-https://gitlab.gnome.org/GNOME/mutter/merge_requests/475
-
-Origin: upstream, commit:2504ae91770a1d6524a136f56ab437d4455a626
-Applied-Upstream: 3.32.1
----
- src/backends/meta-monitor.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/backends/meta-monitor.c b/src/backends/meta-monitor.c
-index 3ff18a5..1a32e4c 100644
---- a/src/backends/meta-monitor.c
-+++ b/src/backends/meta-monitor.c
-@@ -1587,7 +1587,6 @@ get_closest_scale_factor_for_resolution (float width,
-   float scaled_w;
-   float best_scale;
-   int base_scaled_w;
--  gboolean limit_exceeded;
-   gboolean found_one;
- 
-   best_scale = 0;
-@@ -1604,7 +1603,6 @@ get_closest_scale_factor_for_resolution (float width,
- 
-   i = 0;
-   found_one = FALSE;
--  limit_exceeded = FALSE;
-   base_scaled_w = floorf (scaled_w);
- 
-   do
-@@ -1637,7 +1635,7 @@ get_closest_scale_factor_for_resolution (float width,
- 
-       i++;
-     }
--  while (!found_one && !limit_exceeded);
-+  while (!found_one);
- 
- out:
-   return best_scale;
diff --git a/debian/patches/monitor-Fix-indentation-style-on-calculate_crtc_pos-and-f.patch b/debian/patches/monitor-Fix-indentation-style-on-calculate_crtc_pos-and-f.patch
 deleted file mode 100644
index eab8a30..0000000
--- a/debian/patches/monitor-Fix-indentation-style-on-calculate_crtc_pos-and-f.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
-Date: Fri, 8 Mar 2019 18:13:00 +0000
-Subject: monitor: Fix indentation style on calculate_crtc_pos and friends
-
-https://gitlab.gnome.org/GNOME/mutter/merge_requests/488
-
-Origin: upstream, commit:2525f286d3a6687b6d78b038f795d0c1a4f4cb0
-Applied-Upstream: 3.32.1
----
- src/backends/meta-monitor.c | 36 ++++++++++++++++++------------------
- src/backends/meta-monitor.h | 24 ++++++++++++------------
- 2 files changed, 30 insertions(+), 30 deletions(-)
-
-diff --git a/src/backends/meta-monitor.c b/src/backends/meta-monitor.c
-index b2f500f..1c6e844 100644
---- a/src/backends/meta-monitor.c
-+++ b/src/backends/meta-monitor.c
-@@ -615,12 +615,12 @@ meta_monitor_normal_get_suggested_position (MetaMonitor *monitor,
- }
- 
- static void
--meta_monitor_normal_calculate_crtc_pos (MetaMonitor         *monitor,
--                                        MetaMonitorMode     *monitor_mode,
--                                        MetaOutput          *output,
--                                        MetaMonitorTransform crtc_transform,
--                                        int                 *out_x,
--                                        int                 *out_y)
-+meta_monitor_normal_calculate_crtc_pos (MetaMonitor          *monitor,
-+                                        MetaMonitorMode      *monitor_mode,
-+                                        MetaOutput           *output,
-+                                        MetaMonitorTransform  crtc_transform,
-+                                        int                  *out_x,
-+                                        int                  *out_y)
- {
-   *out_x = 0;
-   *out_y = 0;
-@@ -1267,12 +1267,12 @@ meta_monitor_tiled_get_suggested_position (MetaMonitor *monitor,
- }
- 
- static void
--meta_monitor_tiled_calculate_crtc_pos (MetaMonitor         *monitor,
--                                       MetaMonitorMode     *monitor_mode,
--                                       MetaOutput          *output,
--                                       MetaMonitorTransform crtc_transform,
--                                       int                 *out_x,
--                                       int                 *out_y)
-+meta_monitor_tiled_calculate_crtc_pos (MetaMonitor          *monitor,
-+                                       MetaMonitorMode      *monitor_mode,
-+                                       MetaOutput           *output,
-+                                       MetaMonitorTransform  crtc_transform,
-+                                       int                  *out_x,
-+                                       int                  *out_y)
- {
-   MetaMonitorModeTiled *mode_tiled = (MetaMonitorModeTiled *) monitor_mode;
- 
-@@ -1461,12 +1461,12 @@ meta_monitor_get_modes (MetaMonitor *monitor)
- }
- 
- void
--meta_monitor_calculate_crtc_pos (MetaMonitor         *monitor,
--                                 MetaMonitorMode     *monitor_mode,
--                                 MetaOutput          *output,
--                                 MetaMonitorTransform crtc_transform,
--                                 int                 *out_x,
--                                 int                 *out_y)
-+meta_monitor_calculate_crtc_pos (MetaMonitor          *monitor,
-+                                 MetaMonitorMode      *monitor_mode,
-+                                 MetaOutput           *output,
-+                                 MetaMonitorTransform  crtc_transform,
-+                                 int                  *out_x,
-+                                 int                  *out_y)
- {
-   META_MONITOR_GET_CLASS (monitor)->calculate_crtc_pos (monitor,
-                                                         monitor_mode,
-diff --git a/src/backends/meta-monitor.h b/src/backends/meta-monitor.h
-index b24b1a5..c3ba4cf 100644
---- a/src/backends/meta-monitor.h
-+++ b/src/backends/meta-monitor.h
-@@ -74,12 +74,12 @@ struct _MetaMonitorClass
-   MetaOutput * (* get_main_output) (MetaMonitor *monitor);
-   void (* derive_layout) (MetaMonitor   *monitor,
-                           MetaRectangle *layout);
--  void (* calculate_crtc_pos) (MetaMonitor         *monitor,
--                               MetaMonitorMode     *monitor_mode,
--                               MetaOutput          *output,
--                               MetaMonitorTransform crtc_transform,
--                               int                 *out_x,
--                               int                 *out_y);
-+  void (* calculate_crtc_pos) (MetaMonitor          *monitor,
-+                               MetaMonitorMode      *monitor_mode,
-+                               MetaOutput           *output,
-+                               MetaMonitorTransform  crtc_transform,
-+                               int                  *out_x,
-+                               int                  *out_y);
-   gboolean (* get_suggested_position) (MetaMonitor *monitor,
-                                        int         *width,
-                                        int         *height);
-@@ -214,12 +214,12 @@ META_EXPORT_TEST
- GList * meta_monitor_get_modes (MetaMonitor *monitor);
- 
- META_EXPORT_TEST
--void meta_monitor_calculate_crtc_pos (MetaMonitor         *monitor,
--                                      MetaMonitorMode     *monitor_mode,
--                                      MetaOutput          *output,
--                                      MetaMonitorTransform crtc_transform,
--                                      int                 *out_x,
--                                      int                 *out_y);
-+void meta_monitor_calculate_crtc_pos (MetaMonitor          *monitor,
-+                                      MetaMonitorMode      *monitor_mode,
-+                                      MetaOutput           *output,
-+                                      MetaMonitorTransform  crtc_transform,
-+                                      int                  *out_x,
-+                                      int                  *out_y);
- 
- META_EXPORT_TEST
- float meta_monitor_calculate_mode_scale (MetaMonitor     *monitor,
diff --git a/debian/patches/monitor-Fix-indentation-style-on-calculate_supported_scal.patch b/debian/patches/monitor-Fix-indentation-style-on-calculate_supported_scal.patch
 deleted file mode 100644
index 047f099..0000000
--- a/debian/patches/monitor-Fix-indentation-style-on-calculate_supported_scal.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
-Date: Fri, 8 Mar 2019 18:03:57 +0000
-Subject: monitor: Fix indentation style on calculate_supported_scales and
- friends
-
-https://gitlab.gnome.org/GNOME/mutter/merge_requests/488
-
-Origin: upstream, commit:b8510ac566de7e7d08c9713508adb20451d2373
-Applied-Upstream: 3.32.1
----
- src/backends/meta-monitor-manager-dummy.c      | 10 +++++-----
- src/backends/meta-monitor-manager.c            | 10 +++++-----
- src/backends/meta-monitor.c                    |  8 ++++----
- src/backends/meta-monitor.h                    |  8 ++++----
- src/backends/native/meta-monitor-manager-kms.c | 10 +++++-----
- src/backends/x11/meta-monitor-manager-xrandr.c | 10 +++++-----
- src/tests/meta-monitor-manager-test.c          | 10 +++++-----
- 7 files changed, 33 insertions(+), 33 deletions(-)
-
-diff --git a/src/backends/meta-monitor-manager-dummy.c b/src/backends/meta-monitor-manager-dummy.c
-index 06e8837..46c3b8c 100644
---- a/src/backends/meta-monitor-manager-dummy.c
-+++ b/src/backends/meta-monitor-manager-dummy.c
-@@ -694,11 +694,11 @@ meta_monitor_manager_dummy_calculate_monitor_mode_scale (MetaMonitorManager *man
- }
- 
- static float *
--meta_monitor_manager_dummy_calculate_supported_scales (MetaMonitorManager          *manager,
--                                                       MetaLogicalMonitorLayoutMode layout_mode,
--                                                       MetaMonitor                 *monitor,
--                                                       MetaMonitorMode             *monitor_mode,
--                                                       int                         *n_supported_scales)
-+meta_monitor_manager_dummy_calculate_supported_scales (MetaMonitorManager           *manager,
-+                                                       MetaLogicalMonitorLayoutMode  layout_mode,
-+                                                       MetaMonitor                  *monitor,
-+                                                       MetaMonitorMode              *monitor_mode,
-+                                                       int                          *n_supported_scales)
- {
-   MetaMonitorScalesConstraint constraints =
-     META_MONITOR_SCALES_CONSTRAINT_NONE;
-diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
-index 9420265..c4ed245 100644
---- a/src/backends/meta-monitor-manager.c
-+++ b/src/backends/meta-monitor-manager.c
-@@ -400,11 +400,11 @@ meta_monitor_manager_calculate_monitor_mode_scale (MetaMonitorManager *manager,
- }
- 
- float *
--meta_monitor_manager_calculate_supported_scales (MetaMonitorManager          *manager,
--                                                 MetaLogicalMonitorLayoutMode layout_mode,
--                                                 MetaMonitor                 *monitor,
--                                                 MetaMonitorMode             *monitor_mode,
--                                                 int                         *n_supported_scales)
-+meta_monitor_manager_calculate_supported_scales (MetaMonitorManager           *manager,
-+                                                 MetaLogicalMonitorLayoutMode  layout_mode,
-+                                                 MetaMonitor                  *monitor,
-+                                                 MetaMonitorMode              *monitor_mode,
-+                                                 int                          *n_supported_scales)
- {
-   MetaMonitorManagerClass *manager_class =
-     META_MONITOR_MANAGER_GET_CLASS (manager);
-diff --git a/src/backends/meta-monitor.c b/src/backends/meta-monitor.c
-index 1a32e4c..b2f500f 100644
---- a/src/backends/meta-monitor.c
-+++ b/src/backends/meta-monitor.c
-@@ -1642,10 +1642,10 @@ out:
- }
- 
- float *
--meta_monitor_calculate_supported_scales (MetaMonitor                *monitor,
--                                         MetaMonitorMode            *monitor_mode,
--                                         MetaMonitorScalesConstraint constraints,
--                                         int                        *n_supported_scales)
-+meta_monitor_calculate_supported_scales (MetaMonitor                 *monitor,
-+                                         MetaMonitorMode             *monitor_mode,
-+                                         MetaMonitorScalesConstraint  constraints,
-+                                         int                         *n_supported_scales)
- {
-   unsigned int i, j;
-   int width, height;
-diff --git a/src/backends/meta-monitor.h b/src/backends/meta-monitor.h
-index 41f2c0f..b24b1a5 100644
---- a/src/backends/meta-monitor.h
-+++ b/src/backends/meta-monitor.h
-@@ -226,10 +226,10 @@ float meta_monitor_calculate_mode_scale (MetaMonitor     *monitor,
-                                          MetaMonitorMode *monitor_mode);
- 
- META_EXPORT_TEST
--float * meta_monitor_calculate_supported_scales (MetaMonitor                *monitor,
--                                                 MetaMonitorMode            *monitor_mode,
--                                                 MetaMonitorScalesConstraint constraints,
--                                                 int                        *n_supported_scales);
-+float * meta_monitor_calculate_supported_scales (MetaMonitor                 *monitor,
-+                                                 MetaMonitorMode             *monitor_mode,
-+                                                 MetaMonitorScalesConstraint  constraints,
-+                                                 int                         *n_supported_scales);
- 
- META_EXPORT_TEST
- const char * meta_monitor_mode_get_id (MetaMonitorMode *monitor_mode);
-diff --git a/src/backends/native/meta-monitor-manager-kms.c b/src/backends/native/meta-monitor-manager-kms.c
-index c2c8ab5..c9a3cab 100644
---- a/src/backends/native/meta-monitor-manager-kms.c
-+++ b/src/backends/native/meta-monitor-manager-kms.c
-@@ -512,11 +512,11 @@ meta_monitor_manager_kms_calculate_monitor_mode_scale (MetaMonitorManager *manag
- }
- 
- static float *
--meta_monitor_manager_kms_calculate_supported_scales (MetaMonitorManager          *manager,
--                                                     MetaLogicalMonitorLayoutMode layout_mode,
--                                                     MetaMonitor                 *monitor,
--                                                     MetaMonitorMode             *monitor_mode,
--                                                     int                         *n_supported_scales)
-+meta_monitor_manager_kms_calculate_supported_scales (MetaMonitorManager           *manager,
-+                                                     MetaLogicalMonitorLayoutMode  layout_mode,
-+                                                     MetaMonitor                  *monitor,
-+                                                     MetaMonitorMode              *monitor_mode,
-+                                                     int                          *n_supported_scales)
- {
-   MetaMonitorScalesConstraint constraints =
-     META_MONITOR_SCALES_CONSTRAINT_NONE;
-diff --git a/src/backends/x11/meta-monitor-manager-xrandr.c b/src/backends/x11/meta-monitor-manager-xrandr.c
-index c3a33e5..784bbde 100644
---- a/src/backends/x11/meta-monitor-manager-xrandr.c
-+++ b/src/backends/x11/meta-monitor-manager-xrandr.c
-@@ -929,11 +929,11 @@ ensure_supported_monitor_scales (MetaMonitorManager *manager)
- }
- 
- static float *
--meta_monitor_manager_xrandr_calculate_supported_scales (MetaMonitorManager          *manager,
--                                                        MetaLogicalMonitorLayoutMode layout_mode,
--                                                        MetaMonitor                 *monitor,
--                                                        MetaMonitorMode             *monitor_mode,
--                                                        int                         *n_supported_scales)
-+meta_monitor_manager_xrandr_calculate_supported_scales (MetaMonitorManager           *manager,
-+                                                        MetaLogicalMonitorLayoutMode  layout_mode,
-+                                                        MetaMonitor                  *monitor,
-+                                                        MetaMonitorMode              *monitor_mode,
-+                                                        int                          *n_supported_scales)
- {
-   MetaMonitorManagerXrandr *manager_xrandr =
-     META_MONITOR_MANAGER_XRANDR (manager);
-diff --git a/src/tests/meta-monitor-manager-test.c b/src/tests/meta-monitor-manager-test.c
-index d1b729c..45680ed 100644
---- a/src/tests/meta-monitor-manager-test.c
-+++ b/src/tests/meta-monitor-manager-test.c
-@@ -373,11 +373,11 @@ meta_monitor_manager_test_calculate_monitor_mode_scale (MetaMonitorManager *mana
- }
- 
- static float *
--meta_monitor_manager_test_calculate_supported_scales (MetaMonitorManager          *manager,
--                                                      MetaLogicalMonitorLayoutMode layout_mode,
--                                                      MetaMonitor                 *monitor,
--                                                      MetaMonitorMode             *monitor_mode,
--                                                      int                         *n_supported_scales)
-+meta_monitor_manager_test_calculate_supported_scales (MetaMonitorManager           *manager,
-+                                                      MetaLogicalMonitorLayoutMode  layout_mode,
-+                                                      MetaMonitor                  *monitor,
-+                                                      MetaMonitorMode              *monitor_mode,
-+                                                      int                          *n_supported_scales)
- {
-   MetaMonitorScalesConstraint constraints =
-     META_MONITOR_SCALES_CONSTRAINT_NONE;
diff --git a/debian/patches/monitor-Fix-indentation-style-on-foreach-functions.patch b/debian/patches/monitor-Fix-indentation-style-on-foreach-functions.patch
 deleted file mode 100644
index b719f23..0000000
--- a/debian/patches/monitor-Fix-indentation-style-on-foreach-functions.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
-Date: Fri, 8 Mar 2019 18:17:40 +0000
-Subject: monitor: Fix indentation style on foreach functions
-
-https://gitlab.gnome.org/GNOME/mutter/merge_requests/488
-
-Origin: upstream, commit:03e02bdac58f25df3b5e15525fd9bab06e49bf8
-Applied-Upstream: 3.32.1
----
- src/backends/meta-monitor.c | 20 ++++++++++----------
- src/backends/meta-monitor.h | 24 ++++++++++++------------
- 2 files changed, 22 insertions(+), 22 deletions(-)
-
-diff --git a/src/backends/meta-monitor.c b/src/backends/meta-monitor.c
-index 1c6e844..22a3e45 100644
---- a/src/backends/meta-monitor.c
-+++ b/src/backends/meta-monitor.c
-@@ -1725,11 +1725,11 @@ meta_monitor_mode_get_flags (MetaMonitorMode *monitor_mode)
- }
- 
- gboolean
--meta_monitor_mode_foreach_crtc (MetaMonitor        *monitor,
--                                MetaMonitorMode    *mode,
--                                MetaMonitorModeFunc func,
--                                gpointer            user_data,
--                                GError            **error)
-+meta_monitor_mode_foreach_crtc (MetaMonitor          *monitor,
-+                                MetaMonitorMode      *mode,
-+                                MetaMonitorModeFunc   func,
-+                                gpointer              user_data,
-+                                GError              **error)
- {
-   MetaMonitorPrivate *monitor_priv =
-     meta_monitor_get_instance_private (monitor);
-@@ -1751,11 +1751,11 @@ meta_monitor_mode_foreach_crtc (MetaMonitor        *monitor,
- }
- 
- gboolean
--meta_monitor_mode_foreach_output (MetaMonitor        *monitor,
--                                  MetaMonitorMode    *mode,
--                                  MetaMonitorModeFunc func,
--                                  gpointer            user_data,
--                                  GError            **error)
-+meta_monitor_mode_foreach_output (MetaMonitor          *monitor,
-+                                  MetaMonitorMode      *mode,
-+                                  MetaMonitorModeFunc   func,
-+                                  gpointer              user_data,
-+                                  GError              **error)
- {
-   MetaMonitorPrivate *monitor_priv =
-     meta_monitor_get_instance_private (monitor);
-diff --git a/src/backends/meta-monitor.h b/src/backends/meta-monitor.h
-index c3ba4cf..413a4e2 100644
---- a/src/backends/meta-monitor.h
-+++ b/src/backends/meta-monitor.h
-@@ -249,18 +249,18 @@ META_EXPORT_TEST
- MetaCrtcModeFlag meta_monitor_mode_get_flags (MetaMonitorMode *monitor_mode);
- 
- META_EXPORT_TEST
--gboolean meta_monitor_mode_foreach_crtc (MetaMonitor        *monitor,
--                                         MetaMonitorMode    *mode,
--                                         MetaMonitorModeFunc func,
--                                         gpointer            user_data,
--                                         GError            **error);
--
--META_EXPORT_TEST
--gboolean meta_monitor_mode_foreach_output (MetaMonitor        *monitor,
--                                           MetaMonitorMode    *mode,
--                                           MetaMonitorModeFunc func,
--                                           gpointer            user_data,
--                                           GError            **error);
-+gboolean meta_monitor_mode_foreach_crtc (MetaMonitor          *monitor,
-+                                         MetaMonitorMode      *mode,
-+                                         MetaMonitorModeFunc   func,
-+                                         gpointer              user_data,
-+                                         GError              **error);
-+
-+META_EXPORT_TEST
-+gboolean meta_monitor_mode_foreach_output (MetaMonitor          *monitor,
-+                                           MetaMonitorMode      *mode,
-+                                           MetaMonitorModeFunc   func,
-+                                           gpointer              user_data,
-+                                           GError              **error);
- 
- META_EXPORT_TEST
- gboolean meta_monitor_mode_should_be_advertised (MetaMonitorMode *monitor_mode);
diff --git a/debian/patches/prefs-Change-default-of-show-fallback-app-menu.patch b/debian/patches/prefs-Change-default-of-show-fallback-app-menu.patch
 deleted file mode 100644
index 6ad4427..0000000
--- a/debian/patches/prefs-Change-default-of-show-fallback-app-menu.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: =?utf-8?q?Florian_M=C3=BCllner?= <[e-mail]>
-Date: Sun, 10 Mar 2019 19:30:12 +0100
-Subject: prefs: Change default of show-fallback-app-menu
-
-The app menu always was a GNOME-only thing, so after it was removed this
-cycle, assuming that it is not displayed by the environment is a better
-default.
-
-https://gitlab.gnome.org/GNOME/mutter/issues/493
-
-Origin: upstream, commit:574099449fd7cf78c226bdf9d3d5a414d4bd351
-Applied-Upstream: 3.32.1
----
- src/core/prefs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/prefs.c b/src/core/prefs.c
-index fdee5b2..3f0db8a 100644
---- a/src/core/prefs.c
-+++ b/src/core/prefs.c
-@@ -111,7 +111,7 @@ static gboolean resize_with_right_button = FALSE;
- static gboolean edge_tiling = FALSE;
- static gboolean force_fullscreen = TRUE;
- static gboolean auto_maximize = TRUE;
--static gboolean show_fallback_app_menu = FALSE;
-+static gboolean show_fallback_app_menu = TRUE;
- 
- static GDesktopVisualBellType visual_bell_type = G_DESKTOP_VISUAL_BELL_FULLSCREEN_FLASH;
- static MetaButtonLayout button_layout;
diff --git a/debian/patches/series b/debian/patches/series
index 5b6232c..5e2b370 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,15 +1,3 @@
-prefs-Change-default-of-show-fallback-app-menu.patch
-keybindings-Fix-theoretical-memory-leak-while-ungrabbing.patch
-meta-monitor-Remove-useless-variable.patch
-cogl-Remove-unused-CoglTextureDriver-try_setting_gl_borde.patch
-cogl-Introspect-CoglTexture2D-Sliced.patch
-shadow-factory-Update-shadow-of-attached-modals.patch
-monitor-Fix-indentation-style-on-calculate_supported_scal.patch
-monitor-Fix-indentation-style-on-calculate_crtc_pos-and-f.patch
-monitor-Fix-indentation-style-on-foreach-functions.patch
-bell-Always-flash-window-instead-of-frame.patch
-frame-Remove-flashing-support.patch
-boxes-Actually-check-for-rectangle-containment.patch
 theme-use-gtk_render_icon_suface-to-paint-button-icon.patch
 theme-load-icons-as-Gtk-does-with-fallback-and-RTL-suppor.patch
 meson-add-back-default_driver-option.patch
diff --git a/debian/patches/shadow-factory-Update-shadow-of-attached-modals.patch b/debian/patches/shadow-factory-Update-shadow-of-attached-modals.patch
 deleted file mode 100644
index a46c881..0000000
--- a/debian/patches/shadow-factory-Update-shadow-of-attached-modals.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: =?utf-8?q?Florian_M=C3=BCllner?= <[e-mail]>
-Date: Wed, 6 Mar 2019 23:31:43 +0100
-Subject: shadow-factory: Update shadow of attached modals
-
-When commit 91c6a144da synced shadows with Adwaita, it removed the
-shadow completely from attached modal dialogs. However Adwaita uses
-the same shadow for all dialogs (modal or not), so do the same here.
-
-https://gitlab.gnome.org/GNOME/mutter/issues/490
-
-Origin: upstream, commit:a87e87a05fb29e8e9aad5df5c7752b6db20535e
-Applied-Upstream: 3.32.1
----
- src/compositor/meta-shadow-factory.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/compositor/meta-shadow-factory.c b/src/compositor/meta-shadow-factory.c
-index 9fdecac..0eb14c9 100644
---- a/src/compositor/meta-shadow-factory.c
-+++ b/src/compositor/meta-shadow-factory.c
-@@ -128,7 +128,7 @@ MetaShadowClassInfo default_shadow_classes[] = {
-   { "popup-menu",    { 1, -1, 0, 0, 128 }, { 1, -1, 0, 0, 128 } },
-   { "dropdown-menu", { 1, -1, 0, 0, 128 }, { 1, -1, 0, 0, 128 } },
- 
--  { "attached",      { 0, -1, 0, 0, 0 }, { 0, -1, 0, 0, 0 } }
-+  { "attached",      { 10, -1, 0, 3, 128 }, { 8, -1, 0, 2, 64 } }
- };
- 
- G_DEFINE_TYPE (MetaShadowFactory, meta_shadow_factory, G_TYPE_OBJECT);
diff --git a/debian/patches/x11-Add-support-for-fractional-scaling-using-Randr.patch b/debian/patches/x11-Add-support-for-fractional-scaling-using-Randr.patch
index 90c17a9..7717be1 100644
--- a/debian/patches/x11-Add-support-for-fractional-scaling-using-Randr.patch
+++ b/debian/patches/x11-Add-support-for-fractional-scaling-using-Randr.patch
@@ -122,7 +122,7 @@ index ddacfea..8d16455 100644
    MetaLogicalMonitor *logical_monitor;
  
 diff --git a/src/backends/meta-monitor-config-manager.c b/src/backends/meta-monitor-config-manager.c
-index 771c57f..5d620a3 100644
+index 9a54ce5..7084522 100644
 --- a/src/backends/meta-monitor-config-manager.c
 +++ b/src/backends/meta-monitor-config-manager.c
 @@ -152,6 +152,7 @@ find_unassigned_crtc (MetaOutput *output,
@@ -623,7 +623,7 @@ index 46c3b8c..29fde36 100644
          settings,
          META_EXPERIMENTAL_FEATURE_SCALE_MONITOR_FRAMEBUFFER))
 diff --git a/src/backends/meta-monitor-manager-private.h b/src/backends/meta-monitor-manager-private.h
-index 3b951c6..2ba9ced 100644
+index cdb8f42..bf586ea 100644
 --- a/src/backends/meta-monitor-manager-private.h
 +++ b/src/backends/meta-monitor-manager-private.h
 @@ -44,7 +44,9 @@ typedef enum _MetaMonitorManagerCapability
@@ -655,7 +655,7 @@ index 3b951c6..2ba9ced 100644
    MetaMonitorTransform      transform;
    GPtrArray                *outputs;
  };
-@@ -126,6 +130,7 @@ struct _MetaMonitorManager
+@@ -124,6 +128,7 @@ struct _MetaMonitorManager
    GList *gpus;
  
    GList *monitors;
@@ -663,7 +663,7 @@ index 3b951c6..2ba9ced 100644
  
    GList *logical_monitors;
    MetaLogicalMonitor *primary_logical_monitor;
-@@ -156,6 +161,9 @@ struct _MetaMonitorManager
+@@ -154,6 +159,9 @@ struct _MetaMonitorManager
   * @apply_monitors_config: Tries to apply the given config using the given
   *   method. Throws an error if something went wrong.
   *
@@ -697,7 +697,7 @@ index 3b951c6..2ba9ced 100644
  
    float * (*calculate_supported_scales) (MetaMonitorManager          *,
                                           MetaLogicalMonitorLayoutMode ,
-@@ -350,9 +362,10 @@ void               meta_monitor_manager_lid_is_closed_changed (MetaMonitorManage
+@@ -355,9 +367,10 @@ void               meta_monitor_manager_lid_is_closed_changed (MetaMonitorManage
  
  gboolean           meta_monitor_manager_is_headless (MetaMonitorManager *manager);
  
@@ -711,7 +711,7 @@ index 3b951c6..2ba9ced 100644
  
  float *            meta_monitor_manager_calculate_supported_scales (MetaMonitorManager          *,
                                                                      MetaLogicalMonitorLayoutMode ,
-@@ -366,6 +379,11 @@ gboolean           meta_monitor_manager_is_scale_supported (MetaMonitorManager
+@@ -371,6 +384,11 @@ gboolean           meta_monitor_manager_is_scale_supported (MetaMonitorManager
                                                              MetaMonitorMode             *monitor_mode,
                                                              float                        scale);
  
@@ -724,10 +724,10 @@ index 3b951c6..2ba9ced 100644
                     meta_monitor_manager_get_capabilities (MetaMonitorManager *manager);
  
 diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
-index c4ed245..d055eec 100644
+index 2d898c7..a78fb37 100644
 --- a/src/backends/meta-monitor-manager.c
 +++ b/src/backends/meta-monitor-manager.c
-@@ -104,8 +104,18 @@ static gboolean
+@@ -110,8 +110,18 @@ static gboolean
  meta_monitor_manager_is_config_complete (MetaMonitorManager *manager,
                                           MetaMonitorsConfig *config);
  
@@ -746,9 +746,9 @@ index c4ed245..d055eec 100644
 +                                                        float                         threshold,
 +                                                        float                        *out_scale);
  
- MetaBackend *
- meta_monitor_manager_get_backend (MetaMonitorManager *manager)
-@@ -190,15 +200,41 @@ meta_monitor_manager_rebuild_logical_monitors (MetaMonitorManager *manager,
+ static void
+ meta_monitor_manager_real_read_current_state (MetaMonitorManager *manager);
+@@ -199,15 +209,41 @@ meta_monitor_manager_rebuild_logical_monitors (MetaMonitorManager *manager,
                                                      primary_logical_monitor);
  }
  
@@ -793,7 +793,7 @@ index c4ed245..d055eec 100644
  }
  
  static float
-@@ -209,24 +245,70 @@ calculate_monitor_scale (MetaMonitorManager *manager,
+@@ -218,24 +254,70 @@ calculate_monitor_scale (MetaMonitorManager *manager,
  
    monitor_mode = meta_monitor_get_current_mode (monitor);
    return meta_monitor_manager_calculate_monitor_mode_scale (manager,
@@ -869,7 +869,7 @@ index c4ed245..d055eec 100644
  }
  
  static float
-@@ -248,6 +330,44 @@ derive_scale_from_config (MetaMonitorManager *manager,
+@@ -257,6 +339,44 @@ derive_scale_from_config (MetaMonitorManager *manager,
    return 1.0;
  }
  
@@ -914,7 +914,7 @@ index c4ed245..d055eec 100644
  static void
  meta_monitor_manager_rebuild_logical_monitors_derived (MetaMonitorManager *manager,
                                                         MetaMonitorsConfig *config)
-@@ -296,10 +416,16 @@ meta_monitor_manager_rebuild_logical_monitors_derived (MetaMonitorManager *manag
+@@ -305,10 +425,16 @@ meta_monitor_manager_rebuild_logical_monitors_derived (MetaMonitorManager *manag
  
            if (use_global_scale)
              scale = global_scale;
@@ -934,7 +934,7 @@ index c4ed245..d055eec 100644
  
            g_assert (scale > 0);
  
-@@ -387,14 +513,19 @@ meta_monitor_manager_is_headless (MetaMonitorManager *manager)
+@@ -407,14 +533,19 @@ meta_monitor_manager_is_headless (MetaMonitorManager *manager)
  }
  
  float
@@ -957,7 +957,7 @@ index c4ed245..d055eec 100644
                                                        monitor,
                                                        monitor_mode);
  }
-@@ -508,7 +639,8 @@ static gboolean
+@@ -528,7 +659,8 @@ static gboolean
  should_use_stored_config (MetaMonitorManager *manager)
  {
    return (manager->in_init ||
@@ -967,7 +967,7 @@ index c4ed245..d055eec 100644
  }
  
  MetaMonitorsConfig *
-@@ -700,6 +832,8 @@ experimental_features_changed (MetaSettings           *settings,
+@@ -720,6 +852,8 @@ experimental_features_changed (MetaSettings           *settings,
  {
    gboolean was_stage_views_scaled;
    gboolean is_stage_views_scaled;
@@ -976,7 +976,7 @@ index c4ed245..d055eec 100644
    gboolean should_reconfigure = FALSE;
  
    was_stage_views_scaled =
-@@ -709,8 +843,16 @@ experimental_features_changed (MetaSettings           *settings,
+@@ -729,8 +863,16 @@ experimental_features_changed (MetaSettings           *settings,
      meta_settings_is_experimental_feature_enabled (
        settings,
        META_EXPERIMENTAL_FEATURE_SCALE_MONITOR_FRAMEBUFFER);
@@ -994,7 +994,7 @@ index c4ed245..d055eec 100644
      should_reconfigure = TRUE;
  
    if (should_reconfigure)
-@@ -1316,6 +1458,41 @@ request_persistent_confirmation (MetaMonitorManager *manager)
+@@ -1337,6 +1479,41 @@ request_persistent_confirmation (MetaMonitorManager *manager)
    g_signal_emit (manager, signals[CONFIRM_DISPLAY_CHANGE], 0);
  }
  
@@ -1036,7 +1036,7 @@ index c4ed245..d055eec 100644
  #define META_DISPLAY_CONFIG_MODE_FLAGS_PREFERRED (1 << 0)
  #define META_DISPLAY_CONFIG_MODE_FLAGS_CURRENT (1 << 1)
  
-@@ -1343,6 +1520,7 @@ meta_monitor_manager_handle_get_current_state (MetaDBusDisplayConfig *skeleton,
+@@ -1364,6 +1541,7 @@ meta_monitor_manager_handle_get_current_state (MetaDBusDisplayConfig *skeleton,
    MetaMonitorManagerCapability capabilities;
    int ui_scaling_factor;
    int max_screen_width, max_screen_height;
@@ -1044,7 +1044,7 @@ index c4ed245..d055eec 100644
  
    g_variant_builder_init (&monitors_builder,
                            G_VARIANT_TYPE (MONITORS_FORMAT));
-@@ -1389,6 +1567,7 @@ meta_monitor_manager_handle_get_current_state (MetaDBusDisplayConfig *skeleton,
+@@ -1410,6 +1588,7 @@ meta_monitor_manager_handle_get_current_state (MetaDBusDisplayConfig *skeleton,
  
            preferred_scale =
              meta_monitor_manager_calculate_monitor_mode_scale (manager,
@@ -1052,7 +1052,7 @@ index c4ed245..d055eec 100644
                                                                 monitor,
                                                                 monitor_mode);
  
-@@ -1496,6 +1675,14 @@ meta_monitor_manager_handle_get_current_state (MetaDBusDisplayConfig *skeleton,
+@@ -1517,6 +1696,14 @@ meta_monitor_manager_handle_get_current_state (MetaDBusDisplayConfig *skeleton,
      }
  
    g_variant_builder_init (&properties_builder, G_VARIANT_TYPE ("a{sv}"));
@@ -1067,7 +1067,7 @@ index c4ed245..d055eec 100644
    capabilities = meta_monitor_manager_get_capabilities (manager);
    if ((capabilities & META_MONITOR_MANAGER_CAPABILITY_MIRRORING) == 0)
      {
-@@ -1520,6 +1707,13 @@ meta_monitor_manager_handle_get_current_state (MetaDBusDisplayConfig *skeleton,
+@@ -1541,6 +1728,13 @@ meta_monitor_manager_handle_get_current_state (MetaDBusDisplayConfig *skeleton,
                               "global-scale-required",
                               g_variant_new_boolean (TRUE));
      }
@@ -1081,7 +1081,7 @@ index c4ed245..d055eec 100644
  
    ui_scaling_factor = meta_settings_get_ui_scaling_factor (settings);
    g_variant_builder_add (&properties_builder, "{sv}",
-@@ -1564,12 +1758,14 @@ meta_monitor_manager_handle_get_current_state (MetaDBusDisplayConfig *skeleton,
+@@ -1585,12 +1779,14 @@ meta_monitor_manager_handle_get_current_state (MetaDBusDisplayConfig *skeleton,
  #undef LOGICAL_MONITOR_FORMAT
  #undef LOGICAL_MONITORS_FORMAT
  
@@ -1102,7 +1102,7 @@ index c4ed245..d055eec 100644
  {
    g_autofree float *supported_scales = NULL;
    int n_supported_scales;
-@@ -1583,8 +1779,66 @@ meta_monitor_manager_is_scale_supported (MetaMonitorManager          *manager,
+@@ -1604,8 +1800,66 @@ meta_monitor_manager_is_scale_supported (MetaMonitorManager          *manager,
                                                       &n_supported_scales);
    for (i = 0; i < n_supported_scales; i++)
      {
@@ -1171,7 +1171,7 @@ index c4ed245..d055eec 100644
      }
  
    return FALSE;
-@@ -1628,11 +1882,11 @@ meta_monitor_manager_is_config_applicable (MetaMonitorManager *manager,
+@@ -1649,11 +1903,11 @@ meta_monitor_manager_is_config_applicable (MetaMonitorManager *manager,
                return FALSE;
              }
  
@@ -1188,7 +1188,7 @@ index c4ed245..d055eec 100644
              {
                g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
                             "Scale not supported by backend");
-@@ -1841,6 +2095,7 @@ derive_logical_monitor_size (MetaMonitorConfig           *monitor_config,
+@@ -1862,6 +2116,7 @@ derive_logical_monitor_size (MetaMonitorConfig           *monitor_config,
    switch (layout_mode)
      {
      case META_LOGICAL_MONITOR_LAYOUT_MODE_LOGICAL:
@@ -1196,7 +1196,7 @@ index c4ed245..d055eec 100644
        width = roundf (width / scale);
        height = roundf (height / scale);
        break;
-@@ -1963,6 +2218,7 @@ is_valid_layout_mode (MetaLogicalMonitorLayoutMode layout_mode)
+@@ -1984,6 +2239,7 @@ is_valid_layout_mode (MetaLogicalMonitorLayoutMode layout_mode)
      {
      case META_LOGICAL_MONITOR_LAYOUT_MODE_LOGICAL:
      case META_LOGICAL_MONITOR_LAYOUT_MODE_PHYSICAL:
@@ -1204,7 +1204,7 @@ index c4ed245..d055eec 100644
        return TRUE;
      }
  
-@@ -1985,6 +2241,7 @@ meta_monitor_manager_handle_apply_monitors_config (MetaDBusDisplayConfig *skelet
+@@ -2006,6 +2262,7 @@ meta_monitor_manager_handle_apply_monitors_config (MetaDBusDisplayConfig *skelet
    MetaMonitorsConfig *config;
    GList *logical_monitor_configs = NULL;
    GError *error = NULL;
@@ -1212,7 +1212,7 @@ index c4ed245..d055eec 100644
  
    if (serial != manager->serial)
      {
-@@ -2056,10 +2313,26 @@ meta_monitor_manager_handle_apply_monitors_config (MetaDBusDisplayConfig *skelet
+@@ -2077,10 +2334,26 @@ meta_monitor_manager_handle_apply_monitors_config (MetaDBusDisplayConfig *skelet
            return TRUE;
          }
  
@@ -1239,7 +1239,7 @@ index c4ed245..d055eec 100644
    config = meta_monitors_config_new (manager,
                                       logical_monitor_configs,
                                       layout_mode,
-@@ -2497,12 +2770,6 @@ meta_monitor_manager_get_laptop_panel (MetaMonitorManager *manager)
+@@ -2518,12 +2791,6 @@ meta_monitor_manager_get_laptop_panel (MetaMonitorManager *manager)
    return find_monitor (manager, meta_monitor_is_laptop_panel);
  }
  
@@ -1252,7 +1252,7 @@ index c4ed245..d055eec 100644
  MetaMonitor *
  meta_monitor_manager_get_monitor_from_connector (MetaMonitorManager *manager,
                                                   const char         *connector)
-@@ -2688,6 +2955,10 @@ static void
+@@ -2718,6 +2985,10 @@ static void
  rebuild_monitors (MetaMonitorManager *manager)
  {
    GList *l;
@@ -1263,7 +1263,7 @@ index c4ed245..d055eec 100644
  
    if (manager->monitors)
      {
-@@ -2704,7 +2975,7 @@ rebuild_monitors (MetaMonitorManager *manager)
+@@ -2734,7 +3005,7 @@ rebuild_monitors (MetaMonitorManager *manager)
          {
            MetaOutput *output = k->data;
  
@@ -1272,7 +1272,7 @@ index c4ed245..d055eec 100644
              {
                if (is_main_tiled_monitor_output (output))
                  {
-@@ -2901,7 +3172,7 @@ meta_monitor_manager_update_logical_state_derived (MetaMonitorManager *manager,
+@@ -2940,7 +3211,7 @@ meta_monitor_manager_update_logical_state_derived (MetaMonitorManager *manager,
    else
      manager->current_switch_config = META_MONITOR_SWITCH_CONFIG_UNKNOWN;
  
@@ -1281,7 +1281,7 @@ index c4ed245..d055eec 100644
  
    meta_monitor_manager_rebuild_logical_monitors_derived (manager, config);
  }
-@@ -2910,10 +3181,14 @@ void
+@@ -2949,10 +3220,14 @@ void
  meta_monitor_manager_rebuild_derived (MetaMonitorManager *manager,
                                        MetaMonitorsConfig *config)
  {
@@ -1633,10 +1633,10 @@ index 34d49b3..e54317e 100644
      g_signal_new ("experimental-features-changed",
                    G_TYPE_FROM_CLASS (object_class),
 diff --git a/src/backends/native/meta-monitor-manager-kms.c b/src/backends/native/meta-monitor-manager-kms.c
-index c9a3cab..da3a619 100644
+index 9a03644..93905e6 100644
 --- a/src/backends/native/meta-monitor-manager-kms.c
 +++ b/src/backends/native/meta-monitor-manager-kms.c
-@@ -503,20 +503,8 @@ meta_monitor_manager_kms_is_transform_handled (MetaMonitorManager  *manager,
+@@ -518,20 +518,8 @@ meta_monitor_manager_kms_is_transform_handled (MetaMonitorManager  *manager,
    return meta_crtc_kms_is_transform_handled (crtc, transform);
  }
  
@@ -1659,7 +1659,7 @@ index c9a3cab..da3a619 100644
  {
    MetaMonitorScalesConstraint constraints =
      META_MONITOR_SCALES_CONSTRAINT_NONE;
-@@ -524,12 +512,38 @@ meta_monitor_manager_kms_calculate_supported_scales (MetaMonitorManager
+@@ -539,12 +527,38 @@ meta_monitor_manager_kms_calculate_supported_scales (MetaMonitorManager
    switch (layout_mode)
      {
      case META_LOGICAL_MONITOR_LAYOUT_MODE_LOGICAL:
@@ -1698,7 +1698,7 @@ index c9a3cab..da3a619 100644
    return meta_monitor_calculate_supported_scales (monitor, monitor_mode,
                                                    constraints,
                                                    n_supported_scales);
-@@ -543,7 +557,7 @@ meta_monitor_manager_kms_get_capabilities (MetaMonitorManager *manager)
+@@ -558,7 +572,7 @@ meta_monitor_manager_kms_get_capabilities (MetaMonitorManager *manager)
    MetaRenderer *renderer = meta_backend_get_renderer (backend);
    MetaRendererNative *renderer_native = META_RENDERER_NATIVE (renderer);
    MetaMonitorManagerCapability capabilities =
@@ -1857,7 +1857,7 @@ index d38a09a..d3f2f60 100644
  
  #endif /* META_CRTC_XRANDR_H */
 diff --git a/src/backends/x11/meta-gpu-xrandr.c b/src/backends/x11/meta-gpu-xrandr.c
-index 14b46d5..72243a1 100644
+index 3e8a731..e8fa3f5 100644
 --- a/src/backends/x11/meta-gpu-xrandr.c
 +++ b/src/backends/x11/meta-gpu-xrandr.c
 @@ -42,6 +42,8 @@ struct _MetaGpuXrandr
@@ -1945,14 +1945,12 @@ index 14b46d5..72243a1 100644
  static gboolean
  meta_gpu_xrandr_read_current (MetaGpu  *gpu,
                                GError  **error)
-@@ -95,13 +159,14 @@ meta_gpu_xrandr_read_current (MetaGpu  *gpu,
+@@ -95,19 +159,20 @@ meta_gpu_xrandr_read_current (MetaGpu  *gpu,
    RROutput primary_output;
    unsigned int i, j;
    GList *l;
 -  int min_width, min_height;
    Screen *screen;
-   BOOL dpms_capable, dpms_enabled;
-   CARD16 dpms_state;
    GList *outputs = NULL;
    GList *modes = NULL;
    GList *crtcs = NULL;
@@ -1961,8 +1959,7 @@ index 14b46d5..72243a1 100644
  
    if (gpu_xrandr->resources)
      XRRFreeScreenResources (gpu_xrandr->resources);
-@@ -138,8 +203,8 @@ meta_gpu_xrandr_read_current (MetaGpu  *gpu,
-     }
+   gpu_xrandr->resources = NULL;
  
    XRRGetScreenSizeRange (xdisplay, DefaultRootWindow (xdisplay),
 -                         &min_width,
@@ -1972,7 +1969,7 @@ index 14b46d5..72243a1 100644
                           &gpu_xrandr->max_screen_width,
                           &gpu_xrandr->max_screen_height);
  
-@@ -182,17 +247,33 @@ meta_gpu_xrandr_read_current (MetaGpu  *gpu,
+@@ -150,17 +215,33 @@ meta_gpu_xrandr_read_current (MetaGpu  *gpu,
      }
    meta_gpu_take_modes (gpu, modes);
  
@@ -2023,7 +2020,7 @@ index aad49d0..4ac32b9 100644
                                            int           *max_width,
                                            int           *max_height);
 diff --git a/src/backends/x11/meta-monitor-manager-xrandr.c b/src/backends/x11/meta-monitor-manager-xrandr.c
-index 784bbde..246b66d 100644
+index 45c81f4..7df4abc 100644
 --- a/src/backends/x11/meta-monitor-manager-xrandr.c
 +++ b/src/backends/x11/meta-monitor-manager-xrandr.c
 @@ -63,6 +63,9 @@
@@ -2068,7 +2065,7 @@ index 784bbde..246b66d 100644
  }
  
  static GBytes *
-@@ -149,6 +150,57 @@ meta_monitor_manager_xrandr_set_power_save_mode (MetaMonitorManager *manager,
+@@ -193,6 +194,57 @@ meta_monitor_manager_xrandr_set_power_save_mode (MetaMonitorManager *manager,
    DPMSSetTimeouts (manager_xrandr->xdisplay, 0, 0, 0);
  }
  
@@ -2126,7 +2123,7 @@ index 784bbde..246b66d 100644
  static xcb_randr_rotation_t
  meta_monitor_transform_to_xrandr (MetaMonitorTransform transform)
  {
-@@ -203,13 +255,36 @@ xrandr_set_crtc_config (MetaMonitorManagerXrandr *manager_xrandr,
+@@ -247,13 +299,36 @@ xrandr_set_crtc_config (MetaMonitorManagerXrandr *manager_xrandr,
    return TRUE;
  }
  
@@ -2166,7 +2163,7 @@ index 784bbde..246b66d 100644
    for (i = 0; i < n_crtc_infos; i++)
      {
        MetaCrtcInfo *crtc_info = crtc_infos[i];
-@@ -230,6 +305,37 @@ is_crtc_assignment_changed (MetaCrtc      *crtc,
+@@ -274,6 +349,37 @@ is_crtc_assignment_changed (MetaCrtc      *crtc,
        if (crtc->transform != crtc_info->transform)
          return TRUE;
  
@@ -2204,7 +2201,7 @@ index 784bbde..246b66d 100644
        for (j = 0; j < crtc_info->outputs->len; j++)
          {
            MetaOutput *output = ((MetaOutput**) crtc_info->outputs->pdata)[j];
-@@ -315,7 +421,7 @@ is_assignments_changed (MetaMonitorManager *manager,
+@@ -359,7 +465,7 @@ is_assignments_changed (MetaMonitorManager *manager,
      {
        MetaCrtc *crtc = l->data;
  
@@ -2213,7 +2210,7 @@ index 784bbde..246b66d 100644
          return TRUE;
      }
  
-@@ -331,6 +437,32 @@ is_assignments_changed (MetaMonitorManager *manager,
+@@ -375,6 +481,32 @@ is_assignments_changed (MetaMonitorManager *manager,
          return TRUE;
      }
  
@@ -2246,7 +2243,7 @@ index 784bbde..246b66d 100644
    return FALSE;
  }
  
-@@ -343,33 +475,57 @@ apply_crtc_assignments (MetaMonitorManager *manager,
+@@ -387,33 +519,57 @@ apply_crtc_assignments (MetaMonitorManager *manager,
                          unsigned int        n_outputs)
  {
    MetaMonitorManagerXrandr *manager_xrandr = META_MONITOR_MANAGER_XRANDR (manager);
@@ -2311,7 +2308,7 @@ index 784bbde..246b66d 100644
      }
  
    /* Second disable all newly disabled CRTCs, or CRTCs that in the previous
-@@ -394,12 +550,16 @@ apply_crtc_assignments (MetaMonitorManager *manager,
+@@ -438,12 +594,16 @@ apply_crtc_assignments (MetaMonitorManager *manager,
                                    0, 0, XCB_NONE,
                                    XCB_RANDR_ROTATION_ROTATE_0,
                                    NULL, 0);
@@ -2328,7 +2325,7 @@ index 784bbde..246b66d 100644
          }
      }
  
-@@ -424,25 +584,20 @@ apply_crtc_assignments (MetaMonitorManager *manager,
+@@ -468,25 +628,20 @@ apply_crtc_assignments (MetaMonitorManager *manager,
                                0, 0, XCB_NONE,
                                XCB_RANDR_ROTATION_ROTATE_0,
                                NULL, 0);
@@ -2360,7 +2357,7 @@ index 784bbde..246b66d 100644
  
    for (i = 0; i < n_crtcs; i++)
      {
-@@ -455,12 +610,21 @@ apply_crtc_assignments (MetaMonitorManager *manager,
+@@ -499,12 +654,21 @@ apply_crtc_assignments (MetaMonitorManager *manager,
            g_autofree xcb_randr_output_t *output_ids = NULL;
            unsigned int j, n_output_ids;
            xcb_randr_rotation_t rotation;
@@ -2382,7 +2379,7 @@ index 784bbde..246b66d 100644
            for (j = 0; j < n_output_ids; j++)
              {
                MetaOutput *output;
-@@ -473,6 +637,20 @@ apply_crtc_assignments (MetaMonitorManager *manager,
+@@ -517,6 +681,20 @@ apply_crtc_assignments (MetaMonitorManager *manager,
                output_ids[j] = output->winsys_id;
              }
  
@@ -2403,7 +2400,7 @@ index 784bbde..246b66d 100644
            rotation = meta_monitor_transform_to_xrandr (crtc_info->transform);
            if (!xrandr_set_crtc_config (manager_xrandr,
                                         crtc,
-@@ -508,6 +686,7 @@ apply_crtc_assignments (MetaMonitorManager *manager,
+@@ -552,6 +730,7 @@ apply_crtc_assignments (MetaMonitorManager *manager,
            crtc->rect.height = height;
            crtc->current_mode = mode;
            crtc->transform = crtc_info->transform;
@@ -2411,7 +2408,7 @@ index 784bbde..246b66d 100644
          }
      }
  
-@@ -563,14 +742,61 @@ meta_monitor_manager_xrandr_ensure_initial_config (MetaMonitorManager *manager)
+@@ -607,14 +786,61 @@ meta_monitor_manager_xrandr_ensure_initial_config (MetaMonitorManager *manager)
  }
  
  static void
@@ -2477,7 +2474,7 @@ index 784bbde..246b66d 100644
  }
  
  static gboolean
-@@ -584,7 +810,7 @@ meta_monitor_manager_xrandr_apply_monitors_config (MetaMonitorManager      *mana
+@@ -628,7 +854,7 @@ meta_monitor_manager_xrandr_apply_monitors_config (MetaMonitorManager      *mana
  
    if (!config)
      {
@@ -2486,7 +2483,7 @@ index 784bbde..246b66d 100644
        return TRUE;
      }
  
-@@ -609,16 +835,26 @@ meta_monitor_manager_xrandr_apply_monitors_config (MetaMonitorManager      *mana
+@@ -653,16 +879,26 @@ meta_monitor_manager_xrandr_apply_monitors_config (MetaMonitorManager      *mana
                                    (MetaOutputInfo **) output_infos->pdata,
                                    output_infos->len))
          {
@@ -2514,7 +2511,7 @@ index 784bbde..246b66d 100644
          }
      }
  
-@@ -748,7 +984,8 @@ meta_monitor_manager_xrandr_tiled_monitor_added (MetaMonitorManager *manager,
+@@ -792,7 +1028,8 @@ meta_monitor_manager_xrandr_tiled_monitor_added (MetaMonitorManager *manager,
    GList *l;
    int i;
  
@@ -2524,7 +2521,7 @@ index 784bbde..246b66d 100644
      return;
  
    product = meta_monitor_get_product (monitor);
-@@ -797,7 +1034,8 @@ meta_monitor_manager_xrandr_tiled_monitor_removed (MetaMonitorManager *manager,
+@@ -841,7 +1078,8 @@ meta_monitor_manager_xrandr_tiled_monitor_removed (MetaMonitorManager *manager,
  
    int monitor_count;
  
@@ -2534,7 +2531,7 @@ index 784bbde..246b66d 100644
      return;
  
    monitor_xrandr_data = meta_monitor_xrandr_data_from_monitor (monitor);
-@@ -815,10 +1053,12 @@ meta_monitor_manager_xrandr_tiled_monitor_removed (MetaMonitorManager *manager,
+@@ -859,10 +1097,12 @@ meta_monitor_manager_xrandr_tiled_monitor_removed (MetaMonitorManager *manager,
  static void
  meta_monitor_manager_xrandr_init_monitors (MetaMonitorManagerXrandr *manager_xrandr)
  {
@@ -2548,7 +2545,7 @@ index 784bbde..246b66d 100644
      return;
  
    /* delete any tiled monitors setup, as mutter will want to recreate
-@@ -849,83 +1089,26 @@ meta_monitor_manager_xrandr_is_transform_handled (MetaMonitorManager  *manager,
+@@ -893,83 +1133,26 @@ meta_monitor_manager_xrandr_is_transform_handled (MetaMonitorManager  *manager,
    return TRUE;
  }
  
@@ -2646,7 +2643,7 @@ index 784bbde..246b66d 100644
  }
  
  static float *
-@@ -935,21 +1118,35 @@ meta_monitor_manager_xrandr_calculate_supported_scales (MetaMonitorManager
+@@ -979,21 +1162,35 @@ meta_monitor_manager_xrandr_calculate_supported_scales (MetaMonitorManager
                                                          MetaMonitorMode              *monitor_mode,
                                                          int                          *n_supported_scales)
  {
@@ -2692,7 +2689,7 @@ index 784bbde..246b66d 100644
  }
  
  static gboolean
-@@ -966,9 +1163,34 @@ meta_monitor_manager_xrandr_get_max_screen_size (MetaMonitorManager *manager,
+@@ -1010,9 +1207,34 @@ meta_monitor_manager_xrandr_get_max_screen_size (MetaMonitorManager *manager,
    return TRUE;
  }
  
@@ -2727,7 +2724,7 @@ index 784bbde..246b66d 100644
    return META_LOGICAL_MONITOR_LAYOUT_MODE_PHYSICAL;
  }
  
-@@ -978,10 +1200,11 @@ meta_monitor_manager_xrandr_constructed (GObject *object)
+@@ -1022,10 +1244,11 @@ meta_monitor_manager_xrandr_constructed (GObject *object)
    MetaMonitorManagerXrandr *manager_xrandr =
      META_MONITOR_MANAGER_XRANDR (object);
    MetaMonitorManager *manager = META_MONITOR_MANAGER (manager_xrandr);
@@ -2742,7 +2739,7 @@ index 784bbde..246b66d 100644
  
    manager_xrandr->gpu = META_GPU (meta_gpu_xrandr_new (manager_xrandr));
    meta_monitor_manager_add_gpu (manager, manager_xrandr->gpu);
-@@ -1003,19 +1226,19 @@ meta_monitor_manager_xrandr_constructed (GObject *object)
+@@ -1047,19 +1270,19 @@ meta_monitor_manager_xrandr_constructed (GObject *object)
  		      | RRCrtcChangeNotifyMask
  		      | RROutputPropertyNotifyMask);
  
@@ -2770,7 +2767,7 @@ index 784bbde..246b66d 100644
    G_OBJECT_CLASS (meta_monitor_manager_xrandr_parent_class)->constructed (object);
  }
  
-@@ -1026,7 +1249,6 @@ meta_monitor_manager_xrandr_finalize (GObject *object)
+@@ -1070,7 +1293,6 @@ meta_monitor_manager_xrandr_finalize (GObject *object)
  
    g_clear_object (&manager_xrandr->gpu);
    g_hash_table_destroy (manager_xrandr->tiled_monitor_atoms);
@@ -2778,15 +2775,15 @@ index 784bbde..246b66d 100644
  
    G_OBJECT_CLASS (meta_monitor_manager_xrandr_parent_class)->finalize (object);
  }
-@@ -1048,6 +1270,7 @@ meta_monitor_manager_xrandr_class_init (MetaMonitorManagerXrandrClass *klass)
-   manager_class->read_edid = meta_monitor_manager_xrandr_read_edid;
+@@ -1093,6 +1315,7 @@ meta_monitor_manager_xrandr_class_init (MetaMonitorManagerXrandrClass *klass)
+   manager_class->read_current_state = meta_monitor_manager_xrandr_read_current_state;
    manager_class->ensure_initial_config = meta_monitor_manager_xrandr_ensure_initial_config;
    manager_class->apply_monitors_config = meta_monitor_manager_xrandr_apply_monitors_config;
 +  manager_class->update_screen_size_derived = meta_monitor_manager_xrandr_update_screen_size_derived;
    manager_class->set_power_save_mode = meta_monitor_manager_xrandr_set_power_save_mode;
    manager_class->change_backlight = meta_monitor_manager_xrandr_change_backlight;
    manager_class->get_crtc_gamma = meta_monitor_manager_xrandr_get_crtc_gamma;
-@@ -1108,7 +1331,7 @@ meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManagerXrandr *manager_xra
+@@ -1153,7 +1376,7 @@ meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManagerXrandr *manager_xra
            config = NULL;
          }
  
@@ -2931,7 +2928,7 @@ index 0854a19..e412784 100644
      }
  }
 diff --git a/src/core/boxes-private.h b/src/core/boxes-private.h
-index 24c596b..f92837a 100644
+index 74f5c54..0b37f0f 100644
 --- a/src/core/boxes-private.h
 +++ b/src/core/boxes-private.h
 @@ -157,6 +157,10 @@ gboolean meta_rectangle_overlaps_with_region (
@@ -2946,7 +2943,7 @@ index 24c596b..f92837a 100644
   * but make it no smaller than min_size.
   */
 diff --git a/src/core/boxes.c b/src/core/boxes.c
-index 87f2d5d..95978c1 100644
+index 4bb961c..69fd45f 100644
 --- a/src/core/boxes.c
 +++ b/src/core/boxes.c
 @@ -911,6 +911,27 @@ meta_rectangle_overlaps_with_region (const GList         *spanning_rects,
@@ -2966,7 +2963,7 @@ index 87f2d5d..95978c1 100644
 +      if (rect == other || meta_rectangle_equal (rect, other))
 +        continue;
 +
-+      if (meta_rectangle_is_adjecent_to ((MetaRectangle *) rect, other))
++      if (meta_rectangle_is_adjacent_to ((MetaRectangle *) rect, other))
 +        {
 +          return TRUE;
 +        }
@@ -2978,7 +2975,7 @@ index 87f2d5d..95978c1 100644
  void
  meta_rectangle_clamp_to_fit_into_region (const GList         *spanning_rects,
 diff --git a/src/core/window.c b/src/core/window.c
-index 62b2df8..d1cf7c3 100644
+index d2c2450..bb2e459 100644
 --- a/src/core/window.c
 +++ b/src/core/window.c
 @@ -226,6 +226,7 @@ enum
diff --git a/debian/rules b/debian/rules
index 4e6d9c1..2047ed8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,--as-needed
 
 %:
-	dh $@ --with gir,gnome --buildsystem=meson
+	dh $@
 
 override_dh_autoreconf:
 	dh_autoreconf --as-needed
diff --git a/meson.build b/meson.build
index dc210e6..6ce9e59 100644
--- a/meson.build
+++ b/meson.build
@@ -178,7 +178,7 @@ if have_native_backend
   libgbm_dep = dependency('gbm', version: gbm_req)
   libinput_dep = dependency('libinput', version: libinput_req)
 
-  libsystemd_dep = dependency('libsystemd')
+  libsystemd_dep = dependency('libsystemd', required: false)
   if libsystemd_dep.found()
     logind_provider_dep = libsystemd_dep
   else
diff --git a/po/ar.po b/po/ar.po
index 4f26451..82df3c2 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -4,15 +4,14 @@
 # Arafat Medini <[e-mail]>, 2003.
 # Abdulaziz Al-Arfaj <[e-mail]>, 2004.
 # Djihed Afifi <[e-mail]>, 2006.
-# Khaled Hosny <[e-mail]>, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2017.
+# Khaled Hosny <[e-mail]>, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2017, 2019.
 # Anas Afif Emad <[e-mail]>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter&"
-"keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-11-03 10:20+0200\n"
-"PO-Revision-Date: 2017-11-03 10:22+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-03-15 23:40+0200\n"
+"PO-Revision-Date: 2019-03-15 23:42+0200\n"
 "Last-Translator: Khaled Hosny <[e-mail]>\n"
 "Language-Team: Arabic <[e-mail]>\n"
 "Language: ar\n"
@@ -21,126 +20,599 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Virtaal 1.0.0-beta1\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
+#: data/50-mutter-navigation.xml:6
+msgid "Navigation"
+msgstr "الإبحار"
+
+#: data/50-mutter-navigation.xml:9
+msgid "Move window to workspace 1"
+msgstr "انقل النافذة إلى مساحة العمل 1"
+
+#: data/50-mutter-navigation.xml:12
+msgid "Move window to workspace 2"
+msgstr "انقل النافذة إلى مساحة العمل 2"
+
+#: data/50-mutter-navigation.xml:15
+msgid "Move window to workspace 3"
+msgstr "انقل النافذة إلى مساحة العمل 3"
+
+#: data/50-mutter-navigation.xml:18
+msgid "Move window to workspace 4"
+msgstr "انقل النافذة إلى مساحة العمل 4"
+
+#: data/50-mutter-navigation.xml:21
+msgid "Move window to last workspace"
+msgstr "انقل النافذة إلى مساحة العمل الأخيرة"
+
+#: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace up"
+msgstr "انقل النافذة مساحة عمل واحدة إلى الأعلى"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace down"
+msgstr "انقل النافذة مساحة عمل واحدة إلى الأسفل"
+
+#: data/50-mutter-navigation.xml:30
+msgid "Move window one monitor to the left"
+msgstr "انقل النافذة شاشة واحدة إلى اليسار"
+
+#: data/50-mutter-navigation.xml:33
+msgid "Move window one monitor to the right"
+msgstr "انقل النافذة شاشة واحدة إلى اليمين"
+
+#: data/50-mutter-navigation.xml:36
+msgid "Move window one monitor up"
+msgstr "انقل النافذة شاشة واحدة إلى الأعلى"
+
+#: data/50-mutter-navigation.xml:39
+msgid "Move window one monitor down"
+msgstr "انقل النافذة شاشة واحدة إلى الأسفل"
+
+#: data/50-mutter-navigation.xml:43
+msgid "Switch applications"
+msgstr "تنقل بين التطبيقات"
+
+#: data/50-mutter-navigation.xml:48
+msgid "Switch to previous application"
+msgstr "انتقل إلى التطبيق السابق"
+
+#: data/50-mutter-navigation.xml:52
+msgid "Switch windows"
+msgstr "تنقل بين النوافذ"
+
+#: data/50-mutter-navigation.xml:57
+msgid "Switch to previous window"
+msgstr "انتقل إلى النافذة السابقة"
+
+#: data/50-mutter-navigation.xml:61
+msgid "Switch windows of an application"
+msgstr "تنقل بين نوافذ التطبيق"
+
+#: data/50-mutter-navigation.xml:66
+msgid "Switch to previous window of an application"
+msgstr "انتقل إلى نافذة التطبيق السابقة"
+
+#: data/50-mutter-navigation.xml:70
+msgid "Switch system controls"
+msgstr "تنقل بين تحكمات النظام"
+
+#: data/50-mutter-navigation.xml:75
+msgid "Switch to previous system control"
+msgstr "انتقل إلى تحكم النظام السابق"
+
+#: data/50-mutter-navigation.xml:79
+msgid "Switch windows directly"
+msgstr "تنقل مباشرة بين النوافذ"
+
+#: data/50-mutter-navigation.xml:84
+msgid "Switch directly to previous window"
+msgstr "انتقل مباشرة إلى النافذة السابقة"
+
+#: data/50-mutter-navigation.xml:88
+msgid "Switch windows of an app directly"
+msgstr "تنقل مباشرة بين نوافذ التطبيق"
+
+#: data/50-mutter-navigation.xml:93
+msgid "Switch directly to previous window of an app"
+msgstr "انتقل مباشرة إلى نافذة التطبيق السابقة"
+
+#: data/50-mutter-navigation.xml:97
+msgid "Switch system controls directly"
+msgstr "تنقل مباشرة بين تحكمات النظام"
+
+#: data/50-mutter-navigation.xml:102
+msgid "Switch directly to previous system control"
+msgstr "انتقل مباشرة إلى تحكم النظام السابق"
+
+#: data/50-mutter-navigation.xml:105
+msgid "Hide all normal windows"
+msgstr "أخفِ كل النوافذ العادية"
+
+#: data/50-mutter-navigation.xml:108
+msgid "Switch to workspace 1"
+msgstr "انتقل إلى مساحة العمل 1"
+
+#: data/50-mutter-navigation.xml:111
+msgid "Switch to workspace 2"
+msgstr "انتقل إلى مساحة العمل 2"
+
+#: data/50-mutter-navigation.xml:114
+msgid "Switch to workspace 3"
+msgstr "انتقل إلى مساحة العمل 3"
+
+#: data/50-mutter-navigation.xml:117
+msgid "Switch to workspace 4"
+msgstr "انتقل إلى مساحة العمل 4"
+
+#: data/50-mutter-navigation.xml:120
+msgid "Switch to last workspace"
+msgstr "انتقل إلى مساحة العمل الأخيرة"
+
+#: data/50-mutter-navigation.xml:123
+msgid "Move to workspace above"
+msgstr "انقل لمساحة العمل أعلى"
+
+#: data/50-mutter-navigation.xml:126
+msgid "Move to workspace below"
+msgstr "انقل لمساحة العمل أسفل"
+
+#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+msgid "System"
+msgstr "النظام"
+
+#: data/50-mutter-system.xml:8
+msgid "Show the run command prompt"
+msgstr "أظهر محث تشغيل أمر"
+
+#: data/50-mutter-system.xml:10
+msgid "Show the activities overview"
+msgstr "أظهر نظرة عامة على الأنشطة"
+
+#: data/50-mutter-wayland.xml:8
+msgid "Restore the keyboard shortcuts"
+msgstr "استعد اختصارات لوحة المفاتيح"
+
+#: data/50-mutter-windows.xml:6
+msgid "Windows"
+msgstr "النوافذ"
+
+#: data/50-mutter-windows.xml:8
+msgid "Activate the window menu"
+msgstr "فعّل قائمة النافذة"
+
+#: data/50-mutter-windows.xml:10
+msgid "Toggle fullscreen mode"
+msgstr "بدّل نمط ملء الشاشة"
+
+#: data/50-mutter-windows.xml:12
+msgid "Toggle maximization state"
+msgstr "بدّل حالة التكبير"
+
+#: data/50-mutter-windows.xml:14
+msgid "Maximize window"
+msgstr "كبّر النّافذة"
+
+#: data/50-mutter-windows.xml:16
+msgid "Restore window"
+msgstr "استعد النّافذة"
+
+#: data/50-mutter-windows.xml:18
+msgid "Close window"
+msgstr "أغلق النّافذة"
+
+#: data/50-mutter-windows.xml:20
+msgid "Hide window"
+msgstr "أخفِ النّافذة"
+
+#: data/50-mutter-windows.xml:22
+msgid "Move window"
+msgstr "انقل النّافذة"
+
+#: data/50-mutter-windows.xml:24
+msgid "Resize window"
+msgstr "حجّم النّافذة"
+
+#: data/50-mutter-windows.xml:27
+msgid "Toggle window on all workspaces or one"
+msgstr "بدّل حالة ظهور النافذة على جميع مساحات العمل أو واحدة منها"
+
+#: data/50-mutter-windows.xml:29
+msgid "Raise window if covered, otherwise lower it"
+msgstr "ارفع النافذة إذا كانت أخرى تغطيها، أو أخفضها في ما عدا ذلك"
+
+#: data/50-mutter-windows.xml:31
+msgid "Raise window above other windows"
+msgstr "ارفع النافذة فوق النوافذ الأخرى"
+
+#: data/50-mutter-windows.xml:33
+msgid "Lower window below other windows"
+msgstr "اخفض النافذة تحت النوافذ الأخرى"
+
+#: data/50-mutter-windows.xml:35
+msgid "Maximize window vertically"
+msgstr "كبّر النافذة رأسيا"
+
+#: data/50-mutter-windows.xml:37
+msgid "Maximize window horizontally"
+msgstr "كبّر النافذة أفقيا"
+
+#: data/50-mutter-windows.xml:41
+msgid "View split on left"
+msgstr "المنظور مقسوم على اليمين"
+
+#: data/50-mutter-windows.xml:45
+msgid "View split on right"
+msgstr "المنظور مقسوم على اليسار"
+
+#: data/mutter.desktop.in:4
+msgid "Mutter"
+msgstr "مَتَر"
+
+#: data/org.gnome.mutter.gschema.xml.in:7
+msgid "Modifier to use for extended window management operations"
+msgstr "المغير الذي سيُستعمل لتمديد عمليات إدارة النوافذ "
+
+#: data/org.gnome.mutter.gschema.xml.in:8
+msgid ""
+"This key will initiate the “overlay”, which is a combination window overview "
+"and application launching system. The default is intended to be the “Windows "
+"key” on PC hardware. It’s expected that this binding either the default or "
+"set to the empty string."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:20
+#, fuzzy
+msgid "Attach modal dialogs"
+msgstr "صندوق حوار سائد"
+
+#: data/org.gnome.mutter.gschema.xml.in:21
+msgid ""
+"When true, instead of having independent titlebars, modal dialogs appear "
+"attached to the titlebar of the parent window and are moved together with "
+"the parent window."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:30
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:31
+msgid ""
+"If enabled, dropping windows on vertical screen edges maximizes them "
+"vertically and resizes them horizontally to cover half of the available "
+"area. Dropping windows on the top screen edge maximizes them completely."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:40
+msgid "Workspaces are managed dynamically"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:41
+msgid ""
+"Determines whether workspaces are managed dynamically or whether there’s a "
+"static number of workspaces (determined by the num-workspaces key in org."
+"gnome.desktop.wm.preferences)."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:50
+msgid "Workspaces only on primary"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:51
+msgid ""
+"Determines whether workspace switching should happen for windows on all "
+"monitors or only for windows on the primary monitor."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:59
+msgid "No tab popup"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:60
+msgid ""
+"Determines whether the use of popup and highlight frame should be disabled "
+"for window cycling."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:68
+msgid "Delay focus changes until the pointer stops moving"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:69
+msgid ""
+"If set to true, and the focus mode is either “sloppy” or “mouse” then the "
+"focus will not be changed immediately when entering a window, but only after "
+"the pointer stops moving."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:79
+msgid "Draggable border width"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:80
+msgid ""
+"The amount of total draggable borders. If the theme’s visible borders are "
+"not enough, invisible borders will be added to meet this value."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:89
+msgid "Auto maximize nearly monitor sized windows"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:90
+msgid ""
+"If enabled, new windows that are initially the size of the monitor "
+"automatically get maximized."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:98
+msgid "Place new windows in the center"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:99
+msgid ""
+"When true, the new windows will always be put in the center of the active "
+"screen of the monitor."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:107
+msgid "Enable experimental features"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:108
+msgid ""
+"To enable experimental features, add the feature keyword to the list. "
+"Whether the feature requires restarting the compositor depends on the given "
+"feature. Any experimental feature is not required to still be available, or "
+"configurable. Don’t expect adding anything in this setting to be future "
+"proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
+"mutter default to layout logical monitors in a logical pixel coordinate "
+"space, while scaling monitor framebuffers instead of window content, to "
+"manage HiDPI monitors. Does not require a restart."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:141
+msgid "Select window from tab popup"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:146
+msgid "Cancel tab popup"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:151
+#, fuzzy
+msgid "Switch monitor configurations"
+msgstr "غيّر الشاشة"
+
+#: data/org.gnome.mutter.gschema.xml.in:156
+msgid "Rotates the built-in monitor configuration"
+msgstr ""
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:6
+#, fuzzy
+msgid "Switch to VT 1"
+msgstr "انتقل إلى مساحة العمل 1"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:10
+#, fuzzy
+msgid "Switch to VT 2"
+msgstr "انتقل إلى مساحة العمل 2"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:14
+#, fuzzy
+msgid "Switch to VT 3"
+msgstr "انتقل إلى مساحة العمل 3"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:18
+#, fuzzy
+msgid "Switch to VT 4"
+msgstr "انتقل إلى مساحة العمل 4"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:22
+#, fuzzy
+msgid "Switch to VT 5"
+msgstr "انتقل إلى مساحة العمل 5"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:26
+#, fuzzy
+msgid "Switch to VT 6"
+msgstr "انتقل إلى مساحة العمل 6"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:30
+#, fuzzy
+msgid "Switch to VT 7"
+msgstr "انتقل إلى مساحة العمل 7"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:34
+#, fuzzy
+msgid "Switch to VT 8"
+msgstr "انتقل إلى مساحة العمل 8"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:38
+#, fuzzy
+msgid "Switch to VT 9"
+msgstr "انتقل إلى مساحة العمل 9"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:42
+#, fuzzy
+msgid "Switch to VT 10"
+msgstr "انتقل إلى مساحة العمل 10"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:46
+#, fuzzy
+msgid "Switch to VT 11"
+msgstr "انتقل إلى مساحة العمل 11"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:50
+#, fuzzy
+msgid "Switch to VT 12"
+msgstr "انتقل إلى مساحة العمل 12"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr ""
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:64
+msgid "Allow grabs with Xwayland"
+msgstr ""
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:65
+msgid ""
+"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
+"taken into account. For a X11 grab to be taken into account under Wayland, "
+"the client must also either send a specific X11 ClientMessage to the root "
+"window or be among the applications white-listed in key “xwayland-grab-"
+"access-rules”."
+msgstr ""
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:77
+msgid "Xwayland applications allowed to issue keyboard grabs"
+msgstr ""
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:78
+msgid ""
+"List the resource names or resource class of X11 windows either allowed or "
+"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
+"resource class of a given X11 window can be obtained using the command "
+"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
+"Values starting with “!” are blacklisted, which has precedence over the "
+"whitelist, to revoke applications from the default system list. The default "
+"system list includes the following applications: "
+"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
+"using the specific keyboard shortcut defined by the keybinding key “restore-"
+"shortcuts”."
+msgstr ""
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: ../src/backends/meta-input-settings.c:2167
+#: src/backends/meta-input-settings.c:2424
 #, c-format
 msgid "Mode Switch (Group %d)"
-msgstr ""
+msgstr "تغيير الأوضاع (مجموعة %d)"
 
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: ../src/backends/meta-input-settings.c:2190
+#: src/backends/meta-input-settings.c:2447
 msgid "Switch monitor"
 msgstr "غيّر الشاشة"
 
-#: ../src/backends/meta-input-settings.c:2192
+#: src/backends/meta-input-settings.c:2449
 msgid "Show on-screen help"
 msgstr "اعرض المساعدة على الشاشة"
 
-#: ../src/backends/meta-monitor-manager.c:900
+#: src/backends/meta-monitor-manager.c:955
 msgid "Built-in display"
 msgstr "شاشة مدمجة"
 
-#: ../src/backends/meta-monitor-manager.c:923
+#: src/backends/meta-monitor-manager.c:987
 msgid "Unknown"
 msgstr "غير معروفة"
 
-#: ../src/backends/meta-monitor-manager.c:925
+#: src/backends/meta-monitor-manager.c:989
 msgid "Unknown Display"
 msgstr "شاشة غير معروفة"
 
-#. TRANSLATORS: this is a monitor vendor name, followed by a
-#. * size in inches, like 'Dell 15"'
-#.
-#: ../src/backends/meta-monitor-manager.c:933
+#: src/backends/meta-monitor-manager.c:997
 #, c-format
+msgctxt ""
+"This is a monitor vendor name, followed by a size in inches, like 'Dell 15\"'"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/backends/meta-monitor-manager.c:1005
+#, c-format
+msgctxt ""
+"This is a monitor vendor name followed by product/model name where size in "
+"inches could not be calculated, e.g. Dell U2414H"
 msgid "%s %s"
 msgstr "%s %s"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:476
+#: src/compositor/compositor.c:482
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
 msgstr "يعمل مدير مزج آخر على الشاشة %i و العرض ”%s“."
 
-#: ../src/core/bell.c:194
+#: src/core/bell.c:192
 msgid "Bell event"
 msgstr "حدث جرس"
 
-#: ../src/core/display.c:608
-#, c-format
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "فشل فتح عرض نظام نوافذ إكس ”%s“\n"
-
-#: ../src/core/main.c:189
+#: src/core/main.c:185
 msgid "Disable connection to session manager"
 msgstr "عطّل الاتصال بمدير الجلسة"
 
-#: ../src/core/main.c:195
+#: src/core/main.c:191
 msgid "Replace the running window manager"
 msgstr "استبدل بمدير النوافذ الذي يعمل"
 
-#: ../src/core/main.c:201
+#: src/core/main.c:197
 msgid "Specify session management ID"
 msgstr "حدّد رقم هويّة إدارة الجلسة"
 
-#: ../src/core/main.c:206
+#: src/core/main.c:202
 msgid "X Display to use"
 msgstr "معراض س الذي سيستعمل"
 
-#: ../src/core/main.c:212
+#: src/core/main.c:208
 msgid "Initialize session from savefile"
 msgstr "ابدأ الجلسة من ملف محفوظ"
 
-#: ../src/core/main.c:218
+#: src/core/main.c:214
 msgid "Make X calls synchronous"
 msgstr "اجعل نداءات س متزامنة"
 
-#: ../src/core/main.c:225
+#: src/core/main.c:221
 msgid "Run as a wayland compositor"
 msgstr ""
 
-#: ../src/core/main.c:231
+#: src/core/main.c:227
 msgid "Run as a nested compositor"
 msgstr ""
 
-#: ../src/core/main.c:239
+#: src/core/main.c:233
+msgid "Run wayland compositor without starting Xwayland"
+msgstr ""
+
+#: src/core/main.c:241
 msgid "Run as a full display server, rather than nested"
 msgstr ""
 
+#: src/core/main.c:247
+msgid "Run with X11 backend"
+msgstr ""
+
 #. Translators: %s is a window title
-#: ../src/core/meta-close-dialog-default.c:147
+#: src/core/meta-close-dialog-default.c:151
 #, c-format
 msgid "“%s” is not responding."
 msgstr "”‏%s“ لا يستجيب."
 
-#: ../src/core/meta-close-dialog-default.c:149
+#: src/core/meta-close-dialog-default.c:153
 msgid "Application is not responding."
 msgstr "لا يستجيب التطبيق"
 
-#: ../src/core/meta-close-dialog-default.c:154
+#: src/core/meta-close-dialog-default.c:158
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
 msgstr "ربما ترغب في الانتظار قليلا ليُكمِل أو إجبار التطبيق على الإنهاء كُلّية."
 
-#: ../src/core/meta-close-dialog-default.c:161
+#: src/core/meta-close-dialog-default.c:165
 msgid "_Force Quit"
 msgstr "أ_جبر الإنهاء"
 
-#: ../src/core/meta-close-dialog-default.c:161
+#: src/core/meta-close-dialog-default.c:165
 msgid "_Wait"
 msgstr "ا_نتظر"
 
-#: ../src/core/mutter.c:39
+#: src/core/mutter.c:38
 #, c-format
 msgid ""
 "mutter %s\n"
@@ -154,43 +626,52 @@ msgstr ""
 "هذا برنامج حر، راجع المصدر لشروط النسخ.\n"
 "لا يوجد أي ضمان: و لا حتى ضمان قابلية التسويق أو المناسبة لأي هدف.\n"
 
-#: ../src/core/mutter.c:53
+#: src/core/mutter.c:52
 msgid "Print version"
 msgstr "اطبع الإصدارة"
 
-#: ../src/core/mutter.c:59
+#: src/core/mutter.c:58
 msgid "Mutter plugin to use"
 msgstr "ملحق مَتَر الذي سيُستخدم"
 
-#: ../src/core/prefs.c:1997
+#: src/core/prefs.c:1786
 #, c-format
 msgid "Workspace %d"
 msgstr "مساحة العمل %d"
 
-#: ../src/core/screen.c:583
+#: src/core/util.c:121
+msgid "Mutter was compiled without support for verbose mode\n"
+msgstr "جُمِّع مَتَر دون دعم للنمط المطنب\n"
+
+#: src/wayland/meta-wayland-tablet-pad.c:567
+#, c-format
+msgid "Mode Switch: Mode %d"
+msgstr ""
+
+#: src/x11/meta-x11-display.c:666
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
 "replace the current window manager."
 msgstr ""
-"الشاشة ”%s“ لها مدير نوافذ بالفعل، حاول استعمال خيار التبديل --replace لتحُلّ"
-" محلّ مدير النوافذ الحالي."
+"الشاشة ”%s“ لها مدير نوافذ بالفعل، حاول استعمال خيار التبديل --replace لتحُلّ "
+"محلّ مدير النوافذ الحالي."
 
-#: ../src/core/screen.c:668
-#, c-format
-msgid "Screen %d on display “%s” is invalid\n"
-msgstr "الشاشة %d على العرض ”%s“ غير صحيحة\n"
+#: src/x11/meta-x11-display.c:1008
+msgid "Failed to initialize GDK\n"
+msgstr ""
 
-#: ../src/core/util.c:120
-msgid "Mutter was compiled without support for verbose mode\n"
-msgstr "جُمِّع مَتَر دون دعم للنمط المطنب\n"
+#: src/x11/meta-x11-display.c:1032
+#, c-format
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "فشل فتح عرض نظام نوافذ إكس ”%s“\n"
 
-#: ../src/wayland/meta-wayland-tablet-pad.c:563
+#: src/x11/meta-x11-display.c:1113
 #, c-format
-msgid "Mode Switch: Mode %d"
-msgstr ""
+msgid "Screen %d on display “%s” is invalid\n"
+msgstr "الشاشة %d على العرض ”%s“ غير صحيحة\n"
 
-#: ../src/x11/session.c:1815
+#: src/x11/session.c:1821
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -198,245 +679,26 @@ msgstr ""
 "هذه النوافذ لا تدعم ” الضبط الحالي&quot; إعادة تشغيلها يدويا عند الولوج "
 "المرة القادمة."
 
-#: ../src/x11/window-props.c:559
+#: src/x11/window-props.c:569
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (على %s)"
 
-#~ msgid "Navigation"
-#~ msgstr "الإبحار"
-
-#~ msgid "Move window to workspace 1"
-#~ msgstr "انقل النافذة إلى مساحة العمل 1"
-
-#~ msgid "Move window to workspace 2"
-#~ msgstr "انقل النافذة إلى مساحة العمل 2"
-
-#~ msgid "Move window to workspace 3"
-#~ msgstr "انقل النافذة إلى مساحة العمل 3"
-
-#~ msgid "Move window to workspace 4"
-#~ msgstr "انقل النافذة إلى مساحة العمل 4"
-
-#~ msgid "Move window to last workspace"
-#~ msgstr "انقل النافذة إلى مساحة العمل الأخيرة"
-
 #~ msgid "Move window one workspace to the left"
 #~ msgstr "انقل النافذة مساحة عمل واحدة إلى اليسار"
 
 #~ msgid "Move window one workspace to the right"
 #~ msgstr "انقل النافذة مساحة عمل واحدة إلى اليمين"
 
-#~ msgid "Move window one workspace up"
-#~ msgstr "انقل النافذة مساحة عمل واحدة إلى الأعلى"
-
-#~ msgid "Move window one workspace down"
-#~ msgstr "انقل النافذة مساحة عمل واحدة إلى الأسفل"
-
-#~ msgid "Move window one monitor to the left"
-#~ msgstr "انقل النافذة شاشة واحدة إلى اليسار"
-
-#~ msgid "Move window one monitor to the right"
-#~ msgstr "انقل النافذة شاشة واحدة إلى اليمين"
-
-#~ msgid "Move window one monitor up"
-#~ msgstr "انقل النافذة شاشة واحدة إلى الأعلى"
-
-#~ msgid "Move window one monitor down"
-#~ msgstr "انقل النافذة شاشة واحدة إلى الأسفل"
-
-#~ msgid "Switch applications"
-#~ msgstr "تنقل بين التطبيقات"
-
-#~ msgid "Switch to previous application"
-#~ msgstr "انتقل إلى التطبيق السابق"
-
-#~ msgid "Switch windows"
-#~ msgstr "تنقل بين النوافذ"
-
-#~ msgid "Switch to previous window"
-#~ msgstr "انتقل إلى النافذة السابقة"
-
-#~ msgid "Switch windows of an application"
-#~ msgstr "تنقل بين نوافذ التطبيق"
-
-#~ msgid "Switch to previous window of an application"
-#~ msgstr "انتقل إلى نافذة التطبيق السابقة"
-
-#~ msgid "Switch system controls"
-#~ msgstr "تنقل بين تحكمات النظام"
-
-#~ msgid "Switch to previous system control"
-#~ msgstr "انتقل إلى تحكم النظام السابق"
-
-#~ msgid "Switch windows directly"
-#~ msgstr "تنقل مباشرة بين النوافذ"
-
-#~ msgid "Switch directly to previous window"
-#~ msgstr "انتقل مباشرة إلى النافذة السابقة"
-
-#~ msgid "Switch windows of an app directly"
-#~ msgstr "تنقل مباشرة بين نوافذ التطبيق"
-
-#~ msgid "Switch directly to previous window of an app"
-#~ msgstr "انتقل مباشرة إلى نافذة التطبيق السابقة"
-
-#~ msgid "Switch system controls directly"
-#~ msgstr "تنقل مباشرة بين تحكمات النظام"
-
-#~ msgid "Switch directly to previous system control"
-#~ msgstr "انتقل مباشرة إلى تحكم النظام السابق"
-
-#~ msgid "Hide all normal windows"
-#~ msgstr "أخفِ كل النوافذ العادية"
-
-#~ msgid "Switch to workspace 1"
-#~ msgstr "انتقل إلى مساحة العمل 1"
-
-#~ msgid "Switch to workspace 2"
-#~ msgstr "انتقل إلى مساحة العمل 2"
-
-#~ msgid "Switch to workspace 3"
-#~ msgstr "انتقل إلى مساحة العمل 3"
-
-#~ msgid "Switch to workspace 4"
-#~ msgstr "انتقل إلى مساحة العمل 4"
-
-#~ msgid "Switch to last workspace"
-#~ msgstr "انتقل إلى مساحة العمل الأخيرة"
-
 #~ msgid "Move to workspace left"
 #~ msgstr "انقل لمساحة العمل على اليسار"
 
 #~ msgid "Move to workspace right"
 #~ msgstr "انقل لمساحة العمل على اليمين"
 
-#~ msgid "Move to workspace above"
-#~ msgstr "انقل لمساحة العمل أعلى"
-
-#~ msgid "Move to workspace below"
-#~ msgstr "انقل لمساحة العمل أسفل"
-
-#~ msgid "System"
-#~ msgstr "النظام"
-
-#~ msgid "Show the run command prompt"
-#~ msgstr "أظهر محث تشغيل أمر"
-
-#~ msgid "Show the activities overview"
-#~ msgstr "أظهر نظرة عامة على الأنشطة"
-
-#~ msgid "Windows"
-#~ msgstr "النوافذ"
-
-#~ msgid "Activate the window menu"
-#~ msgstr "فعّل قائمة النافذة"
-
-#~ msgid "Toggle fullscreen mode"
-#~ msgstr "بدّل نمط ملء الشاشة"
-
-#~ msgid "Toggle maximization state"
-#~ msgstr "بدّل حالة التكبير"
-
-#~ msgid "Maximize window"
-#~ msgstr "كبّر النّافذة"
-
-#~ msgid "Restore window"
-#~ msgstr "استعد النّافذة"
-
 #~ msgid "Toggle shaded state"
 #~ msgstr "بدّل حالة الإخفاء"
 
-#~ msgid "Close window"
-#~ msgstr "أغلق النّافذة"
-
-#~ msgid "Hide window"
-#~ msgstr "أخفِ النّافذة"
-
-#~ msgid "Move window"
-#~ msgstr "انقل النّافذة"
-
-#~ msgid "Resize window"
-#~ msgstr "حجّم النّافذة"
-
-#~ msgid "Toggle window on all workspaces or one"
-#~ msgstr "بدّل حالة ظهور النافذة على جميع مساحات العمل أو واحدة منها"
-
-#~ msgid "Raise window if covered, otherwise lower it"
-#~ msgstr "ارفع النافذة إذا كانت أخرى تغطيها، أو أخفضها في ما عدا ذلك"
-
-#~ msgid "Raise window above other windows"
-#~ msgstr "ارفع النافذة فوق النوافذ الأخرى"
-
-#~ msgid "Lower window below other windows"
-#~ msgstr "اخفض النافذة تحت النوافذ الأخرى"
-
-#~ msgid "Maximize window vertically"
-#~ msgstr "كبّر النافذة رأسيا"
-
-#~ msgid "Maximize window horizontally"
-#~ msgstr "كبّر النافذة أفقيا"
-
-#~ msgid "View split on left"
-#~ msgstr "المنظور مقسوم على اليمين"
-
-#~ msgid "View split on right"
-#~ msgstr "المنظور مقسوم على اليسار"
-
-#~ msgid "Mutter"
-#~ msgstr "مَتَر"
-
-#~ msgid "Modifier to use for extended window management operations"
-#~ msgstr "المغير الذي سيُستعمل لتمديد عمليات إدارة النوافذ "
-
-#, fuzzy
-#~ msgid "Switch to VT 1"
-#~ msgstr "انتقل إلى مساحة العمل 1"
-
-#, fuzzy
-#~ msgid "Switch to VT 2"
-#~ msgstr "انتقل إلى مساحة العمل 2"
-
-#, fuzzy
-#~ msgid "Switch to VT 3"
-#~ msgstr "انتقل إلى مساحة العمل 3"
-
-#, fuzzy
-#~ msgid "Switch to VT 4"
-#~ msgstr "انتقل إلى مساحة العمل 4"
-
-#, fuzzy
-#~ msgid "Switch to VT 5"
-#~ msgstr "انتقل إلى مساحة العمل 5"
-
-#, fuzzy
-#~ msgid "Switch to VT 6"
-#~ msgstr "انتقل إلى مساحة العمل 6"
-
-#, fuzzy
-#~ msgid "Switch to VT 7"
-#~ msgstr "انتقل إلى مساحة العمل 7"
-
-#, fuzzy
-#~ msgid "Switch to VT 8"
-#~ msgstr "انتقل إلى مساحة العمل 8"
-
-#, fuzzy
-#~ msgid "Switch to VT 9"
-#~ msgstr "انتقل إلى مساحة العمل 9"
-
-#, fuzzy
-#~ msgid "Switch to VT 10"
-#~ msgstr "انتقل إلى مساحة العمل 10"
-
-#, fuzzy
-#~ msgid "Switch to VT 11"
-#~ msgstr "انتقل إلى مساحة العمل 11"
-
-#, fuzzy
-#~ msgid "Switch to VT 12"
-#~ msgstr "انتقل إلى مساحة العمل 12"
-
 #~ msgid "Unknown window information request: %d"
 #~ msgstr "طلب معلومات نافذة مجهول: %d"
 
@@ -1162,9 +1424,6 @@ msgstr "%s (على %s)"
 #~ msgid "Border"
 #~ msgstr "حد"
 
-#~ msgid "Attached Modal Dialog"
-#~ msgstr "صندوق حوار سائد"
-
 #~ msgid "Button layout test %d"
 #~ msgstr "تجربة تصميم الأزرار %d"
 
diff --git a/po/es.po b/po/es.po
index c5dbad6..39e6635 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutter.master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2019-02-20 14:35+0000\n"
+"POT-Creation-Date: 2019-03-28 12:21+0000\n"
 "PO-Revision-Date: 2019-03-01 12:17+0100\n"
 "Last-Translator: Daniel Mustieles <[e-mail]>\n"
 "Language-Team: es <[e-mail]>\n"
@@ -154,7 +154,7 @@ msgstr "Cambiar a la útima área de trabajo"
 
 #: data/50-mutter-navigation.xml:123
 msgid "Move to workspace above"
-msgstr "Mover al área de trabajo de la arriba"
+msgstr "Mover al área de trabajo de arriba"
 
 #: data/50-mutter-navigation.xml:126
 msgid "Move to workspace below"
@@ -534,7 +534,7 @@ msgstr ""
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2423
+#: src/backends/meta-input-settings.c:2424
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Cambiar modo (grupo %d)"
@@ -542,34 +542,34 @@ msgstr "Cambiar modo (grupo %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2446
+#: src/backends/meta-input-settings.c:2447
 msgid "Switch monitor"
 msgstr "Cambiar monitor"
 
-#: src/backends/meta-input-settings.c:2448
+#: src/backends/meta-input-settings.c:2449
 msgid "Show on-screen help"
 msgstr "Mostrar la ayuda en pantalla"
 
-#: src/backends/meta-monitor-manager.c:954
+#: src/backends/meta-monitor-manager.c:955
 msgid "Built-in display"
 msgstr "Pantalla integrada"
 
-#: src/backends/meta-monitor-manager.c:986
+#: src/backends/meta-monitor-manager.c:987
 msgid "Unknown"
 msgstr "Desconocida"
 
-#: src/backends/meta-monitor-manager.c:988
+#: src/backends/meta-monitor-manager.c:989
 msgid "Unknown Display"
 msgstr "Pantalla desconocida"
 
-#: src/backends/meta-monitor-manager.c:996
+#: src/backends/meta-monitor-manager.c:997
 #, c-format
 msgctxt ""
 "This is a monitor vendor name, followed by a size in inches, like 'Dell 15\"'"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: src/backends/meta-monitor-manager.c:1004
+#: src/backends/meta-monitor-manager.c:1005
 #, c-format
 msgctxt ""
 "This is a monitor vendor name followed by product/model name where size in "
@@ -587,7 +587,7 @@ msgstr ""
 "Ya existe un gestor de composición ejecutándose en la monitor %i, pantalla "
 "«%s»."
 
-#: src/core/bell.c:252
+#: src/core/bell.c:192
 msgid "Bell event"
 msgstr "Evento de campana"
 
@@ -636,16 +636,16 @@ msgid "Run with X11 backend"
 msgstr "Ejecutar con «backend» de X11"
 
 #. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:150
+#: src/core/meta-close-dialog-default.c:151
 #, c-format
 msgid "“%s” is not responding."
 msgstr "«%s» no está respondiendo."
 
-#: src/core/meta-close-dialog-default.c:152
+#: src/core/meta-close-dialog-default.c:153
 msgid "Application is not responding."
 msgstr "La aplicación no está respondiendo."
 
-#: src/core/meta-close-dialog-default.c:157
+#: src/core/meta-close-dialog-default.c:158
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -653,11 +653,11 @@ msgstr ""
 "Puede elegir esperar un rato para ver si continua o forzar la aplicación "
 "para cerrarla completamente."
 
-#: src/core/meta-close-dialog-default.c:164
+#: src/core/meta-close-dialog-default.c:165
 msgid "_Force Quit"
 msgstr "_Forzar la salida"
 
-#: src/core/meta-close-dialog-default.c:164
+#: src/core/meta-close-dialog-default.c:165
 msgid "_Wait"
 msgstr "_Esperar"
 
@@ -717,7 +717,7 @@ msgstr "Falló al inicializar GDK\n"
 msgid "Failed to open X Window System display “%s”\n"
 msgstr "Ocurrió un error al abrir la pantalla de X Window System «%s»\n"
 
-#: src/x11/meta-x11-display.c:1115
+#: src/x11/meta-x11-display.c:1113
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "La ventana %d en la pantalla «%s» no es válida\n"
@@ -730,7 +730,7 @@ msgstr ""
 "Estas ventanas no soportan «guardar la configuración actual» y tendrán que "
 "reiniciarse manualmente la próxima vez que inicie una sesión."
 
-#: src/x11/window-props.c:568
+#: src/x11/window-props.c:569
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (on %s)"
diff --git a/po/hr.po b/po/hr.po
index 493ab6e..fba9745 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity 0\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-07-07 09:58+0000\n"
-"PO-Revision-Date: 2018-09-02 18:40+0200\n"
+"POT-Creation-Date: 2019-02-04 17:52+0000\n"
+"PO-Revision-Date: 2019-03-26 12:40+0100\n"
 "Last-Translator: gogo <[e-mail]>\n"
 "Language-Team: Croatian <[e-mail]>\n"
 "Language: hr\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Launchpad-Export-Date: 2008-05-28 13:28+0000\n"
-"X-Generator: Poedit 2.1.1\n"
+"X-Generator: Poedit 2.0.6\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -518,7 +518,7 @@ msgstr ""
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2325
+#: src/backends/meta-input-settings.c:2423
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Način prebacivanja (Grupa %d)"
@@ -526,102 +526,109 @@ msgstr "Način prebacivanja (Grupa %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2348
+#: src/backends/meta-input-settings.c:2446
 msgid "Switch monitor"
 msgstr "Prebaci zaslon"
 
-#: src/backends/meta-input-settings.c:2350
+#: src/backends/meta-input-settings.c:2448
 msgid "Show on-screen help"
 msgstr "Prikaži zaslonsku pomoć"
 
-#: src/backends/meta-monitor-manager.c:907
+#: src/backends/meta-monitor-manager.c:954
 msgid "Built-in display"
 msgstr "Ugrađeni zaslon"
 
-#: src/backends/meta-monitor-manager.c:930
+#: src/backends/meta-monitor-manager.c:986
 msgid "Unknown"
 msgstr "Nepoznat"
 
-#: src/backends/meta-monitor-manager.c:932
+#: src/backends/meta-monitor-manager.c:988
 msgid "Unknown Display"
 msgstr "Nepoznat zaslon"
 
-#. TRANSLATORS: this is a monitor vendor name, followed by a
-#. * size in inches, like 'Dell 15"'
-#.
-#: src/backends/meta-monitor-manager.c:940
+#: src/backends/meta-monitor-manager.c:996
+#, c-format
+msgctxt ""
+"This is a monitor vendor name, followed by a size in inches, like 'Dell 15\"'"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/backends/meta-monitor-manager.c:1004
 #, c-format
+msgctxt ""
+"This is a monitor vendor name followed by product/model name where size in "
+"inches could not be calculated, e.g. Dell U2414H"
 msgid "%s %s"
 msgstr "%s %s"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:481
+#: src/compositor/compositor.c:482
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
 msgstr ""
 "Drugi upravitelja kompoziranja već je pokrenut na zaslonu %i prikaza \"%s\"."
 
-#: src/core/bell.c:254
+#: src/core/bell.c:252
 msgid "Bell event"
 msgstr "Događaj zvona"
 
-#: src/core/main.c:191
+#: src/core/main.c:185
 msgid "Disable connection to session manager"
 msgstr "Onemogući povezivanje sa upraviteljem sesija"
 
-#: src/core/main.c:197
+#: src/core/main.c:191
 msgid "Replace the running window manager"
 msgstr "Zamijeni pokrenutoga upravitelja porozora"
 
-#: src/core/main.c:203
+#: src/core/main.c:197
 msgid "Specify session management ID"
 msgstr "Odredite ID upravljanja sesijama"
 
-#: src/core/main.c:208
+#: src/core/main.c:202
 msgid "X Display to use"
 msgstr "X Prikaz za korištenje"
 
-#: src/core/main.c:214
+#: src/core/main.c:208
 msgid "Initialize session from savefile"
 msgstr "Pokreni sesiju iz spremljene datoteke"
 
-#: src/core/main.c:220
+#: src/core/main.c:214
 msgid "Make X calls synchronous"
 msgstr "Napravi X pozive usklađenim"
 
-#: src/core/main.c:227
+#: src/core/main.c:221
 msgid "Run as a wayland compositor"
 msgstr "Pokreni wayland kompozitor"
 
-#: src/core/main.c:233
+#: src/core/main.c:227
 msgid "Run as a nested compositor"
 msgstr "Pokreni kao ugrađeni kompozitor"
 
-#: src/core/main.c:239
+#: src/core/main.c:233
 msgid "Run wayland compositor without starting Xwayland"
 msgstr "Pokreni wayland kompozitor bez pokretanja Xwaylanda"
 
-#: src/core/main.c:247
+#: src/core/main.c:241
 msgid "Run as a full display server, rather than nested"
 msgstr "Pokreni kao potpuni poslužitelj zaslona, radije nego ugrađeni"
 
-#: src/core/main.c:253
+#: src/core/main.c:247
 msgid "Run with X11 backend"
 msgstr "Pokreni s X11 pozadinskim programom"
 
 #. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:148
+#: src/core/meta-close-dialog-default.c:150
 #, c-format
 msgid "“%s” is not responding."
 msgstr "“%s” ne odgovara."
 
-#: src/core/meta-close-dialog-default.c:150
+#: src/core/meta-close-dialog-default.c:152
 msgid "Application is not responding."
 msgstr "Aplikacija ne odgovara."
 
-#: src/core/meta-close-dialog-default.c:155
+#: src/core/meta-close-dialog-default.c:157
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -629,15 +636,15 @@ msgstr ""
 "Možete pričekati neko vrijeme da aplikacija nastavi s radom ili možete "
 "prisiliti prekid rada aplikacije."
 
-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:164
 msgid "_Force Quit"
 msgstr "_Prisili izlaženje"
 
-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:164
 msgid "_Wait"
 msgstr "_Čekaj"
 
-#: src/core/mutter.c:39
+#: src/core/mutter.c:38
 #, c-format
 msgid ""
 "mutter %s\n"
@@ -652,20 +659,20 @@ msgstr ""
 "NE postoji jamstvo; čak i bez podrazumijevanih jamstava UPORABLJIVOSTI ZA "
 "ODREĐENU SVRHU.\n"
 
-#: src/core/mutter.c:53
+#: src/core/mutter.c:52
 msgid "Print version"
 msgstr "Inačica za ispis"
 
-#: src/core/mutter.c:59
+#: src/core/mutter.c:58
 msgid "Mutter plugin to use"
 msgstr "Mutter priključak koji se koristi"
 
-#: src/core/prefs.c:1915
+#: src/core/prefs.c:1786
 #, c-format
 msgid "Workspace %d"
 msgstr "Radni prostor %d"
 
-#: src/core/util.c:120
+#: src/core/util.c:121
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter je kompiliran bez podrške za opširan način rada\n"
 
@@ -683,21 +690,21 @@ msgstr ""
 "Prikaz \"%s\" već ima upravitelja prozora; pokušajte koristiti --replace "
 "mogućnost za zamjenu trenutnog upravitelja prozora."
 
-#: src/x11/meta-x11-display.c:1010
+#: src/x11/meta-x11-display.c:1008
 msgid "Failed to initialize GDK\n"
 msgstr "Neuspjelo GDK pokretanje\n"
 
-#: src/x11/meta-x11-display.c:1034
+#: src/x11/meta-x11-display.c:1032
 #, c-format
 msgid "Failed to open X Window System display “%s”\n"
 msgstr "Neuspjelo otvaranje sustava prikaza X prozora \"%s\"\n"
 
-#: src/x11/meta-x11-display.c:1117
+#: src/x11/meta-x11-display.c:1115
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "Zaslon %d na prikazu '%s' je neispravan\n"
 
-#: src/x11/session.c:1819
+#: src/x11/session.c:1821
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -705,7 +712,7 @@ msgstr ""
 "Ovi prozori ne podržavaju mogućnost \"spremi trenutne postavke\" i moraju se "
 "ručno ponovno pokrenuti sljedeći puta kada se prijavite."
 
-#: src/x11/window-props.c:565
+#: src/x11/window-props.c:568
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (na %s)"
diff --git a/src/backends/meta-backend-private.h b/src/backends/meta-backend-private.h
index 510e6aa..7eba180 100644
--- a/src/backends/meta-backend-private.h
+++ b/src/backends/meta-backend-private.h
@@ -147,6 +147,10 @@ xkb_layout_index_t meta_backend_get_keymap_layout_group (MetaBackend *backend);
 
 gboolean meta_backend_is_lid_closed (MetaBackend *backend);
 
+void meta_backend_freeze_updates (MetaBackend *backend);
+
+void meta_backend_thaw_updates (MetaBackend *backend);
+
 void meta_backend_update_last_device (MetaBackend *backend,
                                       int          device_id);
 
diff --git a/src/backends/meta-backend.c b/src/backends/meta-backend.c
index c527114..23ab2fa 100644
--- a/src/backends/meta-backend.c
+++ b/src/backends/meta-backend.c
@@ -475,7 +475,7 @@ meta_backend_real_post_init (MetaBackend *backend)
   MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
   ClutterDeviceManager *device_manager = clutter_device_manager_get_default ();
 
-  priv->stage = meta_stage_new ();
+  priv->stage = meta_stage_new (backend);
   clutter_actor_realize (priv->stage);
   META_BACKEND_GET_CLASS (backend)->select_stage_events (backend);
 
@@ -1079,6 +1079,24 @@ meta_backend_get_stage (MetaBackend *backend)
   return priv->stage;
 }
 
+void
+meta_backend_freeze_updates (MetaBackend *backend)
+{
+  ClutterStage *stage;
+
+  stage = CLUTTER_STAGE (meta_backend_get_stage (backend));
+  clutter_stage_freeze_updates (stage);
+}
+
+void
+meta_backend_thaw_updates (MetaBackend *backend)
+{
+  ClutterStage *stage;
+
+  stage = CLUTTER_STAGE (meta_backend_get_stage (backend));
+  clutter_stage_thaw_updates (stage);
+}
+
 static gboolean
 update_last_device (MetaBackend *backend)
 {
diff --git a/src/backends/meta-input-mapper.c b/src/backends/meta-input-mapper.c
index 1a3cb2c..5227292 100644
--- a/src/backends/meta-input-mapper.c
+++ b/src/backends/meta-input-mapper.c
@@ -20,6 +20,10 @@
 
 #include "config.h"
 
+#ifdef HAVE_LIBGUDEV
+#include <gudev/gudev.h>
+#endif
+
 #include "meta-input-mapper-private.h"
 #include "meta-monitor-manager-private.h"
 #include "meta-logical-monitor.h"
@@ -39,6 +43,9 @@ struct _MetaInputMapper
   ClutterDeviceManager *input_device_manager;
   GHashTable *input_devices; /* ClutterInputDevice -> MetaMapperInputInfo */
   GHashTable *output_devices; /* MetaLogicalMonitor -> MetaMapperOutputInfo */
+#ifdef HAVE_LIBGUDEV
+  GUdevClient *udev_client;
+#endif
 };
 
 typedef enum
@@ -271,6 +278,33 @@ match_edid (MetaMapperInputInfo  *input,
 }
 
 static gboolean
+input_device_get_physical_size (MetaInputMapper    *mapper,
+                                ClutterInputDevice *device,
+                                double             *width,
+                                double             *height)
+{
+#ifdef HAVE_LIBGUDEV
+  g_autoptr (GUdevDevice) udev_device = NULL;
+  const char *node;
+
+  node = clutter_input_device_get_device_node (device);
+  udev_device = g_udev_client_query_by_device_file (mapper->udev_client, node);
+
+  if (udev_device &&
+      g_udev_device_has_property (udev_device, "ID_INPUT_WIDTH_MM"))
+    {
+      *width = g_udev_device_get_property_as_double (udev_device,
+                                                     "ID_INPUT_WIDTH_MM");
+      *height = g_udev_device_get_property_as_double (udev_device,
+                                                      "ID_INPUT_HEIGHT_MM");
+      return TRUE;
+    }
+#endif
+
+  return FALSE;
+}
+
+static gboolean
 find_size_match (MetaMapperInputInfo  *input,
                  GList                *monitors,
                  MetaMonitor         **matched_monitor)
@@ -282,7 +316,8 @@ find_size_match (MetaMapperInputInfo  *input,
 
   min_w_diff = min_h_diff = MAX_SIZE_MATCH_DIFF;
 
-  if (!clutter_input_device_get_physical_size (input->device, &i_width, &i_height))
+  if (!input_device_get_physical_size (input->mapper, input->device,
+                                       &i_width, &i_height))
     return FALSE;
 
   for (l = monitors; l; l = l->next)
@@ -520,6 +555,9 @@ meta_input_mapper_finalize (GObject *object)
 
   g_hash_table_unref (mapper->input_devices);
   g_hash_table_unref (mapper->output_devices);
+#ifdef HAVE_LIBGUDEV
+  g_clear_object (&mapper->udev_client);
+#endif
 
   G_OBJECT_CLASS (meta_input_mapper_parent_class)->finalize (object);
 }
@@ -527,11 +565,18 @@ meta_input_mapper_finalize (GObject *object)
 static void
 meta_input_mapper_constructed (GObject *object)
 {
+#ifdef HAVE_LIBGUDEV
+  const char *udev_subsystems[] = { "input", NULL };
+#endif
   MetaInputMapper *mapper = META_INPUT_MAPPER (object);
   MetaBackend *backend;
 
   G_OBJECT_CLASS (meta_input_mapper_parent_class)->constructed (object);
 
+#ifdef HAVE_LIBGUDEV
+  mapper->udev_client = g_udev_client_new (udev_subsystems);
+#endif
+
   mapper->input_device_manager = clutter_device_manager_get_default ();
   g_signal_connect (mapper->input_device_manager, "device-removed",
                     G_CALLBACK (input_mapper_device_removed_cb), mapper);
diff --git a/src/backends/meta-input-settings.c b/src/backends/meta-input-settings.c
index 27e99b5..7b8df56 100644
--- a/src/backends/meta-input-settings.c
+++ b/src/backends/meta-input-settings.c
@@ -1766,9 +1766,11 @@ power_save_mode_changed_cb (MetaMonitorManager *manager,
   ClutterInputDevice *device;
   MetaLogicalMonitor *logical_monitor;
   MetaMonitor *builtin;
+  MetaPowerSave power_save_mode;
   gboolean on;
 
-  on = (manager->power_save_mode == META_POWER_SAVE_ON);
+  power_save_mode = meta_monitor_manager_get_power_save_mode (manager);
+  on = power_save_mode == META_POWER_SAVE_ON;
   priv = meta_input_settings_get_instance_private (user_data);
 
   builtin = meta_monitor_manager_get_laptop_panel (manager);
diff --git a/src/backends/meta-monitor-config-manager.c b/src/backends/meta-monitor-config-manager.c
index 771c57f..9a54ce5 100644
--- a/src/backends/meta-monitor-config-manager.c
+++ b/src/backends/meta-monitor-config-manager.c
@@ -1540,7 +1540,7 @@ meta_verify_logical_monitor_config (MetaLogicalMonitorConfig    *logical_monitor
 }
 
 static gboolean
-has_adjecent_neighbour (MetaMonitorsConfig       *config,
+has_adjacent_neighbour (MetaMonitorsConfig       *config,
                         MetaLogicalMonitorConfig *logical_monitor_config)
 {
   GList *l;
@@ -1559,7 +1559,7 @@ has_adjecent_neighbour (MetaMonitorsConfig       *config,
       if (logical_monitor_config == other_logical_monitor_config)
         continue;
 
-      if (meta_rectangle_is_adjecent_to (&logical_monitor_config->layout,
+      if (meta_rectangle_is_adjacent_to (&logical_monitor_config->layout,
                                          &other_logical_monitor_config->layout))
         return TRUE;
     }
@@ -1665,10 +1665,10 @@ meta_verify_monitors_config (MetaMonitorsConfig *config,
           has_primary = TRUE;
         }
 
-      if (!has_adjecent_neighbour (config, logical_monitor_config))
+      if (!has_adjacent_neighbour (config, logical_monitor_config))
         {
           g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                       "Logical monitors not adjecent");
+                       "Logical monitors not adjacent");
           return FALSE;
         }
 
diff --git a/src/backends/meta-monitor-manager-dummy.c b/src/backends/meta-monitor-manager-dummy.c
index 06e8837..46c3b8c 100644
--- a/src/backends/meta-monitor-manager-dummy.c
+++ b/src/backends/meta-monitor-manager-dummy.c
@@ -694,11 +694,11 @@ meta_monitor_manager_dummy_calculate_monitor_mode_scale (MetaMonitorManager *man
 }
 
 static float *
-meta_monitor_manager_dummy_calculate_supported_scales (MetaMonitorManager          *manager,
-                                                       MetaLogicalMonitorLayoutMode layout_mode,
-                                                       MetaMonitor                 *monitor,
-                                                       MetaMonitorMode             *monitor_mode,
-                                                       int                         *n_supported_scales)
+meta_monitor_manager_dummy_calculate_supported_scales (MetaMonitorManager           *manager,
+                                                       MetaLogicalMonitorLayoutMode  layout_mode,
+                                                       MetaMonitor                  *monitor,
+                                                       MetaMonitorMode              *monitor_mode,
+                                                       int                          *n_supported_scales)
 {
   MetaMonitorScalesConstraint constraints =
     META_MONITOR_SCALES_CONSTRAINT_NONE;
diff --git a/src/backends/meta-monitor-manager-private.h b/src/backends/meta-monitor-manager-private.h
index 3b951c6..cdb8f42 100644
--- a/src/backends/meta-monitor-manager-private.h
+++ b/src/backends/meta-monitor-manager-private.h
@@ -116,8 +116,6 @@ struct _MetaMonitorManager
   gboolean in_init;
   unsigned int serial;
 
-  MetaPowerSave power_save_mode;
-
   MetaLogicalMonitorLayoutMode layout_mode;
 
   int screen_width;
@@ -192,6 +190,8 @@ struct _MetaMonitorManagerClass
   GBytes* (*read_edid) (MetaMonitorManager *,
                         MetaOutput         *);
 
+  void (*read_current_state) (MetaMonitorManager *);
+
   void (*ensure_initial_config) (MetaMonitorManager *);
 
   gboolean (*apply_monitors_config) (MetaMonitorManager      *,
@@ -305,6 +305,11 @@ void                meta_monitor_manager_get_screen_size   (MetaMonitorManager *
                                                             int                *width,
                                                             int                *height);
 
+MetaPowerSave       meta_monitor_manager_get_power_save_mode (MetaMonitorManager *manager);
+
+void                meta_monitor_manager_power_save_mode_changed (MetaMonitorManager *manager,
+                                                                  MetaPowerSave       mode);
+
 void                meta_monitor_manager_confirm_configuration (MetaMonitorManager *manager,
                                                                 gboolean            ok);
 
diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
index 9420265..2d898c7 100644
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@@ -95,7 +95,13 @@ static gfloat transform_matrices[][6] = {
 
 static int signals[SIGNALS_LAST];
 
-G_DEFINE_TYPE (MetaMonitorManager, meta_monitor_manager, G_TYPE_OBJECT)
+typedef struct _MetaMonitorManagerPrivate
+{
+  MetaPowerSave power_save_mode;
+} MetaMonitorManagerPrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE (MetaMonitorManager, meta_monitor_manager,
+                            G_TYPE_OBJECT)
 
 static void initialize_dbus_interface (MetaMonitorManager *manager);
 static void monitor_manager_setup_dbus_config_handlers (MetaMonitorManager *manager);
@@ -107,6 +113,9 @@ meta_monitor_manager_is_config_complete (MetaMonitorManager *manager,
 static MetaMonitor *
 meta_monitor_manager_get_active_monitor (MetaMonitorManager *manager);
 
+static void
+meta_monitor_manager_real_read_current_state (MetaMonitorManager *manager);
+
 MetaBackend *
 meta_monitor_manager_get_backend (MetaMonitorManager *manager)
 {
@@ -329,11 +338,24 @@ meta_monitor_manager_rebuild_logical_monitors_derived (MetaMonitorManager *manag
                                                     primary_logical_monitor);
 }
 
+void
+meta_monitor_manager_power_save_mode_changed (MetaMonitorManager *manager,
+                                              MetaPowerSave       mode)
+{
+  MetaMonitorManagerPrivate *priv =
+    meta_monitor_manager_get_instance_private (manager);
+
+  priv->power_save_mode = mode;
+  g_signal_emit (manager, signals[POWER_SAVE_MODE_CHANGED], 0);
+}
+
 static void
 power_save_mode_changed (MetaMonitorManager *manager,
                          GParamSpec         *pspec,
                          gpointer            user_data)
 {
+  MetaMonitorManagerPrivate *priv =
+    meta_monitor_manager_get_instance_private (manager);
   MetaMonitorManagerClass *klass;
   int mode = meta_dbus_display_config_get_power_save_mode (manager->display_config);
 
@@ -341,7 +363,7 @@ power_save_mode_changed (MetaMonitorManager *manager,
     return;
 
   /* If DPMS is unsupported, force the property back. */
-  if (manager->power_save_mode == META_POWER_SAVE_UNSUPPORTED)
+  if (priv->power_save_mode == META_POWER_SAVE_UNSUPPORTED)
     {
       meta_dbus_display_config_set_power_save_mode (manager->display_config, META_POWER_SAVE_UNSUPPORTED);
       return;
@@ -351,9 +373,7 @@ power_save_mode_changed (MetaMonitorManager *manager,
   if (klass->set_power_save_mode)
     klass->set_power_save_mode (manager, mode);
 
-  manager->power_save_mode = mode;
-
-  g_signal_emit (manager, signals[POWER_SAVE_MODE_CHANGED], 0);
+  meta_monitor_manager_power_save_mode_changed (manager, mode);
 }
 
 void
@@ -400,11 +420,11 @@ meta_monitor_manager_calculate_monitor_mode_scale (MetaMonitorManager *manager,
 }
 
 float *
-meta_monitor_manager_calculate_supported_scales (MetaMonitorManager          *manager,
-                                                 MetaLogicalMonitorLayoutMode layout_mode,
-                                                 MetaMonitor                 *monitor,
-                                                 MetaMonitorMode             *monitor_mode,
-                                                 int                         *n_supported_scales)
+meta_monitor_manager_calculate_supported_scales (MetaMonitorManager           *manager,
+                                                 MetaLogicalMonitorLayoutMode  layout_mode,
+                                                 MetaMonitor                  *monitor,
+                                                 MetaMonitorMode              *monitor_mode,
+                                                 int                          *n_supported_scales)
 {
   MetaMonitorManagerClass *manager_class =
     META_MONITOR_MANAGER_GET_CLASS (manager);
@@ -855,6 +875,7 @@ meta_monitor_manager_class_init (MetaMonitorManagerClass *klass)
   object_class->set_property = meta_monitor_manager_set_property;
 
   klass->read_edid = meta_monitor_manager_real_read_edid;
+  klass->read_current_state = meta_monitor_manager_real_read_current_state;
 
   signals[MONITORS_CHANGED] =
     g_signal_new ("monitors-changed",
@@ -2684,6 +2705,15 @@ meta_monitor_manager_get_screen_size (MetaMonitorManager *manager,
   *height = manager->screen_height;
 }
 
+MetaPowerSave
+meta_monitor_manager_get_power_save_mode (MetaMonitorManager *manager)
+{
+  MetaMonitorManagerPrivate *priv =
+    meta_monitor_manager_get_instance_private (manager);
+
+  return priv->power_save_mode;
+}
+
 static void
 rebuild_monitors (MetaMonitorManager *manager)
 {
@@ -2760,8 +2790,8 @@ meta_monitor_manager_is_transform_handled (MetaMonitorManager  *manager,
   return manager_class->is_transform_handled (manager, crtc, transform);
 }
 
-void
-meta_monitor_manager_read_current_state (MetaMonitorManager *manager)
+static void
+meta_monitor_manager_real_read_current_state (MetaMonitorManager *manager)
 {
   GList *l;
 
@@ -2782,6 +2812,15 @@ meta_monitor_manager_read_current_state (MetaMonitorManager *manager)
   rebuild_monitors (manager);
 }
 
+void
+meta_monitor_manager_read_current_state (MetaMonitorManager *manager)
+{
+  MetaMonitorManagerClass *manager_class =
+    META_MONITOR_MANAGER_GET_CLASS (manager);
+
+  manager_class->read_current_state (manager);
+}
+
 static void
 meta_monitor_manager_notify_monitors_changed (MetaMonitorManager *manager)
 {
diff --git a/src/backends/meta-monitor.c b/src/backends/meta-monitor.c
index 3ff18a5..22a3e45 100644
--- a/src/backends/meta-monitor.c
+++ b/src/backends/meta-monitor.c
@@ -615,12 +615,12 @@ meta_monitor_normal_get_suggested_position (MetaMonitor *monitor,
 }
 
 static void
-meta_monitor_normal_calculate_crtc_pos (MetaMonitor         *monitor,
-                                        MetaMonitorMode     *monitor_mode,
-                                        MetaOutput          *output,
-                                        MetaMonitorTransform crtc_transform,
-                                        int                 *out_x,
-                                        int                 *out_y)
+meta_monitor_normal_calculate_crtc_pos (MetaMonitor          *monitor,
+                                        MetaMonitorMode      *monitor_mode,
+                                        MetaOutput           *output,
+                                        MetaMonitorTransform  crtc_transform,
+                                        int                  *out_x,
+                                        int                  *out_y)
 {
   *out_x = 0;
   *out_y = 0;
@@ -1267,12 +1267,12 @@ meta_monitor_tiled_get_suggested_position (MetaMonitor *monitor,
 }
 
 static void
-meta_monitor_tiled_calculate_crtc_pos (MetaMonitor         *monitor,
-                                       MetaMonitorMode     *monitor_mode,
-                                       MetaOutput          *output,
-                                       MetaMonitorTransform crtc_transform,
-                                       int                 *out_x,
-                                       int                 *out_y)
+meta_monitor_tiled_calculate_crtc_pos (MetaMonitor          *monitor,
+                                       MetaMonitorMode      *monitor_mode,
+                                       MetaOutput           *output,
+                                       MetaMonitorTransform  crtc_transform,
+                                       int                  *out_x,
+                                       int                  *out_y)
 {
   MetaMonitorModeTiled *mode_tiled = (MetaMonitorModeTiled *) monitor_mode;
 
@@ -1461,12 +1461,12 @@ meta_monitor_get_modes (MetaMonitor *monitor)
 }
 
 void
-meta_monitor_calculate_crtc_pos (MetaMonitor         *monitor,
-                                 MetaMonitorMode     *monitor_mode,
-                                 MetaOutput          *output,
-                                 MetaMonitorTransform crtc_transform,
-                                 int                 *out_x,
-                                 int                 *out_y)
+meta_monitor_calculate_crtc_pos (MetaMonitor          *monitor,
+                                 MetaMonitorMode      *monitor_mode,
+                                 MetaOutput           *output,
+                                 MetaMonitorTransform  crtc_transform,
+                                 int                  *out_x,
+                                 int                  *out_y)
 {
   META_MONITOR_GET_CLASS (monitor)->calculate_crtc_pos (monitor,
                                                         monitor_mode,
@@ -1587,7 +1587,6 @@ get_closest_scale_factor_for_resolution (float width,
   float scaled_w;
   float best_scale;
   int base_scaled_w;
-  gboolean limit_exceeded;
   gboolean found_one;
 
   best_scale = 0;
@@ -1604,7 +1603,6 @@ get_closest_scale_factor_for_resolution (float width,
 
   i = 0;
   found_one = FALSE;
-  limit_exceeded = FALSE;
   base_scaled_w = floorf (scaled_w);
 
   do
@@ -1637,17 +1635,17 @@ get_closest_scale_factor_for_resolution (float width,
 
       i++;
     }
-  while (!found_one && !limit_exceeded);
+  while (!found_one);
 
 out:
   return best_scale;
 }
 
 float *
-meta_monitor_calculate_supported_scales (MetaMonitor                *monitor,
-                                         MetaMonitorMode            *monitor_mode,
-                                         MetaMonitorScalesConstraint constraints,
-                                         int                        *n_supported_scales)
+meta_monitor_calculate_supported_scales (MetaMonitor                 *monitor,
+                                         MetaMonitorMode             *monitor_mode,
+                                         MetaMonitorScalesConstraint  constraints,
+                                         int                         *n_supported_scales)
 {
   unsigned int i, j;
   int width, height;
@@ -1727,11 +1725,11 @@ meta_monitor_mode_get_flags (MetaMonitorMode *monitor_mode)
 }
 
 gboolean
-meta_monitor_mode_foreach_crtc (MetaMonitor        *monitor,
-                                MetaMonitorMode    *mode,
-                                MetaMonitorModeFunc func,
-                                gpointer            user_data,
-                                GError            **error)
+meta_monitor_mode_foreach_crtc (MetaMonitor          *monitor,
+                                MetaMonitorMode      *mode,
+                                MetaMonitorModeFunc   func,
+                                gpointer              user_data,
+                                GError              **error)
 {
   MetaMonitorPrivate *monitor_priv =
     meta_monitor_get_instance_private (monitor);
@@ -1753,11 +1751,11 @@ meta_monitor_mode_foreach_crtc (MetaMonitor        *monitor,
 }
 
 gboolean
-meta_monitor_mode_foreach_output (MetaMonitor        *monitor,
-                                  MetaMonitorMode    *mode,
-                                  MetaMonitorModeFunc func,
-                                  gpointer            user_data,
-                                  GError            **error)
+meta_monitor_mode_foreach_output (MetaMonitor          *monitor,
+                                  MetaMonitorMode      *mode,
+                                  MetaMonitorModeFunc   func,
+                                  gpointer              user_data,
+                                  GError              **error)
 {
   MetaMonitorPrivate *monitor_priv =
     meta_monitor_get_instance_private (monitor);
diff --git a/src/backends/meta-monitor.h b/src/backends/meta-monitor.h
index 41f2c0f..413a4e2 100644
--- a/src/backends/meta-monitor.h
+++ b/src/backends/meta-monitor.h
@@ -74,12 +74,12 @@ struct _MetaMonitorClass
   MetaOutput * (* get_main_output) (MetaMonitor *monitor);
   void (* derive_layout) (MetaMonitor   *monitor,
                           MetaRectangle *layout);
-  void (* calculate_crtc_pos) (MetaMonitor         *monitor,
-                               MetaMonitorMode     *monitor_mode,
-                               MetaOutput          *output,
-                               MetaMonitorTransform crtc_transform,
-                               int                 *out_x,
-                               int                 *out_y);
+  void (* calculate_crtc_pos) (MetaMonitor          *monitor,
+                               MetaMonitorMode      *monitor_mode,
+                               MetaOutput           *output,
+                               MetaMonitorTransform  crtc_transform,
+                               int                  *out_x,
+                               int                  *out_y);
   gboolean (* get_suggested_position) (MetaMonitor *monitor,
                                        int         *width,
                                        int         *height);
@@ -214,22 +214,22 @@ META_EXPORT_TEST
 GList * meta_monitor_get_modes (MetaMonitor *monitor);
 
 META_EXPORT_TEST
-void meta_monitor_calculate_crtc_pos (MetaMonitor         *monitor,
-                                      MetaMonitorMode     *monitor_mode,
-                                      MetaOutput          *output,
-                                      MetaMonitorTransform crtc_transform,
-                                      int                 *out_x,
-                                      int                 *out_y);
+void meta_monitor_calculate_crtc_pos (MetaMonitor          *monitor,
+                                      MetaMonitorMode      *monitor_mode,
+                                      MetaOutput           *output,
+                                      MetaMonitorTransform  crtc_transform,
+                                      int                  *out_x,
+                                      int                  *out_y);
 
 META_EXPORT_TEST
 float meta_monitor_calculate_mode_scale (MetaMonitor     *monitor,
                                          MetaMonitorMode *monitor_mode);
 
 META_EXPORT_TEST
-float * meta_monitor_calculate_supported_scales (MetaMonitor                *monitor,
-                                                 MetaMonitorMode            *monitor_mode,
-                                                 MetaMonitorScalesConstraint constraints,
-                                                 int                        *n_supported_scales);
+float * meta_monitor_calculate_supported_scales (MetaMonitor                 *monitor,
+                                                 MetaMonitorMode             *monitor_mode,
+                                                 MetaMonitorScalesConstraint  constraints,
+                                                 int                         *n_supported_scales);
 
 META_EXPORT_TEST
 const char * meta_monitor_mode_get_id (MetaMonitorMode *monitor_mode);
@@ -249,18 +249,18 @@ META_EXPORT_TEST
 MetaCrtcModeFlag meta_monitor_mode_get_flags (MetaMonitorMode *monitor_mode);
 
 META_EXPORT_TEST
-gboolean meta_monitor_mode_foreach_crtc (MetaMonitor        *monitor,
-                                         MetaMonitorMode    *mode,
-                                         MetaMonitorModeFunc func,
-                                         gpointer            user_data,
-                                         GError            **error);
+gboolean meta_monitor_mode_foreach_crtc (MetaMonitor          *monitor,
+                                         MetaMonitorMode      *mode,
+                                         MetaMonitorModeFunc   func,
+                                         gpointer              user_data,
+                                         GError              **error);
 
 META_EXPORT_TEST
-gboolean meta_monitor_mode_foreach_output (MetaMonitor        *monitor,
-                                           MetaMonitorMode    *mode,
-                                           MetaMonitorModeFunc func,
-                                           gpointer            user_data,
-                                           GError            **error);
+gboolean meta_monitor_mode_foreach_output (MetaMonitor          *monitor,
+                                           MetaMonitorMode      *mode,
+                                           MetaMonitorModeFunc   func,
+                                           gpointer              user_data,
+                                           GError              **error);
 
 META_EXPORT_TEST
 gboolean meta_monitor_mode_should_be_advertised (MetaMonitorMode *monitor_mode);
diff --git a/src/backends/meta-stage-private.h b/src/backends/meta-stage-private.h
index 21feab3..639d237 100644
--- a/src/backends/meta-stage-private.h
+++ b/src/backends/meta-stage-private.h
@@ -23,12 +23,13 @@
 #include "backends/meta-cursor.h"
 #include "meta/boxes.h"
 #include "meta/meta-stage.h"
+#include "meta/types.h"
 
 G_BEGIN_DECLS
 
 typedef struct _MetaOverlay    MetaOverlay;
 
-ClutterActor     *meta_stage_new                     (void);
+ClutterActor     *meta_stage_new                     (MetaBackend *backend);
 
 MetaOverlay      *meta_stage_create_cursor_overlay   (MetaStage   *stage);
 void              meta_stage_remove_cursor_overlay   (MetaStage   *stage,
diff --git a/src/backends/meta-stage.c b/src/backends/meta-stage.c
index 1f0d9c0..47a00e5 100644
--- a/src/backends/meta-stage.c
+++ b/src/backends/meta-stage.c
@@ -181,6 +181,15 @@ meta_stage_deactivate (ClutterStage *actor)
 }
 
 static void
+on_power_save_changed (MetaMonitorManager *monitor_manager,
+                       MetaStage          *stage)
+{
+  if (meta_monitor_manager_get_power_save_mode (monitor_manager) ==
+      META_POWER_SAVE_ON)
+    clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
+}
+
+static void
 meta_stage_class_init (MetaStageClass *klass)
 {
   ClutterStageClass *stage_class = (ClutterStageClass *) klass;
@@ -209,11 +218,21 @@ meta_stage_init (MetaStage *stage)
 }
 
 ClutterActor *
-meta_stage_new (void)
+meta_stage_new (MetaBackend *backend)
 {
-  return g_object_new (META_TYPE_STAGE,
-                       "cursor-visible", FALSE,
-                       NULL);
+  MetaStage *stage;
+  MetaMonitorManager *monitor_manager;
+
+  stage = g_object_new (META_TYPE_STAGE,
+                        "cursor-visible", FALSE,
+                        NULL);
+
+  monitor_manager = meta_backend_get_monitor_manager (backend);
+  g_signal_connect (monitor_manager, "power-save-mode-changed",
+                    G_CALLBACK (on_power_save_changed),
+                    stage);
+
+  return CLUTTER_ACTOR (stage);
 }
 
 static void
diff --git a/src/backends/native/meta-crtc-kms.c b/src/backends/native/meta-crtc-kms.c
index 79a9b1e..8c2fbfe 100644
--- a/src/backends/native/meta-crtc-kms.c
+++ b/src/backends/native/meta-crtc-kms.c
@@ -41,9 +41,6 @@
 typedef struct _MetaCrtcKms
 {
   unsigned int index;
-  uint32_t underscan_prop_id;
-  uint32_t underscan_hborder_prop_id;
-  uint32_t underscan_vborder_prop_id;
   uint32_t primary_plane_id;
   uint32_t rotation_prop_id;
   uint32_t rotation_map[ALL_TRANSFORMS];
@@ -137,54 +134,6 @@ meta_crtc_kms_apply_transform (MetaCrtc *crtc)
     }
 }
 
-void
-meta_crtc_kms_set_underscan (MetaCrtc *crtc,
-                             gboolean  is_underscanning)
-{
-  MetaCrtcKms *crtc_kms = crtc->driver_private;
-  MetaGpu *gpu = meta_crtc_get_gpu (crtc);
-  MetaGpuKms *gpu_kms = META_GPU_KMS (gpu);
-  int kms_fd;
-
-  if (!crtc_kms->underscan_prop_id)
-    return;
-
-  kms_fd = meta_gpu_kms_get_fd (gpu_kms);
-
-  if (is_underscanning)
-    {
-      drmModeObjectSetProperty (kms_fd, crtc->crtc_id,
-                                DRM_MODE_OBJECT_CRTC,
-                                crtc_kms->underscan_prop_id, (uint64_t) 1);
-
-      if (crtc_kms->underscan_hborder_prop_id)
-        {
-          uint64_t value;
-
-          value = crtc->current_mode->width * 0.05;
-          drmModeObjectSetProperty (kms_fd, crtc->crtc_id,
-                                    DRM_MODE_OBJECT_CRTC,
-                                    crtc_kms->underscan_hborder_prop_id, value);
-        }
-      if (crtc_kms->underscan_vborder_prop_id)
-        {
-          uint64_t value;
-
-          value = crtc->current_mode->height * 0.05;
-          drmModeObjectSetProperty (kms_fd, crtc->crtc_id,
-                                    DRM_MODE_OBJECT_CRTC,
-                                    crtc_kms->underscan_vborder_prop_id, value);
-        }
-
-    }
-  else
-    {
-      drmModeObjectSetProperty (kms_fd, crtc->crtc_id,
-                                DRM_MODE_OBJECT_CRTC,
-                                crtc_kms->underscan_prop_id, (uint64_t) 0);
-    }
-}
-
 static int
 find_property_index (MetaGpu                    *gpu,
                      drmModeObjectPropertiesPtr  props,
@@ -534,43 +483,6 @@ init_crtc_rotations (MetaCrtc *crtc,
 }
 
 static void
-find_crtc_properties (MetaCrtc   *crtc,
-                      MetaGpuKms *gpu_kms)
-{
-  MetaCrtcKms *crtc_kms = crtc->driver_private;
-  int kms_fd;
-  drmModeObjectPropertiesPtr props;
-  unsigned int i;
-
-  kms_fd = meta_gpu_kms_get_fd (gpu_kms);
-  props = drmModeObjectGetProperties (kms_fd, crtc->crtc_id,
-                                      DRM_MODE_OBJECT_CRTC);
-  if (!props)
-    return;
-
-  for (i = 0; i < props->count_props; i++)
-    {
-      drmModePropertyPtr prop = drmModeGetProperty (kms_fd, props->props[i]);
-      if (!prop)
-        continue;
-
-      if ((prop->flags & DRM_MODE_PROP_ENUM) &&
-          strcmp (prop->name, "underscan") == 0)
-        crtc_kms->underscan_prop_id = prop->prop_id;
-      else if ((prop->flags & DRM_MODE_PROP_RANGE) &&
-               strcmp (prop->name, "underscan hborder") == 0)
-        crtc_kms->underscan_hborder_prop_id = prop->prop_id;
-      else if ((prop->flags & DRM_MODE_PROP_RANGE) &&
-               strcmp (prop->name, "underscan vborder") == 0)
-        crtc_kms->underscan_vborder_prop_id = prop->prop_id;
-
-      drmModeFreeProperty (prop);
-    }
-
-  drmModeFreeObjectProperties (props);
-}
-
-static void
 meta_crtc_destroy_notify (MetaCrtc *crtc)
 {
   MetaCrtcKms *crtc_kms = crtc->driver_private;
@@ -628,7 +540,6 @@ meta_create_kms_crtc (MetaGpuKms   *gpu_kms,
   crtc->driver_private = crtc_kms;
   crtc->driver_notify = (GDestroyNotify) meta_crtc_destroy_notify;
 
-  find_crtc_properties (crtc, gpu_kms);
   init_crtc_rotations (crtc, gpu);
 
   return crtc;
diff --git a/src/backends/native/meta-crtc-kms.h b/src/backends/native/meta-crtc-kms.h
index 622ea55..456f440 100644
--- a/src/backends/native/meta-crtc-kms.h
+++ b/src/backends/native/meta-crtc-kms.h
@@ -44,9 +44,6 @@ gboolean meta_crtc_kms_is_transform_handled (MetaCrtc             *crtc,
 
 void meta_crtc_kms_apply_transform (MetaCrtc *crtc);
 
-void meta_crtc_kms_set_underscan (MetaCrtc *crtc,
-                                  gboolean  is_underscanning);
-
 GArray * meta_crtc_kms_get_modifiers (MetaCrtc *crtc,
                                       uint32_t  format);
 
diff --git a/src/backends/native/meta-gpu-kms.c b/src/backends/native/meta-gpu-kms.c
index d924466..c569b94 100644
--- a/src/backends/native/meta-gpu-kms.c
+++ b/src/backends/native/meta-gpu-kms.c
@@ -210,7 +210,7 @@ meta_gpu_kms_is_crtc_active (MetaGpuKms *gpu_kms,
 
   g_assert (meta_crtc_get_gpu (crtc) == META_GPU (gpu_kms));
 
-  if (monitor_manager->power_save_mode != META_POWER_SAVE_ON)
+  if (meta_monitor_manager_get_power_save_mode (monitor_manager))
     return FALSE;
 
   connected_crtc_found = FALSE;
@@ -273,7 +273,8 @@ meta_gpu_kms_flip_crtc (MetaGpuKms  *gpu_kms,
   int ret = -1;
 
   g_assert (meta_crtc_get_gpu (crtc) == gpu);
-  g_assert (monitor_manager->power_save_mode == META_POWER_SAVE_ON);
+  g_assert (meta_monitor_manager_get_power_save_mode (monitor_manager) ==
+            META_POWER_SAVE_ON);
 
   get_crtc_drm_connectors (gpu, crtc, &connectors, &n_connectors);
   g_assert (n_connectors > 0);
@@ -836,8 +837,6 @@ meta_gpu_kms_read_current (MetaGpu  *gpu,
                            GError  **error)
 {
   MetaGpuKms *gpu_kms = META_GPU_KMS (gpu);
-  MetaMonitorManager *monitor_manager =
-    meta_gpu_get_monitor_manager (gpu);
   MetaKmsResources resources;
   g_autoptr (GError) local_error = NULL;
 
@@ -855,8 +854,6 @@ meta_gpu_kms_read_current (MetaGpu  *gpu,
   gpu_kms->max_buffer_width = resources.resources->max_width;
   gpu_kms->max_buffer_height = resources.resources->max_height;
 
-  monitor_manager->power_save_mode = META_POWER_SAVE_ON;
-
   /* Note: we must not free the public structures (output, crtc, monitor
      mode and monitor info) here, they must be kept alive until the API
      users are done with them after we emit monitors-changed, and thus
diff --git a/src/backends/native/meta-monitor-manager-kms.c b/src/backends/native/meta-monitor-manager-kms.c
index c2c8ab5..9a03644 100644
--- a/src/backends/native/meta-monitor-manager-kms.c
+++ b/src/backends/native/meta-monitor-manager-kms.c
@@ -109,6 +109,21 @@ meta_monitor_manager_kms_read_edid (MetaMonitorManager *manager,
 }
 
 static void
+meta_monitor_manager_kms_read_current_state (MetaMonitorManager *manager)
+{
+  MetaMonitorManagerClass *parent_class =
+    META_MONITOR_MANAGER_CLASS (meta_monitor_manager_kms_parent_class);
+  MetaPowerSave power_save_mode;
+
+  power_save_mode = meta_monitor_manager_get_power_save_mode (manager);
+  if (power_save_mode != META_POWER_SAVE_ON)
+    meta_monitor_manager_power_save_mode_changed (manager,
+                                                  META_POWER_SAVE_ON);
+
+  parent_class->read_current_state (manager);
+}
+
+static void
 meta_monitor_manager_kms_set_power_save_mode (MetaMonitorManager *manager,
                                               MetaPowerSave       mode)
 {
@@ -512,11 +527,11 @@ meta_monitor_manager_kms_calculate_monitor_mode_scale (MetaMonitorManager *manag
 }
 
 static float *
-meta_monitor_manager_kms_calculate_supported_scales (MetaMonitorManager          *manager,
-                                                     MetaLogicalMonitorLayoutMode layout_mode,
-                                                     MetaMonitor                 *monitor,
-                                                     MetaMonitorMode             *monitor_mode,
-                                                     int                         *n_supported_scales)
+meta_monitor_manager_kms_calculate_supported_scales (MetaMonitorManager           *manager,
+                                                     MetaLogicalMonitorLayoutMode  layout_mode,
+                                                     MetaMonitor                  *monitor,
+                                                     MetaMonitorMode              *monitor_mode,
+                                                     int                          *n_supported_scales)
 {
   MetaMonitorScalesConstraint constraints =
     META_MONITOR_SCALES_CONSTRAINT_NONE;
@@ -755,6 +770,7 @@ meta_monitor_manager_kms_class_init (MetaMonitorManagerKmsClass *klass)
   object_class->dispose = meta_monitor_manager_kms_dispose;
 
   manager_class->read_edid = meta_monitor_manager_kms_read_edid;
+  manager_class->read_current_state = meta_monitor_manager_kms_read_current_state;
   manager_class->ensure_initial_config = meta_monitor_manager_kms_ensure_initial_config;
   manager_class->apply_monitors_config = meta_monitor_manager_kms_apply_monitors_config;
   manager_class->set_power_save_mode = meta_monitor_manager_kms_set_power_save_mode;
diff --git a/src/backends/native/meta-output-kms.c b/src/backends/native/meta-output-kms.c
index f3fa17e..f3cc543 100644
--- a/src/backends/native/meta-output-kms.c
+++ b/src/backends/native/meta-output-kms.c
@@ -56,6 +56,10 @@ typedef struct _MetaOutputKms
   uint32_t edid_blob_id;
   uint32_t tile_blob_id;
 
+  uint32_t underscan_prop_id;
+  uint32_t underscan_hborder_prop_id;
+  uint32_t underscan_vborder_prop_id;
+
   int suggested_x;
   int suggested_y;
   uint32_t hotplug_mode_update;
@@ -66,13 +70,55 @@ typedef struct _MetaOutputKms
 void
 meta_output_kms_set_underscan (MetaOutput *output)
 {
+  MetaOutputKms *output_kms = output->driver_private;
+  MetaGpu *gpu = meta_output_get_gpu (output);
+  MetaGpuKms *gpu_kms = META_GPU_KMS (gpu);
   MetaCrtc *crtc;
+  int kms_fd;
+  uint32_t connector_id;
 
-  crtc = meta_output_get_assigned_crtc (output);
-  if (!crtc)
+  if (!output_kms->underscan_prop_id)
     return;
 
-  meta_crtc_kms_set_underscan (crtc, output->is_underscanning);
+  crtc = meta_output_get_assigned_crtc (output);
+  kms_fd = meta_gpu_kms_get_fd (gpu_kms);
+  connector_id = output_kms->connector->connector_id;
+
+  if (output->is_underscanning && crtc && crtc->current_mode)
+    {
+      drmModeObjectSetProperty (kms_fd, connector_id,
+                                DRM_MODE_OBJECT_CONNECTOR,
+                                output_kms->underscan_prop_id,
+                                (uint64_t) 1);
+
+      if (output_kms->underscan_hborder_prop_id)
+        {
+          uint64_t value;
+
+          value = MIN (128, crtc->current_mode->width * 0.05);
+          drmModeObjectSetProperty (kms_fd, connector_id,
+                                    DRM_MODE_OBJECT_CONNECTOR,
+                                    output_kms->underscan_hborder_prop_id,
+                                    value);
+        }
+      if (output_kms->underscan_vborder_prop_id)
+        {
+          uint64_t value;
+
+          value = MIN (128, crtc->current_mode->height * 0.05);
+          drmModeObjectSetProperty (kms_fd, connector_id,
+                                    DRM_MODE_OBJECT_CONNECTOR,
+                                    output_kms->underscan_vborder_prop_id,
+                                    value);
+        }
+    }
+  else
+    {
+      drmModeObjectSetProperty (kms_fd, connector_id,
+                                DRM_MODE_OBJECT_CONNECTOR,
+                                output_kms->underscan_prop_id,
+                                (uint64_t) 0);
+    }
 }
 
 uint32_t
@@ -312,6 +358,15 @@ find_connector_properties (MetaGpuKms    *gpu_kms,
                strcmp (prop->name, "panel orientation") == 0)
         handle_panel_orientation (output, prop,
                                   output_kms->connector->prop_values[i]);
+      else if ((prop->flags & DRM_MODE_PROP_ENUM) &&
+               strcmp (prop->name, "underscan") == 0)
+        output_kms->underscan_prop_id = prop->prop_id;
+      else if ((prop->flags & DRM_MODE_PROP_RANGE) &&
+               strcmp (prop->name, "underscan hborder") == 0)
+        output_kms->underscan_hborder_prop_id = prop->prop_id;
+      else if ((prop->flags & DRM_MODE_PROP_RANGE) &&
+               strcmp (prop->name, "underscan vborder") == 0)
+        output_kms->underscan_vborder_prop_id = prop->prop_id;
 
       drmModeFreeProperty (prop);
     }
@@ -639,6 +694,7 @@ meta_create_kms_output (MetaGpuKms        *gpu_kms,
   output->suggested_x = output_kms->suggested_x;
   output->suggested_y = output_kms->suggested_y;
   output->hotplug_mode_update = output_kms->hotplug_mode_update;
+  output->supports_underscanning = output_kms->underscan_prop_id != 0;
 
   if (output_kms->edid_blob_id != 0)
     {
diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c
index 771ca08..086e8e4 100644
--- a/src/backends/native/meta-renderer-native.c
+++ b/src/backends/native/meta-renderer-native.c
@@ -103,8 +103,6 @@ typedef struct _MetaRendererNativeGpuData
 #ifdef HAVE_EGL_DEVICE
   struct {
     EGLDeviceEXT device;
-
-    gboolean no_egl_output_drm_flip_event;
   } egl;
 #endif
 
@@ -215,6 +213,9 @@ struct _MetaRendererNative
 
   int64_t frame_counter;
   gboolean pending_unset_disabled_crtcs;
+
+  GList *power_save_page_flip_closures;
+  guint power_save_page_flip_source_id;
 };
 
 static void
@@ -257,6 +258,15 @@ cogl_pixel_format_from_drm_format (uint32_t               drm_format,
                                    CoglPixelFormat       *out_format,
                                    CoglTextureComponents *out_components);
 
+static MetaBackend *
+backend_from_renderer_native (MetaRendererNative *renderer_native)
+{
+  MetaMonitorManager *monitor_manager =
+    META_MONITOR_MANAGER (renderer_native->monitor_manager_kms);
+
+  return meta_monitor_manager_get_backend (monitor_manager);
+}
+
 static void
 meta_renderer_native_gpu_data_free (MetaRendererNativeGpuData *renderer_gpu_data)
 {
@@ -1485,8 +1495,6 @@ flip_egl_stream (MetaOnscreenNative *onscreen_native,
   renderer_gpu_data =
     meta_renderer_native_get_gpu_data (onscreen_native->renderer_native,
                                        onscreen_native->render_gpu);
-  if (renderer_gpu_data->egl.no_egl_output_drm_flip_event)
-    return FALSE;
 
   closure_container =
     meta_gpu_kms_wrap_flip_closure (onscreen_native->render_gpu,
@@ -1509,9 +1517,7 @@ flip_egl_stream (MetaOnscreenNative *onscreen_native,
       if (error->domain != META_EGL_ERROR ||
           error->code != EGL_RESOURCE_BUSY_EXT)
         {
-          g_warning ("Failed to flip EGL stream (%s), relying on clock from "
-                     "now on", error->message);
-          renderer_gpu_data->egl.no_egl_output_drm_flip_event = TRUE;
+          g_warning ("Failed to flip EGL stream: %s", error->message);
         }
       g_error_free (error);
       meta_gpu_kms_flip_closure_container_free (closure_container);
@@ -1532,6 +1538,38 @@ is_timestamp_earlier_than (uint64_t ts1,
     return ts2 - ts1 < UINT64_MAX / 2;
 }
 
+static gboolean
+dummy_power_save_page_flip_cb (gpointer user_data)
+{
+  MetaRendererNative *renderer_native = user_data;
+
+  g_list_free_full (renderer_native->power_save_page_flip_closures,
+                    (GDestroyNotify) g_closure_unref);
+  renderer_native->power_save_page_flip_closures = NULL;
+  renderer_native->power_save_page_flip_source_id = 0;
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+queue_dummy_power_save_page_flip (MetaRendererNative *renderer_native,
+                                  GClosure           *flip_closure)
+{
+  const unsigned int timeout_ms = 100;
+
+  if (!renderer_native->power_save_page_flip_source_id)
+    {
+      renderer_native->power_save_page_flip_source_id =
+        g_timeout_add (timeout_ms,
+                       dummy_power_save_page_flip_cb,
+                       renderer_native);
+    }
+
+  renderer_native->power_save_page_flip_closures =
+    g_list_prepend (renderer_native->power_save_page_flip_closures,
+                    g_closure_ref (flip_closure));
+}
+
 typedef struct _RetryPageFlipData
 {
   MetaCrtc *crtc;
@@ -1547,14 +1585,39 @@ retry_page_flip_data_free (RetryPageFlipData *retry_page_flip_data)
   g_free (retry_page_flip_data);
 }
 
+static void
+retry_page_flip_data_fake_flipped (RetryPageFlipData  *retry_page_flip_data,
+                                   MetaOnscreenNative *onscreen_native)
+{
+  MetaCrtc *crtc = retry_page_flip_data->crtc;
+  MetaGpuKms *gpu_kms = META_GPU_KMS (meta_crtc_get_gpu (crtc));
+
+  if (gpu_kms != onscreen_native->render_gpu)
+    {
+      MetaOnscreenNativeSecondaryGpuState *secondary_gpu_state;
+
+      secondary_gpu_state =
+        meta_onscreen_native_get_secondary_gpu_state (onscreen_native,
+                                                      gpu_kms);
+      secondary_gpu_state->pending_flips--;
+    }
+
+  onscreen_native->total_pending_flips--;
+}
+
 static gboolean
 retry_page_flips (gpointer user_data)
 {
   MetaOnscreenNative *onscreen_native = user_data;
+  MetaRendererNative *renderer_native = onscreen_native->renderer_native;
+  MetaMonitorManager *monitor_manager =
+    META_MONITOR_MANAGER (renderer_native->monitor_manager_kms);
   uint64_t now_us;
+  MetaPowerSave power_save_mode;
   GList *l;
 
   now_us = g_source_get_time (onscreen_native->retry_page_flips_source);
+  power_save_mode = meta_monitor_manager_get_power_save_mode (monitor_manager);
 
   l = onscreen_native->pending_page_flip_retries;
   while (l)
@@ -1566,6 +1629,19 @@ retry_page_flips (gpointer user_data)
       g_autoptr (GError) error = NULL;
       gboolean did_flip;
 
+      if (power_save_mode != META_POWER_SAVE_ON)
+        {
+          onscreen_native->pending_page_flip_retries =
+            g_list_remove_link (onscreen_native->pending_page_flip_retries, l);
+
+          retry_page_flip_data_fake_flipped (retry_page_flip_data,
+                                             onscreen_native);
+          retry_page_flip_data_free (retry_page_flip_data);
+
+          l = l_next;
+          continue;
+        }
+
       if (is_timestamp_earlier_than (now_us,
                                      retry_page_flip_data->retry_time_us))
         {
@@ -1582,7 +1658,7 @@ retry_page_flips (gpointer user_data)
           g_error_matches (error, G_IO_ERROR, G_IO_ERROR_BUSY))
         {