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

[Marco Trevisan (Treviño)]

[Daniel van Vugt (vanvugt)]

Sounds and looks sensible.

Although it's never easy to read the diff-of-a-diff, the fact that the patch is shrinking is also good.

review: Approve

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

> Although it's never easy to read the diff-of-a-diff, the fact that the patch
> is shrinking is also good.

In such cases I suggest you to fetch the ubuntu-desktop ubuntu/master branch and do:
 gbp pq import

Fetch my branch locally (say you call it marco-ubuntu), and there again
 gbp pq import

Then you can easily diff things with
  git diff patch-queue/ubuntu/master patch-queue/marco-ubuntu/master

diff --git a/debian/changelog b/debian/changelog
index d096e50..67c17c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mutter (3.32.0-1ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/patches/x11-Add-support-for-fractional-scaling-using-Randr.patch:
+    - Don't invert the screen size when rotation is enabled (LP: #1822513)
+    - Remove unneeded cleanup changes
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Wed, 03 Apr 2019 19:19:59 -0400
+
 mutter (3.32.0-1ubuntu1) disco; urgency=medium
 
   * debian/control:
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 987f4f9..ea6c35f 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
@@ -1,19 +1,25 @@
-From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
-Date: Wed, 27 Mar 2019 06:44:56 +0100
-Subject: X11: Add support for fractional scaling using Randr
+From: Ubuntu Developers <[e-mail]>
+Date: Wed, 3 Apr 2019 19:18:03 -0400
+Subject: x11-Add-support-for-fractional-scaling-using-Randr
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+commit ed760c44b1998fc5fadde18186c51e74525038cc
+Author: Marco Trevisan (Treviño) <[e-mail]>
+Date:   Wed Apr 3 18:57:28 2019 -0400
 
 Add scaling support using randr under x11.
 
+Origin: https://gitlab.gnome.org/3v1n0/mutter/commits/xrandr-scaling
 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1820850
 Forwarded: No, forwarding is in progress and planned though
 ---
  data/meson.build                               |   7 +
  data/org.gnome.mutter.gschema.xml.in           |   5 +
  data/org.gnome.mutter.x11.gschema.xml.in       |  30 ++
- meson.build                                    |   2 +-
  src/backends/meta-crtc.h                       |   1 +
- src/backends/meta-logical-monitor.c            |  36 +--
- src/backends/meta-monitor-config-manager.c     | 150 ++++++++-
+ src/backends/meta-monitor-config-manager.c     | 150 +++++++++-
  src/backends/meta-monitor-config-migration.c   |  15 +-
  src/backends/meta-monitor-config-store.c       |   1 +
  src/backends/meta-monitor-manager-dummy.c      |  24 +-
@@ -22,26 +28,22 @@ Forwarded: No, forwarding is in progress and planned though
  src/backends/meta-monitor.c                    |  60 ++--
  src/backends/meta-monitor.h                    |   6 +-
  src/backends/meta-settings-private.h           |   9 +
- src/backends/meta-settings.c                   |  80 ++++-
+ src/backends/meta-settings.c                   |  76 ++++-
  src/backends/native/meta-monitor-manager-kms.c |  44 ++-
  src/backends/x11/meta-crtc-xrandr.c            |  87 +++++-
  src/backends/x11/meta-crtc-xrandr.h            |  13 +-
  src/backends/x11/meta-gpu-xrandr.c             |  89 +++++-
  src/backends/x11/meta-gpu-xrandr.h             |   4 +
- src/backends/x11/meta-monitor-manager-xrandr.c | 407 +++++++++++++++++--------
+ src/backends/x11/meta-monitor-manager-xrandr.c | 399 +++++++++++++++++--------
  src/backends/x11/meta-monitor-manager-xrandr.h |   4 +-
  src/backends/x11/meta-output-xrandr.c          |   5 +-
- src/compositor/compositor-private.h            |   2 +
- src/compositor/compositor.c                    |  96 +++++-
- src/core/boxes-private.h                       |   8 +
- src/core/boxes.c                               |  53 ++++
- src/core/display.c                             |   3 +-
+ src/compositor/compositor.c                    |  54 ++++
+ src/core/boxes-private.h                       |   4 +
+ src/core/boxes.c                               |  21 ++
  src/core/window.c                              |  19 ++
- src/meta/compositor.h                          |   5 +
- src/meta/display.h                             |   8 +-
  src/org.gnome.Mutter.DisplayConfig.xml         |   5 +
  src/tests/meta-monitor-manager-test.c          |  14 +-
- 34 files changed, 1366 insertions(+), 303 deletions(-)
+ 28 files changed, 1269 insertions(+), 254 deletions(-)
  create mode 100644 data/org.gnome.mutter.x11.gschema.xml.in
 
 diff --git a/data/meson.build b/data/meson.build
@@ -114,19 +116,6 @@ index 0000000..3696659
 +  </schema>
 +
 +</schemalist>
-diff --git a/meson.build b/meson.build
-index cafbde4..afcbd31 100644
---- a/meson.build
-+++ b/meson.build
-@@ -9,7 +9,7 @@ mutter_plugin_api_version = '3'
- libmutter_api_version = '4'
- 
- # generic version requirements
--glib_req = '>= 2.53.2'
-+glib_req = '>= 2.56'
- gi_req = '>= 0.9.5'
- gtk3_req = '>= 3.19.8'
- gdk_pixbuf_req = '>= 2.0'
 diff --git a/src/backends/meta-crtc.h b/src/backends/meta-crtc.h
 index ddacfea..8d16455 100644
 --- a/src/backends/meta-crtc.h
@@ -139,58 +128,6 @@ index ddacfea..8d16455 100644
  
    MetaLogicalMonitor *logical_monitor;
  
-diff --git a/src/backends/meta-logical-monitor.c b/src/backends/meta-logical-monitor.c
-index 99a35f7..a2d8f41 100644
---- a/src/backends/meta-logical-monitor.c
-+++ b/src/backends/meta-logical-monitor.c
-@@ -45,6 +45,7 @@
- #include "backends/meta-backend-private.h"
- #include "backends/meta-crtc.h"
- #include "backends/meta-output.h"
-+#include "core/boxes-private.h"
- 
- G_DEFINE_TYPE (MetaLogicalMonitor, meta_logical_monitor, G_TYPE_OBJECT)
- 
-@@ -302,37 +303,6 @@ meta_logical_monitor_has_neighbor (MetaLogicalMonitor   *logical_monitor,
-                                    MetaLogicalMonitor   *neighbor,
-                                    MetaDisplayDirection  neighbor_direction)
- {
--  switch (neighbor_direction)
--    {
--    case META_DISPLAY_RIGHT:
--      if (neighbor->rect.x == (logical_monitor->rect.x +
--                               logical_monitor->rect.width) &&
--          meta_rectangle_vert_overlap (&neighbor->rect,
--                                       &logical_monitor->rect))
--        return TRUE;
--      break;
--    case META_DISPLAY_LEFT:
--      if (logical_monitor->rect.x == (neighbor->rect.x +
--                                      neighbor->rect.width) &&
--          meta_rectangle_vert_overlap (&neighbor->rect,
--                                       &logical_monitor->rect))
--        return TRUE;
--      break;
--    case META_DISPLAY_UP:
--      if (logical_monitor->rect.y == (neighbor->rect.y +
--                                      neighbor->rect.height) &&
--          meta_rectangle_horiz_overlap (&neighbor->rect,
--                                        &logical_monitor->rect))
--        return TRUE;
--      break;
--    case META_DISPLAY_DOWN:
--      if (neighbor->rect.y == (logical_monitor->rect.y +
--                               logical_monitor->rect.height) &&
--          meta_rectangle_horiz_overlap (&neighbor->rect,
--                                        &logical_monitor->rect))
--        return TRUE;
--      break;
--    }
--
--  return FALSE;
-+  return meta_rectangle_has_neighbor (&logical_monitor->rect, &neighbor->rect,
-+                                      (MetaSide) neighbor_direction);
- }
 diff --git a/src/backends/meta-monitor-config-manager.c b/src/backends/meta-monitor-config-manager.c
 index 771c57f..5d620a3 100644
 --- a/src/backends/meta-monitor-config-manager.c
@@ -774,7 +711,7 @@ index 3b951c6..3b375a0 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..7cb3415 100644
+index c4ed245..8b5b983 100644
 --- a/src/backends/meta-monitor-manager.c
 +++ b/src/backends/meta-monitor-manager.c
 @@ -104,8 +104,18 @@ static gboolean
@@ -1196,7 +1133,7 @@ index c4ed245..7cb3415 100644
 +    {
 +      MetaLogicalMonitorConfig *logical_monitor_config = l->data;
 +
-+      if (logical_monitor_config->scale != scale)
++      if (fabs (logical_monitor_config->scale - scale) > FLT_EPSILON)
 +        return FALSE;
 +    }
 +
@@ -1509,7 +1446,7 @@ index 619de17..8d20b88 100644
  
  #endif /* META_SETTINGS_PRIVATE_H */
 diff --git a/src/backends/meta-settings.c b/src/backends/meta-settings.c
-index 34d49b3..52c6632 100644
+index 34d49b3..e54317e 100644
 --- a/src/backends/meta-settings.c
 +++ b/src/backends/meta-settings.c
 @@ -40,6 +40,7 @@ enum
@@ -1537,7 +1474,7 @@ index 34d49b3..52c6632 100644
  };
  
  G_DEFINE_TYPE (MetaSettings, meta_settings, G_TYPE_OBJECT)
