Bump version to 3.28.1

Update NEWS.
wayland: Plug surface pending state contents leak
2018-04-13 19:11:57 +02:00 · 2018-04-13 00:10:03 +02:00 · 2018-04-11 17:55:41 +00:00 · 2018-04-11 16:34:59 +02:00 · 2018-04-10 17:58:12 +02:00 · 2018-04-10 12:10:19 +00:00
89 changed files with 1774 additions and 2077 deletions
--- a/26
+++ b/26
@ -1,34 +1,18 @@
-3.29.2
+3.28.1
 ======
-* Fix size change animations on wayland [Georges; #780292]
-* Handle touch events on server-side titlebars [Carlos; #770185]
-* 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, Marco Trevisan (Treviño), Daniel van Vugt
-
-Translators:
-  Daniel Șerbănescu [ro], Marcos Lans [gl], Dz Chen [zh_CN]
-
-3.29.1
-======
-* Fix various input-method regressions [Carlos, Olivier; #65, #74, #66, #112]
+* Fix various input-method regressions [Carlos; #65, #74, #66]
 * 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]
-* 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]
+* Disable KMS modifiers by default [Jonas; #81]
+* Misc bug fixes [handsome-feng; !45]

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

 Translators:
--- a/clutter/clutter/Makefile.am
+++ b/clutter/clutter/Makefile.am
@ -692,7 +692,7 @@ Cally_@LIBMUTTER_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
 Cally_@LIBMUTTER_API_VERSION@_gir_SCANNERFLAGS = \
 	--warn-all \
 	--c-include='cally/cally.h' \
-	--pkg-export=mutter-clutter-@LIBMUTTER_API_VERSION@ \
+	--pkg-export=mutter-cally-@LIBMUTTER_API_VERSION@ \
 	--include-uninstalled=$(top_builddir)/clutter/Clutter-@LIBMUTTER_API_VERSION@.gir

 INTROSPECTION_GIRS += Cally-@LIBMUTTER_API_VERSION@.gir
--- a/clutter/clutter/cally/cally-util.c
+++ b/clutter/clutter/cally/cally-util.c
@ -214,8 +214,6 @@ 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_get_relative_transformation_matrix (self, NULL, &modelview);
+  _clutter_actor_apply_relative_transformation_matrix (self, NULL, &modelview);

  /* Fetch the projection and viewport */
  _clutter_stage_get_projection_matrix (CLUTTER_STAGE (stage), &projection);
--- a/clutter/clutter/clutter-input-method.c
+++ b/clutter/clutter/clutter-input-method.c
@ -353,7 +353,6 @@ clutter_input_method_notify_key_event (ClutterInputMethod *im,
      copy = clutter_event_copy (event);
      clutter_event_set_flags (copy, clutter_event_get_flags (event) |
                               CLUTTER_EVENT_FLAG_INPUT_METHOD);
-      clutter_event_set_source_device (copy, clutter_event_get_device (copy));
      clutter_event_put (copy);
      clutter_event_free (copy);
    }
--- a/clutter/clutter/evdev/clutter-device-manager-evdev.c
+++ b/clutter/clutter/evdev/clutter-device-manager-evdev.c
@ -793,12 +793,10 @@ evdev_add_device (ClutterDeviceManagerEvdev *manager_evdev,
      if (priv->main_seat->libinput_seat == NULL)
        seat = priv->main_seat;
      else
-        {
-          seat = clutter_seat_evdev_new (manager_evdev);
-          priv->seats = g_slist_append (priv->seats, seat);
-        }
+        seat = clutter_seat_evdev_new (manager_evdev);

      clutter_seat_evdev_set_libinput_seat (seat, libinput_seat);
+      priv->seats = g_slist_append (priv->seats, seat);
    }

  device = _clutter_input_device_evdev_new (manager, seat, libinput_device);
@ -921,6 +919,7 @@ clutter_device_manager_evdev_get_device (ClutterDeviceManager *manager,
  ClutterDeviceManagerEvdev *manager_evdev;
  ClutterDeviceManagerEvdevPrivate *priv;
  GSList *l;
+  GSList *device_it;

  manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (manager);
  priv = manager_evdev->priv;
@ -928,10 +927,14 @@ clutter_device_manager_evdev_get_device (ClutterDeviceManager *manager,
  for (l = priv->seats; l; l = l->next)
    {
      ClutterSeatEvdev *seat = l->data;
-      ClutterInputDevice *device = clutter_seat_evdev_get_device (seat, id);

-      if (device)
-        return device;
+      for (device_it = seat->devices; device_it; device_it = device_it->next)
+        {
+          ClutterInputDevice *device = device_it->data;
+
+          if (clutter_input_device_get_device_id (device) == id)
+            return device;
+        }
    }

  return NULL;
@ -1964,7 +1967,6 @@ clutter_device_manager_evdev_constructed (GObject *gobject)
  xkb_context_unref (ctx);

  priv->main_seat = clutter_seat_evdev_new (manager_evdev);
-  priv->seats = g_slist_append (priv->seats, priv->main_seat);

  dispatch_libinput (manager_evdev);

--- a/clutter/clutter/evdev/clutter-input-device-evdev.c
+++ b/clutter/clutter/evdev/clutter-input-device-evdev.c
@ -433,8 +433,6 @@ key_event_is_modifier (ClutterEvent *event)
    case XKB_KEY_Super_R:
    case XKB_KEY_Hyper_L:
    case XKB_KEY_Hyper_R:
-    case XKB_KEY_Caps_Lock:
-    case XKB_KEY_Shift_Lock:
      return TRUE;
    default:
      return FALSE;
@ -586,12 +584,6 @@ handle_stickykeys_press (ClutterEvent            *event,
    }

  depressed_mods = xkb_state_serialize_mods (seat->xkb, XKB_STATE_MODS_DEPRESSED);
-  /* Ignore the lock modifier mask, that one cannot be sticky, yet the
-   * CAPS_LOCK key itself counts as a modifier as it might be remapped
-   * to some other modifier which can be sticky.
-   */
-  depressed_mods &= ~CLUTTER_LOCK_MASK;
-
  new_latched_mask = device->stickykeys_latched_mask;
  new_locked_mask = device->stickykeys_locked_mask;

@ -1130,10 +1122,6 @@ clutter_input_device_evdev_process_kbd_a11y_event (ClutterEvent               *e
 {
  ClutterInputDeviceEvdev *device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (device);

-  /* Ignore key events injected from IM */
-  if (event->key.flags & CLUTTER_EVENT_FLAG_INPUT_METHOD)
-    goto emit_event;
-
  if (!device_evdev->a11y_flags & CLUTTER_A11Y_KEYBOARD_ENABLED)
    goto emit_event;

--- a/clutter/clutter/evdev/clutter-seat-evdev.c
+++ b/clutter/clutter/evdev/clutter-seat-evdev.c
@ -858,24 +858,6 @@ clutter_seat_evdev_free (ClutterSeatEvdev *seat)
  g_free (seat);
 }

-ClutterInputDevice *
-clutter_seat_evdev_get_device (ClutterSeatEvdev *seat,
-                               gint              id)
-{
-  ClutterInputDevice *device;
-  GSList *l;
-
-  for (l = seat->devices; l; l = l->next)
-    {
-      device = l->data;
-
-      if (clutter_input_device_get_device_id (device) == id)
-        return device;
-    }
-
-  return NULL;
-}
-
 void
 clutter_seat_evdev_set_stage (ClutterSeatEvdev *seat,
                              ClutterStage     *stage)
--- a/clutter/clutter/evdev/clutter-seat-evdev.h
+++ b/clutter/clutter/evdev/clutter-seat-evdev.h
@ -139,9 +139,6 @@ void clutter_seat_evdev_set_libinput_seat (ClutterSeatEvdev     *seat,

 void clutter_seat_evdev_sync_leds (ClutterSeatEvdev *seat);

-ClutterInputDevice * clutter_seat_evdev_get_device (ClutterSeatEvdev *seat,
-                                                    gint              id);
-
 ClutterTouchState * clutter_seat_evdev_acquire_touch_state (ClutterSeatEvdev *seat,
                                                            int               device_slot);

--- a/clutter/clutter/x11/clutter-input-device-xi2.c
+++ b/clutter/clutter/x11/clutter-input-device-xi2.c
@ -110,8 +110,7 @@ clutter_input_device_xi2_finalize (GObject *object)
  if (device_xi2->wacom_device)
    libwacom_destroy (device_xi2->wacom_device);

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

  G_OBJECT_CLASS (clutter_input_device_xi2_parent_class)->finalize (object);
--- a/cogl/cogl/Makefile.am
+++ b/cogl/cogl/Makefile.am
@ -452,7 +452,7 @@ libmutter_cogl_@LIBMUTTER_API_VERSION@_la_LDFLAGS = \
 	-avoid-version \
 	-export-dynamic \
 	-rpath $(mutterlibdir) \
-	-export-symbols-regex "^(cogl|_cogl_debug_flags|_cogl_atlas_new|_cogl_atlas_add_reorganize_callback|_cogl_atlas_reserve_space|_cogl_callback|_cogl_util_get_eye_planes_for_screen_poly|_cogl_atlas_texture_remove_reorganize_callback|_cogl_atlas_texture_add_reorganize_callback|_cogl_texture_get_format|_cogl_texture_foreach_sub_texture_in_region|_cogl_texture_set_region|_cogl_profile_trace_message|_cogl_context_get_default|_cogl_framebuffer_get_stencil_bits|_cogl_clip_stack_push_rectangle|_cogl_framebuffer_get_modelview_stack|_cogl_object_default_unref|_cogl_pipeline_foreach_layer_internal|_cogl_clip_stack_push_primitive|_cogl_buffer_unmap_for_fill_or_fallback|_cogl_framebuffer_draw_primitive|_cogl_debug_instances|_cogl_framebuffer_get_projection_stack|_cogl_pipeline_layer_get_texture|_cogl_buffer_map_for_fill_or_fallback|_cogl_texture_can_hardware_repeat|_cogl_pipeline_prune_to_n_layers|_cogl_primitive_draw|test_|unit_test_|_cogl_winsys_glx_get_vtable|_cogl_winsys_egl_xlib_get_vtable|_cogl_winsys_egl_get_vtable|_cogl_closure_disconnect|_cogl_onscreen_notify_complete|_cogl_onscreen_notify_frame_sync|_cogl_winsys_egl_renderer_connect_common|_cogl_winsys_error_quark|_cogl_set_error|_cogl_poll_renderer_add_fd|_cogl_poll_renderer_add_idle|_cogl_framebuffer_winsys_update_size|_cogl_winsys_egl_make_current|_cogl_winsys_egl_ensure_current|_cogl_pixel_format_get_bytes_per_pixel).*"
+	-export-symbols-regex "^(cogl|_cogl_debug_flags|_cogl_atlas_new|_cogl_atlas_add_reorganize_callback|_cogl_atlas_reserve_space|_cogl_callback|_cogl_util_get_eye_planes_for_screen_poly|_cogl_atlas_texture_remove_reorganize_callback|_cogl_atlas_texture_add_reorganize_callback|_cogl_texture_get_format|_cogl_texture_foreach_sub_texture_in_region|_cogl_texture_set_region|_cogl_profile_trace_message|_cogl_context_get_default|_cogl_framebuffer_get_stencil_bits|_cogl_clip_stack_push_rectangle|_cogl_framebuffer_get_modelview_stack|_cogl_object_default_unref|_cogl_pipeline_foreach_layer_internal|_cogl_clip_stack_push_primitive|_cogl_buffer_unmap_for_fill_or_fallback|_cogl_framebuffer_draw_primitive|_cogl_debug_instances|_cogl_framebuffer_get_projection_stack|_cogl_pipeline_layer_get_texture|_cogl_buffer_map_for_fill_or_fallback|_cogl_texture_can_hardware_repeat|_cogl_pipeline_prune_to_n_layers|_cogl_primitive_draw|test_|unit_test_|_cogl_winsys_glx_get_vtable|_cogl_winsys_egl_xlib_get_vtable|_cogl_winsys_egl_get_vtable|_cogl_closure_disconnect|_cogl_onscreen_notify_complete|_cogl_onscreen_notify_frame_sync|_cogl_winsys_egl_renderer_connect_common|_cogl_winsys_error_quark|_cogl_set_error|_cogl_poll_renderer_add_fd|_cogl_poll_renderer_add_idle|_cogl_framebuffer_winsys_update_size|_cogl_winsys_egl_make_current|_cogl_pixel_format_get_bytes_per_pixel).*"

 libmutter_cogl_@LIBMUTTER_API_VERSION@_la_SOURCES = $(cogl_sources_c)
 nodist_libmutter_cogl_@LIBMUTTER_API_VERSION@_la_SOURCES = $(BUILT_SOURCES)
--- a/cogl/cogl/cogl-object.c
+++ b/cogl/cogl/cogl-object.c
@ -109,11 +109,7 @@ _cogl_object_default_unref (void *object)
 void
 cogl_object_unref (void *obj)
 {
-  void (* unref_func) (void *);
-
-  _COGL_RETURN_IF_FAIL (obj != NULL);
-
-  unref_func = ((CoglObject *) obj)->klass->virt_unref;
+  void (* unref_func) (void *) = ((CoglObject *) obj)->klass->virt_unref;
  unref_func (obj);
 }

--- a/cogl/cogl/winsys/cogl-winsys-egl-private.h
+++ b/cogl/cogl/winsys/cogl-winsys-egl-private.h
@ -181,9 +181,6 @@ _cogl_winsys_egl_make_current (CoglDisplay *display,
                               EGLSurface read,
                               EGLContext context);

-EGLBoolean
-_cogl_winsys_egl_ensure_current (CoglDisplay *display);
-
 #ifdef EGL_KHR_image_base
 EGLImageKHR
 _cogl_egl_create_image (CoglContext *ctx,
--- a/cogl/cogl/winsys/cogl-winsys-egl.c
+++ b/cogl/cogl/winsys/cogl-winsys-egl.c
@ -309,18 +309,6 @@ _cogl_winsys_egl_make_current (CoglDisplay *display,
  return ret;
 }

-EGLBoolean
-_cogl_winsys_egl_ensure_current (CoglDisplay *display)
-{
-  CoglDisplayEGL *egl_display = display->winsys;
-  CoglRendererEGL *egl_renderer = display->renderer->winsys;
-
-  return eglMakeCurrent (egl_renderer->edpy,
-                         egl_display->current_draw_surface,
-                         egl_display->current_read_surface,
-                         egl_display->current_context);
-}
-
 static void
 cleanup_context (CoglDisplay *display)
 {
--- 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], [29])
-m4_define([mutter_micro_version], [2])
+m4_define([mutter_minor_version], [28])
+m4_define([mutter_micro_version], [1])

 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
@ -270,10 +270,13 @@ fi

 PKG_CHECK_MODULES(SYSTEMD, [libsystemd], [have_systemd=yes], [have_systemd=no])

-if test x$have_systemd = xyes -o -z "$logind_provider"; then
+if test x$have_systemd = xyes; then
     logind_provider="libsystemd"
 fi

+AS_IF([test -z "$logind_provider"],
+  AC_MSG_ERROR([Could not find either systemd or elogind as logind provider])])
+
 MUTTER_NATIVE_BACKEND_MODULES="libdrm $logind_provider libinput >= 1.4 gudev-1.0 gbm >= 10.3"

 AC_ARG_ENABLE(native-backend,
--- a/data/org.gnome.mutter.gschema.xml.in
+++ b/data/org.gnome.mutter.gschema.xml.in
@ -120,6 +120,10 @@
                                        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-03 13:19+0000\n"
-"PO-Revision-Date: 2018-05-07 19:37+0200\n"
-"Last-Translator: marcos <marcoslansgarza@gmail.com>\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"
 "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: Poedit 2.0.6\n"
+"X-Generator: Virtaal 0.7.1\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 controis do sistema"
+msgstr "Cambiar entre os controles 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 controis do sistema directamente"
+msgstr "Cambiar entre os controles 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,13 +4,14 @@
 # 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, 2018.
+# Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity.HEAD.ro\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"
+"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"
 "Last-Translator: Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>\n"
 "Language-Team: Gnome Romanian Translation Team\n"
 "Language: ro\n"
@ -22,256 +23,272 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"

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

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

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

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

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

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

-#: data/50-mutter-navigation.xml:24
+#: ../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
 msgid "Move window one workspace up"
 msgstr "Mută fereastra pe spațiul de lucru de mai sus"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: data/50-mutter-navigation.xml:93
+#: ../data/50-mutter-navigation.xml.in.h:26
 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:97
+#: ../data/50-mutter-navigation.xml.in.h:27
 msgid "Switch system controls directly"
 msgstr "Schimbă comenzile de sistem în mod direct"

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

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

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

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

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

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

-#: data/50-mutter-navigation.xml:120
+#: ../data/50-mutter-navigation.xml.in.h:34
 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:123
+#: ../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
 msgid "Move to workspace above"
 msgstr "Mută pe spațiul de lucru deasupra"

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

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

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

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

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

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

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

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

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

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

-#: data/50-mutter-windows.xml:18
+#: ../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
 msgid "Close window"
 msgstr "Închide fereastra"

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

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

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

-#: data/50-mutter-windows.xml:27
+#: ../data/50-mutter-windows.xml.in.h:12
 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:29
+#: ../data/50-mutter-windows.xml.in.h:13
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Ridică fereastra dacă este acoperită, altfel, coboar-o"

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

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

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

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

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

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

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

-#: data/org.gnome.mutter.gschema.xml.in:7
+#: ../data/org.gnome.mutter.gschema.xml.in.h:1
 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:8
+#: ../data/org.gnome.mutter.gschema.xml.in.h:2
 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 „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."
+"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."

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

-#: data/org.gnome.mutter.gschema.xml.in:21
+#: ../data/org.gnome.mutter.gschema.xml.in.h:4
 msgid ""
 "When true, instead of having independent titlebars, modal dialogs appear "
 "attached to the titlebar of the parent window and are moved together with "
@ -281,12 +298,13 @@ 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:30
+#: ../data/org.gnome.mutter.gschema.xml.in.h:5
+#, fuzzy
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
-"Activează mozaicul de margine la plasarea ferestrelor pe marginile ecranului"
+"Activează mozaicul lateral la plasarea ferestrelor pe marginile ecranului"

-#: data/org.gnome.mutter.gschema.xml.in:31
+#: ../data/org.gnome.mutter.gschema.xml.in.h:6
 msgid ""
 "If enabled, dropping windows on vertical screen edges maximizes them "
 "vertically and resizes them horizontally to cover half of the available "
@ -297,25 +315,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:40
+#: ../data/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Workspaces are managed dynamically"
 msgstr "Spațiile de lucru sunt gestionate în mod dinamic"

-#: data/org.gnome.mutter.gschema.xml.in:41
+#: ../data/org.gnome.mutter.gschema.xml.in.h:8
 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 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)"
+"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”)"

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

-#: data/org.gnome.mutter.gschema.xml.in:51
+#: ../data/org.gnome.mutter.gschema.xml.in.h:10
 msgid ""
 "Determines whether workspace switching should happen for windows on all "
 "monitors or only for windows on the primary monitor."
@ -324,11 +342,11 @@ msgstr ""
 "ferestrele de pe toate monitoarele sau doar pentru ferestrele de pe "
 "monitorul principal."

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

-#: data/org.gnome.mutter.gschema.xml.in:60
+#: ../data/org.gnome.mutter.gschema.xml.in.h:12
 msgid ""
 "Determines whether the use of popup and highlight frame should be disabled "
 "for window cycling."
@ -336,40 +354,42 @@ 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:68
+#: ../data/org.gnome.mutter.gschema.xml.in.h:13
 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:69
+#: ../data/org.gnome.mutter.gschema.xml.in.h:14
 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 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ă."
+"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."

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

-#: data/org.gnome.mutter.gschema.xml.in:80
+#: ../data/org.gnome.mutter.gschema.xml.in.h:16
+#, fuzzy
 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 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."
+"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."

-#: data/org.gnome.mutter.gschema.xml.in:89
+#: ../data/org.gnome.mutter.gschema.xml.in.h:17
 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:90
+#: ../data/org.gnome.mutter.gschema.xml.in.h:18
 msgid ""
 "If enabled, new windows that are initially the size of the monitor "
 "automatically get maximized."
@ -377,11 +397,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:98
+#: ../data/org.gnome.mutter.gschema.xml.in.h:19
 msgid "Place new windows in the center"
 msgstr "Plasează ferestre noi în centru"

-#: data/org.gnome.mutter.gschema.xml.in:99
+#: ../data/org.gnome.mutter.gschema.xml.in.h:20
 msgid ""
 "When true, the new windows will always be put in the center of the active "
 "screen of the monitor."
@ -389,262 +409,107 @@ msgstr ""
 "Când este adevărat, ferestrele noi vor fi plasate în centrul ecranului activ "
 "al monitorului."

-#: 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
+#: ../data/org.gnome.mutter.gschema.xml.in.h:21
 msgid "Select window from tab popup"
 msgstr "Selectează fereastra din popup-ul tabului"

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

-#: 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
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:1
 msgid "Switch to VT 1"
 msgstr "Comută la terminalul virtual 1"

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

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

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

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

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

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

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

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

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

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

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

-#: 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
+#: ../src/backends/meta-monitor-manager.c:500
 msgid "Built-in display"
 msgstr "Afișaj integrat"

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

-#: src/backends/meta-monitor-manager.c:928
+#: ../src/backends/meta-monitor-manager.c:528
 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:936
+#: ../src/backends/meta-monitor-manager.c:536
 #, 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:481
+#: ../src/compositor/compositor.c:456
 #, 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 de compunere rulează deja pe ecranul %i pe "
+"Un alt administrator de ferestre compozit rulează deja pe ecranul %i pe "
 "afișajul „%s”."

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

-#: 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
+#: ../src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
 msgstr "„%s” nu răspunde."

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

-#: src/core/meta-close-dialog-default.c:154
+#: ../src/core/delete.c:134
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@ -652,95 +517,112 @@ 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/meta-close-dialog-default.c:161
-msgid "_Force Quit"
-msgstr "_Forțează închiderea"
-
-#: src/core/meta-close-dialog-default.c:161
+#: ../src/core/delete.c:141
 msgid "_Wait"
 msgstr "_Așteaptă"

-#: src/core/mutter.c:39
+#: ../src/core/delete.c:141
+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/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
 #, c-format
 msgid ""
 "mutter %s\n"
-"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright (C) 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ă NICIO garanție; nici pentru COMERCIALIZARE sau UTILIZAREA ÎNTR-UN "
+"Nu există NICI O 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:1997
+#: ../src/core/prefs.c:2050
 #, c-format
 msgid "Workspace %d"
 msgstr "Spațiu de lucru %d"

-#: src/core/screen.c:583
+#: ../src/core/screen.c:526
 #, 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ă utilizați "
+"Afișajul „%s” are deja un administrator de ferestre; încercați să folosiți "
 "opțiunea --replace (înlocuiește) pentru a înlocui administratorul de "
-"ferestre curent."
+"ferestre actual."

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

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

-#: 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
+#: ../src/x11/session.c:1815
 msgid ""
-"These windows do not support “save current setup” and will have to be "
-"restarted manually next time you log in."
+"These windows do not support &quot;save current setup&quot; 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:559
+#: ../src/x11/window-props.c:549
 #, 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) 2012-2018 mutter's COPYRIGHT HOLDER
-# This file is distributed under the same license as the mutter package.
+# Copyright (C) 2002, 2003, 2004, 2009, 2010 Free Software Foundation, Inc.
 # Sun G11n <gnome_int_l10n@ireland.sun.com>, 2002.
 # He Qiangqiang <carton@linux.net.cn>, 2002
 # Xiong Jiang <jxiong@offtopic.org>, 2003
@ -11,24 +11,22 @@
 # 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: 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"
+"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"
 "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: Gtranslator 2.91.7\n"
+"X-Generator: Poedit 1.8.7.1\n"

 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@ -55,118 +53,134 @@ 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:27
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "将窗口下移一个工作区"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: data/50-mutter-navigation.xml:123
+#: 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
 msgid "Move to workspace above"
 msgstr "移动到上层工作区"

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

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

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

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

 #: data/50-mutter-windows.xml:6
 msgid "Windows"
@ -207,50 +217,54 @@ 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:20
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "隐藏窗口"

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

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

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

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

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

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

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

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

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

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

@ -264,10 +278,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 键”。可能使用默认或者空白。"
@ -304,12 +318,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
@ -339,9 +353,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”，那么进入某个窗口时焦点将不会立即"
 "改变，而是等到光标停止移动之后。"
@ -352,7 +366,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 ""
 "可拖拽的边界总数。如果主题的可见边界不足，将添加不可见的边界来满足此值。"
@ -377,50 +391,14 @@ msgid ""
 "screen of the monitor."
 msgstr "为 true 时，新窗口将总是置于此显示器已激活屏幕的中央。"

-#: 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
+#: data/org.gnome.mutter.gschema.xml.in:120
 msgid "Select window from tab popup"
 msgstr "从 Tab 轮换弹出界面选择窗口"

-#: data/org.gnome.mutter.gschema.xml.in:150
+#: data/org.gnome.mutter.gschema.xml.in:125
 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"
@ -469,183 +447,127 @@ 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:2283
+#: src/backends/meta-input-settings.c:1861
 msgid "Switch monitor"
 msgstr "切换显示器"

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

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

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

-#: src/backends/meta-monitor-manager.c:925
+#: src/backends/meta-monitor-manager.c:540
 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:933
+#: src/backends/meta-monitor-manager.c:548
 #, 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:481
+#: src/compositor/compositor.c:471
 #, 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/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
+#: src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
 msgstr "“%s” 未响应。"

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

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

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

-#: src/core/meta-close-dialog-default.c:161
-msgid "_Wait"
-msgstr "等待(_W)"
+#: 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/mutter.c:39
 #, c-format
 msgid ""
 "mutter %s\n"
-"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright (C) 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"
-"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., 以及其他\n"
-"本软件为自由软件；版权条款请参见源码\n"
-"不存在任何保证；即便是对商业性或者特定目的的适应性也不作保证。\n"
+"版权所有 (C) 2001-%d Havoc Pennington, Red Hat, Inc., 以及其他\n"
+"本软件为自由软件：版权条款请参见源码\n"
+"不存在任何保证：即便是对商业性或者特定目的的适应性也不作保证。\n"

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

-#: src/core/screen.c:583
+#: src/core/screen.c:521
 #, 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:668
+#: src/core/screen.c:606
 #, 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:567
+#: src/wayland/meta-wayland-tablet-pad.c:595
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "模式切换：%d 模式"

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

-#: src/x11/window-props.c:559
+#: src/x11/window-props.c:548
 #, c-format
 msgid "%s (on %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 "切换卷起状态"
+msgstr "%s (于 %s)"

 #~ 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-06-07 13:00+0000\n"
-"PO-Revision-Date: 2018-06-09 11:26+0800\n"
+"POT-Creation-Date: 2018-03-01 18:57+0000\n"
+"PO-Revision-Date: 2018-03-03 15:20+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.8\n"
+"X-Generator: Poedit 2.0.6\n"

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

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

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

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

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

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

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

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

-#: src/backends/meta-monitor-manager.c:928
+#: src/backends/meta-monitor-manager.c:925
 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:936
+#: src/backends/meta-monitor-manager.c:933
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -153,7 +153,7 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	backends/meta-pointer-constraint.h	\
 	backends/meta-settings.c		\
 	backends/meta-settings-private.h	\
-	backends/meta-stage-private.h		\
+	backends/meta-stage.h			\
 	backends/meta-stage.c			\
 	backends/meta-renderer.c		\
 	backends/meta-renderer.h		\
@ -161,7 +161,6 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	backends/meta-renderer-view.h		\
 	backends/edid-parse.c			\
 	backends/edid.h				\
-	backends/gsm-inhibitor-flag.h		\
 	backends/x11/meta-backend-x11.c			\
 	backends/x11/meta-backend-x11.h			\
 	backends/x11/meta-barrier-x11.c			\
@ -184,6 +183,8 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	backends/x11/nested/meta-cursor-renderer-x11-nested.h		\
 	backends/x11/nested/meta-renderer-x11-nested.c	\
 	backends/x11/nested/meta-renderer-x11-nested.h	\
+	backends/x11/meta-idle-monitor-xsync.c		\
+	backends/x11/meta-idle-monitor-xsync.h		\
 	backends/x11/meta-input-settings-x11.c		\
 	backends/x11/meta-input-settings-x11.h		\
 	backends/x11/meta-monitor-manager-xrandr.c	\
@ -246,7 +247,7 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	compositor/meta-window-actor.c		\
 	compositor/meta-window-actor-private.h	\
 	compositor/meta-window-group.c		\
-	compositor/meta-window-group-private.h	\
+	compositor/meta-window-group.h		\
 	compositor/meta-window-shape.c		\
 	compositor/region-utils.c		\
 	compositor/region-utils.h		\
@ -486,6 +487,8 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES +=		\
 	backends/native/meta-default-modes.h		\
 	backends/native/meta-gpu-kms.c			\
 	backends/native/meta-gpu-kms.h			\
+	backends/native/meta-idle-monitor-native.c	\
+	backends/native/meta-idle-monitor-native.h	\
 	backends/native/meta-input-settings-native.c	\
 	backends/native/meta-input-settings-native.h	\
 	backends/native/meta-monitor-manager-kms.c	\
@ -543,9 +546,7 @@ libmutterinclude_headers =			\
 	meta/meta-settings.h			\
 	meta/meta-shaped-texture.h		\
 	meta/meta-shadow-factory.h		\
-	meta/meta-stage.h			\
 	meta/meta-window-actor.h		\
-	meta/meta-window-group.h		\
 	meta/meta-window-shape.h		\
 	meta/prefs.h				\
 	meta/screen.h				\
--- a/src/backends/gsm-inhibitor-flag.h
+++ b/src/backends/gsm-inhibitor-flag.h
@ -1,36 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GSM_INHIBITOR_FLAG_H__
-#define __GSM_INHIBITOR_FLAG_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-typedef enum {
-        GSM_INHIBITOR_FLAG_LOGOUT      = 1 << 0,
-        GSM_INHIBITOR_FLAG_SWITCH_USER = 1 << 1,
-        GSM_INHIBITOR_FLAG_SUSPEND     = 1 << 2,
-        GSM_INHIBITOR_FLAG_IDLE        = 1 << 3,
-        GSM_INHIBITOR_FLAG_AUTOMOUNT   = 1 << 4
-} GsmInhibitorFlag;
-
-G_END_DECLS
-
-#endif /* __GSM_INHIBITOR_FLAG_H__ */
--- a/src/backends/meta-backend-private.h
+++ b/src/backends/meta-backend-private.h
@ -59,6 +59,8 @@ struct _MetaBackendClass

  void (* post_init) (MetaBackend *backend);

+  MetaIdleMonitor * (* create_idle_monitor) (MetaBackend *backend,
+                                             int          device_id);
  MetaMonitorManager * (* create_monitor_manager) (MetaBackend *backend,
                                                   GError     **error);
  MetaCursorRenderer * (* create_cursor_renderer) (MetaBackend *backend);
--- a/src/backends/meta-backend.c
+++ b/src/backends/meta-backend.c
@ -34,7 +34,7 @@
 #include "meta-input-settings-private.h"
 #include "backends/x11/meta-backend-x11.h"
 #include "meta-cursor-tracker-private.h"
-#include "meta-stage-private.h"
+#include "meta-stage.h"

 #ifdef HAVE_REMOTE_DESKTOP
 #include "backends/meta-dbus-session-watcher.h"
@ -110,11 +110,6 @@ struct _MetaBackendPrivate

  MetaPointerConstraint *client_pointer_constraint;
  MetaDnd *dnd;
-
-  UpClient *up_client;
-  guint sleep_signal_id;
-  GCancellable *cancellable;
-  GDBusConnection *system_bus;
 };
 typedef struct _MetaBackendPrivate MetaBackendPrivate;

@ -141,13 +136,6 @@ meta_backend_finalize (GObject *object)
  g_clear_object (&priv->dbus_session_watcher);
 #endif

-  g_object_unref (priv->up_client);
-  if (priv->sleep_signal_id)
-    g_dbus_connection_signal_unsubscribe (priv->system_bus, priv->sleep_signal_id);
-  g_cancellable_cancel (priv->cancellable);
-  g_clear_object (&priv->cancellable);
-  g_clear_object (&priv->system_bus);
-
  if (priv->device_update_idle_id)
    g_source_remove (priv->device_update_idle_id);

@ -170,7 +158,7 @@ meta_backend_sync_screen_size (MetaBackend *backend)
 }

 static void
-reset_pointer_position (MetaBackend *backend)
+center_pointer (MetaBackend *backend)
 {
  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
  MetaMonitorManager *monitor_manager = priv->monitor_manager;
@ -179,11 +167,9 @@ reset_pointer_position (MetaBackend *backend)
  primary =
    meta_monitor_manager_get_primary_logical_monitor (monitor_manager);

-  /* Move the pointer out of the way to avoid hovering over reactive
-   * elements (e.g. users list at login) causing undesired behaviour. */
  meta_backend_warp_pointer (backend,
-                             primary->rect.x + primary->rect.width * 0.9,
-                             primary->rect.y + primary->rect.height * 0.9);
+                             primary->rect.x + primary->rect.width / 2,
+                             primary->rect.y + primary->rect.height / 2);
 }

 void
@ -206,7 +192,7 @@ meta_backend_monitors_changed (MetaBackend *backend)
           !priv->is_pointer_position_initialized) &&
          !meta_monitor_manager_is_headless (monitor_manager))
        {
-          reset_pointer_position (backend);
+          center_pointer (backend);
          priv->is_pointer_position_initialized = TRUE;
        }
    }
