core: Avoid queueing resizes while changing workspace during window drag

We already have a user move/resize going on, so avoid botching it with window resizes with flags & META_MOVE_RESIZE_USER_ACTION == 0 that will trigger unintended constraints. https://gitlab.gnome.org/GNOME/mutter/issues/192 Closes: #192
wayland: Detach MetaWaylandActorSurface from its actor on dispose
2018-06-14 21:10:05 +02:00 · 2018-06-14 14:05:10 +02:00 · 2018-06-13 08:36:21 +00:00 · 2018-06-08 17:41:34 +02:00 · 2018-06-08 17:31:25 +02:00 · 2018-06-07 22:14:05 +02:00
53 changed files with 1120 additions and 962 deletions
--- a/39
+++ b/39
@@ -1,43 +1,34 @@
-3.28.3
+3.29.2
 ======
+* Fix size change animations on wayland [Georges; #780292]
 * Handle touch events on server-side titlebars [Carlos; #770185]
-* Fix crash with unhandled mouse buttons on titlebars [Olivier; #160]
-* Fix Korean Hangul support on wayland [Changwoo; #152]
-* Fix crash when taking up from suspend [Jonas; #786929]
-* Fix crash with parent-less modal dialogs [Olivier; #174]
-* Misc. bug fixes [Olivier, Georges; #83, #112, #150, #104,
-
-Contributors:
-  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Georges Basile Stavracas Neto,
-  Changwoo Ryu, Marco Trevisan (Treviño)
-
-3.28.2
-======
-* Take inhibitors into account for monitoring idle [Bastien; #705942]
-* Fix window animations on wayland [Georges; #780292]
-* Misc. bug fixes [Mario, Jonas, Olivier, Florian; gnome-shell#157, #130,
-  #21, #124, !96, #138, !102, #781471]
+* Misc. bug fixes [Florian, Olivier, Jonas, Georges; #134, #124, !96, #138,
+  !102, #781471, #150]

 Contributors:
  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Florian Müllner,
-  Georges Basile Stavracas Neto, Bastien Nocera, Mario Sanchez Prada,
-  Ray Strode, Marco Trevisan (Treviño)
+  Georges Basile Stavracas Neto, Marco Trevisan (Treviño), Daniel van Vugt

-3.28.1
+Translators:
+  Daniel Șerbănescu [ro], Marcos Lans [gl], Dz Chen [zh_CN]
+
+3.29.1
 ======
-* Fix various input-method regressions [Carlos; #65, #74, #66]
+* Fix various input-method regressions [Carlos, Olivier; #65, #74, #66, #112]
 * Fix wayland build on FreeBSD [Ting-Wei; #792280, #792717]
 * Fix swapped colors in screenshots (again) [Carlos; #72]
 * Allow building with elogind [Rasmus; !46]
 * Consider display rotation for cursor [Olivier; #85]
 * Fall back to non-modifier GBM surfaces [Daniel; #84]
-* Disable KMS modifiers by default [Jonas; #81]
-* Misc bug fixes [handsome-feng; !45]
+* Take inhibitors into account for monitoring idle [Bastien; #705942]
+* Misc. bug fixes [handsome-feng, Olivier, Mario, Jonas; !45, #83, #104,
+  gnome-shell#157, #130, #21]

 Contributors:
  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, handsome-feng, Yussuf Khalil,
  Ting-Wei Lan, Aleksandr Mezin, Alberts Muktupāvels,
-  Georges Basile Stavracas Neto, Benjamin Otte, Daniel Stone, Rasmus Thomsen,
+  Georges Basile Stavracas Neto, Bastien Nocera, Benjamin Otte,
+  Mario Sanchez Prada, Daniel Stone, Ray Strode, Rasmus Thomsen,
  Marco Trevisan (Treviño), Daniel van Vugt

 Translators:
--- a/clutter/clutter/cally/cally-util.c
+++ b/clutter/clutter/cally/cally-util.c
@@ -214,6 +214,8 @@ cally_util_simulate_snooper_install (void)
                    G_CALLBACK (cally_util_stage_added_cb), cally_key_snooper);
  g_signal_connect (G_OBJECT (stage_manager), "stage-removed",
                    G_CALLBACK (cally_util_stage_removed_cb), cally_key_snooper);
+
+  g_slist_free (stage_list);
 }

 static void
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -2821,7 +2821,7 @@ _clutter_actor_fully_transform_vertices (ClutterActor *self,
  /* Note: we pass NULL as the ancestor because we don't just want the modelview
   * that gets us to stage coordinates, we want to go all the way to eye
   * coordinates */
-  _clutter_actor_apply_relative_transformation_matrix (self, NULL, &modelview);
+  _clutter_actor_get_relative_transformation_matrix (self, NULL, &modelview);

  /* Fetch the projection and viewport */
  _clutter_stage_get_projection_matrix (CLUTTER_STAGE (stage), &projection);
--- a/clutter/clutter/x11/clutter-input-device-xi2.c
+++ b/clutter/clutter/x11/clutter-input-device-xi2.c
@@ -110,7 +110,8 @@ clutter_input_device_xi2_finalize (GObject *object)
  if (device_xi2->wacom_device)
    libwacom_destroy (device_xi2->wacom_device);

-  g_array_unref (device_xi2->group_modes);
+  if (device_xi2->group_modes)
+    g_array_unref (device_xi2->group_modes);
 #endif

  G_OBJECT_CLASS (clutter_input_device_xi2_parent_class)->finalize (object);
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 AC_PREREQ(2.62)

 m4_define([mutter_major_version], [3])
-m4_define([mutter_minor_version], [28])
-m4_define([mutter_micro_version], [3])
+m4_define([mutter_minor_version], [29])
+m4_define([mutter_micro_version], [2])

 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
--- a/data/org.gnome.mutter.gschema.xml.in
+++ b/data/org.gnome.mutter.gschema.xml.in
@@ -120,10 +120,6 @@
                                        framebuffers instead of window content,
                                        to manage HiDPI monitors. Does not
                                        require a restart.
-        • “remote-desktop”            — enables remote desktop support. To support
-                                        remote desktop with screen sharing,
-                                        “screen-cast” must also be enabled.
-        • “screen-cast”               — enables screen cast support.
      </description>
    </key>

--- a/po/gl.po
+++ b/po/gl.po
@@ -14,16 +14,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-03-01 10:47+0000\n"
-"PO-Revision-Date: 2018-03-03 14:18+0200\n"
-"Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
+"POT-Creation-Date: 2018-03-03 13:19+0000\n"
+"PO-Revision-Date: 2018-05-07 19:37+0200\n"
+"Last-Translator: marcos <marcoslansgarza@gmail.com>\n"
 "Language-Team: Galician\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Poedit 2.0.6\n"
 "X-Project-Style: gnome\n"

 #: data/50-mutter-navigation.xml:6
@@ -100,7 +100,7 @@ msgstr "Cambia á xanela anterior dun aplicativo"

 #: data/50-mutter-navigation.xml:70
 msgid "Switch system controls"
-msgstr "Cambiar entre os controles do sistema"
+msgstr "Cambiar entre os controis do sistema"

 #: data/50-mutter-navigation.xml:75
 msgid "Switch to previous system control"
@@ -124,7 +124,7 @@ msgstr "Cambia directamente á xanela anterior do aplicativo"

 #: data/50-mutter-navigation.xml:97
 msgid "Switch system controls directly"
-msgstr "Cambiar entre os controles do sistema directamente"
+msgstr "Cambiar entre os controis do sistema directamente"

 #: data/50-mutter-navigation.xml:102
 msgid "Switch directly to previous system control"
--- a/po/ro.po
+++ b/po/ro.po
@@ -4,14 +4,13 @@
 # Mugurel Tudor <mugurelu@gnome.ro>, 2002-2004, 2005, 2006, 2007.
 # Adi Roiban https://launchpad.net/~adiroiban, 2008, 2009
 # Lucian Adrian Grijincu <lucian.grijincu@gmail.com>, 2011.
-# Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>, 2015.
+# Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>, 2015, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity.HEAD.ro\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter&"
-"keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-10-21 11:43+0000\n"
-"PO-Revision-Date: 2015-10-22 19:10+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
+"POT-Creation-Date: 2018-04-26 07:32+0000\n"
+"PO-Revision-Date: 2018-04-30 07:54+0200\n"
 "Last-Translator: Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>\n"
 "Language-Team: Gnome Romanian Translation Team\n"
 "Language: ro\n"
@@ -23,272 +22,256 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"

-#: ../data/50-mutter-navigation.xml.in.h:1
+#: data/50-mutter-navigation.xml:6
 msgid "Navigation"
 msgstr "Navigare"

-#: ../data/50-mutter-navigation.xml.in.h:2
+#: data/50-mutter-navigation.xml:9
 msgid "Move window to workspace 1"
 msgstr "Mută fereastra pe spațiul de lucru 1"

-#: ../data/50-mutter-navigation.xml.in.h:3
+#: data/50-mutter-navigation.xml:12
 msgid "Move window to workspace 2"
 msgstr "Mută fereastra pe spațiul de lucru 2"

-#: ../data/50-mutter-navigation.xml.in.h:4
+#: data/50-mutter-navigation.xml:15
 msgid "Move window to workspace 3"
 msgstr "Mută fereastra pe spațiul de lucru 3"

-#: ../data/50-mutter-navigation.xml.in.h:5
+#: data/50-mutter-navigation.xml:18
 msgid "Move window to workspace 4"
 msgstr "Mută fereastra pe spațiul de lucru 4"

-#: ../data/50-mutter-navigation.xml.in.h:6
+#: data/50-mutter-navigation.xml:21
 msgid "Move window to last workspace"
 msgstr "Mută fereastra pe spațiul de lucru anterior"

-#: ../data/50-mutter-navigation.xml.in.h:7
-msgid "Move window one workspace to the left"
-msgstr "Mută fereastra pe spațiul de lucru de la stânga"
-
-#: ../data/50-mutter-navigation.xml.in.h:8
-msgid "Move window one workspace to the right"
-msgstr "Mută fereastra pe spațiul de lucru de la dreapta"
-
-#: ../data/50-mutter-navigation.xml.in.h:9
+#: data/50-mutter-navigation.xml:24
 msgid "Move window one workspace up"
 msgstr "Mută fereastra pe spațiul de lucru de mai sus"

-#: ../data/50-mutter-navigation.xml.in.h:10
+#: data/50-mutter-navigation.xml:27
 msgid "Move window one workspace down"
 msgstr "Mută fereastra pe spațiul de lucru de mai jos"

-#: ../data/50-mutter-navigation.xml.in.h:11
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one monitor to the left"
 msgstr "Mută fereastra cu un monitor la stânga"

-#: ../data/50-mutter-navigation.xml.in.h:12
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one monitor to the right"
 msgstr "Mută fereastra un monitor la dreapta"

-#: ../data/50-mutter-navigation.xml.in.h:13
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor up"
 msgstr "Mută fereastra cu un monitor mai sus"

-#: ../data/50-mutter-navigation.xml.in.h:14
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor down"
 msgstr "Mută fereastra cu un monitor mai jos"

-#: ../data/50-mutter-navigation.xml.in.h:15
+#: data/50-mutter-navigation.xml:43
 msgid "Switch applications"
 msgstr "Comută aplicațiile"

-#: ../data/50-mutter-navigation.xml.in.h:16
+#: data/50-mutter-navigation.xml:48
 msgid "Switch to previous application"
 msgstr "Schimbă la aplicația anterioară"

-#: ../data/50-mutter-navigation.xml.in.h:17
+#: data/50-mutter-navigation.xml:52
 msgid "Switch windows"
 msgstr "Schimbă ferestre"

-#: ../data/50-mutter-navigation.xml.in.h:18
+#: data/50-mutter-navigation.xml:57
 msgid "Switch to previous window"
 msgstr "Schimbă la fereastra anterioară"

-#: ../data/50-mutter-navigation.xml.in.h:19
+#: data/50-mutter-navigation.xml:61
 msgid "Switch windows of an application"
 msgstr "Schimbă ferestrele unei aplicații"

-#: ../data/50-mutter-navigation.xml.in.h:20
+#: data/50-mutter-navigation.xml:66
 msgid "Switch to previous window of an application"
 msgstr "Schimbă la fereastra anterioară a unei aplicații"

-#: ../data/50-mutter-navigation.xml.in.h:21
+#: data/50-mutter-navigation.xml:70
 msgid "Switch system controls"
 msgstr "Schimbă comenzile de sistem"

-#: ../data/50-mutter-navigation.xml.in.h:22
+#: data/50-mutter-navigation.xml:75
 msgid "Switch to previous system control"
 msgstr "Schimbă la comanda de control anterioară"

-#: ../data/50-mutter-navigation.xml.in.h:23
+#: data/50-mutter-navigation.xml:79
 msgid "Switch windows directly"
 msgstr "Schimbă ferestrele în mod direct"

-#: ../data/50-mutter-navigation.xml.in.h:24
+#: data/50-mutter-navigation.xml:84
 msgid "Switch directly to previous window"
 msgstr "Schimbă la fereastra anterioară în mod direct"

-#: ../data/50-mutter-navigation.xml.in.h:25
+#: data/50-mutter-navigation.xml:88
 msgid "Switch windows of an app directly"
-msgstr "Schimbă în mod direct ferestrele uneui aplicații "
+msgstr "Comută direct ferestrele unei aplicații"

-#: ../data/50-mutter-navigation.xml.in.h:26
+#: data/50-mutter-navigation.xml:93
 msgid "Switch directly to previous window of an app"
 msgstr "Schimbă în mod direct la fereastra anterioară a unei aplicații"

-#: ../data/50-mutter-navigation.xml.in.h:27
+#: data/50-mutter-navigation.xml:97
 msgid "Switch system controls directly"
 msgstr "Schimbă comenzile de sistem în mod direct"

-#: ../data/50-mutter-navigation.xml.in.h:28
+#: data/50-mutter-navigation.xml:102
 msgid "Switch directly to previous system control"
 msgstr "Schimbă în mod direct la o comandă de sistem anterioară"

-#: ../data/50-mutter-navigation.xml.in.h:29
+#: data/50-mutter-navigation.xml:105
 msgid "Hide all normal windows"
-msgstr "Ascunde toate ferestrele normale "
+msgstr "Ascunde toate ferestrele normale"

-#: ../data/50-mutter-navigation.xml.in.h:30
+#: data/50-mutter-navigation.xml:108
 msgid "Switch to workspace 1"
 msgstr "Comută la spațiul de lucru 1"

-#: ../data/50-mutter-navigation.xml.in.h:31
+#: data/50-mutter-navigation.xml:111
 msgid "Switch to workspace 2"
 msgstr "Comută la spațiul de lucru 2"

-#: ../data/50-mutter-navigation.xml.in.h:32
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 3"
 msgstr "Comută la spațiul de lucru 3"

-#: ../data/50-mutter-navigation.xml.in.h:33
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 4"
 msgstr "Comută la spațiul de lucru 4"

-#: ../data/50-mutter-navigation.xml.in.h:34
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to last workspace"
-msgstr "Comută la ultimul spațiu de lucru "
+msgstr "Comută la ultimul spațiu de lucru"

-#: ../data/50-mutter-navigation.xml.in.h:35
-msgid "Move to workspace left"
-msgstr "Mută pe spațiul de lucru din stânga"
-
-#: ../data/50-mutter-navigation.xml.in.h:36
-msgid "Move to workspace right"
-msgstr "Mută pe spațiul de lucru din dreapta"
-
-#: ../data/50-mutter-navigation.xml.in.h:37
+#: data/50-mutter-navigation.xml:123
 msgid "Move to workspace above"
 msgstr "Mută pe spațiul de lucru deasupra"

-#: ../data/50-mutter-navigation.xml.in.h:38
+#: data/50-mutter-navigation.xml:126
 msgid "Move to workspace below"
 msgstr "Mută pe spațiul de lucru de jos"

-#: ../data/50-mutter-system.xml.in.h:1
+#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
 msgid "System"
 msgstr "Sistem"

-#: ../data/50-mutter-system.xml.in.h:2
+#: data/50-mutter-system.xml:8
 msgid "Show the run command prompt"
 msgstr "Arată prompterul de comandă al comenzii run (rulează)"

-#: ../data/50-mutter-system.xml.in.h:3
+#: data/50-mutter-system.xml:10
 msgid "Show the activities overview"
 msgstr "Arată prezentarea generală a activităților"

-#: ../data/50-mutter-windows.xml.in.h:1
+#: data/50-mutter-wayland.xml:8
+msgid "Restore the keyboard shortcuts"
+msgstr "Restaurează scurtăturile de tastatură"
+
+#: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Ferestre"

-#: ../data/50-mutter-windows.xml.in.h:2
+#: data/50-mutter-windows.xml:8
 msgid "Activate the window menu"
 msgstr "Activează meniul ferestrei"

-#: ../data/50-mutter-windows.xml.in.h:3
+#: data/50-mutter-windows.xml:10
 msgid "Toggle fullscreen mode"
 msgstr "Comută modul pe tot ecranul"

-#: ../data/50-mutter-windows.xml.in.h:4
+#: data/50-mutter-windows.xml:12
 msgid "Toggle maximization state"
 msgstr "Comută starea de maximizare"

-#: ../data/50-mutter-windows.xml.in.h:5
+#: data/50-mutter-windows.xml:14
 msgid "Maximize window"
 msgstr "Maximizează fereastra"

-#: ../data/50-mutter-windows.xml.in.h:6
+#: data/50-mutter-windows.xml:16
 msgid "Restore window"
 msgstr "Restabilește fereastra"

-#: ../data/50-mutter-windows.xml.in.h:7
-msgid "Toggle shaded state"
-msgstr "Comută starea de umbrire"
-
-#: ../data/50-mutter-windows.xml.in.h:8
+#: data/50-mutter-windows.xml:18
 msgid "Close window"
 msgstr "Închide fereastra"

-#: ../data/50-mutter-windows.xml.in.h:9
+#: data/50-mutter-windows.xml:20
 msgid "Hide window"
 msgstr "Ascunde fereastra"

-#: ../data/50-mutter-windows.xml.in.h:10
+#: data/50-mutter-windows.xml:22
 msgid "Move window"
 msgstr "Mută fereastra"

-#: ../data/50-mutter-windows.xml.in.h:11
+#: data/50-mutter-windows.xml:24
 msgid "Resize window"
 msgstr "Redimensionează fereastra"

-#: ../data/50-mutter-windows.xml.in.h:12
+#: data/50-mutter-windows.xml:27
 msgid "Toggle window on all workspaces or one"
 msgstr "Comută fereastra pe toate spațiile de lucru sau doar pe unul"

-#: ../data/50-mutter-windows.xml.in.h:13
+#: data/50-mutter-windows.xml:29
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Ridică fereastra dacă este acoperită, altfel, coboar-o"

-#: ../data/50-mutter-windows.xml.in.h:14
+#: data/50-mutter-windows.xml:31
 msgid "Raise window above other windows"
 msgstr "Ridică fereastra deasupra celorlalte ferestre"

-#: ../data/50-mutter-windows.xml.in.h:15
+#: data/50-mutter-windows.xml:33
 msgid "Lower window below other windows"
 msgstr "Coboară fereastra sub alte ferestre"

-#: ../data/50-mutter-windows.xml.in.h:16
+#: data/50-mutter-windows.xml:35
 msgid "Maximize window vertically"
 msgstr "Maximizează fereastra pe verticală"

-#: ../data/50-mutter-windows.xml.in.h:17
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window horizontally"
 msgstr "Maximizează fereastra pe orizontală"

-#: ../data/50-mutter-windows.xml.in.h:18
+#: data/50-mutter-windows.xml:41
 msgid "View split on left"
 msgstr "Împarte în stânga"

-#: ../data/50-mutter-windows.xml.in.h:19
+#: data/50-mutter-windows.xml:45
 msgid "View split on right"
 msgstr "Împarte în dreapta"

-#: ../data/mutter.desktop.in.h:1
+#: data/mutter.desktop.in:4
 msgid "Mutter"
 msgstr "Mutter"

-#: ../data/org.gnome.mutter.gschema.xml.in.h:1
+#: data/org.gnome.mutter.gschema.xml.in:7
 msgid "Modifier to use for extended window management operations"
 msgstr ""
 "Modificatorul folosit pentru operațiile extinse de management al ferestrelor"

-#: ../data/org.gnome.mutter.gschema.xml.in.h:2
+#: 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."
+"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 ""
-"Această cheie va iniția „overlay”-ul, care este o combinație între o privire "
-"de ansamblu a ferestrelor și un sistemul de lansare de aplicații. Implicit "
-"este testa „Windows” pe hardware PC. Este de așteptat ca această cheie să "
-"fie sau implicit sau setat la șirul vid."
+"Această cheie va iniția „suprapunerea”, care este o combinație între o "
+"privire de ansamblu a ferestrelor și un sistem de lansare de aplicații. "
+"Implicit este tasta „Windows” pe hardware PC. Este de așteptat ca această "
+"legătură să fie ori stabilită la implicit sau la șirul vid."

-#: ../data/org.gnome.mutter.gschema.xml.in.h:3
+#: data/org.gnome.mutter.gschema.xml.in:20
 msgid "Attach modal dialogs"
 msgstr "Atașează dialogurile modale"

-#: ../data/org.gnome.mutter.gschema.xml.in.h:4
+#: 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 "
@@ -298,13 +281,12 @@ msgstr ""
 "modale apar atașate la bara de titlu a ferestrei părinte și sunt mutate "
 "împreună cu fereastra părinte."

-#: ../data/org.gnome.mutter.gschema.xml.in.h:5
-#, fuzzy
+#: data/org.gnome.mutter.gschema.xml.in:30
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
-"Activează mozaicul lateral la plasarea ferestrelor pe marginile ecranului"
+"Activează mozaicul de margine la plasarea ferestrelor pe marginile ecranului"

-#: ../data/org.gnome.mutter.gschema.xml.in.h:6
+#: 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 "
@@ -315,25 +297,25 @@ msgstr ""
 "pentru a acoperi jumătate din suprafața disponibilă. Plasarea ferestrelor pe "
 "marginea de sus a ecranului le maximizează complet."

-#: ../data/org.gnome.mutter.gschema.xml.in.h:7
+#: data/org.gnome.mutter.gschema.xml.in:40
 msgid "Workspaces are managed dynamically"
 msgstr "Spațiile de lucru sunt gestionate în mod dinamic"

-#: ../data/org.gnome.mutter.gschema.xml.in.h:8
+#: data/org.gnome.mutter.gschema.xml.in:41
 msgid ""
-"Determines whether workspaces are managed dynamically or whether there's a "
+"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 ""
-"Determină dacă spațiile de lucru sunt gestionate în mod dinamic sau dacă "
-"există un număr static de spații de lucru (determinată de cheia „num-"
-"workspaces” din ”org.gnome.desktop.wm.preferences”)"
+"Determină dacă spațiile de lucru sunt administrate dinamic sau dacă există "
+"un număr static de spații de lucru (determinat de cheia num-workspaces din "
+"org.gnome.desktop.wm.preferences)"

-#: ../data/org.gnome.mutter.gschema.xml.in.h:9
+#: data/org.gnome.mutter.gschema.xml.in:50
 msgid "Workspaces only on primary"
 msgstr "Spații de lucru doar pe ecranul principal"

-#: ../data/org.gnome.mutter.gschema.xml.in.h:10
+#: 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."
@@ -342,11 +324,11 @@ msgstr ""
 "ferestrele de pe toate monitoarele sau doar pentru ferestrele de pe "
 "monitorul principal."

-#: ../data/org.gnome.mutter.gschema.xml.in.h:11
+#: data/org.gnome.mutter.gschema.xml.in:59
 msgid "No tab popup"
 msgstr "Fără popup pentru tab"

-#: ../data/org.gnome.mutter.gschema.xml.in.h:12
+#: data/org.gnome.mutter.gschema.xml.in:60
 msgid ""
 "Determines whether the use of popup and highlight frame should be disabled "
 "for window cycling."
@@ -354,42 +336,40 @@ msgstr ""
 "Determină dacă utilizarea unui popup sau a unui cadrul evidențiat ar trebui "
 "să fie dezactivată pentru rotirea ferestrelor."

-#: ../data/org.gnome.mutter.gschema.xml.in.h:13
+#: data/org.gnome.mutter.gschema.xml.in:68
 msgid "Delay focus changes until the pointer stops moving"
 msgstr ""
 "Întârzie schimbările de focalizare până când cursorul încetează să se miște"

-#: ../data/org.gnome.mutter.gschema.xml.in.h:14
+#: 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."
+"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 ""
-"Dacă este activat iar modul de focalizare este „alunecos” sau „maus”, "
-"focalizarea nu va fi schimbată imediat după intrarea în câmpul unei "
-"ferestre, ci doar după ce pointerul încetează să se miște."
+"Dacă este stabilit ca adevărat, iar modul de focalizare este ori „neglijent” "
+"ori „maus”, atunci focalizarea nu va fi schimbată imediat la intrarea într-o "
+"fereastră, ci doar după ce indicatorul nu se mai mișcă."

-#: ../data/org.gnome.mutter.gschema.xml.in.h:15
-#, fuzzy
+#: data/org.gnome.mutter.gschema.xml.in:79
 msgid "Draggable border width"
-msgstr "Lățimea margini ce poate fi acționată"
+msgstr "Lățimea marginii ce poate fi plasată"

-#: ../data/org.gnome.mutter.gschema.xml.in.h:16
-#, fuzzy
+#: data/org.gnome.mutter.gschema.xml.in:80
 msgid ""
-"The amount of total draggable borders. If the theme's visible borders are "
+"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 ""
-"Numărul marginilor ce pot fi acționate. Dacă marginile vizibile ale temei "
-"sunt insuficiente vor fi adăugate margini invizibile pentru a completa "
-"aceast număr."
+"Numărul total de margini ce pot fi plasate. Dacă marginile vizibile ale "
+"temei nu sunt suficiente, vor fi adăugate margini invizibile pentru a "
+"respecta această valoare."

-#: ../data/org.gnome.mutter.gschema.xml.in.h:17
+#: data/org.gnome.mutter.gschema.xml.in:89
 msgid "Auto maximize nearly monitor sized windows"
 msgstr ""
 "Maximizează automat ferestrele de dimensiune apropiată de cea a monitorului"

-#: ../data/org.gnome.mutter.gschema.xml.in.h:18
+#: data/org.gnome.mutter.gschema.xml.in:90
 msgid ""
 "If enabled, new windows that are initially the size of the monitor "
 "automatically get maximized."
@@ -397,11 +377,11 @@ msgstr ""
 "Dacă este activată, ferestrele noi care sunt inițial de mărimea monitorului "
 "sunt maximizate în mod automat."

-#: ../data/org.gnome.mutter.gschema.xml.in.h:19
+#: data/org.gnome.mutter.gschema.xml.in:98
 msgid "Place new windows in the center"
 msgstr "Plasează ferestre noi în centru"

-#: ../data/org.gnome.mutter.gschema.xml.in.h:20
+#: 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."
@@ -409,107 +389,262 @@ msgstr ""
 "Când este adevărat, ferestrele noi vor fi plasate în centrul ecranului activ "
 "al monitorului."

-#: ../data/org.gnome.mutter.gschema.xml.in.h:21
+#: data/org.gnome.mutter.gschema.xml.in:107
+msgid "Enable experimental features"
+msgstr "Activează funcționalitățile experimentale"
+
+#: 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. • “remote-desktop” — "
+"enables remote desktop support. To support remote desktop with screen "
+"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
+"screen cast support."
+msgstr ""
+"Pentru a activa funcționalitățile experimentale, adăugați cuvântul cheie al "
+"funcționalității la listă. Dacă funcționalitatea necesită sau nu repornirea "
+"compunătorului depinde de funcționalitatea dată. Nu este necesar ca "
+"funcționalitatea experimentală să fie încă disponibilă, sau configurabilă. "
+"Nu vă așteptați să adăugați ceva la această configurare care va rezista "
+"timpului. Cuvintele cheie posibile în mod curent: • “scale-monitor-"
+"framebuffer” — face ca mutter să treacă implicit la aranjarea monitoarelor "
+"logice într-un spațiu logic de coordonate pixel, în timpul scalării de "
+"framebuffer-uri de monitor în locul conținutului ferestrei, pentru a "
+"gestiona monitoare HiDPI. Nu necesită o repornire. • “remote-desktop” — "
+"activează suportul pentru desktop la distanță. Pentru a suporta desktop la "
+"distanță cu partajarea ecranului, trebuie să fie activat și „screen-cast”. • "
+"“screen-cast” — activează suportul pentru înregistrarea ecranului."
+
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Selectează fereastra din popup-ul tabului"

-#: ../data/org.gnome.mutter.gschema.xml.in.h:22
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Elimină popup-ul pentru tab"

-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:1
+#: data/org.gnome.mutter.gschema.xml.in:155
+msgid "Switch monitor configurations"
+msgstr "Comută configurațiile de monitor"
+
+#: data/org.gnome.mutter.gschema.xml.in:160
+msgid "Rotates the built-in monitor configuration"
+msgstr "Rotește configurarea de monitor integrat"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Comută la terminalul virtual 1"

-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:2
+#: data/org.gnome.mutter.wayland.gschema.xml.in:10
 msgid "Switch to VT 2"
 msgstr "Comută la terminalul virtual 2"

-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:3
+#: data/org.gnome.mutter.wayland.gschema.xml.in:14
 msgid "Switch to VT 3"
 msgstr "Comută la terminalul virtual 3"

-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:4
+#: data/org.gnome.mutter.wayland.gschema.xml.in:18
 msgid "Switch to VT 4"
 msgstr "Comută la terminalul virtual 4"

-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:5
+#: data/org.gnome.mutter.wayland.gschema.xml.in:22
 msgid "Switch to VT 5"
 msgstr "Comută la terminalul virtual 5"

-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:6
+#: data/org.gnome.mutter.wayland.gschema.xml.in:26
 msgid "Switch to VT 6"
 msgstr "Comută la terminalul virtual 6"

-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:7
+#: data/org.gnome.mutter.wayland.gschema.xml.in:30
 msgid "Switch to VT 7"
 msgstr "Comută la terminalul virtual 7"

-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
+#: data/org.gnome.mutter.wayland.gschema.xml.in:34
 msgid "Switch to VT 8"
 msgstr "Comută la terminalul virtual 8"

-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
+#: data/org.gnome.mutter.wayland.gschema.xml.in:38
 msgid "Switch to VT 9"
 msgstr "Comută la terminalul virtual 9"

-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
+#: data/org.gnome.mutter.wayland.gschema.xml.in:42
 msgid "Switch to VT 10"
 msgstr "Comută la terminalul virtual 10"

-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
+#: data/org.gnome.mutter.wayland.gschema.xml.in:46
 msgid "Switch to VT 11"
 msgstr "Comută la terminalul virtual 11"

-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
+#: data/org.gnome.mutter.wayland.gschema.xml.in:50
 msgid "Switch to VT 12"
 msgstr "Comută la terminalul virtual 12"

-#: ../src/backends/meta-monitor-manager.c:500
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Reactivează scurtăturile"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:64
+msgid "Allow grabs with Xwayland"
+msgstr "Permite capturi de tastatură cu Xwayland"
+
+#: 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 ""
+"Permite capturile de tastatură emise de aplicațiile X11 care rulează în "
+"Xwayland să fie luate în considerare. Pentru ca o captură X11 să fie luată "
+"în considerare în Wayland, clientul trebuie ori să trimită un mesaj specific "
+"ClientMessage X11 la fereastra root ori să se numere printre aplicațiile "
+"permise în cheia „xwayland-grab-access-rules”."
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:77
+msgid "Xwayland applications allowed to issue keyboard grabs"
+msgstr "Aplicațiile Xwayland sunt permise de a emite capturi de tastatură"
+
+#: 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 ""
+"Listează numele resurselor sau clasa resurselor ale ferestrelor X11 permise "
+"sau nepermise să emită capturi de tastatură X11 în Xwayland. Numele resursei "
+"sau clasa resursei a unei ferestre X11 date pot fi obținute utilizând "
+"comanda „xprop WM_CLASS*. Metacaracterele „*” și jokerii „?” în valori sunt "
+"suportați. Valorile care încep cu „!” sunt adăugate în lista de interziceri, "
+"care are prioritate peste lista de permisiuni, pentru a revoca aplicații din "
+"lista de sistem implicită. Lista de sistem implicită include următoarele "
+"aplicații: „@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Utilizatorii pot să "
+"întrerupă o captură existentă prin utilizarea scurtăturii de tastatură "
+"specifice definite de tasta de stabilire a combinațiilor de taste „restore-"
+"shortcuts”."
+
+#. TRANSLATORS: This string refers to a button that switches between
+#. * different modes.
+#.
+#: src/backends/meta-input-settings.c:2325
+#, c-format
+msgid "Mode Switch (Group %d)"
+msgstr "Comutator de mod (grupul %d)"
+
+#. TRANSLATORS: This string refers to an action, cycles drawing tablets'
+#. * mapping through the available outputs.
+#.
+#: src/backends/meta-input-settings.c:2348
+msgid "Switch monitor"
+msgstr "Comută monitorul"
+
+#: src/backends/meta-input-settings.c:2350
+msgid "Show on-screen help"
+msgstr "Arată ajutorul virtual"
+
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Afișaj integrat"

-#: ../src/backends/meta-monitor-manager.c:526
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Necunoscut"

-#: ../src/backends/meta-monitor-manager.c:528
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Afișaj necunoscut"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:536
+#: src/backends/meta-monitor-manager.c:936
 #, c-format
 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:456
+#: src/compositor/compositor.c:481
 #, c-format
 msgid ""
-"Another compositing manager is already running on screen %i on display \"%s"
-"\"."
+"Another compositing manager is already running on screen %i on display “%s”."
 msgstr ""
-"Un alt administrator de ferestre compozit rulează deja pe ecranul %i pe "
+"Un alt administrator de ferestre de compunere rulează deja pe ecranul %i pe "
 "afișajul „%s”."

-#: ../src/core/bell.c:185
+#: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Eveniment sonor"

-#: ../src/core/delete.c:127
+#: src/core/display.c:608
+#, c-format
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "Nu s-a putut deschide afișajul sistemului de ferestre X „%s”\n"
+
+#: src/core/main.c:190
+msgid "Disable connection to session manager"
+msgstr "Dezactivează conexiunea la administratorul de sesiune"
+
+#: src/core/main.c:196
+msgid "Replace the running window manager"
+msgstr "Înlocuiește administratorul de ferestre curent"
+
+#: src/core/main.c:202
+msgid "Specify session management ID"
+msgstr "Specifică ID-ul administrării de sesiune"
+
+#: src/core/main.c:207
+msgid "X Display to use"
+msgstr "Ecranul X ce va fi folosit"
+
+#: src/core/main.c:213
+msgid "Initialize session from savefile"
+msgstr "Inițializează sesiunea din fișierul salvat"
+
+#: src/core/main.c:219
+msgid "Make X calls synchronous"
+msgstr "Realizează apelurile X sincron"
+
+#: src/core/main.c:226
+msgid "Run as a wayland compositor"
+msgstr "Rulează ca un compunător wayland"
+
+#: src/core/main.c:232
+msgid "Run as a nested compositor"
+msgstr "Rulează ca un compunător imbricat"
+
+#: src/core/main.c:240
+msgid "Run as a full display server, rather than nested"
+msgstr "Rulează ca server de afișare și nu ca server imbricat"
+
+#: src/core/main.c:246
+msgid "Run with X11 backend"
+msgstr "Rulează cu backend X11"
+
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
 #, c-format
 msgid "“%s” is not responding."
 msgstr "„%s” nu răspunde."

-#: ../src/core/delete.c:129
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
 msgstr "Aplicația nu răspunde."

-#: ../src/core/delete.c:134
+#: src/core/meta-close-dialog-default.c:154
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -517,112 +652,95 @@ msgstr ""
 "Puteți alege între a aștepta pentru câteva secunde ca aplicația să continue "
 "sau a forța terminarea aplicației."

-#: ../src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Așteaptă"
-
-#: ../src/core/delete.c:141
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "_Forțează închiderea"

-#: ../src/core/display.c:563
-#, c-format
-msgid "Failed to open X Window System display '%s'\n"
-msgstr "Nu s-a putut deschide afișajul X Window System „%s”\n"
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Așteaptă"

-#: ../src/core/main.c:176
-msgid "Disable connection to session manager"
-msgstr "Dezactivează conexiunea la administratorul de sesiune"
-
-#: ../src/core/main.c:182
-msgid "Replace the running window manager"
-msgstr "Înlocuiește administratorul de ferestre curent"
-
-#: ../src/core/main.c:188
-msgid "Specify session management ID"
-msgstr "Specifică ID-ul administrării de sesiune"
-
-#: ../src/core/main.c:193
-msgid "X Display to use"
-msgstr "Ecranul X ce va fi folosit"
-
-#: ../src/core/main.c:199
-msgid "Initialize session from savefile"
-msgstr "Inițializează sesiunea din fișierul salvat"
-
-#: ../src/core/main.c:205
-msgid "Make X calls synchronous"
-msgstr "Realizează apelurile X sincron"
-
-#: ../src/core/main.c:212
-msgid "Run as a wayland compositor"
-msgstr "Rulează ca compozitor wayland"
-
-#: ../src/core/main.c:220
-msgid "Run as a full display server, rather than nested"
-msgstr "Rulează ca server de afișare și nu ca server imbricat"
-
-#: ../src/core/mutter.c:39
+#: src/core/mutter.c:39
 #, c-format
 msgid ""
 "mutter %s\n"
-"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
 msgstr ""
 "mutter %s\n"
-"Drepturi de autor (C) 2001--%d Havoc Pennington, Red Hat, Inc., și alții\n"
+"Drepturi de autor (C) 2001-%d Havoc Pennington, Red Hat, Inc., și alții\n"
 "Acesta este software liber; consultați codul sursă pentru condițiile de "
 "copiere.\n"
-"Nu există NICI O garanție; nici pentru COMERCIALIZARE sau UTILIZAREA ÎNTR-UN "
+"Nu există NICIO garanție; nici pentru COMERCIALIZARE sau UTILIZAREA ÎNTR-UN "
 "SCOP ANUME.\n"

-#: ../src/core/mutter.c:53
+#: src/core/mutter.c:53
 msgid "Print version"
 msgstr "Afișează versiunea"

-#: ../src/core/mutter.c:59
+#: src/core/mutter.c:59
 msgid "Mutter plugin to use"
 msgstr "Modul Mutter de utilizat"

-#: ../src/core/prefs.c:2050
+#: src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Spațiu de lucru %d"

-#: ../src/core/screen.c:526
+#: src/core/screen.c:583
 #, c-format
 msgid ""
-"Display \"%s\" already has a window manager; try using the --replace option "
-"to replace the current window manager."
+"Display “%s” already has a window manager; try using the --replace option to "
+"replace the current window manager."
 msgstr ""
-"Afișajul „%s” are deja un administrator de ferestre; încercați să folosiți "
+"Afișajul „%s” are deja un administrator de ferestre; încercați să utilizați "
 "opțiunea --replace (înlocuiește) pentru a înlocui administratorul de "
-"ferestre actual."
+"ferestre curent."

-#: ../src/core/screen.c:608
+#: src/core/screen.c:668
 #, c-format
-msgid "Screen %d on display '%s' is invalid\n"
-msgstr "Ecranul %d pe afișajul „%s” este invalid\n"
+msgid "Screen %d on display “%s” is invalid\n"
+msgstr "Ecranul %d de pe afișajul „%s” nu este valid\n"

-#: ../src/core/util.c:118
+#: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter a fost compilat fără suport pentru modul detaliat\n"

-#: ../src/x11/session.c:1815
+#: src/wayland/meta-wayland-tablet-pad.c:567
+#, c-format
+msgid "Mode Switch: Mode %d"
+msgstr "Comutator de mod: modul %d"
+
+#: src/x11/session.c:1818
 msgid ""
-"These windows do not support &quot;save current setup&quot; and will have to "
-"be restarted manually next time you log in."
+"These windows do not support “save current setup” and will have to be "
+"restarted manually next time you log in."
 msgstr ""
 "Aceste ferestre nu suportă „salvează configurarea curentă” și vor trebui "
 "repornite manual următoarea dată când vă veți autentifica."

-#: ../src/x11/window-props.c:549
+#: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (pe %s)"

+#~ msgid "Move window one workspace to the left"
+#~ msgstr "Mută fereastra pe spațiul de lucru de la stânga"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "Mută fereastra pe spațiul de lucru de la dreapta"
+
+#~ msgid "Move to workspace left"
+#~ msgstr "Mută pe spațiul de lucru din stânga"
+
+#~ msgid "Move to workspace right"
+#~ msgstr "Mută pe spațiul de lucru din dreapta"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "Comută starea de umbrire"
+
 #~ msgid "Switch to workspace on the left of the current workspace"
 #~ msgstr "Schimbă cu spațiul de lucru din stânga celui actual"

--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,6 +1,6 @@
-# translation of mutter.po to zh_CN
 # Simplified Chinese translation of mutter.
-# Copyright (C) 2002, 2003, 2004, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2012-2018 mutter's COPYRIGHT HOLDER
+# This file is distributed under the same license as the mutter package.
 # Sun G11n <gnome_int_l10n@ireland.sun.com>, 2002.
 # He Qiangqiang <carton@linux.net.cn>, 2002
 # Xiong Jiang <jxiong@offtopic.org>, 2003
@@ -11,22 +11,24 @@
 # Lele Long <schemacs@gmail.com>, 2011.
 # YunQiang Su <wzssyqa@gmail.com>, 2011, 2012.
 # Tong Hui <tonghuix@gmail.com>, 2014.
+# Mandy Wang <wangmychn@gmail.com>, 2017.
+# Mingcong Bai <jeffbai@aosc.xyz>, 2017.
+# Dingzhong Chen <wsxy162@gmail.com>, 2017, 2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-03 10:06+0000\n"
-"PO-Revision-Date: 2017-01-04 21:52+0800\n"
-"Last-Translator: Mandy Wang <wangmychn@gmail.com>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
+"POT-Creation-Date: 2018-02-09 13:01+0000\n"
+"PO-Revision-Date: 2018-02-16 22:22+0800\n"
+"Last-Translator: Dingzhong Chen <wsxy162@gmail.com>\n"
+"Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Gtranslator 2.91.7\n"

 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -53,134 +55,118 @@ msgid "Move window to last workspace"
 msgstr "将窗口移到最后一个工作区"

 #: data/50-mutter-navigation.xml:24
-msgid "Move window one workspace to the left"
-msgstr "将窗口左移一个工作区"
-
-#: data/50-mutter-navigation.xml:27
-msgid "Move window one workspace to the right"
-msgstr "将窗口右移一个工作区"
-
-#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "将窗口上移一个工作区"

-#: data/50-mutter-navigation.xml:33
+#: data/50-mutter-navigation.xml:27
 msgid "Move window one workspace down"
 msgstr "将窗口下移一个工作区"

-#: data/50-mutter-navigation.xml:36
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one monitor to the left"
 msgstr "将窗口左移一个显示器"

-#: data/50-mutter-navigation.xml:39
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one monitor to the right"
 msgstr "将窗口右移一个显示器"

-#: data/50-mutter-navigation.xml:42
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor up"
 msgstr "将窗口上移一个显示器"

-#: data/50-mutter-navigation.xml:45
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor down"
 msgstr "将窗口下移一个显示器"

-#: data/50-mutter-navigation.xml:49
+#: data/50-mutter-navigation.xml:43
 msgid "Switch applications"
 msgstr "切换应用程序"

-#: data/50-mutter-navigation.xml:54
+#: data/50-mutter-navigation.xml:48
 msgid "Switch to previous application"
 msgstr "切换到前一个应用程序"

-#: data/50-mutter-navigation.xml:58
+#: data/50-mutter-navigation.xml:52
 msgid "Switch windows"
 msgstr "切换窗口"

-#: data/50-mutter-navigation.xml:63
+#: data/50-mutter-navigation.xml:57
 msgid "Switch to previous window"
 msgstr "切换到前一个窗口"

-#: data/50-mutter-navigation.xml:67
+#: data/50-mutter-navigation.xml:61
 msgid "Switch windows of an application"
 msgstr "在应用程序的窗口之间切换窗口"

-#: data/50-mutter-navigation.xml:72
+#: data/50-mutter-navigation.xml:66
 msgid "Switch to previous window of an application"
 msgstr "切换到一个应用程序的前一个窗口"

-#: data/50-mutter-navigation.xml:76
+#: data/50-mutter-navigation.xml:70
 msgid "Switch system controls"
 msgstr "切换系统控制"

-#: data/50-mutter-navigation.xml:81
+#: data/50-mutter-navigation.xml:75
 msgid "Switch to previous system control"
 msgstr "切换到前一个系统控制"

-#: data/50-mutter-navigation.xml:85
+#: data/50-mutter-navigation.xml:79
 msgid "Switch windows directly"
 msgstr "直接切换窗口"

-#: data/50-mutter-navigation.xml:90
+#: data/50-mutter-navigation.xml:84
 msgid "Switch directly to previous window"
 msgstr "直接切换到前一个窗口"

-#: data/50-mutter-navigation.xml:94
+#: data/50-mutter-navigation.xml:88
 msgid "Switch windows of an app directly"
 msgstr "在应用程序窗口间直接移动焦点"

-#: data/50-mutter-navigation.xml:99
+#: data/50-mutter-navigation.xml:93
 msgid "Switch directly to previous window of an app"
 msgstr "直接切换到一个应用程序的前一个窗口"

-#: data/50-mutter-navigation.xml:103
+#: data/50-mutter-navigation.xml:97
 msgid "Switch system controls directly"
 msgstr "直接切换系统控制"

-#: data/50-mutter-navigation.xml:108
+#: data/50-mutter-navigation.xml:102
 msgid "Switch directly to previous system control"
 msgstr "直接切换到前一个系统控制"

-#: data/50-mutter-navigation.xml:111
+#: data/50-mutter-navigation.xml:105
 msgid "Hide all normal windows"
 msgstr "隐藏所有正常窗口"

-#: data/50-mutter-navigation.xml:114
+#: data/50-mutter-navigation.xml:108
 msgid "Switch to workspace 1"
 msgstr "切换到工作区 1"

-#: data/50-mutter-navigation.xml:117
+#: data/50-mutter-navigation.xml:111
 msgid "Switch to workspace 2"
 msgstr "切换到工作区 2"

-#: data/50-mutter-navigation.xml:120
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 3"
 msgstr "切换到工作区 3"

-#: data/50-mutter-navigation.xml:123
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 4"
 msgstr "切换到工作区 4"

-#: data/50-mutter-navigation.xml:126
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to last workspace"
 msgstr "切换到最后一个工作区"

-#: data/50-mutter-navigation.xml:129
-msgid "Move to workspace left"
-msgstr "移动到左侧工作区"
-
-#: data/50-mutter-navigation.xml:132
-msgid "Move to workspace right"
-msgstr "移动到右侧工作区"
-
-#: data/50-mutter-navigation.xml:135
+#: data/50-mutter-navigation.xml:123
 msgid "Move to workspace above"
 msgstr "移动到上层工作区"

-#: data/50-mutter-navigation.xml:138
+#: data/50-mutter-navigation.xml:126
 msgid "Move to workspace below"
 msgstr "移动到下层工作区"

-#: data/50-mutter-system.xml:6
+#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
 msgid "System"
 msgstr "系统"

@@ -190,7 +176,11 @@ msgstr "显示运行命令提示符"

 #: data/50-mutter-system.xml:10
 msgid "Show the activities overview"
-msgstr "显示活动大纲"
+msgstr "显示活动视图"
+
+#: data/50-mutter-wayland.xml:8
+msgid "Restore the keyboard shortcuts"
+msgstr "还原键盘快捷键"

 #: data/50-mutter-windows.xml:6
 msgid "Windows"
@@ -217,54 +207,50 @@ msgid "Restore window"
 msgstr "恢复窗口"

 #: data/50-mutter-windows.xml:18
-msgid "Toggle shaded state"
-msgstr "切换卷起状态"
-
-#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "关闭窗口"

-#: data/50-mutter-windows.xml:22
+#: data/50-mutter-windows.xml:20
 msgid "Hide window"
 msgstr "隐藏窗口"

-#: data/50-mutter-windows.xml:24
+#: data/50-mutter-windows.xml:22
 msgid "Move window"
 msgstr "移动窗口"

-#: data/50-mutter-windows.xml:26
+#: data/50-mutter-windows.xml:24
 msgid "Resize window"
 msgstr "改变窗口大小"

-#: data/50-mutter-windows.xml:29
+#: data/50-mutter-windows.xml:27
 msgid "Toggle window on all workspaces or one"
 msgstr "在位于所有或仅一个工作区的窗口间切换"

-#: data/50-mutter-windows.xml:31
+#: data/50-mutter-windows.xml:29
 msgid "Raise window if covered, otherwise lower it"
 msgstr "如果窗口被其他窗口遮盖，则提升它，否则降低它"

-#: data/50-mutter-windows.xml:33
+#: data/50-mutter-windows.xml:31
 msgid "Raise window above other windows"
 msgstr "将窗口提升到其它窗口之上"

-#: data/50-mutter-windows.xml:35
+#: data/50-mutter-windows.xml:33
 msgid "Lower window below other windows"
 msgstr "将窗口降低到其它窗口之下"

-#: data/50-mutter-windows.xml:37
+#: data/50-mutter-windows.xml:35
 msgid "Maximize window vertically"
 msgstr "垂直最大化窗口"

-#: data/50-mutter-windows.xml:39
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window horizontally"
 msgstr "水平最大化窗口"

-#: data/50-mutter-windows.xml:43
+#: data/50-mutter-windows.xml:41
 msgid "View split on left"
 msgstr "在左侧查看分割"

-#: data/50-mutter-windows.xml:47
+#: data/50-mutter-windows.xml:45
 msgid "View split on right"
 msgstr "在右侧查看分割"

@@ -278,10 +264,10 @@ msgstr "用于修改窗口点击动作的修饰键 met"

 #: 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."
+"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 ""
 "这个键指出的“覆盖”是一种混合窗口概述和应用程序运行的系统。默认要求使用 "
 "“Super 键”。可能使用默认或者空白。"
@@ -318,12 +304,12 @@ msgstr "动态管理工作区"

 #: data/org.gnome.mutter.gschema.xml.in:41
 msgid ""
-"Determines whether workspaces are managed dynamically or whether there's a "
+"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 ""
-"决定工作区动态管理还是静态数量的工作区(由 org.gnome.desktop.wm.preferences 中"
-"的 num-workspaces 键确定)。"
+"决定工作区动态管理还是静态数量的工作区（由 org.gnome.desktop.wm.preferences "
+"中的 num-workspaces 键确定）。"

 # 或者 只在主显示器上显示工作区
 #: data/org.gnome.mutter.gschema.xml.in:50
@@ -353,9 +339,9 @@ 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."
+"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 ""
 "如果为 true，而聚焦模式为“sloppy”或“mouse”，那么进入某个窗口时焦点将不会立即"
 "改变，而是等到光标停止移动之后。"
@@ -366,7 +352,7 @@ msgstr "可拖拽的边界宽度"

 #: data/org.gnome.mutter.gschema.xml.in:80
 msgid ""
-"The amount of total draggable borders. If the theme's visible borders are "
+"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 ""
 "可拖拽的边界总数。如果主题的可见边界不足，将添加不可见的边界来满足此值。"
@@ -391,14 +377,50 @@ msgid ""
 "screen of the monitor."
 msgstr "为 true 时，新窗口将总是置于此显示器已激活屏幕的中央。"

-#: data/org.gnome.mutter.gschema.xml.in:120
+#: 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. • “remote-desktop” — "
+"enables remote desktop support. To support remote desktop with screen "
+"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
+"screen cast support."
+msgstr ""
+"要启用实验性特性，请将如下特性关键字添加到列表中。特性是否要求重启合成器取决"
+"于特性本身。实验性特性不需启用即可配置和使用。请不要将实验性特性作为未来保障"
+"的基础。当前可用的关键字：• “monitor-config-manager” — 使用新的监视器配置系"
+"统，用于替代老的系统。启用此特性将打开一个上级配置 API 以用于配置应用程序，并"
+"可提供基于每屏幕的逻辑缩放功能。• “scale-monitor-framebuffer” — 让 Mutter 默"
+"认基于像素座标排布多屏幕，并同时缩放监视器帧缓冲器而不是窗口内容，以便管理 "
+"HiDPI 监视器。该特性不需要重启来生效。• “remote-desktop” — 启用远程桌面支持。"
+"要支持远程桌面共享，还需要设置“screen-cast”。 • “screen-cast” — 启用屏幕广播"
+"支持。"
+
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "从 Tab 轮换弹出界面选择窗口"

-#: data/org.gnome.mutter.gschema.xml.in:125
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "取消 Tab 轮换弹出"

+#: data/org.gnome.mutter.gschema.xml.in:155
+msgid "Switch monitor configurations"
+msgstr "切换显示器配置"
+
+#: data/org.gnome.mutter.gschema.xml.in:160
+msgid "Rotates the built-in monitor configuration"
+msgstr "旋转内置显示器配置"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "切换到 VT 1"
@@ -447,127 +469,183 @@ msgstr "切换到 VT 11"
 msgid "Switch to VT 12"
 msgstr "切换到 VT 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 "允许用 Xwayland 捕获"
+
+#: 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 ""
+"允许考虑运行在 Xwayland 中的 X11 应用程序发起的键盘捕获。在 Wayland 下，为了"
+"将 X11 捕获考虑在内，客户端也必须发送一个指定的 X11 ClientMessage 到根窗口，"
+"或是包含进“xwayland-grab-access-rules”键成为其中一个白名单应用程序。"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:77
+msgid "Xwayland applications allowed to issue keyboard grabs"
+msgstr "允许发起键盘捕获的 Xwayland 应用程序"
+
+#: 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 ""
+"Xwayland 下允许或不允许发起 X11 键盘捕获的 X11 窗口，其资源名或资源类的列表。"
+"给定 X11 窗口的资源名或资源类可以使用“xprop WM_CLASS”命令获取。支持在键值中使"
+"用通配符“*”和“?”。以“!”开头的键值会列入黑名单，它们的优先级高于白名单，用来撤"
+"销默认系统列表中的应用程序。默认系统列表包含了下列应用程"
+"序：“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” 用户可以使用键绑定键“restore-"
+"shortcuts”定义的键盘快捷键来中断进行中的捕获。"
+
+#. TRANSLATORS: This string refers to a button that switches between
+#. * different modes.
+#.
+#: src/backends/meta-input-settings.c:2260
+#, c-format
+msgid "Mode Switch (Group %d)"
+msgstr "模式切换（组别 %d）"
+
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:1861
+#: src/backends/meta-input-settings.c:2283
 msgid "Switch monitor"
 msgstr "切换显示器"

-#: src/backends/meta-input-settings.c:1863
+#: src/backends/meta-input-settings.c:2285
 msgid "Show on-screen help"
 msgstr "显示在屏帮助"

-#: src/backends/meta-monitor-manager.c:515
+#: src/backends/meta-monitor-manager.c:900
 msgid "Built-in display"
 msgstr "内置显示器"

-#: src/backends/meta-monitor-manager.c:538
+#: src/backends/meta-monitor-manager.c:923
 msgid "Unknown"
 msgstr "未知"

-#: src/backends/meta-monitor-manager.c:540
+#: src/backends/meta-monitor-manager.c:925
 msgid "Unknown Display"
 msgstr "未知的 Display"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:548
+#: src/backends/meta-monitor-manager.c:933
 #, c-format
 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:471
+#: src/compositor/compositor.c:481
 #, c-format
 msgid ""
-"Another compositing manager is already running on screen %i on display \"%s"
-"\"."
+"Another compositing manager is already running on screen %i on display “%s”."
 msgstr "显示器 %2$s 的屏幕 %1$i 上已有另外一个混成窗口管理器正在运行。"

 #: src/core/bell.c:194
 msgid "Bell event"
 msgstr "响铃事件"

-#: src/core/delete.c:127
+#: src/core/display.c:608
+#, c-format
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "无法打开 X Window System 显示器“%s”\n"
+
+#: src/core/main.c:190
+msgid "Disable connection to session manager"
+msgstr "禁止连接到会话管理器"
+
+#: src/core/main.c:196
+msgid "Replace the running window manager"
+msgstr "替换正在运行的窗口管理器"
+
+#: src/core/main.c:202
+msgid "Specify session management ID"
+msgstr "指定会话管理 ID"
+
+#: src/core/main.c:207
+msgid "X Display to use"
+msgstr "要使用的 X Display"
+
+#: src/core/main.c:213
+msgid "Initialize session from savefile"
+msgstr "从保存文件中初始化会话"
+
+#: src/core/main.c:219
+msgid "Make X calls synchronous"
+msgstr "使 X 调用同步"
+
+#: src/core/main.c:226
+msgid "Run as a wayland compositor"
+msgstr "作为 wayland 混成管理器运行"
+
+#: src/core/main.c:232
+msgid "Run as a nested compositor"
+msgstr "作为嵌套混成器运行"
+
+#: src/core/main.c:240
+msgid "Run as a full display server, rather than nested"
+msgstr "以完整显示服务器方式运行，而不是以嵌套方式"
+
+#: src/core/main.c:246
+msgid "Run with X11 backend"
+msgstr "以 X11 后端运行"
+
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
 #, c-format
 msgid "“%s” is not responding."
 msgstr "“%s” 未响应。"

-#: src/core/delete.c:129
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
 msgstr "应用程序未响应。"

-#: src/core/delete.c:134
+#: src/core/meta-close-dialog-default.c:154
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
 msgstr "您可以选择稍等一会儿，或者强制退出该应用程序。"

-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "等待(_W)"
-
-#: src/core/delete.c:141
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "强制退出(_F)"

-#: src/core/display.c:590
-#, c-format
-msgid "Failed to open X Window System display '%s'\n"
-msgstr "无法打开 X Window System 显示器“%s”\n"
-
-#: src/core/main.c:182
-msgid "Disable connection to session manager"
-msgstr "禁止连接到会话管理器"
-
-#: src/core/main.c:188
-msgid "Replace the running window manager"
-msgstr "替换正在运行的窗口管理器"
-
-#: src/core/main.c:194
-msgid "Specify session management ID"
-msgstr "指定会话管理 ID"
-
-#: src/core/main.c:199
-msgid "X Display to use"
-msgstr "要使用的 X Display"
-
-#: src/core/main.c:205
-msgid "Initialize session from savefile"
-msgstr "从保存文件中初始化会话"
-
-#: src/core/main.c:211
-msgid "Make X calls synchronous"
-msgstr "使 X 调用同步"
-
-#: src/core/main.c:218
-msgid "Run as a wayland compositor"
-msgstr "作为 wayland 混成管理器运行"
-
-#: src/core/main.c:224
-msgid "Run as a nested compositor"
-msgstr "作为嵌套混成器运行"
-
-#: src/core/main.c:232
-msgid "Run as a full display server, rather than nested"
-msgstr "以完整显示服务器方式运行，而不是以嵌套方式"
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "等待(_W)"

 #: src/core/mutter.c:39
 #, c-format
 msgid ""
 "mutter %s\n"
-"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
 msgstr ""
 "mutter %s\n"
-"版权所有 (C) 2001-%d Havoc Pennington, Red Hat, Inc., 以及其他\n"
-"本软件为自由软件：版权条款请参见源码\n"
-"不存在任何保证：即便是对商业性或者特定目的的适应性也不作保证。\n"
+"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., 以及其他\n"
+"本软件为自由软件；版权条款请参见源码\n"
+"不存在任何保证；即便是对商业性或者特定目的的适应性也不作保证。\n"

 #: src/core/mutter.c:53
 msgid "Print version"
@@ -582,41 +660,54 @@ msgstr "要使用的 Mutter 插件"
 msgid "Workspace %d"
 msgstr "工作区 %d"

-#: src/core/screen.c:521
+#: src/core/screen.c:583
 #, c-format
 msgid ""
-"Display \"%s\" already has a window manager; try using the --replace option "
-"to replace the current window manager."
+"Display “%s” already has a window manager; try using the --replace option to "
+"replace the current window manager."
 msgstr ""
 "Display“%s”已经有一个窗口管理器；请尝试使用 --replace 选项替换当前的窗口管理"
 "器。"

-#: src/core/screen.c:606
+#: src/core/screen.c:668
 #, c-format
-msgid "Screen %d on display '%s' is invalid\n"
+msgid "Screen %d on display “%s” is invalid\n"
 msgstr "显示“%2$s”上的屏幕 %1$d 无效\n"

 #: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter 编译的时候没有加入详细模式的支持\n"

-#: src/wayland/meta-wayland-tablet-pad.c:595
+#: src/wayland/meta-wayland-tablet-pad.c:567
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "模式切换：%d 模式"

-#: src/x11/session.c:1815
+#: src/x11/session.c:1818
 msgid ""
-"These windows do not support &quot;save current setup&quot; and will have to "
-"be restarted manually next time you log in."
-msgstr ""
-"这些窗口不支持 &quot;保存当前设置 &quot;  您在下次登录时，必须手动重启动它"
-"们。"
+"These windows do not support “save current setup” and will have to be "
+"restarted manually next time you log in."
+msgstr "这些窗口不支持“保存当前设置”，并且在您下次登录时，必须手动重启它们。"

-#: src/x11/window-props.c:548
+#: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
-msgstr "%s (于 %s)"
+msgstr "%s（于 %s）"
+
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "将窗口左移一个工作区"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "将窗口右移一个工作区"
+
+#~ msgid "Move to workspace left"
+#~ msgstr "移动到左侧工作区"
+
+#~ msgid "Move to workspace right"
+#~ msgstr "移动到右侧工作区"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "切换卷起状态"

 #~ msgid "Failed to scan themes directory: %s\n"
 #~ msgstr "扫描主题目录失败：%s\n"
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity 3.3.4\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-03-01 18:57+0000\n"
-"PO-Revision-Date: 2018-03-03 15:20+0800\n"
+"POT-Creation-Date: 2018-06-07 13:00+0000\n"
+"PO-Revision-Date: 2018-06-09 11:26+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n@lists.linux.org.tw>\n"
 "Language: zh_TW\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.0.8\n"

 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -379,32 +379,27 @@ msgid ""
 "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. • “remote-desktop” — "
-"enables remote desktop support. To support remote desktop with screen "
-"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
-"screen cast support."
+"manage HiDPI monitors. Does not require a restart."
 msgstr ""
 "若要啟用實驗性功能，請將功能關鍵字加入列表中。置於該功能是否須要重新啟動混成"
 "器則視給予的功能而定。任何實驗性功能不一定能用、或是可以調整設定。請不要預期"
 "在此設定中加入的任何東西未來都能存在。目前可用的關鍵字有： • “scale-monitor-"
 "framebuffer” — 讓 mutter 預設採用邏輯像素座標空間的配置邏輯螢幕，而縮放螢幕 "
-"framebuffer 則取代視窗內容以管理 HiDPI 螢幕。不須要重新啟動。 • “remote-"
-"desktop” — 啟用遠端桌面支援。若要支援遠端桌面的螢幕分享，則必須也啟用“screen-"
-"cast”。• “screen-cast” — 啟用螢幕投放支援。"
+"framebuffer 則取代視窗內容以管理 HiDPI 螢幕。不須要重新啟動。"

-#: data/org.gnome.mutter.gschema.xml.in:145
+#: data/org.gnome.mutter.gschema.xml.in:141
 msgid "Select window from tab popup"
 msgstr "從分頁彈出項選擇視窗"

-#: data/org.gnome.mutter.gschema.xml.in:150
+#: data/org.gnome.mutter.gschema.xml.in:146
 msgid "Cancel tab popup"
 msgstr "取消分頁彈出項"

-#: data/org.gnome.mutter.gschema.xml.in:155
+#: data/org.gnome.mutter.gschema.xml.in:151
 msgid "Switch monitor configurations"
 msgstr "切換螢幕組態"

-#: data/org.gnome.mutter.gschema.xml.in:160
+#: data/org.gnome.mutter.gschema.xml.in:156
 msgid "Rotates the built-in monitor configuration"
 msgstr "旋轉切換內建螢幕組態"

@@ -520,22 +515,22 @@ msgstr "切換螢幕"
 msgid "Show on-screen help"
 msgstr "顯示螢幕求助"

-#: src/backends/meta-monitor-manager.c:900
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "內建顯示"

-#: src/backends/meta-monitor-manager.c:923
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "不明"

-#: src/backends/meta-monitor-manager.c:925
+#: src/backends/meta-monitor-manager.c:928
 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:936
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
--- a/src/backends/meta-backend.c
+++ b/src/backends/meta-backend.c
@@ -418,28 +418,6 @@ meta_backend_create_input_settings (MetaBackend *backend)
  return META_BACKEND_GET_CLASS (backend)->create_input_settings (backend);
 }

-#ifdef HAVE_REMOTE_DESKTOP
-static gboolean
-is_screen_cast_enabled (MetaBackend *backend)
-{
-  MetaSettings *settings = meta_backend_get_settings (backend);
-
-  return meta_settings_is_experimental_feature_enabled (
-    settings,
-    META_EXPERIMENTAL_FEATURE_SCREEN_CAST);
-}
-
-static gboolean
-is_remote_desktop_enabled (MetaBackend *backend)
-{
-  MetaSettings *settings = meta_backend_get_settings (backend);
-
-  return meta_settings_is_experimental_feature_enabled (
-    settings,
-    META_EXPERIMENTAL_FEATURE_REMOTE_DESKTOP);
-}
-#endif /* HAVE_REMOTE_DESKTOP */
-
 static void
 meta_backend_real_post_init (MetaBackend *backend)
 {
@@ -473,10 +451,8 @@ meta_backend_real_post_init (MetaBackend *backend)

 #ifdef HAVE_REMOTE_DESKTOP
  priv->dbus_session_watcher = g_object_new (META_TYPE_DBUS_SESSION_WATCHER, NULL);
-  if (is_screen_cast_enabled (backend))
-    priv->screen_cast = meta_screen_cast_new (priv->dbus_session_watcher);
-  if (is_remote_desktop_enabled (backend))
-    priv->remote_desktop = meta_remote_desktop_new (priv->dbus_session_watcher);
+  priv->screen_cast = meta_screen_cast_new (priv->dbus_session_watcher);
+  priv->remote_desktop = meta_remote_desktop_new (priv->dbus_session_watcher);
 #endif /* HAVE_REMOTE_DESKTOP */

  if (!meta_monitor_manager_is_headless (priv->monitor_manager))
@@ -568,26 +544,6 @@ meta_backend_class_init (MetaBackendClass *klass)
  stage_views_disabled = g_strcmp0 (mutter_stage_views, "0") == 0;
 }

-static void
-experimental_features_changed (MetaSettings            *settings,
-                               MetaExperimentalFeature  old_experimental_features,
-                               MetaBackend             *backend)
-{
-#ifdef HAVE_REMOTE_DESKTOP
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-
-  if (is_screen_cast_enabled (backend) && !priv->screen_cast)
-    priv->screen_cast = meta_screen_cast_new (priv->dbus_session_watcher);
-  else if (!is_screen_cast_enabled (backend))
-    g_clear_object (&priv->screen_cast);
-
-  if (is_remote_desktop_enabled (backend) && !priv->remote_desktop)
-    priv->remote_desktop = meta_remote_desktop_new (priv->dbus_session_watcher);
-  else if (!is_remote_desktop_enabled (backend))
-    g_clear_object (&priv->remote_desktop);
-#endif /* HAVE_REMOTE_DESKTOP */
-}
-
 static MetaMonitorManager *
 meta_backend_create_monitor_manager (MetaBackend *backend,
                                     GError     **error)
@@ -670,9 +626,6 @@ meta_backend_initable_init (GInitable     *initable,
  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);

  priv->settings = meta_settings_new (backend);
-  g_signal_connect (priv->settings, "experimental-features-changed",
-                    G_CALLBACK (experimental_features_changed),
-                    backend);

  priv->egl = g_object_new (META_TYPE_EGL, NULL);

--- a/src/backends/meta-idle-monitor.c
+++ b/src/backends/meta-idle-monitor.c
@@ -246,7 +246,8 @@ meta_idle_monitor_init (MetaIdleMonitor *monitor)
  /* Monitor inhibitors */
  monitor->session_proxy =
    g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
-                                   G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
+                                   G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS |
+                                   G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
                                   NULL,
                                   "org.gnome.SessionManager",
                                   "/org/gnome/SessionManager",
--- a/src/backends/meta-logical-monitor.c
+++ b/src/backends/meta-logical-monitor.c
@@ -100,12 +100,11 @@ static MetaMonitorTransform
 derive_monitor_transform (MetaMonitor *monitor)
 {
  MetaOutput *main_output;
-  MetaMonitorTransform transform;

  main_output = meta_monitor_get_main_output (monitor);
-  transform = meta_output_get_assigned_crtc (main_output)->transform;

-  return meta_monitor_crtc_to_logical_transform (monitor, transform);
+  return meta_monitor_crtc_to_logical_transform (monitor,
+                                                 main_output->crtc->transform);
 }

 MetaLogicalMonitor *
@@ -146,7 +145,7 @@ meta_logical_monitor_add_monitor (MetaLogicalMonitor *logical_monitor,

  is_presentation = logical_monitor->is_presentation;
  logical_monitor->monitors = g_list_append (logical_monitor->monitors,
-                                             g_object_ref (monitor));
+                                             monitor);

  for (l = logical_monitor->monitors; l; l = l->next)
    {
@@ -158,12 +157,10 @@ meta_logical_monitor_add_monitor (MetaLogicalMonitor *logical_monitor,
      for (l_output = outputs; l_output; l_output = l_output->next)
        {
          MetaOutput *output = l_output->data;
-          MetaCrtc *crtc;

          is_presentation = is_presentation && output->is_presentation;
-          crtc = meta_output_get_assigned_crtc (output);
-          if (crtc)
-            crtc->logical_monitor = logical_monitor;
+          if (output->crtc)
+            output->crtc->logical_monitor = logical_monitor;
        }
    }

@@ -223,7 +220,7 @@ foreach_crtc (MetaMonitor         *monitor,
  ForeachCrtcData *data = user_data;

  data->func (data->logical_monitor,
-              meta_output_get_assigned_crtc (monitor_crtc_mode->output),
+              monitor_crtc_mode->output->crtc,
              data->user_data);

  return TRUE;
@@ -257,17 +254,13 @@ meta_logical_monitor_init (MetaLogicalMonitor *logical_monitor)
 }

 static void
-meta_logical_monitor_dispose (GObject *object)
+meta_logical_monitor_finalize (GObject *object)
 {
  MetaLogicalMonitor *logical_monitor = META_LOGICAL_MONITOR (object);

-  if (logical_monitor->monitors)
-    {
-      g_list_free_full (logical_monitor->monitors, g_object_unref);
-      logical_monitor->monitors = NULL;
-    }
+  g_list_free (logical_monitor->monitors);

-  G_OBJECT_CLASS (meta_logical_monitor_parent_class)->dispose (object);
+  G_OBJECT_CLASS (meta_logical_monitor_parent_class)->finalize (object);
 }

 static void
@@ -275,7 +268,7 @@ meta_logical_monitor_class_init (MetaLogicalMonitorClass *klass)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (klass);

-  object_class->dispose = meta_logical_monitor_dispose;
+  object_class->finalize = meta_logical_monitor_finalize;
 }

 gboolean
--- a/src/backends/meta-monitor-manager-dummy.c
+++ b/src/backends/meta-monitor-manager-dummy.c
@@ -486,7 +486,7 @@ apply_crtc_assignments (MetaMonitorManager *manager,
              output = ((MetaOutput**)crtc_info->outputs->pdata)[j];

              output->is_dirty = TRUE;
-              meta_output_assign_crtc (output, crtc);
+              output->crtc = crtc;
            }
        }
    }
@@ -531,7 +531,7 @@ apply_crtc_assignments (MetaMonitorManager *manager,
          continue;
        }

-      meta_output_unassign_crtc (output);
+      output->crtc = NULL;
      output->is_primary = FALSE;
    }
 }
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@@ -585,8 +585,6 @@ meta_monitor_manager_ensure_configured (MetaMonitorManager *manager)
                                                       &error))
        {
          g_clear_object (&config);
-          g_warning ("Failed to use linear monitor configuration: %s",
-                     error->message);
          g_clear_error (&error);
        }
      else
@@ -604,8 +602,6 @@ meta_monitor_manager_ensure_configured (MetaMonitorManager *manager)
                                                       &error))
        {
          g_clear_object (&config);
-          g_warning ("Failed to use fallback monitor configuration: %s",
-                     error->message);
          g_clear_error (&error);
        }
      else
@@ -1045,7 +1041,6 @@ meta_monitor_manager_handle_get_resources (MetaDBusDisplayConfig *skeleton,
      GVariantBuilder crtcs, modes, clones, properties;
      GBytes *edid;
      char *edid_file;
-      MetaCrtc *crtc;
      int crtc_index;

      g_variant_builder_init (&crtcs, G_VARIANT_TYPE ("au"));
@@ -1139,8 +1134,8 @@ meta_monitor_manager_handle_get_resources (MetaDBusDisplayConfig *skeleton,
                                                output->tile_info.tile_h));
        }

-      crtc = meta_output_get_assigned_crtc (output);
-      crtc_index = crtc ? g_list_index (combined_crtcs, crtc) : -1;
+      crtc_index = output->crtc ? g_list_index (combined_crtcs, output->crtc)
+                                : -1;
      g_variant_builder_add (&output_builder, "(uxiausauaua{sv})",
                             i, /* ID */
                             (gint64)output->winsys_id,
@@ -2908,7 +2903,11 @@ meta_monitor_manager_get_monitor_for_connector (MetaMonitorManager *manager,

      if (meta_monitor_is_active (monitor) &&
          g_str_equal (connector, meta_monitor_get_connector (monitor)))
-        return meta_monitor_get_logical_monitor (monitor)->number;
+        {
+          MetaOutput *main_output = meta_monitor_get_main_output (monitor);
+
+          return main_output->crtc->logical_monitor->number;
+        }
    }

  return -1;
--- a/src/backends/meta-monitor.c
+++ b/src/backends/meta-monitor.c
@@ -204,12 +204,10 @@ gboolean
 meta_monitor_is_active (MetaMonitor *monitor)
 {
  MetaOutput *output;
-  MetaCrtc *crtc;

  output = meta_monitor_get_main_output (monitor);
-  crtc = meta_output_get_assigned_crtc (output);

-  return crtc && crtc->current_mode;
+  return output->crtc && output->crtc->current_mode;
 }

 gboolean
@@ -387,21 +385,6 @@ meta_monitor_crtc_to_logical_transform (MetaMonitor          *monitor,
  return new_transform;
 }

-static void
-meta_monitor_dispose (GObject *object)
-{
-  MetaMonitor *monitor = META_MONITOR (object);
-  MetaMonitorPrivate *priv = meta_monitor_get_instance_private (monitor);
-
-  if (priv->outputs)
-    {
-      g_list_free_full (priv->outputs, g_object_unref);
-      priv->outputs = NULL;
-    }
-
-  G_OBJECT_CLASS (meta_monitor_parent_class)->dispose (object);
-}
-
 static void
 meta_monitor_finalize (GObject *object)
 {
@@ -410,6 +393,7 @@ meta_monitor_finalize (GObject *object)

  g_hash_table_destroy (priv->mode_ids);
  g_list_free_full (priv->modes, (GDestroyNotify) meta_monitor_mode_free);
+  g_clear_pointer (&priv->outputs, g_list_free);
  meta_monitor_spec_free (priv->spec);

  G_OBJECT_CLASS (meta_monitor_parent_class)->finalize (object);
@@ -428,7 +412,6 @@ meta_monitor_class_init (MetaMonitorClass *klass)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (klass);

-  object_class->dispose = meta_monitor_dispose;
  object_class->finalize = meta_monitor_finalize;
 }

@@ -510,7 +493,6 @@ meta_monitor_normal_generate_modes (MetaMonitorNormal *monitor_normal)
  for (i = 0; i < output->n_modes; i++)
    {
      MetaCrtcMode *crtc_mode = output->modes[i];
-      MetaCrtc *crtc;
      MetaMonitorMode *mode;
      gboolean replace;

@@ -544,9 +526,7 @@ meta_monitor_normal_generate_modes (MetaMonitorNormal *monitor_normal)

      if (crtc_mode == output->preferred_mode)
        monitor_priv->preferred_mode = mode;
-
-      crtc = meta_output_get_assigned_crtc (output);
-      if (crtc && crtc_mode == crtc->current_mode)
+      if (output->crtc && crtc_mode == output->crtc->current_mode)
        monitor_priv->current_mode = mode;
    }
 }
@@ -565,7 +545,7 @@ meta_monitor_normal_new (MetaGpu    *gpu,

  monitor_priv->gpu = gpu;

-  monitor_priv->outputs = g_list_append (NULL, g_object_ref (output));
+  monitor_priv->outputs = g_list_append (NULL, output);
  monitor_priv->winsys_id = output->winsys_id;
  meta_monitor_generate_spec (monitor);

@@ -588,15 +568,13 @@ meta_monitor_normal_derive_layout (MetaMonitor   *monitor,
                                   MetaRectangle *layout)
 {
  MetaOutput *output;
-  MetaCrtc *crtc;

  output = meta_monitor_get_main_output (monitor);
-  crtc = meta_output_get_assigned_crtc (output);
  *layout = (MetaRectangle) {
-    .x = crtc->rect.x,
-    .y = crtc->rect.y,
-    .width = crtc->rect.width,
-    .height = crtc->rect.height
+    .x = output->crtc->rect.x,
+    .y = output->crtc->rect.y,
+    .width = output->crtc->rect.width,
+    .height = output->crtc->rect.height
  };
 }

@@ -680,8 +658,7 @@ add_tiled_monitor_outputs (MetaGpu          *gpu,
      g_warn_if_fail (output->subpixel_order ==
                      monitor_tiled->origin_output->subpixel_order);

-      monitor_priv->outputs = g_list_append (monitor_priv->outputs,
-                                             g_object_ref (output));
+      monitor_priv->outputs = g_list_append (monitor_priv->outputs, output);
    }
 }

@@ -787,13 +764,12 @@ is_monitor_mode_assigned (MetaMonitor     *monitor,
    {
      MetaOutput *output = l->data;
      MetaMonitorCrtcMode *monitor_crtc_mode = &mode->crtc_modes[i];
-      MetaCrtc *crtc;

-      crtc = meta_output_get_assigned_crtc (output);
      if (monitor_crtc_mode->crtc_mode &&
-          (!crtc || crtc->current_mode != monitor_crtc_mode->crtc_mode))
+          (!output->crtc ||
+           output->crtc->current_mode != monitor_crtc_mode->crtc_mode))
        return FALSE;
-      else if (!monitor_crtc_mode->crtc_mode && crtc)
+      else if (!monitor_crtc_mode->crtc_mode && output->crtc)
        return FALSE;
    }

@@ -1241,16 +1217,14 @@ meta_monitor_tiled_derive_layout (MetaMonitor   *monitor,
  for (l = monitor_priv->outputs; l; l = l->next)
    {
      MetaOutput *output = l->data;
-      MetaCrtc *crtc;

-      crtc = meta_output_get_assigned_crtc (output);
-      if (!crtc)
+      if (!output->crtc)
        continue;

-      min_x = MIN (crtc->rect.x, min_x);
-      min_y = MIN (crtc->rect.y, min_y);
-      max_x = MAX (crtc->rect.x + crtc->rect.width, max_x);
-      max_y = MAX (crtc->rect.y + crtc->rect.height, max_y);
+      min_x = MIN (output->crtc->rect.x, min_x);
+      min_y = MIN (output->crtc->rect.y, min_y);
+      max_x = MAX (output->crtc->rect.x + output->crtc->rect.width, max_x);
+      max_y = MAX (output->crtc->rect.y + output->crtc->rect.height, max_y);
    }

  *layout = (MetaRectangle) {
@@ -1344,14 +1318,10 @@ meta_monitor_get_spec (MetaMonitor *monitor)
 MetaLogicalMonitor *
 meta_monitor_get_logical_monitor (MetaMonitor *monitor)
 {
-  MetaOutput *output;
-  MetaCrtc *crtc;
+  MetaOutput *output = meta_monitor_get_main_output (monitor);

-  output = meta_monitor_get_main_output (monitor);
-  crtc = meta_output_get_assigned_crtc (output);
-
-  if (crtc)
-    return crtc->logical_monitor;
+  if (output->crtc)
+    return output->crtc->logical_monitor;
  else
    return NULL;
 }
--- a/src/backends/meta-output.c
+++ b/src/backends/meta-output.c
@@ -21,13 +21,7 @@

 #include "backends/meta-output.h"

-typedef struct _MetaOutputPrivate
-{
-  /* The CRTC driving this output, NULL if the output is not enabled */
-  MetaCrtc *crtc;
-} MetaOutputPrivate;
-
-G_DEFINE_TYPE_WITH_PRIVATE (MetaOutput, meta_output, G_TYPE_OBJECT)
+G_DEFINE_TYPE (MetaOutput, meta_output, G_TYPE_OBJECT)

 MetaGpu *
 meta_output_get_gpu (MetaOutput *output)
@@ -35,44 +29,6 @@ meta_output_get_gpu (MetaOutput *output)
  return output->gpu;
 }

-void
-meta_output_assign_crtc (MetaOutput *output,
-                         MetaCrtc   *crtc)
-{
-  MetaOutputPrivate *priv = meta_output_get_instance_private (output);
-
-  g_assert (crtc);
-
-  g_set_object (&priv->crtc, crtc);
-}
-
-void
-meta_output_unassign_crtc (MetaOutput *output)
-{
-  MetaOutputPrivate *priv = meta_output_get_instance_private (output);
-
-  g_clear_object (&priv->crtc);
-}
-
-MetaCrtc *
-meta_output_get_assigned_crtc (MetaOutput *output)
-{
-  MetaOutputPrivate *priv = meta_output_get_instance_private (output);
-
-  return priv->crtc;
-}
-
-static void
-meta_output_dispose (GObject *object)
-{
-  MetaOutput *output = META_OUTPUT (object);
-  MetaOutputPrivate *priv = meta_output_get_instance_private (output);
-
-  g_clear_object (&priv->crtc);
-
-  G_OBJECT_CLASS (meta_output_parent_class)->dispose (object);
-}
-
 static void
 meta_output_finalize (GObject *object)
 {
@@ -102,6 +58,5 @@ meta_output_class_init (MetaOutputClass *klass)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (klass);

-  object_class->dispose = meta_output_dispose;
  object_class->finalize = meta_output_finalize;
 }
--- a/src/backends/meta-output.h
+++ b/src/backends/meta-output.h
@@ -64,6 +64,9 @@ struct _MetaOutput

  MetaGpu *gpu;

+  /* The CRTC driving this output, NULL if the output is not enabled */
+  MetaCrtc *crtc;
+
  /* The low-level ID of this output, used to apply back configuration */
  glong winsys_id;
  char *name;
@@ -119,11 +122,4 @@ G_DECLARE_FINAL_TYPE (MetaOutput, meta_output, META, OUTPUT, GObject)

 MetaGpu * meta_output_get_gpu (MetaOutput *output);

-void meta_output_assign_crtc (MetaOutput *output,
-                              MetaCrtc   *crtc);
-
-void meta_output_unassign_crtc (MetaOutput *output);
-
-MetaCrtc * meta_output_get_assigned_crtc (MetaOutput *output);
-
 #endif /* META_OUTPUT_H */
--- a/src/backends/meta-screen-cast-stream-src.c
+++ b/src/backends/meta-screen-cast-stream-src.c
@@ -360,9 +360,9 @@ create_pipewire_stream (MetaScreenCastStreamSrc  *src,
    ":", spa_type->format_video.format, "I", spa_type->video_format.BGRx,
    ":", spa_type->format_video.size, "R", &SPA_RECTANGLE (width, height),
    ":", spa_type->format_video.framerate, "F", &SPA_FRACTION (0, 1),
-    ":", spa_type->format_video.max_framerate, "Fru", &max_framerate,
-                                                      PROP_RANGE (&min_framerate,
-                                                                  &max_framerate));
+    ":", spa_type->format_video.max_framerate, "Fr", &max_framerate,
+                                                     PROP_RANGE (&min_framerate,
+                                                                 &max_framerate));

  pw_stream_add_listener (pipewire_stream,
                          &priv->pipewire_stream_listener,
--- a/src/backends/meta-settings-private.h
+++ b/src/backends/meta-settings-private.h
@@ -31,9 +31,7 @@ typedef enum _MetaExperimentalFeature
 {
  META_EXPERIMENTAL_FEATURE_NONE = 0,
  META_EXPERIMENTAL_FEATURE_SCALE_MONITOR_FRAMEBUFFER = (1 << 0),
-  META_EXPERIMENTAL_FEATURE_SCREEN_CAST = (1 << 1),
-  META_EXPERIMENTAL_FEATURE_REMOTE_DESKTOP  = (1 << 2),
-  META_EXPERIMENTAL_FEATURE_KMS_MODIFIERS = (1 << 3),
+  META_EXPERIMENTAL_FEATURE_KMS_MODIFIERS  = (1 << 1),
 } MetaExperimentalFeature;

 #define META_TYPE_SETTINGS (meta_settings_get_type ())
--- a/src/backends/meta-settings.c
+++ b/src/backends/meta-settings.c
@@ -260,13 +260,8 @@ experimental_features_handler (GVariant *features_variant,
  g_variant_iter_init (&features_iter, features_variant);
  while (g_variant_iter_loop (&features_iter, "s", &feature))
    {
-      /* So far no experimental features defined. */
      if (g_str_equal (feature, "scale-monitor-framebuffer"))
        features |= META_EXPERIMENTAL_FEATURE_SCALE_MONITOR_FRAMEBUFFER;
-      else if (g_str_equal (feature, "screen-cast"))
-        features |= META_EXPERIMENTAL_FEATURE_SCREEN_CAST;
-      else if (g_str_equal (feature, "remote-desktop"))
-        features |= META_EXPERIMENTAL_FEATURE_REMOTE_DESKTOP;
      else if (g_str_equal (feature, "kms-modifiers"))
        features |= META_EXPERIMENTAL_FEATURE_KMS_MODIFIERS;
      else
--- a/src/backends/native/meta-cursor-renderer-native.c
+++ b/src/backends/native/meta-cursor-renderer-native.c
@@ -291,7 +291,6 @@ update_monitor_crtc_cursor (MetaMonitor         *monitor,
    data->in_cursor_renderer_native;
  MetaCursorRendererNativePrivate *priv =
    meta_cursor_renderer_native_get_instance_private (cursor_renderer_native);
-  MetaCrtc *crtc;
  MetaMonitorTransform transform;
  ClutterRect scaled_crtc_rect;
  float scale;
@@ -331,8 +330,6 @@ update_monitor_crtc_cursor (MetaMonitor         *monitor,
    },
  };

-  crtc = meta_output_get_assigned_crtc (monitor_crtc_mode->output);
-
  if (priv->has_hw_cursor &&
      clutter_rect_intersection (&scaled_crtc_rect,
                                 &data->in_local_cursor_rect,
@@ -343,7 +340,7 @@ update_monitor_crtc_cursor (MetaMonitor         *monitor,
      float crtc_cursor_x, crtc_cursor_y;

      set_crtc_cursor (data->in_cursor_renderer_native,
-                       crtc,
+                       monitor_crtc_mode->output->crtc,
                       data->in_cursor_sprite);

      gpu_kms = META_GPU_KMS (meta_monitor_get_gpu (monitor));
@@ -353,7 +350,7 @@ update_monitor_crtc_cursor (MetaMonitor         *monitor,
      crtc_cursor_y = (data->in_local_cursor_rect.origin.y -
                       scaled_crtc_rect.origin.y) * scale;
      drmModeMoveCursor (kms_fd,
-                         crtc->crtc_id,
+                         monitor_crtc_mode->output->crtc->crtc_id,
                         roundf (crtc_cursor_x),
                         roundf (crtc_cursor_y));

@@ -361,7 +358,8 @@ update_monitor_crtc_cursor (MetaMonitor         *monitor,
    }
  else
    {
-      set_crtc_cursor (data->in_cursor_renderer_native, crtc, NULL);
+      set_crtc_cursor (data->in_cursor_renderer_native,
+                       monitor_crtc_mode->output->crtc, NULL);
    }

  return TRUE;
--- a/src/backends/native/meta-gpu-kms.c
+++ b/src/backends/native/meta-gpu-kms.c
@@ -47,6 +47,12 @@ typedef struct _MetaKmsSource
  MetaGpuKms *gpu_kms;
 } MetaKmsSource;

+typedef struct _MetaGpuKmsFlipClosureContainer
+{
+  GClosure *flip_closure;
+  MetaGpuKms *gpu_kms;
+} MetaGpuKmsFlipClosureContainer;
+
 struct _MetaGpuKms
 {
  MetaGpu parent;
@@ -64,7 +70,6 @@ struct _MetaGpuKms
  gboolean page_flips_not_supported;
 };

-G_DEFINE_QUARK (MetaGpuKmsError, meta_gpu_kms_error)
 G_DEFINE_TYPE (MetaGpuKms, meta_gpu_kms, META_TYPE_GPU)

 static gboolean
@@ -105,10 +110,8 @@ get_crtc_drm_connectors (MetaGpu       *gpu,
  for (l = meta_gpu_get_outputs (gpu); l; l = l->next)
    {
      MetaOutput *output = l->data;
-      MetaCrtc *assigned_crtc;

-      assigned_crtc = meta_output_get_assigned_crtc (output);
-      if (assigned_crtc == crtc)
+      if (output->crtc == crtc)
        g_array_append_val (connectors_array, output->winsys_id);
    }

@@ -188,10 +191,8 @@ meta_gpu_kms_is_crtc_active (MetaGpuKms *gpu_kms,
  for (l = meta_gpu_get_outputs (gpu); l; l = l->next)
    {
      MetaOutput *output = l->data;
-      MetaCrtc *assigned_crtc;

-      assigned_crtc = meta_output_get_assigned_crtc (output);
-      if (assigned_crtc == crtc)
+      if (output->crtc == crtc)
        {
          connected_crtc_found = TRUE;
          break;
@@ -204,11 +205,26 @@ meta_gpu_kms_is_crtc_active (MetaGpuKms *gpu_kms,
  return TRUE;
 }

-typedef struct _GpuClosureContainer
+MetaGpuKmsFlipClosureContainer *
+meta_gpu_kms_wrap_flip_closure (MetaGpuKms *gpu_kms,
+                                GClosure   *flip_closure)
 {
-  GClosure *flip_closure;
-  MetaGpuKms *gpu_kms;
-} GpuClosureContainer;
+  MetaGpuKmsFlipClosureContainer *closure_container;
+
+  closure_container = g_new0 (MetaGpuKmsFlipClosureContainer, 1);
+  *closure_container = (MetaGpuKmsFlipClosureContainer) {
+    .flip_closure = flip_closure,
+    .gpu_kms = gpu_kms
+  };
+
+  return closure_container;
+}
+
+void
+meta_gpu_kms_flip_closure_container_free (MetaGpuKmsFlipClosureContainer *closure_container)
+{
+  g_free (closure_container);
+}

 gboolean
 meta_gpu_kms_flip_crtc (MetaGpuKms *gpu_kms,
@@ -234,14 +250,11 @@ meta_gpu_kms_flip_crtc (MetaGpuKms *gpu_kms,

  if (!gpu_kms->page_flips_not_supported)
    {
-      GpuClosureContainer *closure_container;
+      MetaGpuKmsFlipClosureContainer *closure_container;
      int kms_fd = meta_gpu_kms_get_fd (gpu_kms);

-      closure_container = g_new0 (GpuClosureContainer, 1);
-      *closure_container = (GpuClosureContainer) {
-        .flip_closure = flip_closure,
-        .gpu_kms = gpu_kms
-      };
+      closure_container = meta_gpu_kms_wrap_flip_closure (gpu_kms,
+                                                          flip_closure);

      ret = drmModePageFlip (kms_fd,
                             crtc->crtc_id,
@@ -250,7 +263,7 @@ meta_gpu_kms_flip_crtc (MetaGpuKms *gpu_kms,
                             closure_container);
      if (ret != 0 && ret != -EACCES)
        {
-          g_free (closure_container);
+          meta_gpu_kms_flip_closure_container_free (closure_container);
          g_warning ("Failed to flip: %s", strerror (-ret));
          gpu_kms->page_flips_not_supported = TRUE;
        }
@@ -281,12 +294,12 @@ page_flip_handler (int           fd,
                   unsigned int  usec,
                   void         *user_data)
 {
-  GpuClosureContainer *closure_container = user_data;
+  MetaGpuKmsFlipClosureContainer *closure_container = user_data;
  GClosure *flip_closure = closure_container->flip_closure;
  MetaGpuKms *gpu_kms = closure_container->gpu_kms;

  invoke_flip_closure (flip_closure, gpu_kms);
-  g_free (closure_container);
+  meta_gpu_kms_flip_closure_container_free (closure_container);
 }

 gboolean
@@ -756,8 +769,6 @@ meta_gpu_kms_read_current (MetaGpu  *gpu,
     are freed by the platform-independent layer. */
  free_resources (gpu_kms);

-  g_assert (resources.resources->count_connectors > 0);
-
  init_connectors (gpu_kms, resources.resources);
  init_modes (gpu_kms, resources.resources);
  init_crtcs (gpu_kms, &resources);
@@ -781,40 +792,12 @@ meta_gpu_kms_new (MetaMonitorManagerKms  *monitor_manager_kms,
  GSource *source;
  MetaKmsSource *kms_source;
  MetaGpuKms *gpu_kms;
-  drmModeRes *drm_resources;
-  guint n_connectors;
  int kms_fd;

  kms_fd = meta_launcher_open_restricted (launcher, kms_file_path, error);
  if (kms_fd == -1)
    return NULL;

-  /* Some GPUs might have no connectors, for example dedicated GPUs on PRIME (hybrid) laptops.
-   * These GPUs cannot render anything on separate screens, and they are aggressively switched
-   * off by the kernel.
-   *
-   * If we add these PRIME GPUs to the GPU list anyway, Mutter keeps awakening the secondary GPU,
-   * and doing this causes a considerable stuttering. These GPUs are usually put to sleep again
-   * after ~2s without a workload.
-   *
-   * For now, to avoid this situation, only create the MetaGpuKms when the GPU has any connectors.
-   */
-  drm_resources = drmModeGetResources (kms_fd);
-
-  n_connectors = drm_resources->count_connectors;
-
-  drmModeFreeResources (drm_resources);
-
-  if (n_connectors == 0)
-    {
-      g_set_error (error,
-                   META_GPU_KMS_ERROR,
-                   META_GPU_KMS_ERROR_NO_CONNECTORS,
-                   "No connectors available in this GPU. This is probably a dedicated GPU in a hybrid setup.");
-      meta_launcher_close_restricted (launcher, kms_fd);
-      return NULL;
-    }
-
  gpu_kms = g_object_new (META_TYPE_GPU_KMS,
                          "monitor-manager", monitor_manager_kms,
                          NULL);
--- a/src/backends/native/meta-gpu-kms.h
+++ b/src/backends/native/meta-gpu-kms.h
@@ -29,17 +29,11 @@
 #include "backends/meta-gpu.h"
 #include "backends/native/meta-monitor-manager-kms.h"

-typedef enum
-{
-  META_GPU_KMS_ERROR_NO_CONNECTORS,
-} MetaGpuKmsError;
-
-#define META_GPU_KMS_ERROR (meta_gpu_kms_error_quark ())
-GQuark meta_gpu_kms_error_quark (void);
-
 #define META_TYPE_GPU_KMS (meta_gpu_kms_get_type ())
 G_DECLARE_FINAL_TYPE (MetaGpuKms, meta_gpu_kms, META, GPU_KMS, MetaGpu)

+typedef struct _MetaGpuKmsFlipClosureContainer MetaGpuKmsFlipClosureContainer;
+
 typedef struct _MetaKmsResources
 {
  drmModeRes *resources;
@@ -92,4 +86,9 @@ gboolean meta_drm_mode_equal (const drmModeModeInfo *one,

 float meta_calculate_drm_mode_refresh_rate (const drmModeModeInfo *mode);

+MetaGpuKmsFlipClosureContainer * meta_gpu_kms_wrap_flip_closure (MetaGpuKms *gpu_kms,
+                                                                 GClosure   *flip_closure);
+
+void meta_gpu_kms_flip_closure_container_free (MetaGpuKmsFlipClosureContainer *closure_container);
+
 #endif /* META_GPU_KMS_H */
--- a/src/backends/native/meta-monitor-manager-kms.c
+++ b/src/backends/native/meta-monitor-manager-kms.c
@@ -188,7 +188,7 @@ apply_crtc_assignments (MetaMonitorManager *manager,
              MetaOutput *output = g_ptr_array_index (crtc_info->outputs, j);

              output->is_dirty = TRUE;
-              meta_output_assign_crtc (output, crtc);
+              output->crtc = crtc;
            }
        }

@@ -249,7 +249,7 @@ apply_crtc_assignments (MetaMonitorManager *manager,
              continue;
            }

-          meta_output_unassign_crtc (output);
+          output->crtc = NULL;
          output->is_primary = FALSE;
        }
    }
@@ -681,11 +681,8 @@ meta_monitor_manager_kms_initable_init (GInitable    *initable,
      gpu_kms = meta_gpu_kms_new (manager_kms, gpu_path, &secondary_error);
      if (!gpu_kms)
        {
-          if (g_error_matches (secondary_error, META_GPU_KMS_ERROR, META_GPU_KMS_ERROR_NO_CONNECTORS))
-            g_message ("Ignoring GPU %s due to the lack of connectors", gpu_path);
-          else
-            g_warning ("Failed to open secondary gpu '%s': %s", gpu_path, secondary_error->message);
-
+          g_warning ("Failed to open secondary gpu '%s': %s",
+                     gpu_path, secondary_error->message);
          continue;
        }

--- a/src/backends/native/meta-output-kms.c
+++ b/src/backends/native/meta-output-kms.c
@@ -64,13 +64,11 @@ typedef struct _MetaOutputKms
 void
 meta_output_kms_set_underscan (MetaOutput *output)
 {
-  MetaCrtc *crtc;
-
-  crtc = meta_output_get_assigned_crtc (output);
-  if (!crtc)
+  if (!output->crtc)
    return;

-  meta_crtc_kms_set_underscan (crtc, output->is_underscanning);
+  meta_crtc_kms_set_underscan (output->crtc,
+                               output->is_underscanning);
 }

 void
@@ -602,14 +600,14 @@ meta_create_kms_output (MetaGpuKms        *gpu_kms,

          if (crtc->crtc_id == output_kms->current_encoder->crtc_id)
            {
-              meta_output_assign_crtc (output, crtc);
+              output->crtc = crtc;
              break;
            }
        }
    }
  else
    {
-      meta_output_unassign_crtc (output);
+      output->crtc = NULL;
    }

  if (old_output)
--- a/src/backends/native/meta-renderer-native.c
+++ b/src/backends/native/meta-renderer-native.c
@@ -1271,6 +1271,7 @@ flip_egl_stream (MetaOnscreenNative *onscreen_native,
  MetaRendererNativeGpuData *renderer_gpu_data;
  EGLDisplay *egl_display;
  MetaEgl *egl = meta_onscreen_native_get_egl (onscreen_native);
+  MetaGpuKmsFlipClosureContainer *closure_container;
  EGLAttrib *acquire_attribs;
  GError *error = NULL;

@@ -1280,9 +1281,12 @@ flip_egl_stream (MetaOnscreenNative *onscreen_native,
  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, flip_closure);
+
  acquire_attribs = (EGLAttrib[]) {
    EGL_DRM_FLIP_EVENT_DATA_NV,
-    (EGLAttrib) flip_closure,
+    (EGLAttrib) closure_container,
    EGL_NONE
  };

@@ -1301,6 +1305,7 @@ flip_egl_stream (MetaOnscreenNative *onscreen_native,
          renderer_gpu_data->egl.no_egl_output_drm_flip_event = TRUE;
        }
      g_error_free (error);
+      meta_gpu_kms_flip_closure_container_free (closure_container);
      return FALSE;
    }

@@ -2089,7 +2094,6 @@ meta_renderer_native_create_surface_egl_device (CoglOnscreen       *onscreen,
  EGLDisplay egl_display = renderer_gpu_data->egl_display;
  MetaMonitor *monitor;
  MetaOutput *output;
-  MetaCrtc *crtc;
  EGLConfig egl_config;
  EGLStreamKHR egl_stream;
  EGLSurface egl_surface;
@@ -2113,7 +2117,6 @@ meta_renderer_native_create_surface_egl_device (CoglOnscreen       *onscreen,

  monitor = meta_logical_monitor_get_monitors (logical_monitor)->data;
  output = meta_monitor_get_main_output (monitor);
-  crtc = meta_output_get_assigned_crtc (output);

  /*
   * An "logical_monitor" may have multiple outputs/crtcs in case its tiled,
@@ -2121,7 +2124,7 @@ meta_renderer_native_create_surface_egl_device (CoglOnscreen       *onscreen,
   * lets pass the first one.
   */
  output_attribs[0] = EGL_DRM_CRTC_EXT;
-  output_attribs[1] = crtc->crtc_id;
+  output_attribs[1] = output->crtc->crtc_id;
  output_attribs[2] = EGL_NONE;

  if (!meta_egl_get_output_layers (egl, egl_display,
@@ -2719,10 +2722,12 @@ calculate_view_transform (MetaMonitorManager *monitor_manager,
 {
  MetaMonitor *main_monitor;
  MetaOutput *main_output;
-  MetaCrtc *crtc;
+  MetaMonitorTransform crtc_transform;
  main_monitor = meta_logical_monitor_get_monitors (logical_monitor)->data;
  main_output = meta_monitor_get_main_output (main_monitor);
-  crtc = meta_output_get_assigned_crtc (main_output);
+  crtc_transform =
+    meta_monitor_logical_to_crtc_transform (main_monitor,
+                                            logical_monitor->transform);

  /*
   * Pick any monitor and output and check; all CRTCs of a logical monitor will
@@ -2730,11 +2735,11 @@ calculate_view_transform (MetaMonitorManager *monitor_manager,
   */

  if (meta_monitor_manager_is_transform_handled (monitor_manager,
-                                                 crtc,
-                                                 crtc->transform))
+                                                 main_output->crtc,
+                                                 crtc_transform))
    return META_MONITOR_TRANSFORM_NORMAL;
  else
-    return crtc->transform;
+    return crtc_transform;
 }

 static MetaRendererView *
--- a/src/backends/x11/meta-monitor-manager-xrandr.c
+++ b/src/backends/x11/meta-monitor-manager-xrandr.c
@@ -225,10 +225,8 @@ is_crtc_assignment_changed (MetaCrtc      *crtc,
      for (j = 0; j < crtc_info->outputs->len; j++)
        {
          MetaOutput *output = ((MetaOutput**) crtc_info->outputs->pdata)[j];
-          MetaCrtc *assigned_crtc;

-          assigned_crtc = meta_output_get_assigned_crtc (output);
-          if (assigned_crtc != crtc)
+          if (output->crtc != crtc)
            return TRUE;
        }

@@ -245,7 +243,6 @@ is_output_assignment_changed (MetaOutput      *output,
                              MetaOutputInfo **output_infos,
                              unsigned int     n_output_infos)
 {
-  MetaCrtc *assigned_crtc;
  gboolean output_is_found = FALSE;
  unsigned int i;

@@ -268,10 +265,8 @@ is_output_assignment_changed (MetaOutput      *output,
      output_is_found = TRUE;
    }

-  assigned_crtc = meta_output_get_assigned_crtc (output);
-
  if (!output_is_found)
-    return assigned_crtc != NULL;
+    return output->crtc != NULL;

  for (i = 0; i < n_crtc_infos; i++)
    {
@@ -284,7 +279,7 @@ is_output_assignment_changed (MetaOutput      *output,
            ((MetaOutput**) crtc_info->outputs->pdata)[j];

          if (crtc_info_output == output &&
-              crtc_info->crtc == assigned_crtc)
+              crtc_info->crtc == output->crtc)
            return FALSE;
        }
    }
@@ -460,7 +455,7 @@ apply_crtc_assignments (MetaMonitorManager *manager,
              output = ((MetaOutput**)crtc_info->outputs->pdata)[j];

              output->is_dirty = TRUE;
-              meta_output_assign_crtc (output, crtc);
+              output->crtc = crtc;

              output_ids[j] = output->winsys_id;
            }
@@ -526,7 +521,7 @@ apply_crtc_assignments (MetaMonitorManager *manager,
          continue;
        }

-      meta_output_unassign_crtc (output);
+      output->crtc = NULL;
      output->is_primary = FALSE;
    }

--- a/src/backends/x11/meta-output-xrandr.c
+++ b/src/backends/x11/meta-output-xrandr.c
@@ -97,13 +97,10 @@ output_set_underscanning_xrandr (MetaOutput *output,
   * make the border configurable. */
  if (underscanning)
    {
-      MetaCrtc *crtc;
      uint32_t border_value;

-      crtc = meta_output_get_assigned_crtc (output);
-
      prop = XInternAtom (xdisplay, "underscan hborder", False);
-      border_value = crtc->current_mode->width * 0.05;
+      border_value = output->crtc->current_mode->width * 0.05;

      xcb_randr_change_output_property (XGetXCBConnection (xdisplay),
                                        (XID) output->winsys_id,
@@ -112,7 +109,7 @@ output_set_underscanning_xrandr (MetaOutput *output,
                                        1, &border_value);

      prop = XInternAtom (xdisplay, "underscan vborder", False);
-      border_value = crtc->current_mode->height * 0.05;
+      border_value = output->crtc->current_mode->height * 0.05;

      xcb_randr_change_output_property (XGetXCBConnection (xdisplay),
                                        (XID) output->winsys_id,
@@ -740,14 +737,14 @@ output_get_crtcs (MetaOutput    *output,
    }
  output->n_possible_crtcs = n_actual_crtcs;

-  meta_output_unassign_crtc (output);
+  output->crtc = NULL;
  for (l = meta_gpu_get_crtcs (gpu); l; l = l->next)
    {
      MetaCrtc *crtc = l->data;

      if ((XID) crtc->crtc_id == xrandr_output->crtc)
        {
-          meta_output_assign_crtc (output, crtc);
+          output->crtc = crtc;
          break;
        }
    }
--- a/src/backends/x11/meta-stage-x11-nested.c
+++ b/src/backends/x11/meta-stage-x11-nested.c
@@ -113,7 +113,7 @@ draw_crtc (MetaMonitor         *monitor,
  CoglTexture *texture = data->texture;
  MetaLogicalMonitor *logical_monitor = data->logical_monitor;
  MetaOutput *output = monitor_crtc_mode->output;
-  MetaCrtc *crtc;
+  MetaCrtc *crtc = output->crtc;
  MetaRendererView *renderer_view = META_RENDERER_VIEW (data->view);
  MetaMonitorTransform view_transform;
  MetaMonitorTransform layout_transform = META_MONITOR_TRANSFORM_NORMAL;
@@ -129,8 +129,6 @@ draw_crtc (MetaMonitor         *monitor,
  texture_width = cogl_texture_get_width (texture);
  texture_height = cogl_texture_get_height (texture);

-  crtc = meta_output_get_assigned_crtc (output);
-
  clutter_stage_view_get_layout (data->view, &view_layout);
  sample_x = crtc->rect.x - view_layout.x;
  sample_y = crtc->rect.y - view_layout.y;
--- a/src/backends/x11/nested/meta-renderer-x11-nested.c
+++ b/src/backends/x11/nested/meta-renderer-x11-nested.c
@@ -50,22 +50,24 @@ calculate_view_transform (MetaMonitorManager *monitor_manager,
 {
  MetaMonitor *main_monitor;
  MetaOutput *main_output;
-  MetaCrtc *crtc;
-
+  MetaMonitorTransform crtc_transform;
  main_monitor = meta_logical_monitor_get_monitors (logical_monitor)->data;
  main_output = meta_monitor_get_main_output (main_monitor);
-  crtc = meta_output_get_assigned_crtc (main_output);
+  crtc_transform =
+    meta_monitor_logical_to_crtc_transform (main_monitor,
+                                            logical_monitor->transform);
+
  /*
   * Pick any monitor and output and check; all CRTCs of a logical monitor will
   * always have the same transform assigned to them.
   */

  if (meta_monitor_manager_is_transform_handled (monitor_manager,
-                                                 crtc,
-                                                 crtc->transform))
+                                                 main_output->crtc,
+                                                 crtc_transform))
    return META_MONITOR_TRANSFORM_NORMAL;
  else
-    return crtc->transform;
+    return crtc_transform;
 }

 static MetaRendererView *
--- a/src/compositor/meta-shaped-texture.c
+++ b/src/compositor/meta-shaped-texture.c
@@ -38,6 +38,20 @@

 #include "meta-cullable.h"

+/* MAX_MIPMAPPING_FPS needs to be as small as possible for the best GPU
+ * performance, but higher than the refresh rate of commonly slow updating
+ * windows like top or a blinking cursor, so that such windows do get
+ * mipmapped.
+ */
+#define MAX_MIPMAPPING_FPS 5
+#define MIN_MIPMAP_AGE_USEC (G_USEC_PER_SEC / MAX_MIPMAPPING_FPS)
+
+/* MIN_FAST_UPDATES_BEFORE_UNMIPMAP allows windows to update themselves
+ * occasionally without causing mipmapping to be disabled, so long as such
+ * an update takes fewer update_area calls than:
+ */
+#define MIN_FAST_UPDATES_BEFORE_UNMIPMAP 20
+
 static void meta_shaped_texture_dispose  (GObject    *object);

 static void meta_shaped_texture_paint (ClutterActor       *actor);
@@ -95,6 +109,11 @@ struct _MetaShapedTexturePrivate
  guint tex_width, tex_height;
  guint fallback_width, fallback_height;

+  gint64 prev_invalidation, last_invalidation;
+  guint fast_updates;
+  guint remipmap_timeout_id;
+  gint64 earliest_remipmap;
+
  guint create_mipmaps : 1;
 };

@@ -191,6 +210,12 @@ meta_shaped_texture_dispose (GObject *object)
  MetaShapedTexture *self = (MetaShapedTexture *) object;
  MetaShapedTexturePrivate *priv = self->priv;

+  if (priv->remipmap_timeout_id)
+    {
+      g_source_remove (priv->remipmap_timeout_id);
+      priv->remipmap_timeout_id = 0;
+    }
+
  if (priv->paint_tower)
    meta_texture_tower_free (priv->paint_tower);
  priv->paint_tower = NULL;
@@ -372,6 +397,21 @@ set_cogl_texture (MetaShapedTexture *stex,
    meta_texture_tower_set_base_texture (priv->paint_tower, cogl_tex);
 }

+static gboolean
+texture_is_idle_and_not_mipmapped (gpointer user_data)
+{
+  MetaShapedTexture *stex = META_SHAPED_TEXTURE (user_data);
+  MetaShapedTexturePrivate *priv = stex->priv;
+
+  if ((g_get_monotonic_time () - priv->earliest_remipmap) < 0)
+    return G_SOURCE_CONTINUE;
+
+  clutter_actor_queue_redraw (CLUTTER_ACTOR (stex));
+  priv->remipmap_timeout_id = 0;
+
+  return G_SOURCE_REMOVE;
+}
+
 static void
 meta_shaped_texture_paint (ClutterActor *actor)
 {
@@ -381,9 +421,10 @@ meta_shaped_texture_paint (ClutterActor *actor)
  guchar opacity;
  CoglContext *ctx;
  CoglFramebuffer *fb;
-  CoglTexture *paint_tex;
+  CoglTexture *paint_tex = NULL;
  ClutterActorBox alloc;
  CoglPipelineFilter filter;
+  gint64 now = g_get_monotonic_time ();

  if (priv->clip_region && cairo_region_is_empty (priv->clip_region))
    return;
@@ -406,13 +447,34 @@ meta_shaped_texture_paint (ClutterActor *actor)
   * Setting the texture quality to high without SGIS_generate_mipmap
   * support for TFP textures will result in fallbacks to XGetImage.
   */
-  if (priv->create_mipmaps)
-    paint_tex = meta_texture_tower_get_paint_texture (priv->paint_tower);
-  else
-    paint_tex = COGL_TEXTURE (priv->texture);
+  if (priv->create_mipmaps && priv->last_invalidation)
+    {
+      gint64 age = now - priv->last_invalidation;
+
+      if (age >= MIN_MIPMAP_AGE_USEC ||
+          priv->fast_updates < MIN_FAST_UPDATES_BEFORE_UNMIPMAP)
+        paint_tex = meta_texture_tower_get_paint_texture (priv->paint_tower);
+    }

  if (paint_tex == NULL)
-    return;
+    {
+      paint_tex = COGL_TEXTURE (priv->texture);
+
+      if (paint_tex == NULL)
+        return;
+
+      if (priv->create_mipmaps)
+        {
+          /* Minus 1000 to ensure we don't fail the age test in timeout */
+          priv->earliest_remipmap = now + MIN_MIPMAP_AGE_USEC - 1000;
+
+          if (!priv->remipmap_timeout_id)
+            priv->remipmap_timeout_id =
+              g_timeout_add (MIN_MIPMAP_AGE_USEC / 1000,
+                             texture_is_idle_and_not_mipmapped,
+                             stex);
+        }
+    }

  tex_width = priv->tex_width;
  tex_height = priv->tex_height;
@@ -758,6 +820,20 @@ meta_shaped_texture_update_area (MetaShapedTexture *stex,

  meta_texture_tower_update_area (priv->paint_tower, x, y, width, height);

+  priv->prev_invalidation = priv->last_invalidation;
+  priv->last_invalidation = g_get_monotonic_time ();
+
+  if (priv->prev_invalidation)
+    {
+      gint64 interval = priv->last_invalidation - priv->prev_invalidation;
+      gboolean fast_update = interval < MIN_MIPMAP_AGE_USEC;
+
+      if (!fast_update)
+        priv->fast_updates = 0;
+      else if (priv->fast_updates < MIN_FAST_UPDATES_BEFORE_UNMIPMAP)
+        priv->fast_updates++;
+    }
+
  unobscured_region = effective_unobscured_region (stex);
  if (unobscured_region)
    {
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -450,7 +450,7 @@ meta_window_actor_update_surface (MetaWindowActor *self)

 #ifdef HAVE_WAYLAND
  if (window->surface)
-    surface_actor = window->surface->surface_actor;
+    surface_actor = meta_wayland_surface_get_actor (window->surface);
  else
 #endif
  if (!meta_is_wayland_compositor ())
--- a/src/core/constraints.c
+++ b/src/core/constraints.c
@@ -886,8 +886,7 @@ constrain_modal_dialog (MetaWindow         *window,
  MetaRectangle child_rect, parent_rect;
  gboolean constraint_already_satisfied;

-  if (!parent ||
-      !meta_window_is_attached_dialog (window) ||
+  if (!meta_window_is_attached_dialog (window) ||
      meta_window_get_placement_rule (window))
    return TRUE;

--- a/src/core/delete.c
+++ b/src/core/delete.c
@@ -115,5 +115,8 @@ meta_window_kill (MetaWindow *window)
 void
 meta_window_free_delete_dialog (MetaWindow *window)
 {
+  if (window->close_dialog &&
+      meta_close_dialog_is_visible (window->close_dialog))
+    meta_close_dialog_hide (window->close_dialog);
  g_clear_object (&window->close_dialog);
 }
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -417,7 +417,7 @@ check_for_wayland_session_type (void)
 *
 * If no flag is passed that forces the compositor type, the compositor type
 * is determined first from the logind session type, or if that fails, from the
- * XDG_SESSION_TYPE enviornment variable.
+ * XDG_SESSION_TYPE environment variable.
 *
 * If no flag is passed that forces the backend type, the backend type is
 * determined given the compositor type. If the compositor is a Wayland
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -4734,7 +4734,7 @@ set_workspace_state (MetaWindow    *window,
  /* queue a move_resize since changing workspaces may change
   * the relevant struts
   */
-  if (!window->override_redirect)
+  if (!window->override_redirect && window != window->display->grab_window)
    meta_window_queue (window, META_QUEUE_MOVE_RESIZE);
  meta_window_queue (window, META_QUEUE_CALC_SHOWING);
  meta_window_current_workspace_changed (window);
--- a/src/tests/meta-monitor-manager-test.c
+++ b/src/tests/meta-monitor-manager-test.c
@@ -209,7 +209,7 @@ apply_crtc_assignments (MetaMonitorManager *manager,
              output = ((MetaOutput**)crtc_info->outputs->pdata)[j];

              output->is_dirty = TRUE;
-              meta_output_assign_crtc (output, crtc);
+              output->crtc = crtc;
            }
        }
    }
@@ -255,7 +255,7 @@ apply_crtc_assignments (MetaMonitorManager *manager,
          continue;
        }

-      meta_output_unassign_crtc (output);
+      output->crtc = NULL;
      output->is_primary = FALSE;
    }
 }
--- a/src/tests/monitor-unit-tests.c
+++ b/src/tests/monitor-unit-tests.c
@@ -449,24 +449,22 @@ check_current_monitor_mode (MetaMonitor         *monitor,
  CheckMonitorModeData *data = user_data;
  MetaMonitorManager *monitor_manager = data->monitor_manager;
  MetaOutput *output;
-  MetaCrtc *crtc;

  output = output_from_winsys_id (monitor_manager,
                                  data->expect_crtc_mode_iter->output);
-  crtc = meta_output_get_assigned_crtc (output);

  if (data->expect_crtc_mode_iter->crtc_mode == -1)
    {
-      g_assert_null (crtc);
+      g_assert_null (output->crtc);
    }
  else
    {
      MetaLogicalMonitor *logical_monitor;

-      g_assert_nonnull (crtc);
-      g_assert (monitor_crtc_mode->crtc_mode == crtc->current_mode);
+      g_assert_nonnull (output->crtc);
+      g_assert (monitor_crtc_mode->crtc_mode == output->crtc->current_mode);

-      logical_monitor = crtc->logical_monitor;
+      logical_monitor = output->crtc->logical_monitor;
      g_assert_nonnull (logical_monitor);
    }

@@ -555,7 +553,6 @@ check_logical_monitor (MonitorTestCase               *test_case,
      for (l_output = outputs; l_output; l_output = l_output->next)
        {
          MetaOutput *output = l_output->data;
-          MetaCrtc *crtc;

          if (output->is_primary)
            {
@@ -563,8 +560,8 @@ check_logical_monitor (MonitorTestCase               *test_case,
              primary_output = output;
            }

-          crtc = meta_output_get_assigned_crtc (output);
-          g_assert (!crtc || crtc->logical_monitor == logical_monitor);
+          g_assert (!output->crtc ||
+                    output->crtc->logical_monitor == logical_monitor);
          g_assert_cmpint (logical_monitor->is_presentation,
                           ==,
                           output->is_presentation);
@@ -986,8 +983,7 @@ create_monitor_test_setup (MonitorTestCase *test_case,

      output = g_object_new (META_TYPE_OUTPUT, NULL);

-      if (crtc)
-        meta_output_assign_crtc (output, crtc);
+      output->crtc = crtc;
      output->winsys_id = i;
      output->name = (is_laptop_panel ? g_strdup_printf ("eDP-%d",
                                                  ++n_laptop_panels)
--- a/src/wayland/meta-pointer-confinement-wayland.c
+++ b/src/wayland/meta-pointer-confinement-wayland.c
@@ -664,17 +664,8 @@ meta_pointer_confinement_wayland_maybe_warp (MetaPointerConfinementWayland *self
 }

 static void
-surface_actor_allocation_notify (MetaSurfaceActorWayland       *surface_actor,
-                                 GParamSpec                    *pspec,
-                                 MetaPointerConfinementWayland *self)
-{
-  meta_pointer_confinement_wayland_maybe_warp (self);
-}
-
-static void
-surface_actor_position_notify (MetaSurfaceActorWayland       *surface_actor,
-                               GParamSpec                    *pspec,
-                               MetaPointerConfinementWayland *self)
+surface_actor_geometry_changed (MetaSurfaceActorWayland       *surface_actor,
+                                MetaPointerConfinementWayland *self)
 {
  meta_pointer_confinement_wayland_maybe_warp (self);
 }
@@ -699,14 +690,9 @@ meta_pointer_confinement_wayland_new (MetaWaylandPointerConstraint *constraint)
  confinement->constraint = constraint;

  surface = meta_wayland_pointer_constraint_get_surface (constraint);
-  g_signal_connect_object (surface->surface_actor,
-                           "notify::allocation",
-                           G_CALLBACK (surface_actor_allocation_notify),
-                           confinement,
-                           0);
-  g_signal_connect_object (surface->surface_actor,
-                           "notify::position",
-                           G_CALLBACK (surface_actor_position_notify),
+  g_signal_connect_object (meta_wayland_surface_get_actor (surface),
+                           "geometry-changed",
+                           G_CALLBACK (surface_actor_geometry_changed),
                           confinement,
                           0);
  if (surface->window)
--- a/src/wayland/meta-wayland-actor-surface.c
+++ b/src/wayland/meta-wayland-actor-surface.c
@@ -30,30 +30,70 @@
 #include "wayland/meta-wayland-surface.h"
 #include "wayland/meta-window-wayland.h"

-G_DEFINE_ABSTRACT_TYPE (MetaWaylandActorSurface,
-                        meta_wayland_actor_surface,
-                        META_TYPE_WAYLAND_SURFACE_ROLE)
+typedef struct _MetaWaylandActorSurfacePrivate MetaWaylandActorSurfacePrivate;
+
+struct _MetaWaylandActorSurfacePrivate
+{
+  MetaSurfaceActor *actor;
+};
+
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (MetaWaylandActorSurface,
+                                     meta_wayland_actor_surface,
+                                     META_TYPE_WAYLAND_SURFACE_ROLE)
+
+static void
+meta_wayland_actor_surface_constructed (GObject *object)
+{
+  G_OBJECT_CLASS (meta_wayland_actor_surface_parent_class)->constructed (object);
+
+  meta_wayland_actor_surface_reset_actor (META_WAYLAND_ACTOR_SURFACE (object));
+}
+
+static void
+meta_wayland_actor_surface_dispose (GObject *object)
+{
+  MetaWaylandActorSurfacePrivate *priv =
+    meta_wayland_actor_surface_get_instance_private (META_WAYLAND_ACTOR_SURFACE (object));
+  MetaWaylandSurface *surface =
+    meta_wayland_surface_role_get_surface (META_WAYLAND_SURFACE_ROLE (object));
+
+  if (priv->actor)
+    {
+      g_signal_handlers_disconnect_by_func (priv->actor,
+                                            meta_wayland_surface_notify_geometry_changed,
+                                            surface);
+      clutter_actor_set_reactive (CLUTTER_ACTOR (priv->actor), FALSE);
+      g_clear_object (&priv->actor);
+    }
+
+  G_OBJECT_CLASS (meta_wayland_actor_surface_parent_class)->dispose (object);
+}

 static void
 meta_wayland_actor_surface_assigned (MetaWaylandSurfaceRole *surface_role)
 {
+  MetaWaylandActorSurfacePrivate *priv =
+    meta_wayland_actor_surface_get_instance_private (META_WAYLAND_ACTOR_SURFACE (surface_role));
  MetaWaylandSurface *surface =
    meta_wayland_surface_role_get_surface (surface_role);
-  MetaSurfaceActorWayland *surface_actor =
-    META_SURFACE_ACTOR_WAYLAND (surface->surface_actor);
+  GList *l;

-  meta_surface_actor_wayland_add_frame_callbacks (surface_actor,
+  meta_surface_actor_wayland_add_frame_callbacks (META_SURFACE_ACTOR_WAYLAND (priv->actor),
                                                  &surface->pending_frame_callback_list);
  wl_list_init (&surface->pending_frame_callback_list);
+
+  for (l = surface->subsurfaces; l; l = l->next)
+    {
+      ClutterActor *subsurface_actor =
+        CLUTTER_ACTOR (meta_wayland_surface_get_actor (l->data));
+      clutter_actor_add_child (CLUTTER_ACTOR (priv->actor), subsurface_actor);
+    }
 }

 static void
-queue_surface_actor_frame_callbacks (MetaWaylandSurface      *surface,
+queue_surface_actor_frame_callbacks (MetaSurfaceActorWayland *surface_actor,
                                     MetaWaylandPendingState *pending)
 {
-  MetaSurfaceActorWayland *surface_actor =
-    META_SURFACE_ACTOR_WAYLAND (surface->surface_actor);
-
  meta_surface_actor_wayland_add_frame_callbacks (surface_actor,
                                                  &pending->frame_callback_list);
  wl_list_init (&pending->frame_callback_list);
@@ -90,6 +130,8 @@ meta_wayland_actor_surface_calculate_scale (MetaWaylandActorSurface *actor_surfa
 static void
 meta_wayland_actor_surface_real_sync_actor_state (MetaWaylandActorSurface *actor_surface)
 {
+  MetaWaylandActorSurfacePrivate *priv =
+    meta_wayland_actor_surface_get_instance_private (actor_surface);
  MetaWaylandSurfaceRole *surface_role =
    META_WAYLAND_SURFACE_ROLE (actor_surface);
  MetaWaylandSurface *surface =
@@ -99,7 +141,7 @@ meta_wayland_actor_surface_real_sync_actor_state (MetaWaylandActorSurface *actor
  double actor_scale;
  GList *l;

-  surface_actor = surface->surface_actor;
+  surface_actor = priv->actor;
  stex = meta_surface_actor_get_texture (surface_actor);

  actor_scale = meta_wayland_actor_surface_calculate_scale (actor_surface);
@@ -161,13 +203,16 @@ static void
 meta_wayland_actor_surface_commit (MetaWaylandSurfaceRole  *surface_role,
                                   MetaWaylandPendingState *pending)
 {
+  MetaWaylandActorSurfacePrivate *priv =
+    meta_wayland_actor_surface_get_instance_private (META_WAYLAND_ACTOR_SURFACE (surface_role));
  MetaWaylandActorSurface *actor_surface =
    META_WAYLAND_ACTOR_SURFACE (surface_role);
  MetaWaylandSurface *surface =
    meta_wayland_surface_role_get_surface (surface_role);
  MetaWaylandSurface *toplevel_surface;

-  queue_surface_actor_frame_callbacks (surface, pending);
+  queue_surface_actor_frame_callbacks (META_SURFACE_ACTOR_WAYLAND (priv->actor),
+                                       pending);

  toplevel_surface = meta_wayland_surface_get_toplevel (surface);
  if (!toplevel_surface || !toplevel_surface->window)
@@ -180,9 +225,9 @@ static gboolean
 meta_wayland_actor_surface_is_on_logical_monitor (MetaWaylandSurfaceRole *surface_role,
                                                  MetaLogicalMonitor     *logical_monitor)
 {
-  MetaWaylandSurface *surface =
-    meta_wayland_surface_role_get_surface (surface_role);
-  ClutterActor *actor = CLUTTER_ACTOR (surface->surface_actor);
+  MetaWaylandActorSurfacePrivate *priv =
+    meta_wayland_actor_surface_get_instance_private (META_WAYLAND_ACTOR_SURFACE (surface_role));
+  ClutterActor *actor = CLUTTER_ACTOR (priv->actor);
  float x, y, width, height;
  cairo_rectangle_int_t actor_rect;
  cairo_region_t *region;
@@ -226,6 +271,10 @@ meta_wayland_actor_surface_class_init (MetaWaylandActorSurfaceClass *klass)
 {
  MetaWaylandSurfaceRoleClass *surface_role_class =
    META_WAYLAND_SURFACE_ROLE_CLASS (klass);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed = meta_wayland_actor_surface_constructed;
+  object_class->dispose = meta_wayland_actor_surface_dispose;

  surface_role_class->assigned = meta_wayland_actor_surface_assigned;
  surface_role_class->commit = meta_wayland_actor_surface_commit;
@@ -234,3 +283,41 @@ meta_wayland_actor_surface_class_init (MetaWaylandActorSurfaceClass *klass)

  klass->sync_actor_state = meta_wayland_actor_surface_real_sync_actor_state;
 }
+
+MetaSurfaceActor *
+meta_wayland_actor_surface_get_actor (MetaWaylandActorSurface *actor_surface)
+{
+  MetaWaylandActorSurfacePrivate *priv =
+    meta_wayland_actor_surface_get_instance_private (actor_surface);
+
+  return priv->actor;
+}
+
+void
+meta_wayland_actor_surface_reset_actor (MetaWaylandActorSurface *actor_surface)
+{
+  MetaWaylandActorSurfacePrivate *priv =
+    meta_wayland_actor_surface_get_instance_private (actor_surface);
+  MetaWaylandSurface *surface =
+    meta_wayland_surface_role_get_surface (META_WAYLAND_SURFACE_ROLE (actor_surface));
+
+  if (priv->actor)
+    {
+      g_signal_handlers_disconnect_by_func (priv->actor,
+                                            meta_wayland_surface_notify_geometry_changed,
+                                            surface);
+      g_object_unref (priv->actor);
+    }
+
+  priv->actor = g_object_ref_sink (meta_surface_actor_wayland_new (surface));
+
+  g_signal_connect_swapped (priv->actor, "notify::allocation",
+                            G_CALLBACK (meta_wayland_surface_notify_geometry_changed),
+                            surface);
+  g_signal_connect_swapped (priv->actor, "notify::position",
+                            G_CALLBACK (meta_wayland_surface_notify_geometry_changed),
+                            surface);
+  g_signal_connect_swapped (priv->actor, "notify::mapped",
+                            G_CALLBACK (meta_wayland_surface_notify_geometry_changed),
+                            surface);
+}
--- a/src/wayland/meta-wayland-actor-surface.h
+++ b/src/wayland/meta-wayland-actor-surface.h
@@ -40,4 +40,7 @@ void meta_wayland_actor_surface_sync_actor_state (MetaWaylandActorSurface *actor

 double meta_wayland_actor_surface_calculate_scale (MetaWaylandActorSurface *actor_surface);

+MetaSurfaceActor * meta_wayland_actor_surface_get_actor (MetaWaylandActorSurface *actor_surface);
+void meta_wayland_actor_surface_reset_actor (MetaWaylandActorSurface *actor_surface);
+
 #endif /* META_WAYLAND_ACTOR_SURFACE_H */
--- a/src/wayland/meta-wayland-data-device.c
+++ b/src/wayland/meta-wayland-data-device.c
@@ -1083,6 +1083,7 @@ meta_wayland_data_device_start_drag (MetaWaylandDataDevice                 *data
  MetaWaylandDragGrab *drag_grab;
  ClutterPoint pos, surface_pos;
  ClutterModifierType modifiers;
+  MetaSurfaceActor *surface_actor;

  data_device->current_grab = drag_grab = g_slice_new0 (MetaWaylandDragGrab);

@@ -1100,7 +1101,9 @@ meta_wayland_data_device_start_drag (MetaWaylandDataDevice                 *data
  wl_resource_add_destroy_listener (surface->resource,
                                    &drag_grab->drag_origin_listener);

-  clutter_actor_transform_stage_point (CLUTTER_ACTOR (meta_surface_actor_get_texture (surface->surface_actor)),
+  surface_actor = meta_wayland_surface_get_actor (surface);
+
+  clutter_actor_transform_stage_point (CLUTTER_ACTOR (meta_surface_actor_get_texture (surface_actor)),
                                       seat->pointer->grab_x,
                                       seat->pointer->grab_y,
                                       &surface_pos.x, &surface_pos.y);
@@ -1121,19 +1124,22 @@ meta_wayland_data_device_start_drag (MetaWaylandDataDevice                 *data

  if (icon_surface)
    {
+      ClutterActor *drag_origin_actor;
+
      drag_grab->drag_surface = icon_surface;

      drag_grab->drag_icon_listener.notify = destroy_data_device_icon;
      wl_resource_add_destroy_listener (icon_surface->resource,
                                        &drag_grab->drag_icon_listener);

-      drag_grab->feedback_actor = meta_dnd_actor_new (CLUTTER_ACTOR (drag_grab->drag_origin->surface_actor),
+      drag_origin_actor = CLUTTER_ACTOR (meta_wayland_surface_get_actor (drag_grab->drag_origin));
+
+      drag_grab->feedback_actor = meta_dnd_actor_new (drag_origin_actor,
                                                      drag_grab->drag_start_x,
                                                      drag_grab->drag_start_y);
      meta_feedback_actor_set_anchor (META_FEEDBACK_ACTOR (drag_grab->feedback_actor),
                                      0, 0);
-      clutter_actor_add_child (drag_grab->feedback_actor,
-                               CLUTTER_ACTOR (drag_grab->drag_surface->surface_actor));
+      clutter_actor_add_child (drag_grab->feedback_actor, drag_origin_actor);

      clutter_input_device_get_coords (seat->pointer->device, NULL, &pos);
      meta_feedback_actor_set_position (META_FEEDBACK_ACTOR (drag_grab->feedback_actor),
--- a/src/wayland/meta-wayland-private.h
+++ b/src/wayland/meta-wayland-private.h
@@ -72,6 +72,8 @@ struct _MetaWaylandCompositor

  MetaWaylandSeat *seat;
  MetaWaylandTabletManager *tablet_manager;
+
+  GHashTable *scheduled_surface_associations;
 };

 #endif /* META_WAYLAND_PRIVATE_H */
--- a/src/wayland/meta-wayland-subsurface.c
+++ b/src/wayland/meta-wayland-subsurface.c
@@ -54,7 +54,7 @@ G_DEFINE_TYPE (MetaWaylandSubsurface,
 static void
 sync_actor_subsurface_state (MetaWaylandSurface *surface)
 {
-  ClutterActor *actor = CLUTTER_ACTOR (surface->surface_actor);
+  ClutterActor *actor = CLUTTER_ACTOR (meta_wayland_surface_get_actor (surface));
  MetaWindow *toplevel_window;
  int geometry_scale;
  int x, y;
@@ -99,8 +99,8 @@ meta_wayland_subsurface_parent_state_applied (MetaWaylandSubsurface *subsurface)
      GSList *it;
      MetaWaylandSurface *parent = surface->sub.parent;
      ClutterActor *parent_actor =
-        clutter_actor_get_parent (CLUTTER_ACTOR (parent->surface_actor));
-      ClutterActor *surface_actor = CLUTTER_ACTOR (surface->surface_actor);
+        clutter_actor_get_parent (CLUTTER_ACTOR (meta_wayland_surface_get_actor (parent)));
+      ClutterActor *surface_actor = CLUTTER_ACTOR (meta_wayland_surface_get_actor (surface));

      for (it = surface->sub.pending_placement_ops; it; it = it->next)
        {
@@ -113,7 +113,7 @@ meta_wayland_subsurface_parent_state_applied (MetaWaylandSubsurface *subsurface)
              continue;
            }

-          sibling_actor = CLUTTER_ACTOR (op->sibling->surface_actor);
+          sibling_actor = CLUTTER_ACTOR (meta_wayland_surface_get_actor (op->sibling));

          switch (op->placement)
            {
@@ -234,7 +234,7 @@ meta_wayland_subsurface_class_init (MetaWaylandSubsurfaceClass *klass)
 static void
 unparent_actor (MetaWaylandSurface *surface)
 {
-  ClutterActor *actor = CLUTTER_ACTOR (surface->surface_actor);
+  ClutterActor *actor = CLUTTER_ACTOR (meta_wayland_surface_get_actor (surface));
  ClutterActor *parent_actor;

  parent_actor = clutter_actor_get_parent (actor);
@@ -471,10 +471,13 @@ wl_subcompositor_get_subsurface (struct wl_client   *client,
                                    &surface->sub.parent_destroy_listener);
  parent->subsurfaces = g_list_append (parent->subsurfaces, surface);

-  clutter_actor_add_child (CLUTTER_ACTOR (parent->surface_actor),
-                           CLUTTER_ACTOR (surface->surface_actor));
+  if (meta_wayland_surface_get_actor (parent))
+    {
+      clutter_actor_add_child (CLUTTER_ACTOR (meta_wayland_surface_get_actor (parent)),
+                               CLUTTER_ACTOR (meta_wayland_surface_get_actor (surface)));
+    }

-  clutter_actor_set_reactive (CLUTTER_ACTOR (surface->surface_actor), TRUE);
+  clutter_actor_set_reactive (CLUTTER_ACTOR (meta_wayland_surface_get_actor (surface)), TRUE);
 }

 static const struct wl_subcompositor_interface meta_wayland_subcompositor_interface = {
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -105,6 +105,7 @@ enum {
  SURFACE_CONFIGURE,
  SURFACE_SHORTCUTS_INHIBITED,
  SURFACE_SHORTCUTS_RESTORED,
+  SURFACE_GEOMETRY_CHANGED,
  N_SURFACE_SIGNALS
 };

@@ -128,18 +129,6 @@ meta_wayland_surface_role_is_on_logical_monitor (MetaWaylandSurfaceRole *surface
 static MetaWaylandSurface *
 meta_wayland_surface_role_get_toplevel (MetaWaylandSurfaceRole *surface_role);

-static void
-surface_actor_mapped_notify (MetaSurfaceActorWayland *surface_actor,
-                             GParamSpec              *pspec,
-                             MetaWaylandSurface      *surface);
-static void
-surface_actor_allocation_notify (MetaSurfaceActorWayland *surface_actor,
-                                 GParamSpec              *pspec,
-                                 MetaWaylandSurface      *surface);
-static void
-surface_actor_position_notify (MetaSurfaceActorWayland *surface_actor,
-                               GParamSpec              *pspec,
-                               MetaWaylandSurface      *surface);
 static void
 window_position_changed (MetaWindow         *window,
                         MetaWaylandSurface *surface);
@@ -312,7 +301,7 @@ surface_process_damage (MetaWaylandSurface *surface,
      cairo_rectangle_int_t rect;
      cairo_region_get_rectangle (scaled_region, i, &rect);

-      meta_surface_actor_process_damage (surface->surface_actor,
+      meta_surface_actor_process_damage (meta_wayland_surface_get_actor (surface),
                                         rect.x, rect.y,
                                         rect.width, rect.height);
    }
@@ -655,14 +644,14 @@ meta_wayland_surface_apply_pending_state (MetaWaylandSurface      *surface,
              goto cleanup;
            }

-          if (switched_buffer)
+          if (switched_buffer && meta_wayland_surface_get_actor (surface))
            {
              MetaShapedTexture *stex;
              CoglTexture *texture;
              CoglSnippet *snippet;
              gboolean is_y_inverted;

-              stex = meta_surface_actor_get_texture (surface->surface_actor);
+              stex = meta_surface_actor_get_texture (meta_wayland_surface_get_actor (surface));
              texture = meta_wayland_buffer_get_texture (pending->buffer);
              snippet = meta_wayland_buffer_create_snippet (pending->buffer);
              is_y_inverted = meta_wayland_buffer_is_y_inverted (pending->buffer);
@@ -686,8 +675,9 @@ meta_wayland_surface_apply_pending_state (MetaWaylandSurface      *surface,
  if (pending->scale > 0)
    surface->scale = pending->scale;

-  if (!cairo_region_is_empty (pending->surface_damage) ||
-      !cairo_region_is_empty (pending->buffer_damage))
+  if (meta_wayland_surface_get_actor (surface) &&
+      (!cairo_region_is_empty (pending->surface_damage) ||
+       !cairo_region_is_empty (pending->buffer_damage)))
    surface_process_damage (surface,
                            pending->surface_damage,
                            pending->buffer_damage);
@@ -1149,7 +1139,7 @@ meta_wayland_surface_set_window (MetaWaylandSurface *surface,

  surface->window = window;

-  clutter_actor_set_reactive (CLUTTER_ACTOR (surface->surface_actor), !!window);
+  clutter_actor_set_reactive (CLUTTER_ACTOR (meta_wayland_surface_get_actor (surface)), !!window);
  sync_drag_dest_funcs (surface);

  if (was_unmapped)
@@ -1177,16 +1167,6 @@ wl_surface_destructor (struct wl_resource *resource)

  g_signal_emit (surface, surface_signals[SURFACE_DESTROY], 0);

-  g_signal_handlers_disconnect_by_func (surface->surface_actor,
-                                        surface_actor_mapped_notify,
-                                        surface);
-  g_signal_handlers_disconnect_by_func (surface->surface_actor,
-                                        surface_actor_allocation_notify,
-                                        surface);
-  g_signal_handlers_disconnect_by_func (surface->surface_actor,
-                                        surface_actor_position_notify,
-                                        surface);
-
  g_clear_object (&surface->role);

  /* If we still have a window at the time of destruction, that means that
@@ -1212,8 +1192,6 @@ wl_surface_destructor (struct wl_resource *resource)
  if (surface->input_region)
    cairo_region_destroy (surface->input_region);

-  g_object_unref (surface->surface_actor);
-
  meta_wayland_compositor_destroy_frame_callbacks (compositor, surface);

  g_hash_table_foreach (surface->outputs_to_destroy_notify_id, surface_output_disconnect_signal, surface);
@@ -1235,30 +1213,6 @@ wl_surface_destructor (struct wl_resource *resource)
  meta_wayland_compositor_repick (compositor);
 }

-static void
-surface_actor_mapped_notify (MetaSurfaceActorWayland *surface_actor,
-                             GParamSpec              *pspec,
-                             MetaWaylandSurface      *surface)
-{
-  meta_wayland_surface_update_outputs_recursively (surface);
-}
-
-static void
-surface_actor_allocation_notify (MetaSurfaceActorWayland *surface_actor,
-                                 GParamSpec              *pspec,
-                                 MetaWaylandSurface      *surface)
-{
-  meta_wayland_surface_update_outputs_recursively (surface);
-}
-
-static void
-surface_actor_position_notify (MetaSurfaceActorWayland *surface_actor,
-                               GParamSpec              *pspec,
-                               MetaWaylandSurface      *surface)
-{
-  meta_wayland_surface_update_outputs_recursively (surface);
-}
-
 static void
 window_position_changed (MetaWindow         *window,
                         MetaWaylandSurface *surface)
@@ -1273,21 +1227,6 @@ window_actor_effects_completed (MetaWindowActor    *window_actor,
  meta_wayland_surface_update_outputs_recursively (surface);
 }

-void
-meta_wayland_surface_create_surface_actor (MetaWaylandSurface *surface)
-{
-  MetaSurfaceActor *surface_actor;
-
-  surface_actor = meta_surface_actor_wayland_new (surface);
-  surface->surface_actor = g_object_ref_sink (surface_actor);
-}
-
-void
-meta_wayland_surface_clear_surface_actor (MetaWaylandSurface *surface)
-{
-  g_clear_object (&surface->surface_actor);
-}
-
 MetaWaylandSurface *
 meta_wayland_surface_create (MetaWaylandCompositor *compositor,
                             struct wl_client      *client,
@@ -1302,28 +1241,15 @@ meta_wayland_surface_create (MetaWaylandCompositor *compositor,
  surface->resource = wl_resource_create (client, &wl_surface_interface, wl_resource_get_version (compositor_resource), id);
  wl_resource_set_implementation (surface->resource, &meta_wayland_wl_surface_interface, surface, wl_surface_destructor);

-  surface->surface_actor = g_object_ref_sink (meta_surface_actor_wayland_new (surface));
-
  wl_list_init (&surface->pending_frame_callback_list);

-  g_signal_connect_object (surface->surface_actor,
-                           "notify::allocation",
-                           G_CALLBACK (surface_actor_allocation_notify),
-                           surface, 0);
-  g_signal_connect_object (surface->surface_actor,
-                           "notify::position",
-                           G_CALLBACK (surface_actor_position_notify),
-                           surface, 0);
-  g_signal_connect_object (surface->surface_actor,
-                           "notify::mapped",
-                           G_CALLBACK (surface_actor_mapped_notify),
-                           surface, 0);
-
  sync_drag_dest_funcs (surface);

  surface->outputs_to_destroy_notify_id = g_hash_table_new (NULL, NULL);
  surface->shortcut_inhibited_seats = g_hash_table_new (NULL, NULL);

+  meta_wayland_compositor_notify_surface_id (compositor, id, surface);
+
  return surface;
 }

@@ -1506,7 +1432,7 @@ meta_wayland_surface_get_relative_coordinates (MetaWaylandSurface *surface,
  else
    {
      ClutterActor *actor =
-        CLUTTER_ACTOR (meta_surface_actor_get_texture (surface->surface_actor));
+        CLUTTER_ACTOR (meta_surface_actor_get_texture (meta_wayland_surface_get_actor (surface)));

      clutter_actor_transform_stage_point (actor, abs_x, abs_y, sx, sy);
      *sx /= surface->scale;
@@ -1522,7 +1448,7 @@ meta_wayland_surface_get_absolute_coordinates (MetaWaylandSurface *surface,
                                               float               *y)
 {
  ClutterActor *actor =
-    CLUTTER_ACTOR (meta_surface_actor_get_texture (surface->surface_actor));
+    CLUTTER_ACTOR (meta_surface_actor_get_texture (meta_wayland_surface_get_actor (surface)));
  ClutterVertex sv = {
    .x = sx * surface->scale,
    .y = sy * surface->scale,
@@ -1539,6 +1465,10 @@ static void
 meta_wayland_surface_init (MetaWaylandSurface *surface)
 {
  surface->pending = g_object_new (META_TYPE_WAYLAND_PENDING_STATE, NULL);
+
+  g_signal_connect (surface, "geometry-changed",
+                    G_CALLBACK (meta_wayland_surface_update_outputs_recursively),
+                    NULL);
 }

 static void
@@ -1585,6 +1515,13 @@ meta_wayland_surface_class_init (MetaWaylandSurfaceClass *klass)
                  0, NULL, NULL,
                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
+  surface_signals[SURFACE_GEOMETRY_CHANGED] =
+    g_signal_new ("geometry-changed",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  0, NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
 }

 static void
@@ -1792,3 +1729,18 @@ meta_wayland_surface_is_shortcuts_inhibited (MetaWaylandSurface *surface,

  return g_hash_table_contains (surface->shortcut_inhibited_seats, seat);
 }
+
+MetaSurfaceActor *
+meta_wayland_surface_get_actor (MetaWaylandSurface *surface)
+{
+  if (!surface->role || !META_IS_WAYLAND_ACTOR_SURFACE (surface->role))
+    return NULL;
+
+  return meta_wayland_actor_surface_get_actor (META_WAYLAND_ACTOR_SURFACE (surface->role));
+}
+
+void
+meta_wayland_surface_notify_geometry_changed (MetaWaylandSurface *surface)
+{
+  g_signal_emit (surface, surface_signals[SURFACE_GEOMETRY_CHANGED], 0);
+}
--- a/src/wayland/meta-wayland-surface.h
+++ b/src/wayland/meta-wayland-surface.h
@@ -137,7 +137,6 @@ struct _MetaWaylandSurface
  /* Generic stuff */
  struct wl_resource *resource;
  MetaWaylandCompositor *compositor;
-  MetaSurfaceActor *surface_actor;
  MetaWaylandSurfaceRole *role;
  MetaWindow *window;
  cairo_region_t *input_region;
@@ -231,10 +230,6 @@ void                meta_wayland_surface_unref_buffer_use_count (MetaWaylandSurf
 void                meta_wayland_surface_set_window (MetaWaylandSurface *surface,
                                                     MetaWindow         *window);

-void                meta_wayland_surface_create_surface_actor (MetaWaylandSurface *surface);
-
-void                meta_wayland_surface_clear_surface_actor (MetaWaylandSurface *surface);
-
 void                meta_wayland_surface_configure_notify (MetaWaylandSurface *surface,
                                                           int                 new_x,
                                                           int                 new_y,
@@ -303,4 +298,8 @@ void                meta_wayland_surface_restore_shortcuts (MetaWaylandSurface *
 gboolean            meta_wayland_surface_is_shortcuts_inhibited (MetaWaylandSurface *surface,
                                                                 MetaWaylandSeat    *seat);

+MetaSurfaceActor *  meta_wayland_surface_get_actor (MetaWaylandSurface *surface);
+
+void                meta_wayland_surface_notify_geometry_changed (MetaWaylandSurface *surface);
+
 #endif
--- a/src/wayland/meta-wayland-tablet-tool.c
+++ b/src/wayland/meta-wayland-tablet-tool.c
@@ -632,10 +632,13 @@ meta_wayland_tablet_tool_get_relative_coordinates (MetaWaylandTabletTool *tool,
                                                   wl_fixed_t            *sx,
                                                   wl_fixed_t            *sy)
 {
+  MetaSurfaceActor *surface_actor;
  float xf, yf;

+  surface_actor = meta_wayland_surface_get_actor (surface);
+
  clutter_event_get_coords (event, &xf, &yf);
-  clutter_actor_transform_stage_point (CLUTTER_ACTOR (meta_surface_actor_get_texture (surface->surface_actor)),
+  clutter_actor_transform_stage_point (CLUTTER_ACTOR (meta_surface_actor_get_texture (surface_actor)),
                                       xf, yf, &xf, &yf);

  *sx = wl_fixed_from_double (xf) / surface->scale;
--- a/src/wayland/meta-wayland-xdg-shell.c
+++ b/src/wayland/meta-wayland-xdg-shell.c
@@ -712,9 +712,8 @@ meta_wayland_xdg_toplevel_reset (MetaWaylandXdgSurface *xdg_surface)
  surface = meta_wayland_surface_role_get_surface (surface_role);

  meta_wayland_surface_destroy_window (surface);
-  meta_wayland_surface_clear_surface_actor (surface);

-  meta_wayland_surface_create_surface_actor (surface);
+  meta_wayland_actor_surface_reset_actor (META_WAYLAND_ACTOR_SURFACE (surface_role));
  window = meta_window_wayland_new (meta_get_display (), surface);
  meta_wayland_shell_surface_set_window (shell_surface, window);

--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -46,6 +46,7 @@
 #include "meta-wayland-inhibit-shortcuts.h"
 #include "meta-wayland-inhibit-shortcuts-dialog.h"
 #include "meta-xwayland-grab-keyboard.h"
+#include "meta-xwayland.h"

 static MetaWaylandCompositor _meta_wayland_compositor;
 static char *_display_name_override;
@@ -306,6 +307,8 @@ meta_wayland_compositor_init (MetaWaylandCompositor *compositor)
 {
  memset (compositor, 0, sizeof (MetaWaylandCompositor));
  wl_list_init (&compositor->frame_callbacks);
+
+  compositor->scheduled_surface_associations = g_hash_table_new (NULL, NULL);
 }

 void
@@ -482,3 +485,62 @@ meta_wayland_compositor_flush_clients (MetaWaylandCompositor *compositor)
 {
  wl_display_flush_clients (compositor->wayland_display);
 }
+
+static void on_scheduled_association_unmanaged (MetaWindow *window,
+                                                gpointer    user_data);
+
+static void
+meta_wayland_compositor_remove_surface_association (MetaWaylandCompositor *compositor,
+                                                    int                    id)
+{
+  MetaWindow *window;
+
+  window = g_hash_table_lookup (compositor->scheduled_surface_associations,
+                                GINT_TO_POINTER (id));
+  if (window)
+    {
+      g_signal_handlers_disconnect_by_func (window,
+                                            on_scheduled_association_unmanaged,
+                                            GINT_TO_POINTER (id));
+      g_hash_table_remove (compositor->scheduled_surface_associations,
+                           GINT_TO_POINTER (id));
+    }
+}
+
+static void
+on_scheduled_association_unmanaged (MetaWindow *window,
+                                    gpointer    user_data)
+{
+  MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default ();
+
+  meta_wayland_compositor_remove_surface_association (compositor,
+                                                      GPOINTER_TO_INT (user_data));
+}
+
+void
+meta_wayland_compositor_schedule_surface_association (MetaWaylandCompositor *compositor,
+                                                      int                    id,
+                                                      MetaWindow            *window)
+{
+  g_signal_connect (window, "unmanaged",
+                    G_CALLBACK (on_scheduled_association_unmanaged),
+                    GINT_TO_POINTER (id));
+  g_hash_table_insert (compositor->scheduled_surface_associations,
+                       GINT_TO_POINTER (id), window);
+}
+
+void
+meta_wayland_compositor_notify_surface_id (MetaWaylandCompositor *compositor,
+                                           int                    id,
+                                           MetaWaylandSurface    *surface)
+{
+  MetaWindow *window;
+
+  window = g_hash_table_lookup (compositor->scheduled_surface_associations,
+                                GINT_TO_POINTER (id));
+  if (window)
+    {
+      meta_xwayland_associate_window_with_surface (window, surface);
+      meta_wayland_compositor_remove_surface_association (compositor, id);
+    }
+}
--- a/src/wayland/meta-wayland.h
+++ b/src/wayland/meta-wayland.h
@@ -65,5 +65,12 @@ gboolean                meta_wayland_compositor_is_shortcuts_inhibited (MetaWayl

 void                    meta_wayland_compositor_flush_clients (MetaWaylandCompositor *compositor);

+void                    meta_wayland_compositor_schedule_surface_association (MetaWaylandCompositor *compositor,
+                                                                              int                    id,
+                                                                              MetaWindow            *window);
+void                    meta_wayland_compositor_notify_surface_id (MetaWaylandCompositor *compositor,
+                                                                   int                    id,
+                                                                   MetaWaylandSurface    *surface);
+
 #endif

--- a/src/wayland/meta-xwayland.c
+++ b/src/wayland/meta-xwayland.c
@@ -60,9 +60,9 @@ G_DEFINE_TYPE (MetaWaylandSurfaceRoleXWayland,
               meta_wayland_surface_role_xwayland,
               META_TYPE_WAYLAND_ACTOR_SURFACE)

-static void
-associate_window_with_surface (MetaWindow         *window,
-                               MetaWaylandSurface *surface)
+void
+meta_xwayland_associate_window_with_surface (MetaWindow          *window,
+                                             MetaWaylandSurface  *surface)
 {
  MetaDisplay *display = window->display;

@@ -110,58 +110,13 @@ associate_window_with_surface_id (MetaXWaylandManager *manager,
  if (resource)
    {
      MetaWaylandSurface *surface = wl_resource_get_user_data (resource);
-      associate_window_with_surface (window, surface);
+      meta_xwayland_associate_window_with_surface (window, surface);
      return TRUE;
    }
  else
    return FALSE;
 }

-typedef struct {
-  MetaXWaylandManager *manager;
-  MetaWindow *window;
-  guint32 surface_id;
-  guint later_id;
-} AssociateWindowWithSurfaceOp;
-
-static void associate_window_with_surface_window_unmanaged (MetaWindow                   *window,
-                                                            AssociateWindowWithSurfaceOp *op);
-static void
-associate_window_with_surface_op_free (AssociateWindowWithSurfaceOp *op)
-{
-  if (op->later_id != 0)
-    meta_later_remove (op->later_id);
-  g_signal_handlers_disconnect_by_func (op->window,
-                                        (gpointer) associate_window_with_surface_window_unmanaged,
-                                        op);
-  g_free (op);
-}
-
-static void
-associate_window_with_surface_window_unmanaged (MetaWindow                   *window,
-                                                AssociateWindowWithSurfaceOp *op)
-{
-  associate_window_with_surface_op_free (op);
-}
-
-static gboolean
-associate_window_with_surface_later (gpointer user_data)
-{
-  AssociateWindowWithSurfaceOp *op = user_data;
-
-  op->later_id = 0;
-
-  if (!associate_window_with_surface_id (op->manager, op->window, op->surface_id))
-    {
-      /* Not here? Oh well... nothing we can do */
-      g_warning ("Unknown surface ID %d (from window %s)", op->surface_id, op->window->desc);
-    }
-
-  associate_window_with_surface_op_free (op);
-
-  return G_SOURCE_REMOVE;
-}
-
 void
 meta_xwayland_handle_wl_surface_id (MetaWindow *window,
                                    guint32     surface_id)
@@ -171,21 +126,11 @@ meta_xwayland_handle_wl_surface_id (MetaWindow *window,

  if (!associate_window_with_surface_id (manager, window, surface_id))
    {
-      /* No surface ID yet... it should arrive after the next
-       * iteration through the loop, so queue a later and see
-       * what happens.
+      /* No surface ID yet, schedule this association for whenever the
+       * surface is made known.
       */
-      AssociateWindowWithSurfaceOp *op = g_new0 (AssociateWindowWithSurfaceOp, 1);
-      op->manager = manager;
-      op->window = window;
-      op->surface_id = surface_id;
-      op->later_id = meta_later_add (META_LATER_BEFORE_REDRAW,
-                                     associate_window_with_surface_later,
-                                     op,
-                                     NULL);
-
-      g_signal_connect (op->window, "unmanaged",
-                        G_CALLBACK (associate_window_with_surface_window_unmanaged), op);
+      meta_wayland_compositor_schedule_surface_association (compositor,
+                                                            surface_id, window);
    }
 }

--- a/src/wayland/meta-xwayland.h
+++ b/src/wayland/meta-xwayland.h
@@ -41,4 +41,8 @@ void
 meta_xwayland_handle_xwayland_grab (MetaWindow *window,
                                    gboolean    allow);

+void
+meta_xwayland_associate_window_with_surface (MetaWindow          *window,
+                                             MetaWaylandSurface  *surface);
+
 #endif /* META_XWAYLAND_H */