-@@ -77,14 +81,37 @@ calculate_ui_scaling_factor (MetaSettings *settings)
+@@ -77,14 +81,33 @@ calculate_ui_scaling_factor (MetaSettings *settings)
  {
    MetaMonitorManager *monitor_manager =
      meta_backend_get_monitor_manager (settings->backend);
@@ -1547,28 +1484,24 @@ index 34d49b3..52c6632 100644
 -    meta_monitor_manager_get_primary_logical_monitor (monitor_manager);
 -  if (!primary_logical_monitor)
 -    return 1;
- 
--  return (int) meta_logical_monitor_get_scale (primary_logical_monitor);
-+  if (settings->experimental_features &
-+      META_EXPERIMENTAL_FEATURE_X11_RANDR_FRACTIONAL_SCALING)
++  if (!meta_is_wayland_compositor () &&
++      (settings->experimental_features &
++       META_EXPERIMENTAL_FEATURE_X11_RANDR_FRACTIONAL_SCALING))
 +    {
-+      if (settings->x11_scale_mode == META_X11_SCALE_MODE_UP)
-+        return 1;
++      float scale = 1;
 +
 +      if (monitor_manager &&
 +          settings->x11_scale_mode == META_X11_SCALE_MODE_UI_DOWN)
-+        {
-+          float max_scale =
-+            meta_monitor_manager_get_maximum_crtc_scale (monitor_manager);
-+          return ceilf (max_scale);
-+        }
++        scale =
++          ceilf (meta_monitor_manager_get_maximum_crtc_scale (monitor_manager));
 +
-+      return 1;
++      return scale;
 +    }
 +  else if (monitor_manager)
 +    {
 +      MetaLogicalMonitor *primary_logical_monitor;
-+
+ 
+-  return (int) meta_logical_monitor_get_scale (primary_logical_monitor);
 +      primary_logical_monitor =
 +        meta_monitor_manager_get_primary_logical_monitor (monitor_manager);
 +      if (!primary_logical_monitor)
@@ -1581,7 +1514,7 @@ index 34d49b3..52c6632 100644
  }
  
  static gboolean
-@@ -264,6 +291,8 @@ experimental_features_handler (GVariant *features_variant,
+@@ -264,6 +287,8 @@ experimental_features_handler (GVariant *features_variant,
          features |= META_EXPERIMENTAL_FEATURE_SCALE_MONITOR_FRAMEBUFFER;
        else if (g_str_equal (feature, "kms-modifiers"))
          features |= META_EXPERIMENTAL_FEATURE_KMS_MODIFIERS;
@@ -1590,7 +1523,7 @@ index 34d49b3..52c6632 100644
        else
          g_info ("Unknown experimental feature '%s'\n", feature);
      }
-@@ -392,6 +421,25 @@ wayland_settings_changed (GSettings    *wayland_settings,
+@@ -392,6 +417,25 @@ wayland_settings_changed (GSettings    *wayland_settings,
      }
  }
  
@@ -1616,7 +1549,7 @@ index 34d49b3..52c6632 100644
  void
  meta_settings_get_xwayland_grab_patterns (MetaSettings  *settings,
                                            GPtrArray    **whitelist_patterns,
-@@ -407,6 +455,12 @@ gboolean
+@@ -407,6 +451,12 @@ gboolean
    return (settings->xwayland_allow_grabs);
  }
  
@@ -1629,7 +1562,7 @@ index 34d49b3..52c6632 100644
  MetaSettings *
  meta_settings_new (MetaBackend *backend)
  {
-@@ -426,6 +480,7 @@ meta_settings_dispose (GObject *object)
+@@ -426,6 +476,7 @@ meta_settings_dispose (GObject *object)
    g_clear_object (&settings->mutter_settings);
    g_clear_object (&settings->interface_settings);
    g_clear_object (&settings->wayland_settings);
@@ -1637,7 +1570,7 @@ index 34d49b3..52c6632 100644
    g_clear_pointer (&settings->xwayland_grab_whitelist_patterns,
                     g_ptr_array_unref);
    g_clear_pointer (&settings->xwayland_grab_blacklist_patterns,
-@@ -449,6 +504,10 @@ meta_settings_init (MetaSettings *settings)
+@@ -449,6 +500,10 @@ meta_settings_init (MetaSettings *settings)
    g_signal_connect (settings->wayland_settings, "changed",
                      G_CALLBACK (wayland_settings_changed),
                      settings);
@@ -1648,7 +1581,7 @@ index 34d49b3..52c6632 100644
  
    /* Chain up inter-dependent settings. */
    g_signal_connect (settings, "global-scaling-factor-changed",
-@@ -460,6 +519,7 @@ meta_settings_init (MetaSettings *settings)
+@@ -460,6 +515,7 @@ meta_settings_init (MetaSettings *settings)
    update_experimental_features (settings);
    update_xwayland_grab_access_rules (settings);
    update_xwayland_allow_grabs (settings);
@@ -1656,7 +1589,7 @@ index 34d49b3..52c6632 100644
  }
  
  static void
-@@ -514,6 +574,14 @@ meta_settings_class_init (MetaSettingsClass *klass)
+@@ -514,6 +570,14 @@ meta_settings_class_init (MetaSettingsClass *klass)
                    NULL, NULL, NULL,
                    G_TYPE_NONE, 0);
  
@@ -2063,7 +1996,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..9594bf4 100644
+index 784bbde..47d19d6 100644
 --- a/src/backends/x11/meta-monitor-manager-xrandr.c
 +++ b/src/backends/x11/meta-monitor-manager-xrandr.c
 @@ -63,6 +63,9 @@
@@ -2072,7 +2005,7 @@ index 784bbde..9594bf4 100644
  #define DPI_FALLBACK 96.0
 +#define RANDR_VERSION_FORMAT(major, minor) ((major * 100) + minor)
 +#define RANDR_TILING_MIN_VERSION RANDR_VERSION_FORMAT (1, 5)
-+#define RANDR_TRANSFOMR_MIN_VERSION RANDR_VERSION_FORMAT (1, 3)
++#define RANDR_TRANSFORM_MIN_VERSION RANDR_VERSION_FORMAT (1, 3)
  
  struct _MetaMonitorManagerXrandr
  {
@@ -2374,7 +2307,7 @@ index 784bbde..9594bf4 100644
          }
      }
  
-@@ -568,8 +681,64 @@ meta_monitor_manager_xrandr_rebuild_derived (MetaMonitorManager *manager,
+@@ -568,8 +681,56 @@ meta_monitor_manager_xrandr_rebuild_derived (MetaMonitorManager *manager,
  {
    MetaMonitorManagerXrandr *manager_xrandr =
      META_MONITOR_MANAGER_XRANDR (manager);
@@ -2408,21 +2341,13 @@ index 784bbde..9594bf4 100644
 +          scale = crtc->scale > 1.0f ? crtc->scale : 1.0f;
 +        }
 +
-+      if (meta_monitor_transform_is_rotated (crtc->transform))
-+        {
-+          screen_width = MAX (screen_width, crtc->rect.x +
-+                              roundf (crtc->rect.height * scale));
-+          screen_height = MAX (screen_height, crtc->rect.y +
-+                               roundf (crtc->rect.width * scale));
-+        }
-+        else
-+        {
-+          screen_width = MAX (screen_width, crtc->rect.x +
-+                              roundf (crtc->rect.width * scale));
-+          screen_height = MAX (screen_height, crtc->rect.y +
-+                               roundf (crtc->rect.height * scale));
-+        }
-+
++      /* When computing the screen size from the crtc rects we don't have to
++       * use inverted values when monitors are rotated, because this is already
++       * taken in account in the crtc rectangles */
++      screen_width = MAX (screen_width, crtc->rect.x +
++                          roundf (crtc->rect.width * scale));
++      screen_height = MAX (screen_height, crtc->rect.y +
++                           roundf (crtc->rect.height * scale));
 +      ++n_crtcs;
 +
 +      /* This value isn't completely exact, since it doesn't take care of the
@@ -2440,7 +2365,7 @@ index 784bbde..9594bf4 100644
    meta_monitor_manager_rebuild_derived (manager, config);
  }
  
-@@ -595,6 +764,9 @@ meta_monitor_manager_xrandr_apply_monitors_config (MetaMonitorManager      *mana
+@@ -595,6 +756,9 @@ meta_monitor_manager_xrandr_apply_monitors_config (MetaMonitorManager      *mana
  
    if (method != META_MONITORS_CONFIG_METHOD_VERIFY)
      {
@@ -2450,7 +2375,7 @@ index 784bbde..9594bf4 100644
        /*
         * If the assignment has not changed, we won't get any notification about
         * any new configuration from the X server; but we still need to update
-@@ -615,6 +787,8 @@ meta_monitor_manager_xrandr_apply_monitors_config (MetaMonitorManager      *mana
+@@ -615,6 +779,8 @@ meta_monitor_manager_xrandr_apply_monitors_config (MetaMonitorManager      *mana
                                    crtc_infos->len,
                                    (MetaOutputInfo **) output_infos->pdata,
                                    output_infos->len);
@@ -2459,7 +2384,7 @@ index 784bbde..9594bf4 100644
          }
        else
          {
-@@ -748,7 +922,8 @@ meta_monitor_manager_xrandr_tiled_monitor_added (MetaMonitorManager *manager,
+@@ -748,7 +914,8 @@ meta_monitor_manager_xrandr_tiled_monitor_added (MetaMonitorManager *manager,
    GList *l;
    int i;
  
@@ -2469,7 +2394,7 @@ index 784bbde..9594bf4 100644
      return;
  
    product = meta_monitor_get_product (monitor);
-@@ -797,7 +972,8 @@ meta_monitor_manager_xrandr_tiled_monitor_removed (MetaMonitorManager *manager,
+@@ -797,7 +964,8 @@ meta_monitor_manager_xrandr_tiled_monitor_removed (MetaMonitorManager *manager,
  
    int monitor_count;
  
@@ -2479,7 +2404,7 @@ index 784bbde..9594bf4 100644
      return;
  
    monitor_xrandr_data = meta_monitor_xrandr_data_from_monitor (monitor);
-@@ -815,10 +991,12 @@ meta_monitor_manager_xrandr_tiled_monitor_removed (MetaMonitorManager *manager,
+@@ -815,10 +983,12 @@ meta_monitor_manager_xrandr_tiled_monitor_removed (MetaMonitorManager *manager,
  static void
  meta_monitor_manager_xrandr_init_monitors (MetaMonitorManagerXrandr *manager_xrandr)
  {
@@ -2493,7 +2418,7 @@ index 784bbde..9594bf4 100644
      return;
  
    /* delete any tiled monitors setup, as mutter will want to recreate
-@@ -849,83 +1027,26 @@ meta_monitor_manager_xrandr_is_transform_handled (MetaMonitorManager  *manager,
+@@ -849,83 +1019,26 @@ meta_monitor_manager_xrandr_is_transform_handled (MetaMonitorManager  *manager,
    return TRUE;
  }
  
@@ -2506,25 +2431,25 @@ index 784bbde..9594bf4 100644
  {
 -  return meta_monitor_calculate_mode_scale (monitor, monitor_mode);
 -}
-+  MetaMonitorScalesConstraint constraints = 0;
- 
+-
 -static void
 -add_supported_scale (GArray *supported_scales,
 -                     float   scale)
 -{
 -  unsigned int i;
-+  if (meta_monitor_manager_get_capabilities (manager) &
-+      META_MONITOR_MANAGER_CAPABILITY_GLOBAL_SCALE_REQUIRED)
-+    constraints |= META_MONITOR_SCALES_CONSTRAINT_NO_FRAC;
- 
+-
 -  for (i = 0; i < supported_scales->len; i++)
 -    {
 -      float supported_scale = g_array_index (supported_scales, float, i);
--
++  MetaMonitorScalesConstraint constraints = 0;
+ 
 -      if (scale == supported_scale)
 -        return;
 -    }
--
++  if (meta_monitor_manager_get_capabilities (manager) &
++      META_MONITOR_MANAGER_CAPABILITY_GLOBAL_SCALE_REQUIRED)
++    constraints |= META_MONITOR_SCALES_CONSTRAINT_NO_FRAC;
+ 
 -  g_array_append_val (supported_scales, scale);
 +  return constraints;
  }
@@ -2532,7 +2457,12 @@ index 784bbde..9594bf4 100644
 -static int
 -compare_scales (gconstpointer a,
 -                gconstpointer b)
--{
++static float
++meta_monitor_manager_xrandr_calculate_monitor_mode_scale (MetaMonitorManager           *manager,
++                                                          MetaLogicalMonitorLayoutMode  layout_mode,
++                                                          MetaMonitor                  *monitor,
++                                                          MetaMonitorMode              *monitor_mode)
+ {
 -  float f = *(float *) a - *(float *) b;
 -
 -  if (f < 0)
@@ -2544,12 +2474,7 @@ index 784bbde..9594bf4 100644
 -
 -static void
 -ensure_supported_monitor_scales (MetaMonitorManager *manager)
-+static float
-+meta_monitor_manager_xrandr_calculate_monitor_mode_scale (MetaMonitorManager           *manager,
-+                                                          MetaLogicalMonitorLayoutMode  layout_mode,
-+                                                          MetaMonitor                  *monitor,
-+                                                          MetaMonitorMode              *monitor_mode)
- {
+-{
 -  MetaMonitorManagerXrandr *manager_xrandr =
 -    META_MONITOR_MANAGER_XRANDR (manager);
 -  MetaMonitorScalesConstraint constraints;
@@ -2591,7 +2516,7 @@ index 784bbde..9594bf4 100644
  }
  
  static float *
-@@ -935,21 +1056,35 @@ meta_monitor_manager_xrandr_calculate_supported_scales (MetaMonitorManager
+@@ -935,21 +1048,35 @@ meta_monitor_manager_xrandr_calculate_supported_scales (MetaMonitorManager
                                                          MetaMonitorMode              *monitor_mode,
                                                          int                          *n_supported_scales)
  {
@@ -2625,7 +2550,7 @@ index 784bbde..9594bf4 100644
 +
 +  if (meta_settings_is_experimental_feature_enabled (settings,
 +       META_EXPERIMENTAL_FEATURE_X11_RANDR_FRACTIONAL_SCALING) &&
-+      xrandr_manager->randr_version >= RANDR_TRANSFOMR_MIN_VERSION)
++      xrandr_manager->randr_version >= RANDR_TRANSFORM_MIN_VERSION)
 +    {
 +      capabilities |= META_MONITOR_MANAGER_CAPABILITY_NATIVE_OUTPUT_SCALING |
 +                      META_MONITOR_MANAGER_CAPABILITY_LAYOUT_MODE;
@@ -2637,7 +2562,7 @@ index 784bbde..9594bf4 100644
  }
  
  static gboolean
-@@ -966,9 +1101,30 @@ meta_monitor_manager_xrandr_get_max_screen_size (MetaMonitorManager *manager,
+@@ -966,9 +1093,30 @@ meta_monitor_manager_xrandr_get_max_screen_size (MetaMonitorManager *manager,
    return TRUE;
  }
  
@@ -2668,7 +2593,7 @@ index 784bbde..9594bf4 100644
    return META_LOGICAL_MONITOR_LAYOUT_MODE_PHYSICAL;
  }
  
-@@ -978,10 +1134,15 @@ meta_monitor_manager_xrandr_constructed (GObject *object)
+@@ -978,10 +1126,15 @@ meta_monitor_manager_xrandr_constructed (GObject *object)
    MetaMonitorManagerXrandr *manager_xrandr =
      META_MONITOR_MANAGER_XRANDR (object);
    MetaMonitorManager *manager = META_MONITOR_MANAGER (manager_xrandr);
@@ -2687,7 +2612,7 @@ index 784bbde..9594bf4 100644
  
    manager_xrandr->gpu = META_GPU (meta_gpu_xrandr_new (manager_xrandr));
    meta_monitor_manager_add_gpu (manager, manager_xrandr->gpu);
-@@ -1003,16 +1164,13 @@ meta_monitor_manager_xrandr_constructed (GObject *object)
+@@ -1003,16 +1156,13 @@ meta_monitor_manager_xrandr_constructed (GObject *object)
  		      | RRCrtcChangeNotifyMask
  		      | RROutputPropertyNotifyMask);
  
@@ -2709,7 +2634,7 @@ index 784bbde..9594bf4 100644
        meta_monitor_manager_xrandr_init_monitors (manager_xrandr);
      }
  
-@@ -1026,7 +1184,6 @@ meta_monitor_manager_xrandr_finalize (GObject *object)
+@@ -1026,7 +1176,6 @@ meta_monitor_manager_xrandr_finalize (GObject *object)
  
    g_clear_object (&manager_xrandr->gpu);
    g_hash_table_destroy (manager_xrandr->tiled_monitor_atoms);
@@ -2756,47 +2681,35 @@ index 515389d..3bc7f0b 100644
      return;
  
    tile_atom = XInternAtom (xdisplay, "TILE", FALSE);
-diff --git a/src/compositor/compositor-private.h b/src/compositor/compositor-private.h
-index 0f92d42..13a8a6a 100644
---- a/src/compositor/compositor-private.h
-+++ b/src/compositor/compositor-private.h
-@@ -13,6 +13,8 @@
- 
- struct _MetaCompositor
- {
-+  GObject         parent;
-+
-   MetaDisplay    *display;
- 
-   guint           pre_paint_func_id;
 diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
-index 0854a19..7fc2943 100644
+index 0854a19..e412784 100644
 --- a/src/compositor/compositor.c
 +++ b/src/compositor/compositor.c
-@@ -86,6 +86,8 @@
- #include "wayland/meta-wayland-private.h"
- #endif
+@@ -92,6 +92,11 @@ on_presented (ClutterStage     *stage,
+               ClutterFrameInfo *frame_info,
+               MetaCompositor   *compositor);
  
-+G_DEFINE_TYPE (MetaCompositor, meta_compositor, G_TYPE_OBJECT)
++static void
++on_redirected_monitor_changed (MetaWindow     *window,
++                               int             old_monitor,
++                               MetaCompositor *compositor);
 +
- static void
- on_presented (ClutterStage     *stage,
-               CoglFrameEvent    event,
-@@ -131,11 +133,8 @@ meta_switch_workspace_completed (MetaCompositor *compositor)
- void
- meta_compositor_destroy (MetaCompositor *compositor)
+ static gboolean
+ is_modal (MetaDisplay *display)
  {
--  clutter_threads_remove_repaint_func (compositor->pre_paint_func_id);
--  clutter_threads_remove_repaint_func (compositor->post_paint_func_id);
--
--  if (compositor->have_x11_sync_object)
--    meta_sync_ring_destroy ();
-+  g_object_run_dispose (G_OBJECT (compositor));
-+  g_object_unref (compositor);
- }
+@@ -134,6 +139,11 @@ meta_compositor_destroy (MetaCompositor *compositor)
+   clutter_threads_remove_repaint_func (compositor->pre_paint_func_id);
+   clutter_threads_remove_repaint_func (compositor->post_paint_func_id);
  
- static void
-@@ -635,16 +634,54 @@ meta_shape_cow_for_window (MetaCompositor *compositor,
++  if (compositor->unredirected_window)
++    g_signal_handlers_disconnect_by_func (compositor->unredirected_window,
++                                          on_redirected_monitor_changed,
++                                          compositor);
++
+   if (compositor->have_x11_sync_object)
+     meta_sync_ring_destroy ();
+ }
+@@ -635,16 +645,54 @@ meta_shape_cow_for_window (MetaCompositor *compositor,
      }
  }
  
@@ -2851,81 +2764,21 @@ index 0854a19..7fc2943 100644
        meta_window_actor_set_unredirected (window_actor, FALSE);
      }
  
-@@ -654,6 +691,13 @@ set_unredirected_window (MetaCompositor *compositor,
+@@ -654,6 +702,12 @@ set_unredirected_window (MetaCompositor *compositor,
    if (compositor->unredirected_window != NULL)
      {
        MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (compositor->unredirected_window));
 +
 +      meta_monitor_manager_disable_scale_for_monitor (monitor_manager,
 +                                                      window->monitor);
-+      g_signal_connect_object (window, "monitor-changed",
-+                               G_CALLBACK (on_redirected_monitor_changed),
-+                               compositor, 0);
++      g_signal_connect (window, "monitor-changed",
++                        G_CALLBACK (on_redirected_monitor_changed), compositor);
 +
        meta_window_actor_set_unredirected (window_actor, TRUE);
      }
  }
-@@ -1274,12 +1318,20 @@ on_shadow_factory_changed (MetaShadowFactory *factory,
- MetaCompositor *
- meta_compositor_new (MetaDisplay *display)
- {
--  MetaBackend *backend = meta_get_backend ();
--  ClutterBackend *clutter_backend = meta_backend_get_clutter_backend (backend);
-   MetaCompositor *compositor;
- 
--  compositor = g_new0 (MetaCompositor, 1);
-+  compositor = g_object_new (META_TYPE_COMPOSITOR, NULL);
-   compositor->display = display;
-+
-+  return compositor;
-+}
-+
-+static void
-+meta_compositor_init (MetaCompositor *compositor)
-+{
-+  MetaBackend *backend = meta_get_backend ();
-+  ClutterBackend *clutter_backend = meta_backend_get_clutter_backend (backend);
-+
-   compositor->context = clutter_backend->cogl_context;
- 
-   g_signal_connect (meta_shadow_factory_get_default (),
-@@ -1297,7 +1349,33 @@ meta_compositor_new (MetaDisplay *display)
-                                            meta_post_paint_func,
-                                            compositor,
-                                            NULL);
--  return compositor;
-+}
-+
-+static void
-+meta_compositor_dispose (GObject *gobject)
-+{
-+  MetaCompositor *compositor = META_COMPOSITOR (gobject);
-+
-+  g_clear_handle_id (&compositor->pre_paint_func_id,
-+                     clutter_threads_remove_repaint_func);
-+  g_clear_handle_id (&compositor->post_paint_func_id,
-+                     clutter_threads_remove_repaint_func);
-+
-+  if (compositor->have_x11_sync_object)
-+    {
-+      meta_sync_ring_destroy ();
-+      compositor->have_x11_sync_object = FALSE;
-+    }
-+
-+  G_OBJECT_CLASS (meta_compositor_parent_class)->dispose (gobject);
-+}
-+
-+static void
-+meta_compositor_class_init (MetaCompositorClass *klass)
-+{
-+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-+
-+  gobject_class->dispose = meta_compositor_dispose;
- }
- 
- /**
 diff --git a/src/core/boxes-private.h b/src/core/boxes-private.h
-index 24c596b..bb88083 100644
+index 24c596b..f92837a 100644
 --- a/src/core/boxes-private.h
 +++ b/src/core/boxes-private.h
 @@ -157,6 +157,10 @@ gboolean meta_rectangle_overlaps_with_region (
@@ -2939,17 +2792,8 @@ index 24c596b..bb88083 100644
  /* Make the rectangle small enough to fit into one of the spanning_rects,
   * but make it no smaller than min_size.
   */
-@@ -284,4 +288,8 @@ void meta_rectangle_crop_and_scale (const MetaRectangle *rect,
-                                     int                  dst_height,
-                                     MetaRectangle       *dest);
- 
-+gboolean meta_rectangle_has_neighbor (const MetaRectangle *rect,
-+                                      const MetaRectangle *neighbor,
-+                                      MetaSide             neighbor_side);
-+
- #endif /* META_BOXES_PRIVATE_H */
 diff --git a/src/core/boxes.c b/src/core/boxes.c
-index 87f2d5d..7c30153 100644
+index 87f2d5d..95978c1 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 +2810,7 @@ index 87f2d5d..7c30153 100644
 +    {
 +      MetaRectangle *other = (MetaRectangle *) l->data;
 +
-+      if (other == rect)
++      if (rect == other || meta_rectangle_equal (rect, other))
 +        continue;
 +
 +      if (meta_rectangle_is_adjecent_to ((MetaRectangle *) rect, other))
@@ -2980,56 +2824,6 @@ index 87f2d5d..7c30153 100644
  
  void
  meta_rectangle_clamp_to_fit_into_region (const GList         *spanning_rects,
-@@ -2201,3 +2222,35 @@ meta_rectangle_crop_and_scale (const MetaRectangle *rect,
- 
-   meta_rectangle_from_clutter_rect (&tmp, META_ROUNDING_STRATEGY_GROW, dest);
- }
-+
-+gboolean
-+meta_rectangle_has_neighbor (const MetaRectangle *rect,
-+                             const MetaRectangle *neighbor,
-+                             MetaSide             neighbor_side)
-+{
-+  switch (neighbor_side)
-+    {
-+    case META_SIDE_RIGHT:
-+      if (neighbor->x == (rect->x + rect->width) &&
-+          meta_rectangle_vert_overlap (neighbor, rect))
-+        return TRUE;
-+      break;
-+    case META_SIDE_LEFT:
-+      if (rect->x == (neighbor->x + neighbor->width) &&
-+          meta_rectangle_vert_overlap (neighbor, rect))
-+        return TRUE;
-+      break;
-+    case META_SIDE_TOP:
-+      if (rect->y == (neighbor->y + neighbor->height) &&
-+          meta_rectangle_horiz_overlap (neighbor, rect))
-+        return TRUE;
-+      break;
-+    case META_SIDE_BOTTOM:
-+      if (neighbor->y == (rect->y + rect->height) &&
-+          meta_rectangle_horiz_overlap (neighbor, rect))
-+        return TRUE;
-+      break;
-+    }
-+
-+  return FALSE;
-+}
-diff --git a/src/core/display.c b/src/core/display.c
-index e1477d3..0a55d90 100644
---- a/src/core/display.c
-+++ b/src/core/display.c
-@@ -946,8 +946,7 @@ meta_display_close (MetaDisplay *display,
-   g_hash_table_destroy (display->wayland_windows);
-   g_hash_table_destroy (display->stamps);
- 
--  if (display->compositor)
--    meta_compositor_destroy (display->compositor);
-+  g_clear_object (&display->compositor);
- 
-   if (display->x11_display)
-     {
 diff --git a/src/core/window.c b/src/core/window.c
 index 62b2df8..d1cf7c3 100644
 --- a/src/core/window.c
@@ -3074,41 +2868,6 @@ index 62b2df8..d1cf7c3 100644
    if (old)
      g_signal_emit_by_name (window->display, "window-left-monitor",
                             old->number, window);
-diff --git a/src/meta/compositor.h b/src/meta/compositor.h
-index 31d14dd..7fad05b 100644
---- a/src/meta/compositor.h
-+++ b/src/meta/compositor.h
-@@ -28,6 +28,11 @@
- #include <meta/window.h>
- #include <meta/workspace.h>
- 
-+#define META_TYPE_COMPOSITOR (meta_compositor_get_type ())
-+
-+META_EXPORT
-+G_DECLARE_FINAL_TYPE (MetaCompositor, meta_compositor, META, COMPOSITOR, GObject)
-+
- /**
-  * MetaCompEffect:
-  * @META_COMP_EFFECT_CREATE: The window is newly created
-diff --git a/src/meta/display.h b/src/meta/display.h
-index 1703920..0eb1629 100644
---- a/src/meta/display.h
-+++ b/src/meta/display.h
-@@ -226,10 +226,10 @@ void meta_display_set_cursor (MetaDisplay *display,
-  */
- typedef enum
- {
--  META_DISPLAY_UP,
--  META_DISPLAY_DOWN,
--  META_DISPLAY_LEFT,
--  META_DISPLAY_RIGHT
-+  META_DISPLAY_UP = META_DIRECTION_UP,
-+  META_DISPLAY_DOWN = META_DIRECTION_DOWN,
-+  META_DISPLAY_LEFT = META_DIRECTION_LEFT,
-+  META_DISPLAY_RIGHT = META_DIRECTION_RIGHT,
- } MetaDisplayDirection;
- 
- META_EXPORT
 diff --git a/src/org.gnome.Mutter.DisplayConfig.xml b/src/org.gnome.Mutter.DisplayConfig.xml
 index 3abfa15..4ec6cd4 100644
 --- a/src/org.gnome.Mutter.DisplayConfig.xml