@ -236,9 +222,7 @@ static MetaIdleMonitor *
 meta_backend_create_idle_monitor (MetaBackend *backend,
                                  int          device_id)
 {
-  return g_object_new (META_TYPE_IDLE_MONITOR,
-                       "device-id", device_id,
-                       NULL);
+  return META_BACKEND_GET_CLASS (backend)->create_idle_monitor (backend, device_id);
 }

 static void
@ -418,6 +402,28 @@ 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)
 {
@ -451,13 +457,15 @@ meta_backend_real_post_init (MetaBackend *backend)

 #ifdef HAVE_REMOTE_DESKTOP
  priv->dbus_session_watcher = g_object_new (META_TYPE_DBUS_SESSION_WATCHER, NULL);
-  priv->screen_cast = meta_screen_cast_new (priv->dbus_session_watcher);
-  priv->remote_desktop = meta_remote_desktop_new (priv->dbus_session_watcher);
+  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);
 #endif /* HAVE_REMOTE_DESKTOP */

  if (!meta_monitor_manager_is_headless (priv->monitor_manager))
    {
-      reset_pointer_position (backend);
+      center_pointer (backend);
      priv->is_pointer_position_initialized = TRUE;
    }
 }
@ -544,6 +552,26 @@ 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)
@ -562,61 +590,6 @@ meta_backend_create_renderer (MetaBackend *backend,
  return META_BACKEND_GET_CLASS (backend)->create_renderer (backend, error);
 }

-static void
-lid_is_closed_changed_cb (UpClient   *client,
-                          GParamSpec *pspec,
-                          gpointer    user_data)
-{
-  if (up_client_get_lid_is_closed (client))
-    return;
-
-  meta_idle_monitor_reset_idletime (meta_idle_monitor_get_core ());
-}
-
-static void
-prepare_for_sleep_cb (GDBusConnection *connection,
-                      const gchar     *sender_name,
-                      const gchar     *object_path,
-                      const gchar     *interface_name,
-                      const gchar     *signal_name,
-                      GVariant        *parameters,
-                      gpointer         user_data)
-{
-  gboolean suspending;
-
-  g_variant_get (parameters, "(b)", &suspending);
-  if (suspending)
-    return;
-  meta_idle_monitor_reset_idletime (meta_idle_monitor_get_core ());
-}
-
-static void
-system_bus_gotten_cb (GObject      *object,
-                      GAsyncResult *res,
-                      gpointer      user_data)
-{
-  MetaBackendPrivate *priv;
-  GDBusConnection *bus;
-
-  bus = g_bus_get_finish (res, NULL);
-  if (!bus)
-    return;
-
-  priv = meta_backend_get_instance_private (user_data);
-  priv->system_bus = bus;
-  priv->sleep_signal_id =
-    g_dbus_connection_signal_subscribe (priv->system_bus,
-                                        "org.freedesktop.login1",
-                                        "org.freedesktop.login1.Manager",
-                                        "PrepareForSleep",
-                                        "/org/freedesktop/login1",
-                                        NULL,
-                                        G_DBUS_SIGNAL_FLAGS_NONE,
-                                        prepare_for_sleep_cb,
-                                        NULL,
-                                        NULL);
-}
-
 static gboolean
 meta_backend_initable_init (GInitable     *initable,
                            GCancellable  *cancellable,
@ -626,6 +599,9 @@ 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);

@ -643,16 +619,6 @@ meta_backend_initable_init (GInitable     *initable,

  priv->dnd = g_object_new (META_TYPE_DND, NULL);

-  priv->up_client = up_client_new ();
-  g_signal_connect (priv->up_client, "notify::lid-is-closed",
-                    G_CALLBACK (lid_is_closed_changed_cb), NULL);
-
-  priv->cancellable = g_cancellable_new ();
-  g_bus_get (G_BUS_TYPE_SYSTEM,
-             priv->cancellable,
-             system_bus_gotten_cb,
-             backend);
-
  return TRUE;
 }

--- a/src/backends/meta-cursor-renderer.c
+++ b/src/backends/meta-cursor-renderer.c
@ -33,7 +33,7 @@
 #include <cogl/cogl.h>
 #include <clutter/clutter.h>

-#include "meta-stage-private.h"
+#include "meta-stage.h"

 struct _MetaCursorRendererPrivate
 {
@ -264,18 +264,6 @@ meta_cursor_renderer_set_position (MetaCursorRenderer *renderer,
  update_cursor (renderer, priv->displayed_cursor);
 }

-ClutterPoint
-meta_cursor_renderer_get_position (MetaCursorRenderer *renderer)
-{
-  MetaCursorRendererPrivate *priv =
-    meta_cursor_renderer_get_instance_private (renderer);
-
-  return (ClutterPoint) {
-    .x = priv->current_x,
-    .y = priv->current_y
-  };
-}
-
 MetaCursorSprite *
 meta_cursor_renderer_get_cursor (MetaCursorRenderer *renderer)
 {
--- a/src/backends/meta-cursor-renderer.h
+++ b/src/backends/meta-cursor-renderer.h
@ -62,7 +62,6 @@ void meta_cursor_renderer_set_cursor (MetaCursorRenderer *renderer,
 void meta_cursor_renderer_set_position (MetaCursorRenderer *renderer,
                                        float               x,
                                        float               y);
-ClutterPoint meta_cursor_renderer_get_position (MetaCursorRenderer *renderer);
 void meta_cursor_renderer_force_update (MetaCursorRenderer *renderer);

 MetaCursorSprite * meta_cursor_renderer_get_cursor (MetaCursorRenderer *renderer);
--- a/src/backends/meta-idle-monitor-dbus.c
+++ b/src/backends/meta-idle-monitor-dbus.c
@ -24,7 +24,6 @@

 #include "meta-idle-monitor-dbus.h"
 #include <meta/meta-idle-monitor.h>
-#include <backends/meta-idle-monitor-private.h>
 #include "meta-dbus-idle-monitor.h"

 #include <clutter/clutter.h>
@ -44,26 +43,6 @@ handle_get_idletime (MetaDBusIdleMonitor   *skeleton,
  return TRUE;
 }

-static gboolean
-handle_reset_idletime (MetaDBusIdleMonitor   *skeleton,
-                       GDBusMethodInvocation *invocation,
-                       MetaIdleMonitor       *monitor)
-{
-  if (!g_getenv ("MUTTER_DEBUG_RESET_IDLETIME"))
-    {
-      g_dbus_method_invocation_return_error_literal (invocation,
-                                                     G_DBUS_ERROR,
-                                                     G_DBUS_ERROR_UNKNOWN_METHOD,
-                                                     "No such method");
-      return FALSE;
-    }
-
-  meta_idle_monitor_reset_idletime (meta_idle_monitor_get_core ());
-  meta_dbus_idle_monitor_complete_reset_idletime (skeleton, invocation);
-
-  return TRUE;
-}
-
 typedef struct {
  MetaDBusIdleMonitor *dbus_monitor;
  MetaIdleMonitor *monitor;
@ -194,8 +173,6 @@ create_monitor_skeleton (GDBusObjectManagerServer *manager,
                           G_CALLBACK (handle_add_user_active_watch), monitor, 0);
  g_signal_connect_object (skeleton, "handle-remove-watch",
                           G_CALLBACK (handle_remove_watch), monitor, 0);
-  g_signal_connect_object (skeleton, "handle-reset-idletime",
-                           G_CALLBACK (handle_reset_idletime), monitor, 0);
  g_signal_connect_object (skeleton, "handle-get-idletime",
                           G_CALLBACK (handle_get_idletime), monitor, 0);

--- a/src/backends/meta-idle-monitor-private.h
+++ b/src/backends/meta-idle-monitor-private.h
@ -26,6 +26,9 @@
 #include <meta/meta-idle-monitor.h>
 #include "display-private.h"

+#include <X11/Xlib.h>
+#include <X11/extensions/sync.h>
+
 typedef struct
 {
  MetaIdleMonitor          *monitor;
@ -35,26 +38,28 @@ typedef struct
  GDestroyNotify            notify;
  guint64                   timeout_msec;
  int                       idle_source_id;
-  GSource                  *timeout_source;
 } MetaIdleMonitorWatch;

 struct _MetaIdleMonitor
 {
  GObject parent_instance;

-  GDBusProxy *session_proxy;
-  gboolean inhibited;
  GHashTable *watches;
  int device_id;
-  guint64 last_event_time;
 };

 struct _MetaIdleMonitorClass
 {
  GObjectClass parent_class;
+
+  gint64 (*get_idletime) (MetaIdleMonitor *monitor);
+  MetaIdleMonitorWatch * (*make_watch) (MetaIdleMonitor           *monitor,
+                                        guint64                    timeout_msec,
+                                        MetaIdleMonitorWatchFunc   callback,
+                                        gpointer                   user_data,
+                                        GDestroyNotify             notify);
 };

 void _meta_idle_monitor_watch_fire (MetaIdleMonitorWatch *watch);
-void meta_idle_monitor_reset_idletime (MetaIdleMonitor *monitor);

 #endif /* META_IDLE_MONITOR_PRIVATE_H */
--- a/src/backends/meta-idle-monitor.c
+++ b/src/backends/meta-idle-monitor.c
@ -36,7 +36,6 @@
 #include <meta/util.h>
 #include <meta/main.h>
 #include <meta/meta-idle-monitor.h>
-#include "gsm-inhibitor-flag.h"
 #include "meta-idle-monitor-private.h"
 #include "meta-idle-monitor-dbus.h"
 #include "meta-backend-private.h"
@ -88,7 +87,6 @@ meta_idle_monitor_dispose (GObject *object)
  MetaIdleMonitor *monitor = META_IDLE_MONITOR (object);

  g_clear_pointer (&monitor->watches, g_hash_table_destroy);
-  g_clear_object (&monitor->session_proxy);

  G_OBJECT_CLASS (meta_idle_monitor_parent_class)->dispose (object);
 }
@ -153,118 +151,9 @@ meta_idle_monitor_class_init (MetaIdleMonitorClass *klass)
  g_object_class_install_property (object_class, PROP_DEVICE_ID, obj_props[PROP_DEVICE_ID]);
 }

-static void
-free_watch (gpointer data)
-{
-  MetaIdleMonitorWatch *watch = (MetaIdleMonitorWatch *) data;
-  MetaIdleMonitor *monitor = watch->monitor;
-
-  g_object_ref (monitor);
-
-  if (watch->idle_source_id)
-    {
-      g_source_remove (watch->idle_source_id);
-      watch->idle_source_id = 0;
-    }
-
-  if (watch->notify != NULL)
-    watch->notify (watch->user_data);
-
-  if (watch->timeout_source != NULL)
-    g_source_destroy (watch->timeout_source);
-
-  g_object_unref (monitor);
-  g_slice_free (MetaIdleMonitorWatch, watch);
-}
-
-static void
-update_inhibited_watch (gpointer key,
-                        gpointer value,
-                        gpointer user_data)
-{
-  MetaIdleMonitor *monitor = user_data;
-  MetaIdleMonitorWatch *watch = value;
-
-  if (!watch->timeout_source)
-    return;
-
-  if (monitor->inhibited)
-    {
-      g_source_set_ready_time (watch->timeout_source, -1);
-    }
-  else
-    {
-      g_source_set_ready_time (watch->timeout_source,
-                               monitor->last_event_time +
-                               watch->timeout_msec * 1000);
-    }
-}
-
-static void
-update_inhibited (MetaIdleMonitor *monitor,
-                  gboolean         inhibited)
-{
-  if (inhibited == monitor->inhibited)
-    return;
-
-  g_hash_table_foreach (monitor->watches,
-                        update_inhibited_watch,
-                        monitor);
-}
-
-static void
-meta_idle_monitor_inhibited_actions_changed (GDBusProxy  *session,
-                                             GVariant    *changed,
-                                             char       **invalidated,
-                                             gpointer     user_data)
-{
-  MetaIdleMonitor *monitor = user_data;
-  GVariant *v;
-
-  v = g_variant_lookup_value (changed, "InhibitedActions", G_VARIANT_TYPE_UINT32);
-  if (v)
-    {
-      gboolean inhibited;
-
-      inhibited = g_variant_get_uint32 (v) & GSM_INHIBITOR_FLAG_IDLE;
-      g_variant_unref (v);
-
-      if (!inhibited)
-        monitor->last_event_time = g_get_monotonic_time ();
-      update_inhibited (monitor, inhibited);
-    }
-}
-
 static void
 meta_idle_monitor_init (MetaIdleMonitor *monitor)
 {
-  GVariant *v;
-
-  monitor->watches = g_hash_table_new_full (NULL, NULL, NULL, free_watch);
-  monitor->last_event_time = g_get_monotonic_time ();
-
-  /* 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_AUTO_START,
-                                   NULL,
-                                   "org.gnome.SessionManager",
-                                   "/org/gnome/SessionManager",
-                                   "org.gnome.SessionManager",
-                                   NULL,
-                                   NULL);
-  if (!monitor->session_proxy)
-    return;
-
-  g_signal_connect (monitor->session_proxy, "g-properties-changed",
-                    G_CALLBACK (meta_idle_monitor_inhibited_actions_changed),
-                    monitor);
-
-  v = g_dbus_proxy_get_cached_property (monitor->session_proxy,
-                                        "InhibitedActions");
-  monitor->inhibited = g_variant_get_uint32 (v) & GSM_INHIBITOR_FLAG_IDLE;
-  g_variant_unref (v);
 }

 /**
@ -296,36 +185,6 @@ meta_idle_monitor_get_for_device (int device_id)
  return meta_backend_get_idle_monitor (backend, device_id);
 }

-static guint32
-get_next_watch_serial (void)
-{
-  static guint32 serial = 0;
-
-  g_atomic_int_inc (&serial);
-
-  return serial;
-}
-
-static gboolean
-idle_monitor_dispatch_timeout (GSource     *source,
-                               GSourceFunc  callback,
-                               gpointer     user_data)
-{
-  MetaIdleMonitorWatch *watch = (MetaIdleMonitorWatch *) user_data;
-
-  _meta_idle_monitor_watch_fire (watch);
-  g_source_set_ready_time (watch->timeout_source, -1);
-
-  return TRUE;
-}
-
-static GSourceFuncs idle_monitor_source_funcs = {
-  .prepare = NULL,
-  .check = NULL,
-  .dispatch = idle_monitor_dispatch_timeout,
-  .finalize = NULL,
-};
-
 static MetaIdleMonitorWatch *
 make_watch (MetaIdleMonitor           *monitor,
            guint64                    timeout_msec,
@ -335,32 +194,11 @@ make_watch (MetaIdleMonitor           *monitor,
 {
  MetaIdleMonitorWatch *watch;

-  watch = g_slice_new0 (MetaIdleMonitorWatch);
-
-  watch->monitor = monitor;
-  watch->id = get_next_watch_serial ();
-  watch->callback = callback;
-  watch->user_data = user_data;
-  watch->notify = notify;
-  watch->timeout_msec = timeout_msec;
-
-  if (timeout_msec != 0)
-    {
-      GSource *source = g_source_new (&idle_monitor_source_funcs,
-                                      sizeof (GSource));
-
-      g_source_set_callback (source, NULL, watch, NULL);
-      if (!monitor->inhibited)
-        {
-          g_source_set_ready_time (source,
-                                   monitor->last_event_time +
-                                   timeout_msec * 1000);
-        }
-      g_source_attach (source, NULL);
-      g_source_unref (source);
-
-      watch->timeout_source = source;
-    }
+  watch = META_IDLE_MONITOR_GET_CLASS (monitor)->make_watch (monitor,
+                                                             timeout_msec,
+                                                             callback,
+                                                             user_data,
+                                                             notify);

  g_hash_table_insert (monitor->watches,
                       GUINT_TO_POINTER (watch->id),
@ -476,39 +314,5 @@ meta_idle_monitor_remove_watch (MetaIdleMonitor *monitor,
 gint64
 meta_idle_monitor_get_idletime (MetaIdleMonitor *monitor)
 {
-  return (g_get_monotonic_time () - monitor->last_event_time) / 1000;
-}
-
-void
-meta_idle_monitor_reset_idletime (MetaIdleMonitor *monitor)
-{
-  GList *node, *watch_ids;
-
-  monitor->last_event_time = g_get_monotonic_time ();
-
-  watch_ids = g_hash_table_get_keys (monitor->watches);
-
-  for (node = watch_ids; node != NULL; node = node->next)
-    {
-      guint watch_id = GPOINTER_TO_UINT (node->data);
-      MetaIdleMonitorWatch *watch;
-
-      watch = g_hash_table_lookup (monitor->watches,
-                                   GUINT_TO_POINTER (watch_id));
-      if (!watch)
-        continue;
-
-      if (watch->timeout_msec == 0)
-        {
-          _meta_idle_monitor_watch_fire ((MetaIdleMonitorWatch *) watch);
-        }
-      else
-        {
-          g_source_set_ready_time (watch->timeout_source,
-                                   monitor->last_event_time +
-                                   watch->timeout_msec * 1000);
-        }
-    }
-
-  g_list_free (watch_ids);
+  return META_IDLE_MONITOR_GET_CLASS (monitor)->get_idletime (monitor);
 }
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@ -89,9 +89,6 @@ static gboolean
 meta_monitor_manager_is_config_complete (MetaMonitorManager *manager,
                                         MetaMonitorsConfig *config);

-static MetaMonitor *
-meta_monitor_manager_get_active_monitor (MetaMonitorManager *manager);
-
 MetaBackend *
 meta_monitor_manager_get_backend (MetaMonitorManager *manager)
 {
@ -201,17 +198,13 @@ calculate_monitor_scale (MetaMonitorManager *manager,
 static float
 derive_calculated_global_scale (MetaMonitorManager *manager)
 {
-  MetaMonitor *monitor = NULL;
+  MetaMonitor *primary_monitor;

-  monitor = meta_monitor_manager_get_primary_monitor (manager);
-
-  if (!monitor || !meta_monitor_is_active (monitor))
-    monitor = meta_monitor_manager_get_active_monitor (manager);
-
-  if (!monitor)
+  primary_monitor = meta_monitor_manager_get_primary_monitor (manager);
+  if (!primary_monitor)
    return 1.0;

-  return calculate_monitor_scale (manager, monitor);
+  return calculate_monitor_scale (manager, primary_monitor);
 }

 static float
@ -585,6 +578,8 @@ 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
@ -602,6 +597,8 @@ 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
@ -2385,12 +2382,6 @@ meta_monitor_manager_get_laptop_panel (MetaMonitorManager *manager)
  return find_monitor (manager, meta_monitor_is_laptop_panel);
 }

-static MetaMonitor *
-meta_monitor_manager_get_active_monitor (MetaMonitorManager *manager)
-{
-  return find_monitor (manager, meta_monitor_is_active);
-}
-
 MetaMonitor *
 meta_monitor_manager_get_monitor_from_connector (MetaMonitorManager *manager,
                                                 const char         *connector)
--- a/src/backends/meta-screen-cast-stream-src.c
+++ b/src/backends/meta-screen-cast-stream-src.c
@ -153,11 +153,6 @@ meta_screen_cast_stream_src_maybe_record_frame (MetaScreenCastStreamSrc *src)
    return;

  buffer = pw_stream_peek_buffer (priv->pipewire_stream, buffer_id);
-  if (!buffer)
-    {
-      g_warning ("Failed to peek at PipeWire buffer");
-      return;
-    }

  if (buffer->datas[0].type == priv->pipewire_type->data.MemFd)
    {
@ -332,18 +327,10 @@ create_pipewire_stream (MetaScreenCastStreamSrc  *src,
  struct spa_fraction max_framerate;
  struct spa_fraction min_framerate;
  const struct spa_pod *params[1];
-  int result;

  pipewire_stream = pw_stream_new (priv->pipewire_remote,
                                   "meta-screen-cast-src",
                                   NULL);
-  if (!pipewire_stream)
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Failed to create PipeWire stream: %s",
-                   strerror (errno));
-      return NULL;
-    }

  meta_screen_cast_stream_src_get_specs (src, &width, &height, &frame_rate);
  frame_rate_fraction = meta_fraction_from_double (frame_rate);
@ -369,15 +356,14 @@ create_pipewire_stream (MetaScreenCastStreamSrc  *src,
                          &stream_events,
                          src);

-  result = pw_stream_connect (pipewire_stream,
-                              PW_DIRECTION_OUTPUT,
-                              NULL,
-                              PW_STREAM_FLAG_NONE,
-                              params, G_N_ELEMENTS (params));
-  if (result != 0)
+  if (pw_stream_connect (pipewire_stream,
+                         PW_DIRECTION_OUTPUT,
+                         NULL,
+                         PW_STREAM_FLAG_NONE,
+                         params, G_N_ELEMENTS (params)) != 0)
    {
      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Could not connect: %s", spa_strerror (result));
+                   "Could not connect");
      return NULL;
    }

@ -480,12 +466,6 @@ create_pipewire_source (void)
    (MetaPipeWireSource *) g_source_new (&pipewire_source_funcs,
                                         sizeof (MetaPipeWireSource));
  pipewire_source->pipewire_loop = pw_loop_new (NULL);
-  if (!pipewire_source->pipewire_loop)
-    {
-      g_source_destroy ((GSource *) pipewire_source);
-      return NULL;
-    }
-
  g_source_add_unix_fd (&pipewire_source->base,
                        pw_loop_get_fd (pipewire_source->pipewire_loop),
                        G_IO_IN | G_IO_ERR);
@ -511,13 +491,6 @@ meta_screen_cast_stream_src_initable_init (GInitable     *initable,
    meta_screen_cast_stream_src_get_instance_private (src);

  priv->pipewire_source = create_pipewire_source ();
-  if (!priv->pipewire_source)
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Failed to create PipeWire source");
-      return FALSE;
-    }
-
  priv->pipewire_core = pw_core_new (priv->pipewire_source->pipewire_loop,
                                     NULL);
  if (!priv->pipewire_core)
--- a/src/backends/meta-settings-private.h
+++ b/src/backends/meta-settings-private.h
@ -31,7 +31,9 @@ typedef enum _MetaExperimentalFeature
 {
  META_EXPERIMENTAL_FEATURE_NONE = 0,
  META_EXPERIMENTAL_FEATURE_SCALE_MONITOR_FRAMEBUFFER = (1 << 0),
-  META_EXPERIMENTAL_FEATURE_KMS_MODIFIERS  = (1 << 1),
+  META_EXPERIMENTAL_FEATURE_SCREEN_CAST = (1 << 1),
+  META_EXPERIMENTAL_FEATURE_REMOTE_DESKTOP  = (1 << 2),
+  META_EXPERIMENTAL_FEATURE_KMS_MODIFIERS = (1 << 3),
 } MetaExperimentalFeature;

 #define META_TYPE_SETTINGS (meta_settings_get_type ())
--- a/src/backends/meta-settings.c
+++ b/src/backends/meta-settings.c
@ -260,8 +260,13 @@ 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/meta-stage.c
+++ b/src/backends/meta-stage.c
@ -22,7 +22,7 @@

 #include <config.h>

-#include "meta-stage-private.h"
+#include "meta-stage.h"

 #include <meta/meta-backend.h>
 #include <meta/meta-monitor-manager.h>
--- a/src/backends/meta-stage-private.h
+++ b/src/backends/meta-stage-private.h
@ -17,23 +17,39 @@
 * 02111-1307, USA.
 */

-#ifndef META_STAGE_PRIVATE_H
-#define META_STAGE_PRIVATE_H
+#ifndef META_STAGE_H
+#define META_STAGE_H

-#include <meta/meta-stage.h>
+#include <clutter/clutter.h>

 #include "meta-cursor.h"
 #include <meta/boxes.h>

 G_BEGIN_DECLS

+#define META_TYPE_STAGE            (meta_stage_get_type ())
+#define META_STAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_STAGE, MetaStage))
+#define META_STAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_STAGE, MetaStageClass))
+#define META_IS_STAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_STAGE))
+#define META_IS_STAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_STAGE))
+#define META_STAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_STAGE, MetaStageClass))
+
+typedef struct _MetaStage      MetaStage;
+typedef struct _MetaStageClass MetaStageClass;
 typedef struct _MetaOverlay    MetaOverlay;

+struct _MetaStageClass
+{
+  ClutterStageClass parent_class;
+};
+
 struct _MetaStage
 {
  ClutterStage parent;
 };

+GType             meta_stage_get_type                (void) G_GNUC_CONST;
+
 ClutterActor     *meta_stage_new                     (void);

 MetaOverlay      *meta_stage_create_cursor_overlay   (MetaStage   *stage);
@ -52,4 +68,4 @@ void meta_stage_update_view_layout (MetaStage *stage);

 G_END_DECLS

-#endif /* META_STAGE_PRIVATE_H */
+#endif /* META_STAGE_H */
--- a/src/backends/native/meta-backend-native.c
+++ b/src/backends/native/meta-backend-native.c
@ -35,15 +35,15 @@
 #include "clutter/evdev/clutter-evdev.h"
 #include "meta-barrier-native.h"
 #include "meta-border.h"
+#include "meta-idle-monitor-native.h"
 #include "meta-monitor-manager-kms.h"
 #include "meta-cursor-renderer-native.h"
 #include "meta-launcher.h"
 #include "backends/meta-cursor-tracker-private.h"
-#include "backends/meta-idle-monitor-private.h"
 #include "backends/meta-logical-monitor.h"
 #include "backends/meta-monitor-manager-private.h"
 #include "backends/meta-pointer-constraint.h"
-#include "backends/meta-stage-private.h"
+#include "backends/meta-stage.h"
 #include "backends/native/meta-clutter-backend-native.h"
 #include "backends/native/meta-input-settings-native.h"
 #include "backends/native/meta-renderer-native.h"
@ -60,6 +60,10 @@ struct _MetaBackendNativePrivate
 {
  MetaLauncher *launcher;
  MetaBarrierManagerNative *barrier_manager;
+  UpClient *up_client;
+  guint sleep_signal_id;
+  GCancellable *cancellable;
+  GDBusConnection *system_bus;
 };
 typedef struct _MetaBackendNativePrivate MetaBackendNativePrivate;

@ -81,9 +85,69 @@ meta_backend_native_finalize (GObject *object)

  meta_launcher_free (priv->launcher);

+  g_object_unref (priv->up_client);
+  if (priv->sleep_signal_id)
+    g_dbus_connection_signal_unsubscribe (priv->system_bus, priv->sleep_signal_id);
+  g_cancellable_cancel (priv->cancellable);
+  g_clear_object (&priv->cancellable);
+  g_clear_object (&priv->system_bus);
+
  G_OBJECT_CLASS (meta_backend_native_parent_class)->finalize (object);
 }

+static void
+prepare_for_sleep_cb (GDBusConnection *connection,
+                      const gchar     *sender_name,
+                      const gchar     *object_path,
+                      const gchar     *interface_name,
+                      const gchar     *signal_name,
+                      GVariant        *parameters,
+                      gpointer         user_data)
+{
+  gboolean suspending;
+  g_variant_get (parameters, "(b)", &suspending);
+  if (suspending)
+    return;
+  meta_idle_monitor_native_reset_idletime (meta_idle_monitor_get_core ());
+}
+
+static void
+system_bus_gotten_cb (GObject      *object,
+                      GAsyncResult *res,
+                      gpointer      user_data)
+{
+  MetaBackendNativePrivate *priv;
+  GDBusConnection *bus;
+
+  bus = g_bus_get_finish (res, NULL);
+  if (!bus)
+    return;
+
+  priv = meta_backend_native_get_instance_private (META_BACKEND_NATIVE (user_data));
+  priv->system_bus = bus;
+  priv->sleep_signal_id = g_dbus_connection_signal_subscribe (priv->system_bus,
+                                                              "org.freedesktop.login1",
+                                                              "org.freedesktop.login1.Manager",
+                                                              "PrepareForSleep",
+                                                              "/org/freedesktop/login1",
+                                                              NULL,
+                                                              G_DBUS_SIGNAL_FLAGS_NONE,
+                                                              prepare_for_sleep_cb,
+                                                              NULL,
+                                                              NULL);
+}
+
+static void
+lid_is_closed_changed_cb (UpClient   *client,
+                          GParamSpec *pspec,
+                          gpointer    user_data)
+{
+  if (up_client_get_lid_is_closed (client))
+    return;
+
+  meta_idle_monitor_native_reset_idletime (meta_idle_monitor_get_core ());
+}
+
 static void
 constrain_to_barriers (ClutterInputDevice *device,
                       guint32             time,
@ -334,6 +398,15 @@ meta_backend_native_post_init (MetaBackend *backend)
                                            meta_backend_get_monitor_manager (backend));
 }

+static MetaIdleMonitor *
+meta_backend_native_create_idle_monitor (MetaBackend *backend,
+                                         int          device_id)
+{
+  return g_object_new (META_TYPE_IDLE_MONITOR_NATIVE,
+                       "device-id", device_id,
+                       NULL);
+}
+
 static MetaMonitorManager *
 meta_backend_native_create_monitor_manager (MetaBackend *backend,
                                            GError     **error)
@ -531,6 +604,7 @@ meta_backend_native_class_init (MetaBackendNativeClass *klass)

  backend_class->post_init = meta_backend_native_post_init;

+  backend_class->create_idle_monitor = meta_backend_native_create_idle_monitor;
  backend_class->create_monitor_manager = meta_backend_native_create_monitor_manager;
  backend_class->create_cursor_renderer = meta_backend_native_create_cursor_renderer;
  backend_class->create_renderer = meta_backend_native_create_renderer;
@ -563,6 +637,16 @@ meta_backend_native_init (MetaBackendNative *native)
    }

  priv->barrier_manager = meta_barrier_manager_native_new ();
+
+  priv->up_client = up_client_new ();
+  g_signal_connect (priv->up_client, "notify::lid-is-closed",
+                    G_CALLBACK (lid_is_closed_changed_cb), NULL);
+
+  priv->cancellable = g_cancellable_new ();
+  g_bus_get (G_BUS_TYPE_SYSTEM,
+             priv->cancellable,
+             system_bus_gotten_cb,
+             native);
 }

 MetaLauncher *
@ -663,5 +747,5 @@ void meta_backend_native_resume (MetaBackendNative *native)
  meta_cursor_renderer_native_force_update (cursor_renderer_native);

  idle_monitor = meta_backend_get_idle_monitor (backend, 0);
-  meta_idle_monitor_reset_idletime (idle_monitor);
+  meta_idle_monitor_native_reset_idletime (idle_monitor);
 }
--- a/src/backends/native/meta-gpu-kms.c
+++ b/src/backends/native/meta-gpu-kms.c
@ -47,12 +47,6 @@ typedef struct _MetaKmsSource
  MetaGpuKms *gpu_kms;
 } MetaKmsSource;

-typedef struct _MetaGpuKmsFlipClosureContainer
-{
-  GClosure *flip_closure;
-  MetaGpuKms *gpu_kms;
-} MetaGpuKmsFlipClosureContainer;
-
 struct _MetaGpuKms
 {
  MetaGpu parent;
@ -70,6 +64,7 @@ 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
@ -205,26 +200,11 @@ meta_gpu_kms_is_crtc_active (MetaGpuKms *gpu_kms,
  return TRUE;
 }

-MetaGpuKmsFlipClosureContainer *
-meta_gpu_kms_wrap_flip_closure (MetaGpuKms *gpu_kms,
-                                GClosure   *flip_closure)
+typedef struct _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);
-}
+  GClosure *flip_closure;
+  MetaGpuKms *gpu_kms;
+} GpuClosureContainer;

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

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

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

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

 gboolean
@ -769,6 +752,8 @@ 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);
@ -792,12 +777,40 @@ 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,11 +29,17 @@
 #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;
@ -86,9 +92,4 @@ 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-idle-monitor-native.c
+++ b/src/backends/native/meta-idle-monitor-native.c
@ -0,0 +1,200 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright 2013 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Adapted from gnome-session/gnome-session/gs-idle-monitor.c and
+ *         from gnome-desktop/libgnome-desktop/gnome-idle-monitor.c
+ */
+
+#include "config.h"
+
+#include "meta-idle-monitor-native.h"
+#include "meta-idle-monitor-private.h"
+
+#include <meta/util.h>
+#include "display-private.h"
+
+#include <string.h>
+
+struct _MetaIdleMonitorNative
+{
+  MetaIdleMonitor parent;
+
+  guint64 last_event_time;
+};
+
+struct _MetaIdleMonitorNativeClass
+{
+  MetaIdleMonitorClass parent_class;
+};
+
+typedef struct {
+  MetaIdleMonitorWatch base;
+
+  GSource *timeout_source;
+} MetaIdleMonitorWatchNative;
+
+G_DEFINE_TYPE (MetaIdleMonitorNative, meta_idle_monitor_native, META_TYPE_IDLE_MONITOR)
+
+static gint64
+meta_idle_monitor_native_get_idletime (MetaIdleMonitor *monitor)
+{
+  MetaIdleMonitorNative *monitor_native = META_IDLE_MONITOR_NATIVE (monitor);
+
+  return (g_get_monotonic_time () - monitor_native->last_event_time) / 1000;
+}
+
+static guint32
+get_next_watch_serial (void)
+{
+  static guint32 serial = 0;
+  g_atomic_int_inc (&serial);
+  return serial;
+}
+
+static gboolean
+native_dispatch_timeout (GSource     *source,
+                         GSourceFunc  callback,
+                         gpointer     user_data)
+{
+  MetaIdleMonitorWatchNative *watch_native = user_data;
+  MetaIdleMonitorWatch *watch = (MetaIdleMonitorWatch *) watch_native;
+
+  _meta_idle_monitor_watch_fire (watch);
+  g_source_set_ready_time (watch_native->timeout_source, -1);
+  return TRUE;
+}
+
+static GSourceFuncs native_source_funcs = {
+  NULL, /* prepare */
+  NULL, /* check */
+  native_dispatch_timeout,
+  NULL, /* finalize */
+};
+
+static void
+free_watch (gpointer data)
+{
+  MetaIdleMonitorWatchNative *watch_native = data;
+  MetaIdleMonitorWatch *watch = (MetaIdleMonitorWatch *) watch_native;
+  MetaIdleMonitor *monitor = watch->monitor;
+
+  g_object_ref (monitor);
+
+  if (watch->idle_source_id)
+    {
+      g_source_remove (watch->idle_source_id);
+      watch->idle_source_id = 0;
+    }
+
+  if (watch->notify != NULL)
+    watch->notify (watch->user_data);
+
+  if (watch_native->timeout_source != NULL)
+    g_source_destroy (watch_native->timeout_source);
+
+  g_object_unref (monitor);
+  g_slice_free (MetaIdleMonitorWatchNative, watch_native);
+}
+
+static MetaIdleMonitorWatch *
+meta_idle_monitor_native_make_watch (MetaIdleMonitor           *monitor,
+                                     guint64                    timeout_msec,
+                                     MetaIdleMonitorWatchFunc   callback,
+                                     gpointer                   user_data,
+                                     GDestroyNotify             notify)
+{
+  MetaIdleMonitorWatchNative *watch_native;
+  MetaIdleMonitorWatch *watch;
+  MetaIdleMonitorNative *monitor_native = META_IDLE_MONITOR_NATIVE (monitor);
+
+  watch_native = g_slice_new0 (MetaIdleMonitorWatchNative);
+  watch = (MetaIdleMonitorWatch *) watch_native;
+
+  watch->monitor = monitor;
+  watch->id = get_next_watch_serial ();
+  watch->callback = callback;
+  watch->user_data = user_data;
+  watch->notify = notify;
+  watch->timeout_msec = timeout_msec;
+
+  if (timeout_msec != 0)
+    {
+      GSource *source = g_source_new (&native_source_funcs, sizeof (GSource));
+
+      g_source_set_callback (source, NULL, watch, NULL);
+      g_source_set_ready_time (source, monitor_native->last_event_time + timeout_msec * 1000);
+      g_source_attach (source, NULL);
+      g_source_unref (source);
+
+      watch_native->timeout_source = source;
+    }
+
+  return watch;
+}
+
+static void
+meta_idle_monitor_native_class_init (MetaIdleMonitorNativeClass *klass)
+{
+  MetaIdleMonitorClass *idle_monitor_class = META_IDLE_MONITOR_CLASS (klass);
+
+  idle_monitor_class->get_idletime = meta_idle_monitor_native_get_idletime;
+  idle_monitor_class->make_watch = meta_idle_monitor_native_make_watch;
+}
+
+static void
+meta_idle_monitor_native_init (MetaIdleMonitorNative *monitor_native)
+{
+  MetaIdleMonitor *monitor = META_IDLE_MONITOR (monitor_native);
+
+  monitor->watches = g_hash_table_new_full (NULL, NULL, NULL, free_watch);
+  monitor_native->last_event_time = g_get_monotonic_time ();
+}
+
+void
+meta_idle_monitor_native_reset_idletime (MetaIdleMonitor *monitor)
+{
+  MetaIdleMonitorNative *monitor_native = META_IDLE_MONITOR_NATIVE (monitor);
+  GList *node, *watch_ids;
+
+  monitor_native->last_event_time = g_get_monotonic_time ();
+
+  watch_ids = g_hash_table_get_keys (monitor->watches);
+
+  for (node = watch_ids; node != NULL; node = node->next)
+    {
+      guint watch_id = GPOINTER_TO_UINT (node->data);
+      MetaIdleMonitorWatchNative *watch;
+
+      watch = g_hash_table_lookup (monitor->watches, GUINT_TO_POINTER (watch_id));
+      if (!watch)
+        continue;
+
+      if (watch->base.timeout_msec == 0)
+        {
+          _meta_idle_monitor_watch_fire ((MetaIdleMonitorWatch *) watch);
+        }
+      else
+        {
+          g_source_set_ready_time (watch->timeout_source,
+                                   monitor_native->last_event_time +
+                                   watch->base.timeout_msec * 1000);
+        }
+    }
+
+  g_list_free (watch_ids);
+}
--- a/src/backends/native/meta-idle-monitor-native.h
+++ b/src/backends/native/meta-idle-monitor-native.h
@ -0,0 +1,43 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright 2013 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Adapted from gnome-session/gnome-session/gs-idle-monitor.c and
+ *         from gnome-desktop/libgnome-desktop/gnome-idle-monitor.c
+ */
+
+#ifndef META_IDLE_MONITOR_NATIVE_H
+#define META_IDLE_MONITOR_NATIVE_H
+
+#include <glib-object.h>
+#include <meta/meta-idle-monitor.h>
+
+#define META_TYPE_IDLE_MONITOR_NATIVE            (meta_idle_monitor_native_get_type ())
+#define META_IDLE_MONITOR_NATIVE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_IDLE_MONITOR_NATIVE, MetaIdleMonitorNative))
+#define META_IDLE_MONITOR_NATIVE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_IDLE_MONITOR_NATIVE, MetaIdleMonitorNativeClass))
+#define META_IS_IDLE_MONITOR_NATIVE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_IDLE_MONITOR_NATIVE))
+#define META_IS_IDLE_MONITOR_NATIVE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_IDLE_MONITOR_NATIVE))
+#define META_IDLE_MONITOR_NATIVE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_IDLE_MONITOR_NATIVE, MetaIdleMonitorNativeClass))
+
+typedef struct _MetaIdleMonitorNative        MetaIdleMonitorNative;
+typedef struct _MetaIdleMonitorNativeClass   MetaIdleMonitorNativeClass;
+
+GType meta_idle_monitor_native_get_type (void);
+
+void meta_idle_monitor_native_reset_idletime (MetaIdleMonitor *monitor);
+
+#endif /* META_IDLE_MONITOR_NATIVE_H */
--- a/src/backends/native/meta-launcher.c
+++ b/src/backends/native/meta-launcher.c
@ -44,6 +44,7 @@
 #include "backends/meta-backend-private.h"
 #include "backends/native/meta-backend-native.h"
 #include "meta-cursor-renderer-native.h"
+#include "meta-idle-monitor-native.h"
 #include "meta-renderer-native.h"

 struct _MetaLauncher
--- a/src/backends/native/meta-monitor-manager-kms.c
+++ b/src/backends/native/meta-monitor-manager-kms.c
@ -681,8 +681,11 @@ meta_monitor_manager_kms_initable_init (GInitable    *initable,
      gpu_kms = meta_gpu_kms_new (manager_kms, gpu_path, &secondary_error);
      if (!gpu_kms)
        {
-          g_warning ("Failed to open secondary gpu '%s': %s",
-                     gpu_path, secondary_error->message);
+          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);
+
          continue;
        }

--- a/src/backends/native/meta-renderer-native.c
+++ b/src/backends/native/meta-renderer-native.c
@ -1271,7 +1271,6 @@ 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;

@ -1281,12 +1280,9 @@ 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) closure_container,
+    (EGLAttrib) flip_closure,
    EGL_NONE
  };

@ -1305,7 +1301,6 @@ 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;
    }

@ -1606,12 +1601,6 @@ gbm_get_next_fb_id (MetaGpuKms         *gpu_kms,
  /* Now we need to set the CRTC to whatever is the front buffer */
  next_bo = gbm_surface_lock_front_buffer (gbm_surface);

-  if (!next_bo)
-    {
-      g_error ("Impossible to lock surface front buffer: %m");
-      return FALSE;
-    }
-
  for (i = 0; i < gbm_bo_get_plane_count (next_bo); i++)
    {
      strides[i] = gbm_bo_get_stride_for_plane (next_bo, i);
@ -1922,7 +1911,12 @@ meta_onscreen_native_swap_buffers_with_damage (CoglOnscreen *onscreen,
   * context.
   */
  if (egl_context_changed)
-    _cogl_winsys_egl_ensure_current (cogl_display);
+    {
+      _cogl_winsys_egl_make_current (cogl_display,
+                                     EGL_NO_SURFACE,
+                                     EGL_NO_SURFACE,
+                                     EGL_NO_CONTEXT);
+    }
 }

 static gboolean
--- a/src/backends/x11/meta-backend-x11.c
+++ b/src/backends/x11/meta-backend-x11.c
@ -37,7 +37,8 @@
 #include <X11/Xlib-xcb.h>
 #include <xkbcommon/xkbcommon-x11.h>

-#include "backends/meta-stage-private.h"
+#include "meta-idle-monitor-xsync.h"
+#include "backends/meta-stage.h"
 #include "backends/x11/meta-clutter-backend-x11.h"
 #include "backends/x11/meta-renderer-x11.h"
 #include "meta/meta-cursor-tracker.h"
@ -46,7 +47,6 @@
 #include "display-private.h"
 #include "compositor/compositor-private.h"
 #include "backends/meta-dnd-private.h"
-#include "backends/meta-idle-monitor-private.h"

 struct _MetaBackendX11Private
 {
@ -57,8 +57,6 @@ struct _MetaBackendX11Private

  int xsync_event_base;
  int xsync_error_base;
-  XSyncAlarm user_active_alarm;
-  XSyncCounter counter;

  int xinput_opcode;
  int xinput_event_base;
@ -85,77 +83,13 @@ G_DEFINE_TYPE_WITH_CODE (MetaBackendX11, meta_backend_x11, META_TYPE_BACKEND,
                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
                                                initable_iface_init));

-
 static void
-uint64_to_xsync_value (uint64_t    value,
-                       XSyncValue *xsync_value)
+handle_alarm_notify (MetaBackend *backend,
+                     XEvent      *event)
 {
-  XSyncIntsToValue (xsync_value, value & 0xffffffff, value >> 32);
-}
-
-static XSyncAlarm
-xsync_user_active_alarm_set (MetaBackendX11Private *priv)
-{
-  XSyncAlarmAttributes attr;
-  XSyncValue delta;
-  unsigned long flags;
-
-  flags = (XSyncCACounter | XSyncCAValueType | XSyncCATestType |
-           XSyncCAValue | XSyncCADelta | XSyncCAEvents);
-
-  XSyncIntToValue (&delta, 0);
-  attr.trigger.counter = priv->counter;
-  attr.trigger.value_type = XSyncAbsolute;
-  attr.delta = delta;
-  attr.events = TRUE;
-
-  uint64_to_xsync_value (1, &attr.trigger.wait_value);
-
-  attr.trigger.test_type = XSyncNegativeTransition;
-  return XSyncCreateAlarm (priv->xdisplay, flags, &attr);
-}
-
-static XSyncCounter
-find_idletime_counter (MetaBackendX11Private *priv)
-{
-  int i;
-  int n_counters;
-  XSyncSystemCounter *counters;
-  XSyncCounter counter = None;
-
-  counters = XSyncListSystemCounters (priv->xdisplay, &n_counters);
-  for (i = 0; i < n_counters; i++)
-    {
-      if (g_strcmp0 (counters[i].name, "IDLETIME") == 0)
-        {
-          counter = counters[i].counter;
-          break;
-        }
-    }
-  XSyncFreeSystemCounterList (counters);
-
-  return counter;
-}
-
-static void
-handle_alarm_notify (MetaBackend           *backend,
-                     XSyncAlarmNotifyEvent *alarm_event)
-{
-  MetaBackendX11 *x11 = META_BACKEND_X11 (backend);
-  MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
-  MetaIdleMonitor *idle_monitor;
-  XSyncAlarmAttributes attr;
-
-  if (alarm_event->state != XSyncAlarmActive ||
-      alarm_event->alarm != priv->user_active_alarm)
-    return;
-
-  attr.events = TRUE;
-  XSyncChangeAlarm (priv->xdisplay, priv->user_active_alarm,
-                    XSyncCAEvents, &attr);
-
-  idle_monitor = meta_backend_get_idle_monitor (backend, 0);
-  meta_idle_monitor_reset_idletime (idle_monitor);
+  meta_backend_foreach_device_monitor (backend,
+                                       (GFunc) meta_idle_monitor_xsync_handle_xevent,
+                                       event);
 }

 static void
@ -341,7 +275,7 @@ handle_host_xevent (MetaBackend *backend,
                    bypass_clutter);

  if (event->type == (priv->xsync_event_base + XSyncAlarmNotify))
-    handle_alarm_notify (backend, (XSyncAlarmNotifyEvent *) event);
+    handle_alarm_notify (backend, event);

  if (event->type == priv->xkb_event_base)
    {
@ -489,12 +423,6 @@ meta_backend_x11_post_init (MetaBackend *backend)
      !XSyncInitialize (priv->xdisplay, &major, &minor))
    meta_fatal ("Could not initialize XSync");

-  priv->counter = find_idletime_counter (priv);
-  if (priv->counter == None)
-    meta_fatal ("Could not initialize XSync counter");
-
-  priv->user_active_alarm = xsync_user_active_alarm_set (priv);
-
  if (XQueryExtension (priv->xdisplay,
                       "XInputExtension",
                       &priv->xinput_opcode,
@ -536,6 +464,15 @@ meta_backend_x11_create_clutter_backend (MetaBackend *backend)
  return g_object_new (META_TYPE_CLUTTER_BACKEND_X11, NULL);
 }

+static MetaIdleMonitor *
+meta_backend_x11_create_idle_monitor (MetaBackend *backend,
+                                      int          device_id)
+{
+  return g_object_new (META_TYPE_IDLE_MONITOR_XSYNC,
+                       "device-id", device_id,
+                       NULL);
+}
+
 static gboolean
 meta_backend_x11_grab_device (MetaBackend *backend,
                              int          device_id,
@ -742,30 +679,14 @@ initable_iface_init (GInitableIface *initable_iface)
  initable_iface->init = meta_backend_x11_initable_init;
 }

-static void
-meta_backend_x11_finalize (GObject *object)
-{
-  MetaBackendX11 *x11 = META_BACKEND_X11 (object);
-  MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
-
-  if (priv->user_active_alarm != None)
-    {
-      XSyncDestroyAlarm (priv->xdisplay, priv->user_active_alarm);
-      priv->user_active_alarm = None;
-    }
-
-  G_OBJECT_CLASS (meta_backend_x11_parent_class)->finalize (object);
-}
-
 static void
 meta_backend_x11_class_init (MetaBackendX11Class *klass)
 {
  MetaBackendClass *backend_class = META_BACKEND_CLASS (klass);
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);

-  object_class->finalize = meta_backend_x11_finalize;
  backend_class->create_clutter_backend = meta_backend_x11_create_clutter_backend;
  backend_class->post_init = meta_backend_x11_post_init;
+  backend_class->create_idle_monitor = meta_backend_x11_create_idle_monitor;
  backend_class->grab_device = meta_backend_x11_grab_device;
  backend_class->ungrab_device = meta_backend_x11_ungrab_device;
  backend_class->warp_pointer = meta_backend_x11_warp_pointer;
--- a/src/backends/x11/meta-cursor-renderer-x11.c
+++ b/src/backends/x11/meta-cursor-renderer-x11.c
@ -29,7 +29,7 @@
 #include <X11/extensions/Xfixes.h>

 #include "meta-backend-x11.h"
-#include "meta-stage-private.h"
+#include "meta-stage.h"

 struct _MetaCursorRendererX11Private
 {
--- a/src/backends/x11/meta-idle-monitor-xsync.c
+++ b/src/backends/x11/meta-idle-monitor-xsync.c
@ -0,0 +1,373 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright 2013 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Adapted from gnome-session/gnome-session/gs-idle-monitor.c and
+ *         from gnome-desktop/libgnome-desktop/gnome-idle-monitor.c
+ */
+
+#include "config.h"
+
+#include "meta-idle-monitor-xsync.h"
+#include "meta-idle-monitor-private.h"
+
+#include "meta-backend-x11.h"
+
+#include <string.h>
+
+struct _MetaIdleMonitorXSync
+{
+  MetaIdleMonitor parent;
+
+  GHashTable  *alarms;
+  Display     *display;
+  XSyncCounter counter;
+  XSyncAlarm   user_active_alarm;
+};
+
+struct _MetaIdleMonitorXSyncClass
+{
+  MetaIdleMonitorClass parent_class;
+};
+
+typedef struct {
+  MetaIdleMonitorWatch base;
+
+  XSyncAlarm xalarm;
+} MetaIdleMonitorWatchXSync;
+
+G_DEFINE_TYPE (MetaIdleMonitorXSync, meta_idle_monitor_xsync, META_TYPE_IDLE_MONITOR)
+
+static gint64
+_xsyncvalue_to_int64 (XSyncValue value)
+{
+  return ((guint64) XSyncValueHigh32 (value)) << 32
+    | (guint64) XSyncValueLow32 (value);
+}
+
+#define GUINT64_TO_XSYNCVALUE(value, ret) XSyncIntsToValue (ret, (value) & 0xFFFFFFFF, ((guint64)(value)) >> 32)
+
+static XSyncAlarm
+_xsync_alarm_set (MetaIdleMonitorXSync	*monitor_xsync,
+		  XSyncTestType          test_type,
+		  guint64                interval,
+		  gboolean               want_events)
+{
+  XSyncAlarmAttributes attr;
+  XSyncValue	     delta;
+  guint		     flags;
+
+  flags = XSyncCACounter | XSyncCAValueType | XSyncCATestType |
+    XSyncCAValue | XSyncCADelta | XSyncCAEvents;
+
+  XSyncIntToValue (&delta, 0);
+  attr.trigger.counter = monitor_xsync->counter;
+  attr.trigger.value_type = XSyncAbsolute;
+  attr.delta = delta;
+  attr.events = want_events;
+
+  GUINT64_TO_XSYNCVALUE (interval, &attr.trigger.wait_value);
+  attr.trigger.test_type = test_type;
+  return XSyncCreateAlarm (monitor_xsync->display, flags, &attr);
+}
+
+static void
+ensure_alarm_rescheduled (Display    *dpy,
+			  XSyncAlarm  alarm)
+{
+  XSyncAlarmAttributes attr;
+
+  /* Some versions of Xorg have an issue where alarms aren't
+   * always rescheduled. Calling XSyncChangeAlarm, even
+   * without any attributes, will reschedule the alarm. */
+  XSyncChangeAlarm (dpy, alarm, 0, &attr);
+}
+
+static void
+set_alarm_enabled (Display    *dpy,
+		   XSyncAlarm  alarm,
+		   gboolean    enabled)
+{
+  XSyncAlarmAttributes attr;
+  attr.events = enabled;
+  XSyncChangeAlarm (dpy, alarm, XSyncCAEvents, &attr);
+}
+
+static char *
+counter_name_for_device (int device_id)
+{
+  if (device_id > 0)
+    return g_strdup_printf ("DEVICEIDLETIME %d", device_id);
+
+  return g_strdup ("IDLETIME");
+}
+
+static XSyncCounter
+find_idletime_counter (MetaIdleMonitorXSync *monitor_xsync)
+{
+  MetaIdleMonitor *monitor = META_IDLE_MONITOR (monitor_xsync);
+  int		      i;
+  int		      ncounters;
+  XSyncSystemCounter *counters;
+  XSyncCounter        counter = None;
+  char               *counter_name;
+
+  counter_name = counter_name_for_device (monitor->device_id);
+  counters = XSyncListSystemCounters (monitor_xsync->display, &ncounters);
+  for (i = 0; i < ncounters; i++)
+    {
+      if (counters[i].name != NULL && strcmp (counters[i].name, counter_name) == 0)
+        {
+          counter = counters[i].counter;
+          break;
+        }
+    }
+  XSyncFreeSystemCounterList (counters);
+  g_free (counter_name);
+
+  return counter;
+}
+
+static void
+init_xsync (MetaIdleMonitorXSync *monitor_xsync)
+{
+  monitor_xsync->counter = find_idletime_counter (monitor_xsync);
+  /* IDLETIME counter not found? */
+  if (monitor_xsync->counter == None)
+    {
+      g_warning ("IDLETIME counter not found\n");
+      return;
+    }
+
+  monitor_xsync->user_active_alarm = _xsync_alarm_set (monitor_xsync, XSyncNegativeTransition, 1, FALSE);
+}
+
+static void
+meta_idle_monitor_xsync_dispose (GObject *object)
+{
+  MetaIdleMonitorXSync *monitor_xsync = META_IDLE_MONITOR_XSYNC (object);
+
+  if (monitor_xsync->user_active_alarm != None)
+    {
+      XSyncDestroyAlarm (monitor_xsync->display, monitor_xsync->user_active_alarm);
+      monitor_xsync->user_active_alarm = None;
+    }
+
+  g_clear_pointer (&monitor_xsync->alarms, g_hash_table_destroy);
+
+  G_OBJECT_CLASS (meta_idle_monitor_xsync_parent_class)->dispose (object);
+}
+
+static void
+meta_idle_monitor_xsync_constructed (GObject *object)
+{
+  MetaIdleMonitorXSync *monitor_xsync = META_IDLE_MONITOR_XSYNC (object);
+  MetaBackendX11 *backend = META_BACKEND_X11 (meta_get_backend ());
+
+  monitor_xsync->display = meta_backend_x11_get_xdisplay (backend);
+  init_xsync (monitor_xsync);
+
+  G_OBJECT_CLASS (meta_idle_monitor_xsync_parent_class)->constructed (object);
+}
+
+static gint64
+meta_idle_monitor_xsync_get_idletime (MetaIdleMonitor *monitor)
+{
+  MetaIdleMonitorXSync *monitor_xsync = META_IDLE_MONITOR_XSYNC (monitor);
+  XSyncValue value;
+
+  if (!XSyncQueryCounter (monitor_xsync->display, monitor_xsync->counter, &value))
+    return -1;
+
+  return _xsyncvalue_to_int64 (value);
+}
+
+static gboolean
+fire_watch_idle (gpointer data)
+{
+  MetaIdleMonitorWatch *watch = data;
+
+  watch->idle_source_id = 0;
+  _meta_idle_monitor_watch_fire (watch);
+
+  return FALSE;
+}
+
+static guint32
+get_next_watch_serial (void)
+{
+  static guint32 serial = 0;
+  g_atomic_int_inc (&serial);
+  return serial;
+}
+
+static void
+free_watch (gpointer data)
+{
+  MetaIdleMonitorWatchXSync *watch_xsync = data;
+  MetaIdleMonitorWatch *watch = (MetaIdleMonitorWatch *) watch_xsync;
+  MetaIdleMonitor *monitor = watch->monitor;
+  MetaIdleMonitorXSync *monitor_xsync = META_IDLE_MONITOR_XSYNC (monitor);
+
+  g_object_ref (monitor);
+
+  if (watch->idle_source_id)
+    {
+      g_source_remove (watch->idle_source_id);
+      watch->idle_source_id = 0;
+    }
+
+  if (watch->notify != NULL)
+    watch->notify (watch->user_data);
+
+  if (watch_xsync->xalarm != monitor_xsync->user_active_alarm &&
+      watch_xsync->xalarm != None)
+    {
+      XSyncDestroyAlarm (monitor_xsync->display, watch_xsync->xalarm);
+      g_hash_table_remove (monitor_xsync->alarms, (gpointer) watch_xsync->xalarm);
+    }
+
+  g_object_unref (monitor);
+  g_slice_free (MetaIdleMonitorWatchXSync, watch_xsync);
+}
+
+static MetaIdleMonitorWatch *
+meta_idle_monitor_xsync_make_watch (MetaIdleMonitor           *monitor,
+                                    guint64                    timeout_msec,
+                                    MetaIdleMonitorWatchFunc   callback,
+                                    gpointer                   user_data,
+                                    GDestroyNotify             notify)
+{
+  MetaIdleMonitorXSync *monitor_xsync = META_IDLE_MONITOR_XSYNC (monitor);
+  MetaIdleMonitorWatchXSync *watch_xsync;
+  MetaIdleMonitorWatch *watch;
+
+  watch_xsync = g_slice_new0 (MetaIdleMonitorWatchXSync);
+  watch = (MetaIdleMonitorWatch *) watch_xsync;
+
+  watch->monitor = monitor;
+  watch->id = get_next_watch_serial ();
+  watch->callback = callback;
+  watch->user_data = user_data;
+  watch->notify = notify;
+  watch->timeout_msec = timeout_msec;
+
+  if (monitor_xsync->user_active_alarm != None)
+    {
+      if (timeout_msec != 0)
+        {
+          watch_xsync->xalarm = _xsync_alarm_set (monitor_xsync, XSyncPositiveTransition, timeout_msec, TRUE);
+
+          g_hash_table_add (monitor_xsync->alarms, (gpointer) watch_xsync->xalarm);
+
+          if (meta_idle_monitor_get_idletime (monitor) > (gint64)timeout_msec)
+            {
+              watch->idle_source_id = g_idle_add (fire_watch_idle, watch);
+              g_source_set_name_by_id (watch->idle_source_id, "[mutter] fire_watch_idle");
+            }
+        }
+      else
+        {
+          watch_xsync->xalarm = monitor_xsync->user_active_alarm;
+
+          set_alarm_enabled (monitor_xsync->display, monitor_xsync->user_active_alarm, TRUE);
+        }
+    }
+
+  return watch;
+}
+
+static void
+meta_idle_monitor_xsync_class_init (MetaIdleMonitorXSyncClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  MetaIdleMonitorClass *idle_monitor_class = META_IDLE_MONITOR_CLASS (klass);
+
+  object_class->dispose = meta_idle_monitor_xsync_dispose;
+  object_class->constructed = meta_idle_monitor_xsync_constructed;
+
+  idle_monitor_class->get_idletime = meta_idle_monitor_xsync_get_idletime;
+  idle_monitor_class->make_watch = meta_idle_monitor_xsync_make_watch;
+}
+
+static void
+meta_idle_monitor_xsync_init (MetaIdleMonitorXSync *monitor_xsync)
+{
+  MetaIdleMonitor *monitor = META_IDLE_MONITOR (monitor_xsync);
+
+  monitor->watches = g_hash_table_new_full (NULL, NULL, NULL, free_watch);
+  monitor_xsync->alarms = g_hash_table_new (NULL, NULL);
+}
+
+static void
+check_x11_watches (MetaIdleMonitor *monitor,
+                   XSyncAlarm       alarm)
+{
+  GList *node, *watch_ids;
+
+  /* we get the keys and do explicit look ups in case
+   * an early iteration of the loop ends up leading
+   * to watches from later iterations getting invalidated
+   */
+  watch_ids = g_hash_table_get_keys (monitor->watches);
+
+  for (node = watch_ids; node != NULL; node = node->next)
+    {
+      guint watch_id = GPOINTER_TO_UINT (node->data);
+      MetaIdleMonitorWatchXSync *watch;
+
+      watch = g_hash_table_lookup (monitor->watches, GUINT_TO_POINTER (watch_id));
+
+      if (watch && watch->xalarm == alarm)
+        _meta_idle_monitor_watch_fire ((MetaIdleMonitorWatch *) watch);
+    }
+
+  g_list_free (watch_ids);
+}
+
+void
+meta_idle_monitor_xsync_handle_xevent (MetaIdleMonitor       *monitor,
+                                       XSyncAlarmNotifyEvent *alarm_event)
+{
+  MetaIdleMonitorXSync *monitor_xsync = META_IDLE_MONITOR_XSYNC (monitor);
+  XSyncAlarm alarm;
+  gboolean has_alarm;
+
+  if (alarm_event->state != XSyncAlarmActive)
+    return;
+
+  alarm = alarm_event->alarm;
+
+  has_alarm = FALSE;
+
+  if (alarm == monitor_xsync->user_active_alarm)
+    {
+      set_alarm_enabled (monitor_xsync->display,
+                         alarm,
+                         FALSE);
+      has_alarm = TRUE;
+    }
+  else if (g_hash_table_contains (monitor_xsync->alarms, (gpointer) alarm))
+    {
+      ensure_alarm_rescheduled (monitor_xsync->display,
+                                alarm);
+      has_alarm = TRUE;
+    }
+
+  if (has_alarm)
+    check_x11_watches (monitor, alarm);
+}
--- a/src/backends/x11/meta-idle-monitor-xsync.h
+++ b/src/backends/x11/meta-idle-monitor-xsync.h
@ -0,0 +1,47 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright 2013 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Adapted from gnome-session/gnome-session/gs-idle-monitor.c and
+ *         from gnome-desktop/libgnome-desktop/gnome-idle-monitor.c
+ */
+
+#ifndef META_IDLE_MONITOR_XSYNC_H
+#define META_IDLE_MONITOR_XSYNC_H
+
+#include <glib-object.h>
+#include <meta/meta-idle-monitor.h>
+
+#include <X11/Xlib.h>
+#include <X11/extensions/sync.h>
+
+#define META_TYPE_IDLE_MONITOR_XSYNC            (meta_idle_monitor_xsync_get_type ())
+#define META_IDLE_MONITOR_XSYNC(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_IDLE_MONITOR_XSYNC, MetaIdleMonitorXSync))
+#define META_IDLE_MONITOR_XSYNC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_IDLE_MONITOR_XSYNC, MetaIdleMonitorXSyncClass))
+#define META_IS_IDLE_MONITOR_XSYNC(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_IDLE_MONITOR_XSYNC))
+#define META_IS_IDLE_MONITOR_XSYNC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_IDLE_MONITOR_XSYNC))
+#define META_IDLE_MONITOR_XSYNC_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_IDLE_MONITOR_XSYNC, MetaIdleMonitorXSyncClass))
+
+typedef struct _MetaIdleMonitorXSync        MetaIdleMonitorXSync;
+typedef struct _MetaIdleMonitorXSyncClass   MetaIdleMonitorXSyncClass;
+
+GType meta_idle_monitor_xsync_get_type (void);
+
+void meta_idle_monitor_xsync_handle_xevent (MetaIdleMonitor       *monitor,
+                                            XSyncAlarmNotifyEvent *xevent);
+
+#endif /* META_IDLE_MONITOR_XSYNC_H */
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@ -67,7 +67,7 @@
 #include <meta/meta-background-group.h>
 #include <meta/meta-shadow-factory.h>
 #include "meta-window-actor-private.h"
-#include "meta-window-group-private.h"
+#include "meta-window-group.h"
 #include "window-private.h" /* to check window->hidden */
 #include "display-private.h" /* for meta_display_lookup_x_window() and meta_display_cancel_touch() */
 #include "util-private.h"
--- a/src/compositor/meta-shaped-texture.c
+++ b/src/compositor/meta-shaped-texture.c
@ -38,20 +38,6 @@

 #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);
@ -109,11 +95,6 @@ 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;
 };

@ -210,12 +191,6 @@ 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;
@ -397,21 +372,6 @@ 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)
 {
@ -421,10 +381,9 @@ meta_shaped_texture_paint (ClutterActor *actor)
  guchar opacity;
  CoglContext *ctx;
  CoglFramebuffer *fb;
-  CoglTexture *paint_tex = NULL;
+  CoglTexture *paint_tex;
  ClutterActorBox alloc;
  CoglPipelineFilter filter;
-  gint64 now = g_get_monotonic_time ();

  if (priv->clip_region && cairo_region_is_empty (priv->clip_region))
    return;
@ -447,34 +406,13 @@ 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 && 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 (priv->create_mipmaps)
+    paint_tex = meta_texture_tower_get_paint_texture (priv->paint_tower);
+  else
+    paint_tex = COGL_TEXTURE (priv->texture);

  if (paint_tex == NULL)
-    {
-      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);
-        }
-    }
+    return;

  tex_width = priv->tex_width;
  tex_height = priv->tex_height;
@ -820,20 +758,6 @@ 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-private.h
+++ b/src/compositor/meta-window-actor-private.h
@ -58,6 +58,5 @@ void meta_window_actor_effect_completed (MetaWindowActor  *actor,

 MetaSurfaceActor *meta_window_actor_get_surface (MetaWindowActor *self);
 void meta_window_actor_update_surface (MetaWindowActor *self);
-MetaWindowActor *meta_window_actor_from_window (MetaWindow *window);

 #endif /* META_WINDOW_ACTOR_PRIVATE_H */
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@ -142,8 +142,6 @@ struct _FrameData
 enum
 {
  FIRST_FRAME,
-  EFFECTS_COMPLETED,
-
  LAST_SIGNAL
 };

@ -240,21 +238,6 @@ meta_window_actor_class_init (MetaWindowActorClass *klass)
                  NULL, NULL, NULL,
                  G_TYPE_NONE, 0);

-  /**
-   * MetaWindowActor::effects-completed:
-   * @actor: the #MetaWindowActor instance
-   *
-   * The ::effects-completed signal will be emitted once all pending compositor
-   * effects are completed.
-   */
-  signals[EFFECTS_COMPLETED] =
-    g_signal_new ("effects-completed",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL, NULL,
-                  G_TYPE_NONE, 0);
-
  pspec = g_param_spec_object ("meta-window",
                               "MetaWindow",
                               "The displayed MetaWindow",
@ -450,7 +433,7 @@ meta_window_actor_update_surface (MetaWindowActor *self)

 #ifdef HAVE_WAYLAND
  if (window->surface)
-    surface_actor = meta_wayland_surface_get_actor (window->surface);
+    surface_actor = window->surface->surface_actor;
  else
 #endif
  if (!meta_is_wayland_compositor ())
@ -1148,7 +1131,6 @@ meta_window_actor_after_effects (MetaWindowActor *self)
      return;
    }

-  g_signal_emit (self, signals[EFFECTS_COMPLETED], 0);
  meta_window_actor_sync_visibility (self);
  meta_window_actor_sync_actor_geometry (self, FALSE);
 }
@ -2175,9 +2157,3 @@ meta_window_actor_sync_updates_frozen (MetaWindowActor *self)

  meta_window_actor_set_updates_frozen (self, meta_window_updates_are_frozen (window));
 }
-
-MetaWindowActor *
-meta_window_actor_from_window (MetaWindow *window)
-{
-  return META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
-}
--- a/src/compositor/meta-window-group-private.h
+++ b/src/compositor/meta-window-group-private.h
@ -1,24 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-#ifndef META_WINDOW_GROUP_PRIVATE_H
-#define META_WINDOW_GROUP_PRIVATE_H
-
-#include <meta/meta-window-group.h>
-
-#include <meta/screen.h>
-
-/**
- * MetaWindowGroup:
- *
- * This class is a subclass of ClutterActor with special handling for
- * #MetaCullable when painting children. It uses code similar to
- * meta_cullable_cull_out_children(), but also has additional special
- * cases for the undirected window, and similar.
- */
-
-
-typedef struct _MetaWindowGroupPrivate MetaWindowGroupPrivate;
-
-ClutterActor *meta_window_group_new (MetaScreen *screen);
-
-#endif /* META_WINDOW_GROUP_PRIVATE_H */
--- a/src/compositor/meta-window-group.c
+++ b/src/compositor/meta-window-group.c
@ -10,7 +10,7 @@
 #include "clutter-utils.h"
 #include "compositor-private.h"
 #include "meta-window-actor-private.h"
-#include "meta-window-group-private.h"
+#include "meta-window-group.h"
 #include "window-private.h"
 #include "meta-cullable.h"

--- a/src/compositor/meta-window-group.h
+++ b/src/compositor/meta-window-group.h
@ -0,0 +1,37 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+#ifndef META_WINDOW_GROUP_H
+#define META_WINDOW_GROUP_H
+
+#include <clutter/clutter.h>
+
+#include <meta/screen.h>
+
+/**
+ * MetaWindowGroup:
+ *
+ * This class is a subclass of ClutterActor with special handling for
+ * #MetaCullable when painting children. It uses code similar to
+ * meta_cullable_cull_out_children(), but also has additional special
+ * cases for the undirected window, and similar.
+ */
+
+#define META_TYPE_WINDOW_GROUP            (meta_window_group_get_type ())
+#define META_WINDOW_GROUP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_WINDOW_GROUP, MetaWindowGroup))
+#define META_WINDOW_GROUP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_WINDOW_GROUP, MetaWindowGroupClass))
+#define META_IS_WINDOW_GROUP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_WINDOW_GROUP))
+#define META_IS_WINDOW_GROUP_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_WINDOW_GROUP))
+#define META_WINDOW_GROUP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_WINDOW_GROUP, MetaWindowGroupClass))
+
+typedef struct _MetaWindowGroup        MetaWindowGroup;
+typedef struct _MetaWindowGroupClass   MetaWindowGroupClass;
+typedef struct _MetaWindowGroupPrivate MetaWindowGroupPrivate;
+
+GType meta_window_group_get_type (void);
+
+ClutterActor *meta_window_group_new (MetaScreen *screen);
+
+gboolean meta_window_group_actor_is_untransformed (ClutterActor *actor,
+                                                   int          *x_origin,
+                                                   int          *y_origin);
+#endif /* META_WINDOW_GROUP_H */
--- a/src/core/delete.c
+++ b/src/core/delete.c
@ -115,8 +115,5 @@ 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/display.c
+++ b/src/core/display.c
@ -53,7 +53,7 @@
 #include "backends/meta-logical-monitor.h"
 #include "backends/native/meta-backend-native.h"
 #include "backends/x11/meta-backend-x11.h"
-#include "backends/meta-stage-private.h"
+#include "backends/meta-stage.h"
 #include "backends/meta-input-settings-private.h"
 #include <clutter/x11/clutter-x11.h>

--- a/src/core/events.c
+++ b/src/core/events.c
@ -32,10 +32,9 @@

 #ifdef HAVE_NATIVE_BACKEND
 #include "backends/native/meta-backend-native.h"
+#include "backends/native/meta-idle-monitor-native.h"
 #endif

-#include "backends/meta-idle-monitor-private.h"
-
 #ifdef HAVE_WAYLAND
 #include "wayland/meta-wayland-private.h"
 #endif
@ -93,38 +92,46 @@ get_window_for_event (MetaDisplay        *display,
 static void
 handle_idletime_for_event (const ClutterEvent *event)
 {
-  ClutterInputDevice *device, *source_device;
-  MetaIdleMonitor *core_monitor, *device_monitor;
-  int device_id;
+#ifdef HAVE_NATIVE_BACKEND
+  /* This is handled by XSync under X11. */
+  MetaBackend *backend = meta_get_backend ();

-  device = clutter_event_get_device (event);
-  if (device == NULL)
-    return;
-
-  if (event->any.flags & CLUTTER_EVENT_FLAG_SYNTHETIC ||
-      event->type == CLUTTER_ENTER ||
-      event->type == CLUTTER_LEAVE ||
-      event->type == CLUTTER_STAGE_STATE ||
-      event->type == CLUTTER_DESTROY_NOTIFY ||
-      event->type == CLUTTER_CLIENT_MESSAGE ||
-      event->type == CLUTTER_DELETE)
-    return;
-
-  device_id = clutter_input_device_get_device_id (device);
-
-  core_monitor = meta_idle_monitor_get_core ();
-  device_monitor = meta_idle_monitor_get_for_device (device_id);
-
-  meta_idle_monitor_reset_idletime (core_monitor);
-  meta_idle_monitor_reset_idletime (device_monitor);
-
-  source_device = clutter_event_get_source_device (event);
-  if (source_device != device)
+  if (META_IS_BACKEND_NATIVE (backend))
    {
+      ClutterInputDevice *device, *source_device;
+      MetaIdleMonitor *core_monitor, *device_monitor;
+      int device_id;
+
+      device = clutter_event_get_device (event);
+      if (device == NULL)
+        return;
+
+      if (event->any.flags & CLUTTER_EVENT_FLAG_SYNTHETIC ||
+          event->type == CLUTTER_ENTER ||
+          event->type == CLUTTER_LEAVE ||
+          event->type == CLUTTER_STAGE_STATE ||
+          event->type == CLUTTER_DESTROY_NOTIFY ||
+          event->type == CLUTTER_CLIENT_MESSAGE ||
+          event->type == CLUTTER_DELETE)
+        return;
+
      device_id = clutter_input_device_get_device_id (device);
+
+      core_monitor = meta_idle_monitor_get_core ();
      device_monitor = meta_idle_monitor_get_for_device (device_id);
-      meta_idle_monitor_reset_idletime (device_monitor);
+
+      meta_idle_monitor_native_reset_idletime (core_monitor);
+      meta_idle_monitor_native_reset_idletime (device_monitor);
+
+      source_device = clutter_event_get_source_device (event);
+      if (source_device != device)
+        {
+          device_id = clutter_input_device_get_device_id (device);
+          device_monitor = meta_idle_monitor_get_for_device (device_id);
+          meta_idle_monitor_native_reset_idletime (device_monitor);
+        }
    }
+#endif /* HAVE_NATIVE_BACKEND */
 }

 static gboolean
--- 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 environment variable.
+ * XDG_SESSION_TYPE enviornment 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-private.h
+++ b/src/core/window-private.h
@ -81,7 +81,6 @@ typedef enum
  META_MOVE_RESIZE_STATE_CHANGED = 1 << 5,
  META_MOVE_RESIZE_UNMAXIMIZE = 1 << 6,
  META_MOVE_RESIZE_FORCE_MOVE = 1 << 7,
-  META_MOVE_RESIZE_WAYLAND_STATE_CHANGED = 1 << 8,
 } MetaMoveResizeFlags;

 typedef enum
@ -89,7 +88,6 @@ typedef enum
  META_MOVE_RESIZE_RESULT_MOVED               = 1 << 0,
  META_MOVE_RESIZE_RESULT_RESIZED             = 1 << 1,
  META_MOVE_RESIZE_RESULT_FRAME_SHAPE_CHANGED = 1 << 2,
-  META_MOVE_RESIZE_RESULT_STATE_CHANGED       = 1 << 3,
 } MetaMoveResizeResultFlags;

 typedef enum
--- a/src/core/window.c
+++ b/src/core/window.c
@ -3997,7 +3997,7 @@ meta_window_move_resize_internal (MetaWindow          *window,

  if ((moved_or_resized ||
       did_placement ||
-       (result & META_MOVE_RESIZE_RESULT_STATE_CHANGED) != 0) &&
+       (flags & META_MOVE_RESIZE_STATE_CHANGED) != 0) &&
      window->known_to_compositor)
    {
      meta_compositor_sync_window_geometry (window->display->compositor,
@ -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 && window != window->display->grab_window)
+  if (!window->override_redirect)
    meta_window_queue (window, META_QUEUE_MOVE_RESIZE);
  meta_window_queue (window, META_QUEUE_CALC_SHOWING);
  meta_window_current_workspace_changed (window);
--- a/src/meta/meta-monitor-manager.h
+++ b/src/meta/meta-monitor-manager.h
@ -54,7 +54,4 @@ MetaMonitorSwitchConfigType meta_monitor_manager_get_switch_config (MetaMonitorM

 gint meta_monitor_manager_get_display_configuration_timeout (void);

-/* Re-declaration of parent type for introspection */
-GType meta_dbus_display_config_skeleton_get_type (void) G_GNUC_CONST;
-
 #endif /* META_MONITOR_MANAGER_H */
--- a/src/meta/meta-stage.h
+++ b/src/meta/meta-stage.h
@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef META_STAGE_H
-#define META_STAGE_H
-
-#include "clutter/clutter.h"
-
-G_BEGIN_DECLS
-
-#define META_TYPE_STAGE (meta_stage_get_type ())
-G_DECLARE_FINAL_TYPE (MetaStage, meta_stage, META, STAGE, ClutterStage)
-
-G_END_DECLS
-
-#endif /* META_STAGE_H */
--- a/src/meta/meta-window-group.h
+++ b/src/meta/meta-window-group.h
@ -1,11 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-#ifndef META_WINDOW_GROUP_H
-#define META_WINDOW_GROUP_H
-
-#include "clutter/clutter.h"
-
-#define META_TYPE_WINDOW_GROUP (meta_window_group_get_type())
-G_DECLARE_FINAL_TYPE (MetaWindowGroup, meta_window_group, META, WINDOW_GROUP, ClutterActor)
-
-#endif /* META_WINDOW_GROUP_H */
--- a/src/org.gnome.Mutter.IdleMonitor.xml
+++ b/src/org.gnome.Mutter.IdleMonitor.xml
@ -28,8 +28,6 @@
      <arg name="id" direction="in" type="u" />
    </method>

-    <method name="ResetIdletime"/>
-
    <signal name="WatchFired">
      <arg name="id" direction="out" type="u" />
    </signal>
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@ -71,14 +71,6 @@ static MetaFrameControl get_control  (MetaUIFrame       *frame,

 G_DEFINE_TYPE (MetaFrames, meta_frames, GTK_TYPE_WINDOW);

-enum {
-  META_ACTION_CLICK,
-  META_ACTION_RIGHT_CLICK,
-  META_ACTION_MIDDLE_CLICK,
-  META_ACTION_DOUBLE_CLICK,
-  META_ACTION_IGNORE
-};
-
 static GObject *
 meta_frames_constructor (GType                  gtype,
                         guint                  n_properties,
@ -750,25 +742,17 @@ redraw_control (MetaUIFrame *frame,
 }

 static gboolean
-meta_frame_titlebar_event (MetaUIFrame        *frame,
-                           const ClutterEvent *event,
-                           int                 action)
+meta_frame_titlebar_event (MetaUIFrame *frame,
+                           ClutterButtonEvent *event,
+                           int action)
 {
  MetaFrameFlags flags;
  Display *display;
-  uint32_t evtime;
-  float x, y;
-
-  g_assert (event->type == CLUTTER_BUTTON_PRESS ||
-            event->type == CLUTTER_TOUCH_BEGIN);

  display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());

  flags = meta_frame_get_flags (frame->meta_window->frame);

-  evtime = clutter_event_get_time (event);
-  clutter_event_get_coords (event, &x, &y);
-
  switch (action)
    {
    case G_DESKTOP_TITLEBAR_ACTION_TOGGLE_SHADE:
@ -776,9 +760,9 @@ meta_frame_titlebar_event (MetaUIFrame        *frame,
        if (flags & META_FRAME_ALLOWS_SHADE)
          {
            if (flags & META_FRAME_SHADED)
-              meta_window_unshade (frame->meta_window, evtime);
+              meta_window_unshade (frame->meta_window, event->time);
            else
-              meta_window_shade (frame->meta_window, evtime);
+              meta_window_shade (frame->meta_window, event->time);
          }
      }
      break;
@ -824,14 +808,16 @@ meta_frame_titlebar_event (MetaUIFrame        *frame,
    case G_DESKTOP_TITLEBAR_ACTION_LOWER:
      meta_core_user_lower_and_unfocus (display,
                                        frame->xwindow,
-                                        evtime);
+                                        event->time);
      break;

    case G_DESKTOP_TITLEBAR_ACTION_MENU:
      meta_core_show_window_menu (display,
                                  frame->xwindow,
                                  META_WINDOW_MENU_WM,
-                                  x, y, evtime);
+                                  event->x,
+                                  event->y,
+                                  event->time);
      break;
    }

@ -839,8 +825,8 @@ meta_frame_titlebar_event (MetaUIFrame        *frame,
 }

 static gboolean
-meta_frame_double_click_event (MetaUIFrame        *frame,
-                               const ClutterEvent *event)
+meta_frame_double_click_event (MetaUIFrame  *frame,
+                               ClutterButtonEvent *event)
 {
  int action = meta_prefs_get_action_double_click_titlebar ();

@ -853,8 +839,7 @@ meta_frame_middle_click_event (MetaUIFrame *frame,
 {
  int action = meta_prefs_get_action_middle_click_titlebar();

-  return meta_frame_titlebar_event (frame, (const ClutterEvent *) event,
-                                    action);
+  return meta_frame_titlebar_event (frame, event, action);
 }

 static gboolean
@ -863,8 +848,7 @@ meta_frame_right_click_event (MetaUIFrame *frame,
 {
  int action = meta_prefs_get_action_right_click_titlebar();

-  return meta_frame_titlebar_event (frame, (const ClutterEvent *) event,
-                                    action);
+  return meta_frame_titlebar_event (frame, event, action);
 }

 static gboolean
@ -895,8 +879,6 @@ meta_frames_try_grab_op (MetaUIFrame *frame,
      frames->grab_x = grab_x;
      frames->grab_y = grab_y;
    }
-  else
-    frames->grab_touch = NULL;

  return ret;
 }
@ -907,7 +889,6 @@ meta_frames_retry_grab_op (MetaFrames *frames,
 {
  Display *display;
  MetaGrabOp op;
-  gboolean ret;

  if (frames->current_grab_op == META_GRAB_OP_NONE)
    return TRUE;
@ -916,20 +897,16 @@ meta_frames_retry_grab_op (MetaFrames *frames,
  frames->current_grab_op = META_GRAB_OP_NONE;
  display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());

-  ret = meta_core_begin_grab_op (display,
-                                 frames->grab_frame->xwindow,
-                                 op,
-                                 FALSE,
-                                 TRUE,
-                                 frames->grab_frame->grab_button,
-                                 0,
-                                 time,
-                                 frames->grab_x,
-                                 frames->grab_y);
-  if (ret)
-    frames->grab_touch = NULL;
-
-  return ret;
+  return meta_core_begin_grab_op (display,
+                                  frames->grab_frame->xwindow,
+                                  op,
+                                  FALSE,
+                                  TRUE,
+                                  frames->grab_frame->grab_button,
+                                  0,
+                                  time,
+                                  frames->grab_x,
+                                  frames->grab_y);
 }

 static MetaGrabOp
@ -958,65 +935,12 @@ grab_op_from_resize_control (MetaFrameControl control)
    }
 }

-static guint
-get_action (const ClutterEvent *event)
-{
-  if (event->type == CLUTTER_BUTTON_PRESS ||
-      event->type == CLUTTER_BUTTON_RELEASE)
-    {
-      switch (event->button.button)
-        {
-        case CLUTTER_BUTTON_PRIMARY:
-          if (clutter_event_get_click_count (event) == 2)
-            return META_ACTION_DOUBLE_CLICK;
-          else
-            return META_ACTION_CLICK;
-        case CLUTTER_BUTTON_SECONDARY:
-          return META_ACTION_RIGHT_CLICK;
-        case CLUTTER_BUTTON_MIDDLE:
-          return META_ACTION_MIDDLE_CLICK;
-        default:
-          meta_verbose ("No action triggered for button %u %s\n",
-                        event->button.button,
-                        (event->type == CLUTTER_BUTTON_PRESS) ? "press" : "release");
-        }
-    }
-  else if (event->type == CLUTTER_TOUCH_BEGIN ||
-           event->type == CLUTTER_TOUCH_UPDATE ||
-           event->type == CLUTTER_TOUCH_END)
-    {
-      return META_ACTION_CLICK;
-    }
-
-  return META_ACTION_IGNORE;
-}
-
-static uint32_t
-get_button_number (const ClutterEvent *event)
-{
-  if (event->type == CLUTTER_TOUCH_BEGIN ||
-      event->type == CLUTTER_TOUCH_UPDATE ||
-      event->type == CLUTTER_TOUCH_END)
-    return -1;
-  else if (event->type == CLUTTER_BUTTON_PRESS ||
-           event->type == CLUTTER_BUTTON_RELEASE)
-    return clutter_event_get_button (event);
-
-  g_assert_not_reached ();
-}
-
 static gboolean
-meta_frame_left_click_event (MetaUIFrame        *frame,
-                             const ClutterEvent *event)
+meta_frame_left_click_event (MetaUIFrame *frame,
+                             ClutterButtonEvent *event)
 {
  Display *display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-  MetaFrameControl control;
-  guint32 evtime;
-  gfloat x, y;
-
-  evtime = clutter_event_get_time (event);
-  clutter_event_get_coords (event, &x, &y);
-  control = get_control (frame, x, y);
+  MetaFrameControl control = get_control (frame, event->x, event->y);

  switch (control)
    {
@ -1026,7 +950,7 @@ meta_frame_left_click_event (MetaUIFrame        *frame,
    case META_FRAME_CONTROL_DELETE:
    case META_FRAME_CONTROL_MENU:
    case META_FRAME_CONTROL_APPMENU:
-      frame->grab_button = get_button_number (event);
+      frame->grab_button = event->button;
      frame->button_state = META_BUTTON_STATE_PRESSED;
      frame->prelit_control = control;
      redraw_control (frame, control);
@ -1063,12 +987,13 @@ meta_frame_left_click_event (MetaUIFrame        *frame,
                                               frame->xwindow,
                                               menu,
                                               &root_rect,
-                                               evtime);
+                                               event->time);
        }
      else
        {
          meta_frames_try_grab_op (frame, META_GRAB_OP_FRAME_BUTTON,
-                                   x, y, evtime);
+                                   event->x, event->y,
+                                   event->time);
        }

      return TRUE;
@ -1082,7 +1007,8 @@ meta_frame_left_click_event (MetaUIFrame        *frame,
    case META_FRAME_CONTROL_RESIZE_W:
      meta_frames_try_grab_op (frame,
                               grab_op_from_resize_control (control),
-                               x, y, evtime);
+                               event->x, event->y,
+                               event->time);

      return TRUE;
    case META_FRAME_CONTROL_TITLE:
@ -1093,7 +1019,8 @@ meta_frame_left_click_event (MetaUIFrame        *frame,
          {
            meta_frames_try_grab_op (frame,
                                     META_GRAB_OP_MOVING,
-                                     x, y, evtime);
+                                     event->x, event->y,
+                                     event->time);
          }
      }

@ -1109,31 +1036,21 @@ meta_frame_left_click_event (MetaUIFrame        *frame,
 }

 static gboolean
-handle_press_event (MetaUIFrame        *frame,
-                    const ClutterEvent *event)
+handle_button_press_event (MetaUIFrame *frame,
+                           ClutterButtonEvent *event)
 {
  MetaFrameControl control;
  Display *display;
-  uint32_t evtime, action;
-  float x, y;
-
-  g_assert (event->type == CLUTTER_BUTTON_PRESS ||
-            event->type == CLUTTER_TOUCH_BEGIN);
-
-  action = get_action (event);
-  if (action == META_ACTION_IGNORE)
-    return FALSE;

  display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());

-  evtime = clutter_event_get_time (event);
-  clutter_event_get_coords (event, &x, &y);
-  control = get_control (frame, x, y);
+  control = get_control (frame, event->x, event->y);
+
  /* don't do the rest of this if on client area */
  if (control == META_FRAME_CONTROL_CLIENT_AREA)
    return FALSE; /* not on the frame, just passed through from client */

-  if (action == META_ACTION_CLICK &&
+  if (event->button == 1 &&
      !(control == META_FRAME_CONTROL_MINIMIZE ||
        control == META_FRAME_CONTROL_DELETE ||
        control == META_FRAME_CONTROL_MAXIMIZE))
@ -1141,60 +1058,52 @@ handle_press_event (MetaUIFrame        *frame,
      meta_topic (META_DEBUG_FOCUS,
                  "Focusing window with frame 0x%lx due to button 1 press\n",
                  frame->xwindow);
-      meta_window_focus (frame->meta_window, evtime);
+      meta_window_focus (frame->meta_window, event->time);
    }

  /* We want to shade even if we have a GrabOp, since we'll have a move grab
   * if we double click the titlebar.
   */
  if (control == META_FRAME_CONTROL_TITLE &&
-      action == META_ACTION_DOUBLE_CLICK)
+      event->button == 1 &&
+      event->click_count == 2)
    {
-      meta_core_end_grab_op (display, evtime);
+      meta_core_end_grab_op (display, event->time);
      return meta_frame_double_click_event (frame, event);
    }

  if (meta_core_get_grab_op (display) != META_GRAB_OP_NONE)
    return FALSE; /* already up to something */

-  frame->grab_button = get_button_number (event);
+  frame->grab_button = event->button;

-  switch (action)
+  switch (event->button)
    {
-    case META_ACTION_CLICK:
+    case 1:
      return meta_frame_left_click_event (frame, event);
-    case META_ACTION_MIDDLE_CLICK:
-      return meta_frame_middle_click_event (frame, (ClutterButtonEvent *) event);
-    case META_ACTION_RIGHT_CLICK:
-      return meta_frame_right_click_event (frame, (ClutterButtonEvent *) event);
+    case 2:
+      return meta_frame_middle_click_event (frame, event);
+    case 3:
+      return meta_frame_right_click_event (frame, event);
    default:
      return FALSE;
    }
 }

 static gboolean
-handle_release_event (MetaUIFrame        *frame,
-                      const ClutterEvent *event)
+handle_button_release_event (MetaUIFrame *frame,
+                             ClutterButtonEvent *event)
 {
  Display *display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-  guint32 evtime, button;
-  gfloat x, y;
-
-  g_assert (event->type == CLUTTER_BUTTON_RELEASE ||
-            event->type == CLUTTER_TOUCH_END);
-
-  evtime = clutter_event_get_time (event);
-  clutter_event_get_coords (event, &x, &y);
-  button = get_button_number (event);

  frame->frames->current_grab_op = META_GRAB_OP_NONE;
-  meta_core_end_grab_op (display, evtime);
+  meta_core_end_grab_op (display, event->time);

  /* We only handle the releases we handled the presses for (things
   * involving frame controls). Window ops that don't require a
   * frame are handled in the Xlib part of the code, display.c/window.c
   */
-  if (((int) button) == frame->grab_button &&
+  if (((int) event->button) == frame->grab_button &&
      frame->button_state == META_BUTTON_STATE_PRESSED)
    {
      switch (frame->prelit_control)
@ -1204,7 +1113,7 @@ handle_release_event (MetaUIFrame        *frame,
          break;
        case META_FRAME_CONTROL_MAXIMIZE:
          /* Focus the window on the maximize */
-          meta_window_focus (frame->meta_window, evtime);
+          meta_window_focus (frame->meta_window, event->time);
          if (meta_prefs_get_raise_on_click ())
            meta_window_raise (frame->meta_window);
          meta_window_maximize (frame->meta_window, META_MAXIMIZE_BOTH);
@ -1215,7 +1124,7 @@ handle_release_event (MetaUIFrame        *frame,
          meta_window_unmaximize (frame->meta_window, META_MAXIMIZE_BOTH);
          break;
        case META_FRAME_CONTROL_DELETE:
-          meta_window_delete (frame->meta_window, evtime);
+          meta_window_delete (frame->meta_window, event->time);
          break;
        default:
          break;
@ -1226,7 +1135,7 @@ handle_release_event (MetaUIFrame        *frame,
       * prelit so to let the user know that it can now be pressed.
       * :)
       */
-      MetaFrameControl control = get_control (frame, x, y);
+      MetaFrameControl control = get_control (frame, event->x, event->y);
      meta_ui_frame_update_prelit_control (frame, control);
    }

@ -1327,22 +1236,13 @@ meta_ui_frame_update_prelit_control (MetaUIFrame     *frame,
 }

 static gboolean
-handle_motion_event (MetaUIFrame        *frame,
-                     const ClutterEvent *event)
+handle_motion_notify_event (MetaUIFrame *frame,
+                            ClutterMotionEvent *event)
 {
  MetaFrames *frames = frame->frames;
  MetaFrameControl control;
-  ClutterModifierType modifiers;
-  guint32 evtime;
-  gfloat x, y;

-  g_assert (event->type == CLUTTER_MOTION ||
-            event->type == CLUTTER_TOUCH_UPDATE);
-
-  modifiers = clutter_event_get_state (event);
-  evtime = clutter_event_get_time (event);
-  clutter_event_get_coords (event, &x, &y);
-  control = get_control (frame, x, y);
+  control = get_control (frame, event->x, event->y);

  if (frame->button_state == META_BUTTON_STATE_PRESSED)
    {
@ -1360,11 +1260,9 @@ handle_motion_event (MetaUIFrame        *frame,
      meta_ui_frame_update_prelit_control (frame, control);
    }

-  if (frames->current_grab_op != META_GRAB_OP_NONE &&
-      (event->type == CLUTTER_TOUCH_UPDATE ||
-       (event->type == CLUTTER_MOTION &&
-        (modifiers & CLUTTER_BUTTON1_MASK))))
-    meta_frames_retry_grab_op (frames, evtime);
+  if ((event->modifier_state & CLUTTER_BUTTON1_MASK) &&
+      frames->current_grab_op != META_GRAB_OP_NONE)
+    meta_frames_retry_grab_op (frames, event->time);

  return TRUE;
 }
@ -1432,9 +1330,7 @@ meta_ui_frame_get_mask (MetaUIFrame *frame,
  MetaFrameBorders borders;
  MetaFrameFlags flags;
  MetaRectangle frame_rect;
-  cairo_surface_t *surface;
-  double xscale, yscale;
-  int scale;
+  int scale = meta_theme_get_window_scaling_factor ();

  meta_window_get_frame_rect (frame->meta_window, &frame_rect);

@ -1444,11 +1340,7 @@ meta_ui_frame_get_mask (MetaUIFrame *frame,
  meta_ui_frame_get_borders (frame, &borders);

  /* See comment in meta_frame_layout_draw_with_style() for details on HiDPI handling */
-  scale = meta_theme_get_window_scaling_factor ();
-  surface = cairo_get_target (cr);
-  cairo_surface_get_device_scale (surface, &xscale, &yscale);
-  cairo_surface_set_device_scale (surface, scale, scale);
-
+  cairo_scale (cr, scale, scale);
  gtk_render_background (frame->style_info->styles[META_STYLE_ELEMENT_FRAME], cr,
                         borders.invisible.left / scale,
                         borders.invisible.top / scale,
@ -1457,8 +1349,6 @@ meta_ui_frame_get_mask (MetaUIFrame *frame,
                         borders.invisible.left / scale,
                         borders.invisible.top / scale,
                         frame_rect.width / scale, borders.total.top / scale);
-
-  cairo_surface_set_device_scale (surface, xscale, yscale);
 }

 /* XXX -- this is disgusting. Find a better approach here.
@ -1618,51 +1508,14 @@ gboolean
 meta_ui_frame_handle_event (MetaUIFrame *frame,
                            const ClutterEvent *event)
 {
-  if (event->type == CLUTTER_TOUCH_BEGIN ||
-      event->type == CLUTTER_TOUCH_UPDATE ||
-      event->type == CLUTTER_TOUCH_END)
-    {
-      ClutterEventSequence *sequence;
-      MetaFrames *frames = frame->frames;
-
-      /* In X11, mutter sets up passive touch grabs which basically
-       * means we handle those events twice (once through the passive
-       * grab, and then through XISelectEvents).
-       *
-       * Receiving touch events here means we are going through the
-       * former, but passive grabs are exclusively for gesture
-       * recognition purposes.
-       *
-       * We do actually want this to happen though the regular event
-       * selection paths to avoid breaking internal state, which means
-       * we will get pointer events, because we don't select for XI_Touch*.
-       */
-      if (!meta_is_wayland_compositor ())
-        return FALSE;
-
-      sequence = clutter_event_get_event_sequence (event);
-
-      /* Lock onto a single touch */
-      if (frames->grab_touch && frames->grab_touch != sequence)
-        return FALSE;
-
-      if (event->type == CLUTTER_TOUCH_BEGIN)
-        frames->grab_touch = sequence;
-      else if (event->type == CLUTTER_TOUCH_END)
-        frames->grab_touch = NULL;
-    }
-
  switch (event->any.type)
    {
    case CLUTTER_BUTTON_PRESS:
-    case CLUTTER_TOUCH_BEGIN:
-      return handle_press_event (frame, event);
+      return handle_button_press_event (frame, (ClutterButtonEvent *) event);
    case CLUTTER_BUTTON_RELEASE:
-    case CLUTTER_TOUCH_END:
-      return handle_release_event (frame, event);
+      return handle_button_release_event (frame, (ClutterButtonEvent *) event);
    case CLUTTER_MOTION:
-    case CLUTTER_TOUCH_UPDATE:
-      return handle_motion_event (frame, event);
+      return handle_motion_notify_event (frame, (ClutterMotionEvent *) event);
    case CLUTTER_ENTER:
      return handle_enter_notify_event (frame, (ClutterCrossingEvent *) event);
    case CLUTTER_LEAVE:
--- a/src/ui/frames.h
+++ b/src/ui/frames.h
@ -99,8 +99,6 @@ struct _MetaFrames
  guint grab_button;
  gdouble grab_x;
  gdouble grab_y;
-
-  ClutterEventSequence *grab_touch;
 };

 struct _MetaFramesClass
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@ -736,9 +736,7 @@ meta_frame_layout_draw_with_style (MetaFrameLayout         *layout,
  GdkRectangle titlebar_rect;
  GdkRectangle button_rect;
  const MetaFrameBorders *borders;
-  cairo_surface_t *frame_surface;
-  double xscale, yscale;
-  int scale;
+  int scale = meta_theme_get_window_scaling_factor ();

  /* We opt out of GTK+/Clutter's HiDPI handling, so we have to do the scaling
   * ourselves; the nitty-gritty is a bit confusing, so here is an overview:
@ -750,14 +748,8 @@ meta_frame_layout_draw_with_style (MetaFrameLayout         *layout,
   *  - for drawing, we scale the canvas to have GTK+ render elements (borders,
   *    radii, ...) at the correct scale - as a result, we have to "unscale"
   *    the geometry again to not apply the scaling twice
-   *  - As per commit e36b629c GTK expects the device scale to be set and match
-   *    the final scaling or the surface caching won't take this in account
-   *    breaking -gtk-scaled items.
   */
-  scale = meta_theme_get_window_scaling_factor ();
-  frame_surface = cairo_get_target (cr);
-  cairo_surface_get_device_scale (frame_surface, &xscale, &yscale);
-  cairo_surface_set_device_scale (frame_surface, scale, scale);
+  cairo_scale (cr, scale, scale);

  borders = &fgeom->borders;

@ -913,8 +905,6 @@ meta_frame_layout_draw_with_style (MetaFrameLayout         *layout,
        gtk_style_context_remove_class (style, button_class);
      gtk_style_context_set_state (style, state);
    }
-
-  cairo_surface_set_device_scale (frame_surface, xscale, yscale);
 }

 /**
--- a/src/wayland/meta-pointer-confinement-wayland.c
+++ b/src/wayland/meta-pointer-confinement-wayland.c
@ -664,8 +664,17 @@ meta_pointer_confinement_wayland_maybe_warp (MetaPointerConfinementWayland *self
 }

 static void
-surface_actor_geometry_changed (MetaSurfaceActorWayland       *surface_actor,
-                                MetaPointerConfinementWayland *self)
+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)
 {
  meta_pointer_confinement_wayland_maybe_warp (self);
 }
@ -690,9 +699,14 @@ meta_pointer_confinement_wayland_new (MetaWaylandPointerConstraint *constraint)
  confinement->constraint = constraint;

  surface = meta_wayland_pointer_constraint_get_surface (constraint);
-  g_signal_connect_object (meta_wayland_surface_get_actor (surface),
-                           "geometry-changed",
-                           G_CALLBACK (surface_actor_geometry_changed),
+  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),
                           confinement,
                           0);
  if (surface->window)
--- a/src/wayland/meta-wayland-actor-surface.c
+++ b/src/wayland/meta-wayland-actor-surface.c
@ -30,70 +30,30 @@
 #include "wayland/meta-wayland-surface.h"
 #include "wayland/meta-window-wayland.h"

-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);
-}
+G_DEFINE_ABSTRACT_TYPE (MetaWaylandActorSurface,
+                        meta_wayland_actor_surface,
+                        META_TYPE_WAYLAND_SURFACE_ROLE)

 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);
-  GList *l;
+  MetaSurfaceActorWayland *surface_actor =
+    META_SURFACE_ACTOR_WAYLAND (surface->surface_actor);

-  meta_surface_actor_wayland_add_frame_callbacks (META_SURFACE_ACTOR_WAYLAND (priv->actor),
+  meta_surface_actor_wayland_add_frame_callbacks (surface_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 (MetaSurfaceActorWayland *surface_actor,
+queue_surface_actor_frame_callbacks (MetaWaylandSurface      *surface,
                                     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);
@ -130,8 +90,6 @@ 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 =
@ -141,7 +99,7 @@ meta_wayland_actor_surface_real_sync_actor_state (MetaWaylandActorSurface *actor
  double actor_scale;
  GList *l;

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

  actor_scale = meta_wayland_actor_surface_calculate_scale (actor_surface);
@ -203,16 +161,13 @@ 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 (META_SURFACE_ACTOR_WAYLAND (priv->actor),
-                                       pending);
+  queue_surface_actor_frame_callbacks (surface, pending);

  toplevel_surface = meta_wayland_surface_get_toplevel (surface);
  if (!toplevel_surface || !toplevel_surface->window)
@ -225,9 +180,9 @@ static gboolean
 meta_wayland_actor_surface_is_on_logical_monitor (MetaWaylandSurfaceRole *surface_role,
                                                  MetaLogicalMonitor     *logical_monitor)
 {
-  MetaWaylandActorSurfacePrivate *priv =
-    meta_wayland_actor_surface_get_instance_private (META_WAYLAND_ACTOR_SURFACE (surface_role));
-  ClutterActor *actor = CLUTTER_ACTOR (priv->actor);
+  MetaWaylandSurface *surface =
+    meta_wayland_surface_role_get_surface (surface_role);
+  ClutterActor *actor = CLUTTER_ACTOR (surface->surface_actor);
  float x, y, width, height;
  cairo_rectangle_int_t actor_rect;
  cairo_region_t *region;
@ -271,10 +226,6 @@ 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;
@ -283,41 +234,3 @@ 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,7 +40,4 @@ 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,7 +1083,6 @@ 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);

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

-  surface_actor = meta_wayland_surface_get_actor (surface);
-
-  clutter_actor_transform_stage_point (CLUTTER_ACTOR (meta_surface_actor_get_texture (surface_actor)),
+  clutter_actor_transform_stage_point (CLUTTER_ACTOR (meta_surface_actor_get_texture (surface->surface_actor)),
                                       seat->pointer->grab_x,
                                       seat->pointer->grab_y,
                                       &surface_pos.x, &surface_pos.y);
@ -1124,22 +1121,19 @@ 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_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->feedback_actor = meta_dnd_actor_new (CLUTTER_ACTOR (drag_grab->drag_origin->surface_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, drag_origin_actor);
+      clutter_actor_add_child (drag_grab->feedback_actor,
+                               CLUTTER_ACTOR (drag_grab->drag_surface->surface_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-legacy-xdg-shell.c
+++ b/src/wayland/meta-wayland-legacy-xdg-shell.c
@ -600,10 +600,6 @@ meta_wayland_zxdg_toplevel_v6_commit (MetaWaylandSurfaceRole  *surface_role,
    meta_wayland_surface_role_get_surface (surface_role);
  MetaWindow *window = surface->window;
  MetaRectangle window_geometry;
-  MetaRectangle old_geometry;
-  gboolean geometry_changed;
-
-  old_geometry = xdg_surface_priv->geometry;

  surface_role_class =
    META_WAYLAND_SURFACE_ROLE_CLASS (meta_wayland_zxdg_toplevel_v6_parent_class);
@ -622,9 +618,7 @@ meta_wayland_zxdg_toplevel_v6_commit (MetaWaylandSurfaceRole  *surface_role,
  if (!window)
    return;

-  geometry_changed = !meta_rectangle_equal (&old_geometry, &xdg_surface_priv->geometry);
-
-  if (geometry_changed || meta_window_wayland_needs_move_resize (window))
+  if (pending->has_new_geometry)
    {
      window_geometry =
        meta_wayland_zxdg_surface_v6_get_window_geometry (xdg_surface);
--- a/src/wayland/meta-wayland-private.h
+++ b/src/wayland/meta-wayland-private.h
@ -72,8 +72,6 @@ struct _MetaWaylandCompositor

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

 #endif /* META_WAYLAND_PRIVATE_H */
--- a/src/wayland/meta-wayland-seat.c
+++ b/src/wayland/meta-wayland-seat.c
@ -325,8 +325,7 @@ void
 meta_wayland_seat_update (MetaWaylandSeat    *seat,
                          const ClutterEvent *event)
 {
-  if (!(clutter_event_get_flags (event) & CLUTTER_EVENT_FLAG_INPUT_METHOD) &&
-      !event_from_supported_hardware_device (seat, event) &&
+  if (!event_from_supported_hardware_device (seat, event) &&
      !event_is_synthesized_crossing (event))
    return;

@ -364,8 +363,7 @@ gboolean
 meta_wayland_seat_handle_event (MetaWaylandSeat *seat,
                                const ClutterEvent *event)
 {
-  if (!(clutter_event_get_flags (event) & CLUTTER_EVENT_FLAG_INPUT_METHOD) &&
-      !event_from_supported_hardware_device (seat, event))
+  if (!event_from_supported_hardware_device (seat, event))
    return FALSE;

  switch (event->type)
--- 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 (meta_wayland_surface_get_actor (surface));
+  ClutterActor *actor = CLUTTER_ACTOR (surface->surface_actor);
  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 (meta_wayland_surface_get_actor (parent)));
-      ClutterActor *surface_actor = CLUTTER_ACTOR (meta_wayland_surface_get_actor (surface));
+        clutter_actor_get_parent (CLUTTER_ACTOR (parent->surface_actor));
+      ClutterActor *surface_actor = CLUTTER_ACTOR (surface->surface_actor);

      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 (meta_wayland_surface_get_actor (op->sibling));
+          sibling_actor = CLUTTER_ACTOR (op->sibling->surface_actor);

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

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

-  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_add_child (CLUTTER_ACTOR (parent->surface_actor),
+                           CLUTTER_ACTOR (surface->surface_actor));

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

 static const struct wl_subcompositor_interface meta_wayland_subcompositor_interface = {
--- a/src/wayland/meta-wayland-surface-role-cursor.c
+++ b/src/wayland/meta-wayland-surface-role-cursor.c
@ -195,15 +195,14 @@ cursor_surface_role_is_on_logical_monitor (MetaWaylandSurfaceRole *role,
    META_WAYLAND_SURFACE_ROLE_CURSOR (surface->role);
  MetaWaylandSurfaceRoleCursorPrivate *priv =
    meta_wayland_surface_role_cursor_get_instance_private (cursor_role);
-  ClutterPoint point;
+  ClutterRect rect;
  ClutterRect logical_monitor_rect;

+  rect = meta_cursor_renderer_calculate_rect (priv->cursor_renderer,
+                                              priv->cursor_sprite);
  logical_monitor_rect =
    meta_rectangle_to_clutter_rect (&logical_monitor->rect);
-
-  point = meta_cursor_renderer_get_position (priv->cursor_renderer);
-
-  return clutter_rect_contains_point (&logical_monitor_rect, &point);
+  return clutter_rect_intersection (&rect, &logical_monitor_rect, NULL);
 }

 static void
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@ -54,7 +54,6 @@

 #include "compositor/region-utils.h"
 #include "compositor/meta-shaped-texture-private.h"
-#include "compositor/meta-window-actor-private.h"

 #include "meta-surface-actor.h"
 #include "meta-surface-actor-wayland.h"
@ -105,7 +104,6 @@ enum {
  SURFACE_CONFIGURE,
  SURFACE_SHORTCUTS_INHIBITED,
  SURFACE_SHORTCUTS_RESTORED,
-  SURFACE_GEOMETRY_CHANGED,
  N_SURFACE_SIGNALS
 };

@ -129,12 +127,21 @@ 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);
-static void
-window_actor_effects_completed (MetaWindowActor    *window_actor,
-                                MetaWaylandSurface *surface);

 static void
 role_assignment_valist_to_properties (GType       role_type,
@ -301,7 +308,7 @@ surface_process_damage (MetaWaylandSurface *surface,
      cairo_rectangle_int_t rect;
      cairo_region_get_rectangle (scaled_region, i, &rect);

-      meta_surface_actor_process_damage (meta_wayland_surface_get_actor (surface),
+      meta_surface_actor_process_damage (surface->surface_actor,
                                         rect.x, rect.y,
                                         rect.width, rect.height);
    }
@ -457,6 +464,7 @@ merge_pending_state (MetaWaylandPendingState *from,
      to->dy = from->dy;
    }

+  wl_list_init (&to->frame_callback_list);
  wl_list_insert_list (&to->frame_callback_list, &from->frame_callback_list);

  cairo_region_union (to->surface_damage, from->surface_damage);
@ -573,10 +581,7 @@ meta_wayland_surface_is_effectively_synchronized (MetaWaylandSurface *surface)
        {
          MetaWaylandSurface *parent = surface->sub.parent;

-          if (parent)
-            return meta_wayland_surface_is_effectively_synchronized (parent);
-
-          return TRUE;
+          return meta_wayland_surface_is_effectively_synchronized (parent);
        }
    }
 }
@ -644,14 +649,14 @@ meta_wayland_surface_apply_pending_state (MetaWaylandSurface      *surface,
              goto cleanup;
            }

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

-              stex = meta_surface_actor_get_texture (meta_wayland_surface_get_actor (surface));
+              stex = meta_surface_actor_get_texture (surface->surface_actor);
              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);
@ -675,9 +680,8 @@ meta_wayland_surface_apply_pending_state (MetaWaylandSurface      *surface,
  if (pending->scale > 0)
    surface->scale = pending->scale;

-  if (meta_wayland_surface_get_actor (surface) &&
-      (!cairo_region_is_empty (pending->surface_damage) ||
-       !cairo_region_is_empty (pending->buffer_damage)))
+  if (!cairo_region_is_empty (pending->surface_damage) ||
+      !cairo_region_is_empty (pending->buffer_damage))
    surface_process_damage (surface,
                            pending->surface_damage,
                            pending->buffer_damage);
@ -1132,14 +1136,11 @@ meta_wayland_surface_set_window (MetaWaylandSurface *surface,
      g_signal_handlers_disconnect_by_func (surface->window,
                                            window_position_changed,
                                            surface);
-      g_signal_handlers_disconnect_by_func (meta_window_actor_from_window (surface->window),
-                                            window_actor_effects_completed,
-                                            surface);
    }

  surface->window = window;

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

  if (was_unmapped)
@ -1151,10 +1152,6 @@ meta_wayland_surface_set_window (MetaWaylandSurface *surface,
                               "position-changed",
                               G_CALLBACK (window_position_changed),
                               surface, 0);
-      g_signal_connect_object (meta_window_actor_from_window (window),
-                               "effects-completed",
-                               G_CALLBACK (window_actor_effects_completed),
-                               surface, 0);
    }
 }

@ -1167,6 +1164,16 @@ 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
@ -1192,6 +1199,8 @@ 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);
@ -1213,6 +1222,30 @@ 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)
@ -1220,11 +1253,19 @@ window_position_changed (MetaWindow         *window,
  meta_wayland_surface_update_outputs_recursively (surface);
 }

-static void
-window_actor_effects_completed (MetaWindowActor    *window_actor,
-                                MetaWaylandSurface *surface)
+void
+meta_wayland_surface_create_surface_actor (MetaWaylandSurface *surface)
 {
-  meta_wayland_surface_update_outputs_recursively (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 *
@ -1241,15 +1282,28 @@ 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;
 }

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

      clutter_actor_transform_stage_point (actor, abs_x, abs_y, sx, sy);
      *sx /= surface->scale;
@ -1448,7 +1502,7 @@ meta_wayland_surface_get_absolute_coordinates (MetaWaylandSurface *surface,
                                               float               *y)
 {
  ClutterActor *actor =
-    CLUTTER_ACTOR (meta_surface_actor_get_texture (meta_wayland_surface_get_actor (surface)));
+    CLUTTER_ACTOR (meta_surface_actor_get_texture (surface->surface_actor));
  ClutterVertex sv = {
    .x = sx * surface->scale,
    .y = sy * surface->scale,
@ -1465,10 +1519,6 @@ 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
@ -1515,13 +1565,6 @@ 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
@ -1729,18 +1772,3 @@ 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,6 +137,7 @@ struct _MetaWaylandSurface
  /* Generic stuff */
  struct wl_resource *resource;
  MetaWaylandCompositor *compositor;
+  MetaSurfaceActor *surface_actor;
  MetaWaylandSurfaceRole *role;
  MetaWindow *window;
  cairo_region_t *input_region;
@ -230,6 +231,10 @@ 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,
@ -298,8 +303,4 @@ 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,13 +632,10 @@ 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_actor)),
+  clutter_actor_transform_stage_point (CLUTTER_ACTOR (meta_surface_actor_get_texture (surface->surface_actor)),
                                       xf, yf, &xf, &yf);

  *sx = wl_fixed_from_double (xf) / surface->scale;
--- a/src/wayland/meta-wayland-text-input.c
+++ b/src/wayland/meta-wayland-text-input.c
@ -120,6 +120,8 @@ meta_wayland_text_input_focus_commit_text (ClutterInputFocus *focus,
      gtk_text_input_send_preedit_string (resource, NULL, 0);
      gtk_text_input_send_commit_string (resource, text);
    }
+
+  clutter_input_focus_reset (focus);
 }

 static void
--- a/src/wayland/meta-wayland-xdg-foreign.c
+++ b/src/wayland/meta-wayland-xdg-foreign.c
@ -252,8 +252,10 @@ is_valid_child (MetaWaylandSurface *surface)
  if (!surface->role)
    return FALSE;

-  if (!META_IS_WAYLAND_XDG_TOPLEVEL (surface->role) &&
-      !META_IS_WAYLAND_ZXDG_TOPLEVEL_V6 (surface->role))
+  if (!META_IS_WAYLAND_XDG_SURFACE (surface->role))
+    return FALSE;
+
+  if (!META_IS_WAYLAND_ZXDG_SURFACE_V6 (surface->role))
    return FALSE;

  if (!surface->window)
@ -382,7 +384,7 @@ xdg_importer_import (struct wl_client   *client,
      (!META_IS_WAYLAND_XDG_SURFACE (exported->surface->role) &&
       !META_IS_WAYLAND_ZXDG_SURFACE_V6 (exported->surface->role)))
    {
-      zxdg_imported_v1_send_destroyed (xdg_imported_resource);
+      zxdg_imported_v1_send_destroyed (resource);
      return;
    }

--- a/src/wayland/meta-wayland-xdg-shell.c
+++ b/src/wayland/meta-wayland-xdg-shell.c
@ -621,8 +621,6 @@ meta_wayland_xdg_toplevel_commit (MetaWaylandSurfaceRole  *surface_role,
    meta_wayland_surface_role_get_surface (surface_role);
  MetaWindow *window;
  MetaRectangle window_geometry;
-  MetaRectangle old_geometry;
-  gboolean geometry_changed;

  if (!surface->buffer_ref.buffer && xdg_surface_priv->first_buffer_attached)
    {
@ -631,7 +629,6 @@ meta_wayland_xdg_toplevel_commit (MetaWaylandSurfaceRole  *surface_role,
    }

  window = surface->window;
-  old_geometry = xdg_surface_priv->geometry;

  surface_role_class =
    META_WAYLAND_SURFACE_ROLE_CLASS (meta_wayland_xdg_toplevel_parent_class);
@ -646,9 +643,7 @@ meta_wayland_xdg_toplevel_commit (MetaWaylandSurfaceRole  *surface_role,
  if (!pending->newly_attached)
    return;

-  geometry_changed = !meta_rectangle_equal (&old_geometry, &xdg_surface_priv->geometry);
-
-  if (geometry_changed || meta_window_wayland_needs_move_resize (window))
+  if (pending->has_new_geometry)
    {
      window_geometry = meta_wayland_xdg_surface_get_window_geometry (xdg_surface);
      meta_window_wayland_move_resize (window,
@ -712,8 +707,9 @@ 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_actor_surface_reset_actor (META_WAYLAND_ACTOR_SURFACE (surface_role));
+  meta_wayland_surface_create_surface_actor (surface);
  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,7 +46,6 @@
 #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;
@ -307,8 +306,6 @@ 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
@ -485,62 +482,3 @@ 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,12 +65,5 @@ 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-window-wayland.c
+++ b/src/wayland/meta-window-wayland.c
@ -48,7 +48,6 @@ struct _MetaWindowWayland
  int geometry_scale;

  MetaWaylandSerial pending_configure_serial;
-  gboolean has_pending_state_change;
  gboolean has_pending_move;
  int pending_move_x;
  int pending_move_y;
@ -325,9 +324,6 @@ meta_window_wayland_move_resize_internal (MetaWindow                *window,
          window->buffer_rect.x = new_buffer_x;
          window->buffer_rect.y = new_buffer_y;
        }
-
-      if (flags & META_MOVE_RESIZE_WAYLAND_STATE_CHANGED)
-        *result |= META_MOVE_RESIZE_RESULT_STATE_CHANGED;
    }
  else
    {
@ -340,8 +336,6 @@ meta_window_wayland_move_resize_internal (MetaWindow                *window,
          wl_window->pending_move_x = new_x;
          wl_window->pending_move_y = new_y;
        }
-
-      wl_window->has_pending_state_change = (flags & META_MOVE_RESIZE_STATE_CHANGED) != 0;
    }
 }

@ -635,9 +629,12 @@ meta_window_wayland_new (MetaDisplay        *display,
 }

 static gboolean
-is_pending_ack_configure (MetaWindowWayland *wl_window,
-                          MetaWaylandSerial *acked_configure_serial)
+should_do_pending_move (MetaWindowWayland *wl_window,
+                        MetaWaylandSerial *acked_configure_serial)
 {
+  if (!wl_window->has_pending_move)
+    return FALSE;
+
  if (wl_window->pending_configure_serial.set)
    {
      /* If we're waiting for a configure and this isn't an ACK for
@ -680,7 +677,6 @@ meta_window_wayland_move_resize (MetaWindow        *window,
  int gravity;
  MetaRectangle rect;
  MetaMoveResizeFlags flags;
-  gboolean pending_ack_configure;

  /* new_geom is in the logical pixel coordinate space, but MetaWindow wants its
   * rects to represent what in turn will end up on the stage, i.e. we need to
@ -704,12 +700,10 @@ meta_window_wayland_move_resize (MetaWindow        *window,

  flags = META_MOVE_RESIZE_WAYLAND_RESIZE;

-  pending_ack_configure = is_pending_ack_configure (wl_window, acked_configure_serial);
-
  /* x/y are ignored when we're doing interactive resizing */
  if (!meta_grab_op_is_resizing (window->display->grab_op))
    {
-      if (wl_window->has_pending_move && pending_ack_configure)
+      if (wl_window->has_pending_move && should_do_pending_move (wl_window, acked_configure_serial))
        {
          rect.x = wl_window->pending_move_x;
          rect.y = wl_window->pending_move_y;
@ -730,12 +724,6 @@ meta_window_wayland_move_resize (MetaWindow        *window,
        }
    }

-  if (wl_window->has_pending_state_change && pending_ack_configure)
-    {
-      flags |= META_MOVE_RESIZE_WAYLAND_STATE_CHANGED;
-      wl_window->has_pending_state_change = FALSE;
-    }
-
  wl_window->pending_configure_serial.set = FALSE;

  rect.width = new_geom.width;
@ -915,10 +903,3 @@ meta_window_wayland_get_max_size (MetaWindow *window,
  scale_size (width, height, scale);
 }

-gboolean
-meta_window_wayland_needs_move_resize (MetaWindow *window)
-{
-  MetaWindowWayland *wl_window = META_WINDOW_WAYLAND (window);
-
-  return wl_window->has_pending_state_change || wl_window->has_pending_move;
-}
--- a/src/wayland/meta-window-wayland.h
+++ b/src/wayland/meta-window-wayland.h
@ -78,6 +78,5 @@ void meta_window_wayland_get_max_size (MetaWindow *window,
                                       int        *width,
                                       int        *height);

-gboolean meta_window_wayland_needs_move_resize (MetaWindow *window);

 #endif
--- a/src/wayland/meta-xwayland.c
+++ b/src/wayland/meta-xwayland.c
@ -26,8 +26,6 @@
 #include "meta-xwayland.h"
 #include "meta-xwayland-private.h"

-#include <meta/main.h>
-
 #include <glib.h>
 #include <glib-unix.h>
 #include <errno.h>
@ -60,9 +58,9 @@ G_DEFINE_TYPE (MetaWaylandSurfaceRoleXWayland,
               meta_wayland_surface_role_xwayland,
               META_TYPE_WAYLAND_ACTOR_SURFACE)

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

@ -110,13 +108,58 @@ associate_window_with_surface_id (MetaXWaylandManager *manager,
  if (resource)
    {
      MetaWaylandSurface *surface = wl_resource_get_user_data (resource);
-      meta_xwayland_associate_window_with_surface (window, surface);
+      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)
@ -126,11 +169,21 @@ meta_xwayland_handle_wl_surface_id (MetaWindow *window,

  if (!associate_window_with_surface_id (manager, window, surface_id))
    {
-      /* No surface ID yet, schedule this association for whenever the
-       * surface is made known.
+      /* No surface ID yet... it should arrive after the next
+       * iteration through the loop, so queue a later and see
+       * what happens.
       */
-      meta_wayland_compositor_schedule_surface_association (compositor,
-                                                            surface_id, window);
+      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);
    }
 }

@ -340,34 +393,30 @@ xserver_died (GObject      *source,
              gpointer      user_data)
 {
  GSubprocess *proc = G_SUBPROCESS (source);
-  g_autoptr (GError) error = NULL;
+  GError *error = NULL;

  if (!g_subprocess_wait_finish (proc, result, &error))
    {
-      if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-        return;
-
-      g_warning ("Failed to finish waiting for Xwayland: %s", error->message);
+      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_error ("Failed to finish waiting for Xwayland: %s", error->message);
+      g_clear_error (&error);
    }
  else if (!g_subprocess_get_successful (proc))
-    g_warning ("X Wayland crashed; exiting");
+    g_error ("X Wayland crashed; aborting");
  else
    {
      /* For now we simply abort if we see the server exit.
       *
       * In the future X will only be loaded lazily for legacy X support
       * but for now it's a hard requirement. */
-      g_warning ("Spurious exit of X Wayland server");
+      g_error ("Spurious exit of X Wayland server");
    }
-
-  meta_exit (META_EXIT_ERROR);
 }

 static int
 x_io_error (Display *display)
 {
-  g_warning ("Connection to xwayland lost");
-  meta_exit (META_EXIT_ERROR);
+  g_error ("Connection to xwayland lost");

  return 0;
 }
--- a/src/wayland/meta-xwayland.h
+++ b/src/wayland/meta-xwayland.h
@ -41,8 +41,4 @@ 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 */
--- a/src/x11/window-x11.c
+++ b/src/x11/window-x11.c
@ -1282,8 +1282,6 @@ meta_window_x11_move_resize_internal (MetaWindow                *window,
    *result |= META_MOVE_RESIZE_RESULT_MOVED;
  if (need_resize_client || need_resize_frame)
    *result |= META_MOVE_RESIZE_RESULT_RESIZED;
-  if (flags & META_MOVE_RESIZE_STATE_CHANGED)
-    *result |= META_MOVE_RESIZE_RESULT_STATE_CHANGED;

  update_gtk_edge_constraints (window);
 }
Author	SHA1	Message	Date
Florian Müllner	34644b2133	Bump version to 3.28.1 Update NEWS.	2018-04-13 19:11:57 +02:00
Carlos Garnacho	7da4e8cf14	wayland: Plug surface pending state contents leak When moving the pending state of an effectively synchronized subsurface so it is applied together with the parent, perform a merge of the source MetaWaylandPendingState into the destination one, instead of simply overwriting the struct. The other approach had 2 kind of leaks, one that would happen everytime a wl_surface.commit happens on a sync subsurface (both surface/buffer damage regions are leaked). The other more unlikely one would apply on the rest of pending state data, happening whenever the compositor gets >1 wl_surface.commit calls on the subsurface before the parent surface gets its own. The function has also been renamed to use the more descriptive "merge" term. Related: gnome-shell#64	2018-04-13 00:10:03 +02:00
Aleksandr Mezin	23c3f8bb18	monitor-manager: fix output ids returned by GetResources Output ID is set equal to 'i' later in the loop. But 'i' was never incremented, so all outputs were getting the same ID (equal to the number of CRTCs, because 'i' was reused from the previous loop).	2018-04-11 17:55:41 +00:00
Jonas Ådahl	60866e0f85	native: Disable the use of KMS modifiers by default Make it re-enable:able by a hidden "experimental feature". To enable, add "kms-modifiers" to the org.gnome.mutter.experimental-features GSettings entry. https://gitlab.gnome.org/GNOME/mutter/issues/81	2018-04-11 16:34:59 +02:00
Matej Urbančič	45c02645f3	Updated Slovenian translation	2018-04-10 17:58:12 +02:00
Benjamin Otte	e515e37a7e	screen-cast: Fix compile error Credit goes to gcc for finding this typo. (cherry picked from commit `98dfd5b887`)	2018-04-10 12:10:19 +00:00
Marco Trevisan (Treviño)	957f4ec69d	theme: Scale titlebar spacing when computing x The value is not scaled by default so it needs to be adjusted depending on the window scaling, as it's done in other places. Fixes: #87 (cherry picked from commit `deda7a5235`)	2018-04-03 20:42:28 +00:00
Marco Trevisan (Treviño)	a98eb107be	theme: add ".appmenu" class to the appmenu button So it does gtk headerbar, so mutter should do. (cherry picked from commit `96141e28f9`)	2018-04-03 20:22:52 +00:00
Daniel Stone	1851fa2bd0	renderer-native: Fall back to non-modifier GBM surfaces If we attempt GBM surface allocation with a set of modifiers but the allocation fails, fall back to non-modifier allocations. This fixes startup on Pineview-based Atom systems, where KMS provides us a set of modifiers but the GBM implementation doesn't support modifier use. Closes: https://gitlab.gnome.org/GNOME/mutter/issues/84 (cherry picked from commit `e6109cfc22`)	2018-04-03 18:18:31 +00:00
Carlos Garnacho	de7d7bbf3d	clutter: Apply input hints/purpose on ClutterTextInputFocus focus in And make the ClutterText-level properties independent from the input focus, as those properties can be set anytime, not just when the ClutterText actor is focused. https://gitlab.gnome.org/GNOME/mutter/issues/66 Closes: #66 (cherry picked from commit `3684f6b0ac`)	2018-04-03 15:00:01 +00:00
Alberts Muktupāvels	7ac551cd05	input-settings: Fix a typo in tap-and-drag setting (cherry picked from commit `31b5059068`)	2018-03-29 14:54:00 +00:00
Olivier Fourdan	8696a79477	cursor-renderer-native: take rotation into account Rotating an output would show duplicate cursors when the pointer is located over an area which would be within the output if not rotated. Make sure to swap the width/height of the output when rotated. Closes: https://gitlab.gnome.org/GNOME/mutter/issues/85 (cherry picked from commit `ebff7fd7f4`)	2018-03-29 06:49:14 +00:00
Daniel van Vugt	b2f9de98d0	renderer-native: Swap then await earlier flips. Rendering the next frame (which mostly happens as part of the flush done in swap buffers) is a task that the GPU can complete independently of the CPU having to wait for previous page flips. So reverse their order to get the GPU started earlier, with the aim of greater GPU-CPU parallelism. (cherry picked from commit `6e415353e3`)	2018-03-29 05:41:02 +00:00
Georges Basile Stavracas Neto	2da2489da5	window: Fix a small memory leak (cherry picked from commit `63e2c0329f`)	2018-03-29 05:24:08 +00:00
Yussuf Khalil	31779404f0	clutter: Avoid unnecessary relayouts in ClutterText We can save an unnecessary relayout if the required size to fully draw the text is equal to the currently allocated size after the underlying text buffer or attributes that only affect the PangoLayout have changed.	2018-03-22 23:35:27 +01:00
Rasmus Thomsen	b096c0ac33	mutter: allow building with elogind This commit allows building mutter with elogind, which is systemd-logind extracted into a standalone package. This allows using mutter with its native-backend ( and consequently wayland ) enabled on distros which use init systems other than systemd. https://gitlab.gnome.org/GNOME/mutter/merge_requests/46	2018-03-21 23:07:46 +01:00
Carlos Garnacho	44a7f74dcd	cogl: Read pixels as per the stored format By the looks of it, commit `95e9fa10ef` was taping over an Intel DRI bug that would make it return post-swizzling pixel data on glReadPixels(). There's been reports over time of that commit resulting in wrong colors on other drivers, and lately Mesa >17.3 started showing the same symptoms on Intel. But texture swizzling works by changing parameters before fragment shaders and reading pixels from an already drawn FBO/texture doesn't involve those. This should thus use pixel_format_to_gl_with_target(), which will result in correctly requesting the same pixel format than the underlying texture, while still considering it BGRA for the upper layers in the swizzling case. https://gitlab.gnome.org/GNOME/mutter/issues/72 Closes: #72	2018-03-21 20:37:34 +01:00
Georges Basile Stavracas Neto	3832c6b607	gpu-kms: Ignore GPUs with no connectors Mutter recently gained the ability to deal with multiple GPUs rendering at different displays. These GPUs would have a display connected to them, and Mutter was adapted in order to be aware of different GPUs and their outputs. However, one specific edge case appeared: PRIME systems. PRIME systems have two GPUs: * The integrated GPU (iGPU), usually Intel, which has connectors and deals with the routine load. * The dedicated GPU (dGPU), usually AMD or NVidia, which has no connectors at all and are there just to aid heavy loads. On those systems, the dGPU is aggressively put to sleep by the kernel to avoid energy waste. Waking it up is a costly operation. With Mutter's adaptation to deal with multiple GPUs, Mutter began wakening the dGPU every time some rendering had to be done. This was causing stuttering every time the dGPU was put to sleep, and Mutter asked it to wake up again. To fix this situation, this commit ignores GPUs with no connectors attached. Issue: #77	2018-03-21 18:50:14 +00:00
Georges Basile Stavracas Neto	14b7e79d3c	gpu-kms: Return NULL, not FALSE Another small mistake spotted while working on #77. This function returns a pointer, thus we should return NULL, not FALSE. Issue: #77	2018-03-21 18:50:13 +00:00
Georges Basile Stavracas Neto	e99b0b9368	monitor-manager-kms: Don't add GPU if it fails This is a small mistake spotted while working on a solution for #77. When a GPU fails to initialize, we're adding them anyway, which might have pretty bad consequences when trying to use these NULL GPUs. Issue: #77	2018-03-21 18:50:13 +00:00
Georges Basile Stavracas Neto	de294f34bb	monitor-manager-kms: Use g_autoptr for error A minor code cleanup.	2018-03-21 18:50:13 +00:00